Browse Source

Update neutron-lbaas for gate changes

The gates are now testing with python3 and we needed to update some
requirements.

Change-Id: I6e48becf2f1267e7059baeb12b5f0a137205fcff
Michael Johnson 1 month ago
parent
commit
a4c4944d56

+ 4
- 4
lower-constraints.txt View File

@@ -52,8 +52,8 @@ msgpack-python==0.4.0
52 52
 munch==2.1.0
53 53
 netaddr==0.7.18
54 54
 netifaces==0.10.4
55
-neutron-lib==1.20.0
56
-neutron==12.0.0
55
+neutron-lib==1.25.0
56
+neutron==13.0.0
57 57
 openstackdocstheme==1.18.1
58 58
 openstacksdk==0.11.2
59 59
 os-client-config==1.28.0
@@ -65,7 +65,7 @@ oslo.cache==1.26.0
65 65
 oslo.concurrency==3.26.0
66 66
 oslo.config==5.2.0
67 67
 oslo.context==2.19.2
68
-oslo.db==4.27.0
68
+oslo.db==4.37.0
69 69
 oslo.i18n==3.15.3
70 70
 oslo.log==3.36.0
71 71
 oslo.messaging==5.29.0
@@ -132,7 +132,7 @@ snowballstemmer==1.2.1
132 132
 Sphinx==1.6.2
133 133
 sphinxcontrib-websupport==1.0.1
134 134
 sqlalchemy-migrate==0.11.0
135
-SQLAlchemy==1.0.10
135
+SQLAlchemy==1.2.0
136 136
 sqlparse==0.2.2
137 137
 statsd==3.2.1
138 138
 stestr==1.0.0

+ 1
- 1
neutron_lbaas/drivers/haproxy/jinja_cfg.py View File

@@ -409,4 +409,4 @@ def _expand_expected_codes(codes):
409 409
                 str(i) for i in six.moves.range(int(low), int(hi) + 1))
410 410
         else:
411 411
             retval.add(code)
412
-    return retval
412
+    return sorted(retval)

+ 3
- 1
neutron_lbaas/tests/unit/agent/test_agent.py View File

@@ -13,6 +13,8 @@
13 13
 #    License for the specific language governing permissions and limitations
14 14
 #    under the License.
15 15
 
16
+import sys
17
+
16 18
 import mock
17 19
 from oslo_config import cfg
18 20
 
@@ -39,7 +41,7 @@ class TestLbaasService(base.BaseTestCase):
39 41
         with mock.patch(logging_str), \
40 42
                 mock.patch(privsep_str), \
41 43
                 mock.patch.object(agent.service, 'launch') as mock_launch, \
42
-                mock.patch('sys.argv'), \
44
+                mock.patch.object(sys, 'argv', ['neutron-lbaasv2-agent']), \
43 45
                 mock.patch.object(agent.manager, 'LbaasAgentManager'), \
44 46
                 mock.patch.object(cfg.CONF, 'register_opts'):
45 47
             agent.main()

+ 2
- 2
neutron_lbaas/tests/unit/drivers/haproxy/sample_configs/sample_configs.py View File

@@ -21,7 +21,7 @@ RET_PERSISTENCE = {
21 21
     'type': 'HTTP_COOKIE',
22 22
     'cookie_name': 'HTTP_COOKIE'}
23 23
 
24
-HASHSEED_ORDERED_CODES = list({'404', '405', '500'})
24
+HASHSEED_ORDERED_CODES = ['404', '405', '500']
25 25
 PIPED_CODES = '|'.join(HASHSEED_ORDERED_CODES)
26 26
 
27 27
 RET_MONITOR = {
@@ -269,7 +269,7 @@ def sample_health_monitor_tuple(proto='HTTP', admin_state=True):
269 269
 
270 270
     return monitor(id='sample_monitor_id_1', type=proto, delay=30,
271 271
                    timeout=31, max_retries=3, http_method='GET',
272
-                   url_path='/index.html', expected_codes='500, 405, 404',
272
+                   url_path='/index.html', expected_codes='404, 405, 500',
273 273
                    admin_state_up=admin_state)
274 274
 
275 275
 

+ 9
- 9
neutron_lbaas/tests/unit/drivers/haproxy/test_jinja_cfg.py View File

@@ -480,30 +480,30 @@ class TestHaproxyCfg(base.BaseTestCase):
480 480
 
481 481
     def test_expand_expected_codes(self):
482 482
         exp_codes = ''
483
-        self.assertEqual(set([]), jinja_cfg._expand_expected_codes(exp_codes))
483
+        self.assertEqual([], jinja_cfg._expand_expected_codes(exp_codes))
484 484
         exp_codes = '200'
485
-        self.assertEqual(set(['200']),
485
+        self.assertEqual(['200'],
486 486
                          jinja_cfg._expand_expected_codes(exp_codes))
487 487
         exp_codes = '200, 201'
488
-        self.assertEqual(set(['200', '201']),
488
+        self.assertEqual(['200', '201'],
489 489
                          jinja_cfg._expand_expected_codes(exp_codes))
490 490
         exp_codes = '200, 201,202'
491
-        self.assertEqual(set(['200', '201', '202']),
491
+        self.assertEqual(['200', '201', '202'],
492 492
                          jinja_cfg._expand_expected_codes(exp_codes))
493 493
         exp_codes = '200-202'
494
-        self.assertEqual(set(['200', '201', '202']),
494
+        self.assertEqual(['200', '201', '202'],
495 495
                          jinja_cfg._expand_expected_codes(exp_codes))
496 496
         exp_codes = '200-202, 205'
497
-        self.assertEqual(set(['200', '201', '202', '205']),
497
+        self.assertEqual(['200', '201', '202', '205'],
498 498
                          jinja_cfg._expand_expected_codes(exp_codes))
499 499
         exp_codes = '200, 201-203'
500
-        self.assertEqual(set(['200', '201', '202', '203']),
500
+        self.assertEqual(['200', '201', '202', '203'],
501 501
                          jinja_cfg._expand_expected_codes(exp_codes))
502 502
         exp_codes = '200, 201-203, 205'
503
-        self.assertEqual(set(['200', '201', '202', '203', '205']),
503
+        self.assertEqual(['200', '201', '202', '203', '205'],
504 504
                          jinja_cfg._expand_expected_codes(exp_codes))
505 505
         exp_codes = '201-200, 205'
506
-        self.assertEqual(set(['205']),
506
+        self.assertEqual(['205'],
507 507
                          jinja_cfg._expand_expected_codes(exp_codes))
508 508
 
509 509
     def test_render_template_about_option_log(self):

+ 4
- 4
requirements.txt View File

@@ -6,13 +6,13 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
6 6
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
7 7
 requests>=2.14.2 # Apache-2.0
8 8
 netaddr>=0.7.18 # BSD
9
-neutron-lib>=1.20.0 # Apache-2.0
10
-neutron>=12.0.0 # Apache-2.0
11
-SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
9
+neutron-lib>=1.25.0 # Apache-2.0
10
+neutron>=13.0.0 # Apache-2.0
11
+SQLAlchemy>=1.2.0 # MIT
12 12
 alembic>=0.8.10 # MIT
13 13
 six>=1.10.0 # MIT
14 14
 oslo.config>=5.2.0 # Apache-2.0
15
-oslo.db>=4.27.0 # Apache-2.0
15
+oslo.db>=4.37.0 # Apache-2.0
16 16
 oslo.i18n>=3.15.3 # Apache-2.0
17 17
 oslo.log>=3.36.0 # Apache-2.0
18 18
 oslo.messaging>=5.29.0 # Apache-2.0

Loading…
Cancel
Save