summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCai Hui <cai.hui@zte.com.cn>2018-11-06 20:00:28 -0500
committerCai Hui <cai.hui@zte.com.cn>2018-11-06 20:33:41 -0500
commit6763ff9a59413dfe6ae9bcc5ee60877581d51425 (patch)
treee1658a4bb572003c1b2c37964b42ffbc6369743f
parent76bd7e2722cca540cb12ada0e2b66b64536672ca (diff)
Use freezerclient.client to support v1 or v27.0.0
The python-freezerclient 2.0.0 is released now. We can directly use freezerclinent.client to support api v1 or v2. Change-Id: I30ad8694d137e0fab081b0f8ded842caa723c86f
Notes
Notes (review): Code-Review+2: Trinh Nguyen <dangtrinhnt@gmail.com> Code-Review+2: gengchc2 <geng.changcai2@zte.com.cn> Workflow+1: gengchc2 <geng.changcai2@zte.com.cn> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 07 Nov 2018 06:11:42 +0000 Reviewed-on: https://review.openstack.org/616041 Project: openstack/freezer-web-ui Branch: refs/heads/master
-rw-r--r--disaster_recovery/api/api.py8
-rw-r--r--lower-constraints.txt2
-rw-r--r--requirements.txt2
3 files changed, 3 insertions, 9 deletions
diff --git a/disaster_recovery/api/api.py b/disaster_recovery/api/api.py
index d594f66..c726a05 100644
--- a/disaster_recovery/api/api.py
+++ b/disaster_recovery/api/api.py
@@ -17,13 +17,7 @@ from oslo_log import log
17 17
18from django.conf import settings 18from django.conf import settings
19from horizon.utils.memoized import memoized # noqa 19from horizon.utils.memoized import memoized # noqa
20 20from freezerclient import client as freezer_client
21# When python-freezerclient 2.0 released, directly use freezerclient.client
22# as freezer_client.
23# The current python-freezerclient version hasn't freezerclient.client module.
24# from freezerclient import client as freezer_client
25
26from freezerclient.v2 import client as freezer_client
27 21
28from disaster_recovery import utils 22from disaster_recovery import utils
29 23
diff --git a/lower-constraints.txt b/lower-constraints.txt
index a731ec4..96fccc7 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -39,7 +39,7 @@ Pygments==2.2.0
39pylint==1.4.5 39pylint==1.4.5
40pyparsing==2.2.0 40pyparsing==2.2.0
41pyperclip==1.6.0 41pyperclip==1.6.0
42python-freezerclient==1.3.0 42python-freezerclient==2.0.0
43python-mimeparse==1.6.0 43python-mimeparse==1.6.0
44python-subunit==1.2.0 44python-subunit==1.2.0
45pytz==2018.3 45pytz==2018.3
diff --git a/requirements.txt b/requirements.txt
index 691795d..e1469c8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
1# The order of packages is significant, because pip processes them in the order 1# The order of packages is significant, because pip processes them in the order
2# of appearance. Changing the order has an impact on the overall integration 2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4python-freezerclient>=1.3.0 # Apache-2.0 4python-freezerclient>=2.0.0 # Apache-2.0
5oslo.log>=3.36.0 # Apache-2.0 5oslo.log>=3.36.0 # Apache-2.0
6 6
7# OpenStack CI will install the following projects from git 7# OpenStack CI will install the following projects from git