summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com>2018-07-25 13:50:33 +0900
committerYushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com>2018-07-25 21:31:54 +0900
commit7ed00236a50ff36989618b8da760120adca433e6 (patch)
treef2cdcbc41662efb2744461d0c7912bc5227c2a48
parent565bab52d3f161fdceb360466b8fe7a521f55131 (diff)
Update neutron components and fix broken test
Notes
Notes (review): Code-Review+2: Yushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com> Workflow+1: Yushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 25 Jul 2018 23:39:01 +0000 Reviewed-on: https://review.openstack.org/585679 Project: openstack/networking-fujitsu Branch: refs/heads/master
-rw-r--r--lower-constraints.txt32
-rw-r--r--networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py8
-rw-r--r--requirements.txt4
3 files changed, 22 insertions, 22 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 795c9e9..21ba372 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -13,7 +13,7 @@ chardet==3.0.4
13cliff==2.11.0 13cliff==2.11.0
14cmd2==0.8.1 14cmd2==0.8.1
15contextlib2==0.5.5 15contextlib2==0.5.5
16coverage==4.5.1 16coverage==4.0
17cryptography==2.1.4 17cryptography==2.1.4
18debtcollector==1.19.0 18debtcollector==1.19.0
19decorator==4.2.1 19decorator==4.2.1
@@ -56,7 +56,7 @@ msgpack-python==0.5.6
56munch==2.2.0 56munch==2.2.0
57netaddr==0.7.19 57netaddr==0.7.19
58netifaces==0.10.6 58netifaces==0.10.6
59neutron-lib==1.13.0 59neutron-lib==1.18.0
60openstacksdk==0.12.0 60openstacksdk==0.12.0
61os-client-config==1.29.0 61os-client-config==1.29.0
62os-service-types==1.2.0 62os-service-types==1.2.0
@@ -68,8 +68,8 @@ oslo.concurrency==3.26.0
68oslo.config==5.2.0 68oslo.config==5.2.0
69oslo.context==2.20.0 69oslo.context==2.20.0
70oslo.db==4.35.0 70oslo.db==4.35.0
71oslo.i18n==3.20.0 71oslo.i18n==3.15.3
72oslo.log==3.37.0 72oslo.log==3.36.0
73oslo.messaging==5.36.0 73oslo.messaging==5.36.0
74oslo.middleware==3.35.0 74oslo.middleware==3.35.0
75oslo.policy==1.34.0 75oslo.policy==1.34.0
@@ -78,18 +78,18 @@ oslo.reports==1.27.0
78oslo.rootwrap==5.13.0 78oslo.rootwrap==5.13.0
79oslo.serialization==2.25.0 79oslo.serialization==2.25.0
80oslo.service==1.30.0 80oslo.service==1.30.0
81oslo.utils==3.36.0 81oslo.utils==3.33.0
82oslo.versionedobjects==1.32.0 82oslo.versionedobjects==1.32.0
83oslosphinx==4.18.0 83oslosphinx==4.7.0
84oslotest==3.3.0 84oslotest==3.2.0
85osprofiler==2.0.0 85osprofiler==2.0.0
86ovs==2.8.1 86ovs==2.8.1
87ovsdbapp==0.10.0 87ovsdbapp==0.10.0
88packaging==17.1 88packaging==17.1
89paramiko==2.4.1 89paramiko==2.0.0
90Paste==2.0.3 90Paste==2.0.3
91PasteDeploy==1.5.2 91PasteDeploy==1.5.2
92pbr==3.1.1 92pbr==2.0.0
93pecan==1.2.1 93pecan==1.2.1
94pep8==1.5.7 94pep8==1.5.7
95pika==0.10.0 95pika==0.10.0
@@ -113,10 +113,10 @@ python-keystoneclient==3.15.0
113python-mimeparse==1.6.0 113python-mimeparse==1.6.0
114python-neutronclient==6.7.0 114python-neutronclient==6.7.0
115python-novaclient==10.1.0 115python-novaclient==10.1.0
116python-subunit==1.2.0 116python-subunit==1.0.0
117pytz==2018.3 117pytz==2018.3
118PyYAML==3.12 118PyYAML==3.12
119reno==2.7.0 119reno==2.5.0
120repoze.lru==0.7 120repoze.lru==0.7
121requests==2.18.4 121requests==2.18.4
122requestsexceptions==1.4.0 122requestsexceptions==1.4.0
@@ -126,7 +126,7 @@ ryu==4.23
126simplejson==3.13.2 126simplejson==3.13.2
127six==1.11.0 127six==1.11.0
128snowballstemmer==1.2.1 128snowballstemmer==1.2.1
129Sphinx==1.6.5 129Sphinx==1.6.2
130sphinxcontrib-websupport==1.0.1 130sphinxcontrib-websupport==1.0.1
131SQLAlchemy==1.2.5 131SQLAlchemy==1.2.5
132sqlalchemy-migrate==0.11.0 132sqlalchemy-migrate==0.11.0
@@ -136,10 +136,10 @@ stestr==2.0.0
136stevedore==1.28.0 136stevedore==1.28.0
137Tempita==0.5.2 137Tempita==0.5.2
138tenacity==4.9.0 138tenacity==4.9.0
139testrepository==0.0.20 139testrepository==0.0.18
140testresources==2.0.1 140testresources==2.0.0
141testscenarios==0.5.0 141testscenarios==0.4
142testtools==2.3.0 142testtools==2.2.0
143tinyrpc==0.8 143tinyrpc==0.8
144traceback2==1.4.0 144traceback2==1.4.0
145unittest2==1.1.0 145unittest2==1.1.0
diff --git a/networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py b/networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py
index 460b393..bd1dd89 100644
--- a/networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py
+++ b/networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py
@@ -84,14 +84,14 @@ class TestFOSSWInitialize(helper.FujitsuMechanismHelper):
84 mech_fossw.FOSSW_VLAN_DRIVER, 84 mech_fossw.FOSSW_VLAN_DRIVER,
85 importutils.import_object.call_args_list[0][0][0]) 85 importutils.import_object.call_args_list[0][0][0])
86 self.assertEqual( 86 self.assertEqual(
87 config.cfg.CONF, 87 config.cfg.CONF.__dict__,
88 importutils.import_object.call_args_list[0][0][1]) 88 importutils.import_object.call_args_list[0][0][1].__dict__)
89 self.assertEqual( 89 self.assertEqual(
90 mech_fossw.FOSSW_VXLAN_DRIVER, 90 mech_fossw.FOSSW_VXLAN_DRIVER,
91 importutils.import_object.call_args_list[1][0][0]) 91 importutils.import_object.call_args_list[1][0][0])
92 self.assertEqual( 92 self.assertEqual(
93 config.cfg.CONF, 93 config.cfg.CONF.__dict__,
94 importutils.import_object.call_args_list[1][0][1]) 94 importutils.import_object.call_args_list[1][0][1].__dict__)
95 self.mech._vlan_driver.get_switch_mac_ip_pair.assert_called_once_with( 95 self.mech._vlan_driver.get_switch_mac_ip_pair.assert_called_once_with(
96 [ADDRESS, ADDRESS2]) 96 [ADDRESS, ADDRESS2])
97 97
diff --git a/requirements.txt b/requirements.txt
index 50ddc4b..2706f70 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
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.
4 4
5neutron-lib>=1.13.0 # Apache-2.0 5neutron-lib>=1.18.0 # Apache-2.0
6oslo.i18n>=3.15.3 # Apache-2.0 6oslo.i18n>=3.15.3 # Apache-2.0
7oslo.log>=3.36.0 # Apache-2.0 7oslo.log>=3.36.0 # Apache-2.0
8oslo.utils>=3.33.0 # Apache-2.0 8oslo.utils>=3.33.0 # Apache-2.0
@@ -11,4 +11,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
11 11
12# These repos are installed from git in OpenStack CI if the job 12# These repos are installed from git in OpenStack CI if the job
13# configures them as required-projects: 13# configures them as required-projects:
14neutron>=12.0.0 # Apache-2.0 14neutron>=13.0.0.0b1 # Apache-2.0