Browse Source

Update neutron components and fix broken test

Change-Id: I56245a273dbcedbe03d01c7f4a66a439deccc441
tags/7.0.0
Yushiro FURUKAWA 1 year ago
parent
commit
7ed00236a5
3 changed files with 22 additions and 22 deletions
  1. 16
    16
      lower-constraints.txt
  2. 4
    4
      networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py
  3. 2
    2
      requirements.txt

+ 16
- 16
lower-constraints.txt View File

@@ -13,7 +13,7 @@ chardet==3.0.4
13 13
 cliff==2.11.0
14 14
 cmd2==0.8.1
15 15
 contextlib2==0.5.5
16
-coverage==4.5.1
16
+coverage==4.0
17 17
 cryptography==2.1.4
18 18
 debtcollector==1.19.0
19 19
 decorator==4.2.1
@@ -56,7 +56,7 @@ msgpack-python==0.5.6
56 56
 munch==2.2.0
57 57
 netaddr==0.7.19
58 58
 netifaces==0.10.6
59
-neutron-lib==1.13.0
59
+neutron-lib==1.18.0
60 60
 openstacksdk==0.12.0
61 61
 os-client-config==1.29.0
62 62
 os-service-types==1.2.0
@@ -68,8 +68,8 @@ oslo.concurrency==3.26.0
68 68
 oslo.config==5.2.0
69 69
 oslo.context==2.20.0
70 70
 oslo.db==4.35.0
71
-oslo.i18n==3.20.0
72
-oslo.log==3.37.0
71
+oslo.i18n==3.15.3
72
+oslo.log==3.36.0
73 73
 oslo.messaging==5.36.0
74 74
 oslo.middleware==3.35.0
75 75
 oslo.policy==1.34.0
@@ -78,18 +78,18 @@ oslo.reports==1.27.0
78 78
 oslo.rootwrap==5.13.0
79 79
 oslo.serialization==2.25.0
80 80
 oslo.service==1.30.0
81
-oslo.utils==3.36.0
81
+oslo.utils==3.33.0
82 82
 oslo.versionedobjects==1.32.0
83
-oslosphinx==4.18.0
84
-oslotest==3.3.0
83
+oslosphinx==4.7.0
84
+oslotest==3.2.0
85 85
 osprofiler==2.0.0
86 86
 ovs==2.8.1
87 87
 ovsdbapp==0.10.0
88 88
 packaging==17.1
89
-paramiko==2.4.1
89
+paramiko==2.0.0
90 90
 Paste==2.0.3
91 91
 PasteDeploy==1.5.2
92
-pbr==3.1.1
92
+pbr==2.0.0
93 93
 pecan==1.2.1
94 94
 pep8==1.5.7
95 95
 pika==0.10.0
@@ -113,10 +113,10 @@ python-keystoneclient==3.15.0
113 113
 python-mimeparse==1.6.0
114 114
 python-neutronclient==6.7.0
115 115
 python-novaclient==10.1.0
116
-python-subunit==1.2.0
116
+python-subunit==1.0.0
117 117
 pytz==2018.3
118 118
 PyYAML==3.12
119
-reno==2.7.0
119
+reno==2.5.0
120 120
 repoze.lru==0.7
121 121
 requests==2.18.4
122 122
 requestsexceptions==1.4.0
@@ -126,7 +126,7 @@ ryu==4.23
126 126
 simplejson==3.13.2
127 127
 six==1.11.0
128 128
 snowballstemmer==1.2.1
129
-Sphinx==1.6.5
129
+Sphinx==1.6.2
130 130
 sphinxcontrib-websupport==1.0.1
131 131
 SQLAlchemy==1.2.5
132 132
 sqlalchemy-migrate==0.11.0
@@ -136,10 +136,10 @@ stestr==2.0.0
136 136
 stevedore==1.28.0
137 137
 Tempita==0.5.2
138 138
 tenacity==4.9.0
139
-testrepository==0.0.20
140
-testresources==2.0.1
141
-testscenarios==0.5.0
142
-testtools==2.3.0
139
+testrepository==0.0.18
140
+testresources==2.0.0
141
+testscenarios==0.4
142
+testtools==2.2.0
143 143
 tinyrpc==0.8
144 144
 traceback2==1.4.0
145 145
 unittest2==1.1.0

+ 4
- 4
networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py View File

@@ -84,14 +84,14 @@ class TestFOSSWInitialize(helper.FujitsuMechanismHelper):
84 84
             mech_fossw.FOSSW_VLAN_DRIVER,
85 85
             importutils.import_object.call_args_list[0][0][0])
86 86
         self.assertEqual(
87
-            config.cfg.CONF,
88
-            importutils.import_object.call_args_list[0][0][1])
87
+            config.cfg.CONF.__dict__,
88
+            importutils.import_object.call_args_list[0][0][1].__dict__)
89 89
         self.assertEqual(
90 90
             mech_fossw.FOSSW_VXLAN_DRIVER,
91 91
             importutils.import_object.call_args_list[1][0][0])
92 92
         self.assertEqual(
93
-            config.cfg.CONF,
94
-            importutils.import_object.call_args_list[1][0][1])
93
+            config.cfg.CONF.__dict__,
94
+            importutils.import_object.call_args_list[1][0][1].__dict__)
95 95
         self.mech._vlan_driver.get_switch_mac_ip_pair.assert_called_once_with(
96 96
             [ADDRESS, ADDRESS2])
97 97
 

+ 2
- 2
requirements.txt View File

@@ -2,7 +2,7 @@
2 2
 # of appearance. Changing the order has an impact on the overall integration
3 3
 # process, which may cause wedges in the gate later.
4 4
 
5
-neutron-lib>=1.13.0 # Apache-2.0
5
+neutron-lib>=1.18.0 # Apache-2.0
6 6
 oslo.i18n>=3.15.3 # Apache-2.0
7 7
 oslo.log>=3.36.0 # Apache-2.0
8 8
 oslo.utils>=3.33.0 # Apache-2.0
@@ -11,4 +11,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
11 11
 
12 12
 # These repos are installed from git in OpenStack CI if the job
13 13
 # configures them as required-projects:
14
-neutron>=12.0.0 # Apache-2.0
14
+neutron>=13.0.0.0b1 # Apache-2.0

Loading…
Cancel
Save