Browse Source

Ocata sync

Change-Id: I359c17ae209b6edc6d04fc3e4ee1c3ee32c51b5e
Sumit Naiksatam 1 year ago
parent
commit
4190cbe0a8

+ 19
- 19
gbpautomation/heat/tests/test_grouppolicy.py View File

@@ -491,7 +491,7 @@ class ApplicationPolicyGroupTest(HeatTestCase):
491 491
         scheduler.TaskRunner(rsrc.create)()
492 492
 
493 493
         update_template = copy.deepcopy(rsrc.t)
494
-        update_template['Properties']['name'] = 'new name'
494
+        update_template._properties['name'] = 'new name'
495 495
         scheduler.TaskRunner(rsrc.update, update_template)()
496 496
 
497 497
         self.m.VerifyAll()
@@ -654,7 +654,7 @@ class PolicyTargetTest(HeatTestCase):
654 654
         scheduler.TaskRunner(rsrc.create)()
655 655
 
656 656
         update_template = copy.deepcopy(rsrc.t)
657
-        update_template['Properties']['policy_target_group_id'] = (
657
+        update_template._properties['policy_target_group_id'] = (
658 658
             'ptg_id_update')
659 659
         scheduler.TaskRunner(rsrc.update, update_template)()
660 660
 
@@ -834,8 +834,8 @@ class PolicyTargetGroupTest(HeatTestCase):
834 834
         scheduler.TaskRunner(rsrc.create)()
835 835
 
836 836
         update_template = copy.deepcopy(rsrc.t)
837
-        update_template['Properties']['l2_policy_id'] = 'l2_id_update'
838
-        update_template['Properties']['provided_policy_rule_sets'] = [
837
+        update_template._properties['l2_policy_id'] = 'l2_id_update'
838
+        update_template._properties['provided_policy_rule_sets'] = [
839 839
             {'policy_rule_set_id': 'policy_rule_set1',
840 840
              'policy_rule_set_scope': 'scope1'},
841 841
             {'policy_rule_set_id': 'policy_rule_set2',
@@ -843,7 +843,7 @@ class PolicyTargetGroupTest(HeatTestCase):
843 843
             {'policy_rule_set_id': 'policy_rule_set5',
844 844
              'policy_rule_set_scope': 'scope5'}
845 845
         ]
846
-        update_template['Properties']['consumed_policy_rule_sets'] = [
846
+        update_template._properties['consumed_policy_rule_sets'] = [
847 847
             {'policy_rule_set_id': 'policy_rule_set3',
848 848
              'policy_rule_set_scope': 'scope3'},
849 849
             {'policy_rule_set_id': 'policy_rule_set4',
@@ -851,7 +851,7 @@ class PolicyTargetGroupTest(HeatTestCase):
851 851
             {'policy_rule_set_id': 'policy_rule_set6',
852 852
              'policy_rule_set_scope': 'scope6'}
853 853
         ]
854
-        update_template['Properties']['intra_ptg_allow'] = True
854
+        update_template._properties['intra_ptg_allow'] = True
855 855
         scheduler.TaskRunner(rsrc.update, update_template)()
856 856
 
857 857
         self.m.VerifyAll()
@@ -965,7 +965,7 @@ class L2PolicyTest(HeatTestCase):
965 965
         scheduler.TaskRunner(rsrc.create)()
966 966
 
967 967
         update_template = copy.deepcopy(rsrc.t)
968
-        update_template['Properties']['l3_policy_id'] = 'l3_id_update'
968
+        update_template._properties['l3_policy_id'] = 'l3_id_update'
969 969
         scheduler.TaskRunner(rsrc.update, update_template)()
970 970
 
971 971
         self.m.VerifyAll()
@@ -1085,8 +1085,8 @@ class L3PolicyTest(HeatTestCase):
1085 1085
         scheduler.TaskRunner(rsrc.create)()
1086 1086
 
1087 1087
         update_template = copy.deepcopy(rsrc.t)
1088
-        update_template['Properties']['subnet_prefix_length'] = 28
1089
-        update_template['Properties']['external_segments'] = [
1088
+        update_template._properties['subnet_prefix_length'] = 28
1089
+        update_template._properties['external_segments'] = [
1090 1090
             {'external_segment_id': 'es2',
1091 1091
              'allocated_address': '2.1.1.1'}]
1092 1092
         scheduler.TaskRunner(rsrc.update, update_template)()
@@ -1210,7 +1210,7 @@ class PolicyClassifierTest(HeatTestCase):
1210 1210
         scheduler.TaskRunner(rsrc.create)()
1211 1211
 
1212 1212
         update_template = copy.deepcopy(rsrc.t)
1213
-        update_template['Properties']['protocol'] = 'udp'
1213
+        update_template._properties['protocol'] = 'udp'
1214 1214
         scheduler.TaskRunner(rsrc.update, update_template)()
1215 1215
 
1216 1216
         self.m.VerifyAll()
@@ -1324,7 +1324,7 @@ class PolicyActionTest(HeatTestCase):
1324 1324
         scheduler.TaskRunner(rsrc.create)()
1325 1325
 
1326 1326
         update_template = copy.deepcopy(rsrc.t)
1327
-        update_template['Properties']['action_type'] = 'allow'
1327
+        update_template._properties['action_type'] = 'allow'
1328 1328
         scheduler.TaskRunner(rsrc.update, update_template)()
1329 1329
 
1330 1330
         self.m.VerifyAll()
@@ -1440,7 +1440,7 @@ class PolicyRuleTest(HeatTestCase):
1440 1440
         scheduler.TaskRunner(rsrc.create)()
1441 1441
 
1442 1442
         update_template = copy.deepcopy(rsrc.t)
1443
-        update_template['Properties']['enabled'] = False
1443
+        update_template._properties['enabled'] = False
1444 1444
         scheduler.TaskRunner(rsrc.update, update_template)()
1445 1445
 
1446 1446
         self.m.VerifyAll()
@@ -1556,7 +1556,7 @@ class PolicyRuleSetTest(HeatTestCase):
1556 1556
         scheduler.TaskRunner(rsrc.create)()
1557 1557
 
1558 1558
         update_template = copy.deepcopy(rsrc.t)
1559
-        update_template['Properties']['child_policy_rule_sets'] = ["1234"]
1559
+        update_template._properties['child_policy_rule_sets'] = ["1234"]
1560 1560
         scheduler.TaskRunner(rsrc.update, update_template)()
1561 1561
 
1562 1562
         self.m.VerifyAll()
@@ -1679,7 +1679,7 @@ class NetworkServicePolicyTest(HeatTestCase):
1679 1679
         scheduler.TaskRunner(rsrc.create)()
1680 1680
 
1681 1681
         update_template = copy.deepcopy(rsrc.t)
1682
-        update_template['Properties']['network_service_params'] = [
1682
+        update_template._properties['network_service_params'] = [
1683 1683
             {'name': 'vip-update'}]
1684 1684
         scheduler.TaskRunner(rsrc.update, update_template)()
1685 1685
 
@@ -1825,9 +1825,9 @@ class ExternalPolicyTest(HeatTestCase):
1825 1825
         scheduler.TaskRunner(rsrc.create)()
1826 1826
 
1827 1827
         update_template = copy.deepcopy(rsrc.t)
1828
-        update_template['Properties']['external_segments'] = [
1828
+        update_template._properties['external_segments'] = [
1829 1829
             '9876']
1830
-        update_template['Properties']['provided_policy_rule_sets'] = [
1830
+        update_template._properties['provided_policy_rule_sets'] = [
1831 1831
             {'policy_rule_set_id': '2345',
1832 1832
              'policy_rule_set_scope': 'scope1'},
1833 1833
             {'policy_rule_set_id': '8901',
@@ -1835,7 +1835,7 @@ class ExternalPolicyTest(HeatTestCase):
1835 1835
             {'policy_rule_set_id': '1122',
1836 1836
              'policy_rule_set_scope': 'scope5'}
1837 1837
         ]
1838
-        update_template['Properties']['consumed_policy_rule_sets'] = [
1838
+        update_template._properties['consumed_policy_rule_sets'] = [
1839 1839
             {'policy_rule_set_id': '9012',
1840 1840
              'policy_rule_set_scope': 'scope3'},
1841 1841
             {'policy_rule_set_id': '9210',
@@ -1975,7 +1975,7 @@ class ExternalSegmentTest(HeatTestCase):
1975 1975
         scheduler.TaskRunner(rsrc.create)()
1976 1976
 
1977 1977
         update_template = copy.deepcopy(rsrc.t)
1978
-        update_template['Properties']['port_address_translation'] = False
1978
+        update_template._properties['port_address_translation'] = False
1979 1979
         scheduler.TaskRunner(rsrc.update, update_template)()
1980 1980
 
1981 1981
         self.m.VerifyAll()
@@ -2098,7 +2098,7 @@ class NATPoolTest(HeatTestCase):
2098 2098
         scheduler.TaskRunner(rsrc.create)()
2099 2099
 
2100 2100
         update_template = copy.deepcopy(rsrc.t)
2101
-        update_template['Properties']['external_segment_id'] = '9876'
2101
+        update_template._properties['external_segment_id'] = '9876'
2102 2102
         scheduler.TaskRunner(rsrc.update, update_template)()
2103 2103
 
2104 2104
         self.m.VerifyAll()

+ 3
- 3
gbpautomation/heat/tests/test_servicechain.py View File

@@ -195,7 +195,7 @@ class ServiceChainNodeTest(HeatTestCase):
195 195
         scheduler.TaskRunner(rsrc.create)()
196 196
 
197 197
         update_template = copy.deepcopy(rsrc.t)
198
-        update_template['Properties']['name'] = 'node_update'
198
+        update_template._properties['name'] = 'node_update'
199 199
         scheduler.TaskRunner(rsrc.update, update_template)()
200 200
 
201 201
         self.m.VerifyAll()
@@ -309,7 +309,7 @@ class ServiceChainSpecTest(HeatTestCase):
309 309
         scheduler.TaskRunner(rsrc.create)()
310 310
 
311 311
         update_template = copy.deepcopy(rsrc.t)
312
-        update_template['Properties']['name'] = 'spec_update'
312
+        update_template._properties['name'] = 'spec_update'
313 313
         scheduler.TaskRunner(rsrc.update, update_template)()
314 314
 
315 315
         self.m.VerifyAll()
@@ -428,7 +428,7 @@ class ServiceProfileTest(HeatTestCase):
428 428
         scheduler.TaskRunner(rsrc.create)()
429 429
 
430 430
         update_template = copy.deepcopy(rsrc.t)
431
-        update_template['Properties']['name'] = 'profile_update'
431
+        update_template._properties['name'] = 'profile_update'
432 432
         scheduler.TaskRunner(rsrc.update, update_template)()
433 433
 
434 434
         self.m.VerifyAll()

+ 2
- 2
requirements.txt View File

@@ -2,5 +2,5 @@
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
-pbr>=1.6 # Apache-2.0
6
-Babel>=1.3
5
+pbr>=1.8 # Apache-2.0
6
+Babel>=2.3.4

+ 4
- 6
test-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
--e git://github.com/openstack/heat.git@stable/newton#egg=heat
5
+-e git://github.com/openstack/heat.git@stable/ocata#egg=heat
6 6
 -e git://git.openstack.org/openstack/python-group-based-policy-client.git@master#egg=gbpclient
7 7
 # Hacking already pins down pep8, pyflakes and flake8
8 8
 hacking<0.11,>=0.10.0
@@ -11,16 +11,14 @@ coverage>=3.6 # Apache-2.0
11 11
 fixtures>=3.0.0 # Apache-2.0/BSD
12 12
 kombu<4.0.0,>=3.0.25 # BSD
13 13
 mock>=2.0 # BSD
14
-mox3>=0.7.0 # Apache-2.0
15
-PyMySQL!=0.7.7,>=0.6.2 # MIT License
14
+mox3!=0.19.0,>=0.7.0 # Apache-2.0
15
+PyMySQL>=0.7.6 # MIT License
16 16
 openstackdocstheme>=1.5.0 # Apache-2.0
17 17
 os-api-ref>=1.0.0 # Apache-2.0
18
-oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
18
+oslosphinx>=4.7.0 # Apache-2.0
19 19
 oslotest>=1.10.0 # Apache-2.0
20 20
 qpid-python;python_version=='2.7' # Apache-2.0
21 21
 psycopg2>=2.5 # LGPL/ZPL
22
-python-glanceclient>=2.3.0,!=2.4.0,<2.6.0
23
-python-troveclient<2.6.0
24 22
 sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
25 23
 testrepository>=0.0.18 # Apache-2.0/BSD
26 24
 testscenarios>=0.4 # Apache-2.0/BSD

Loading…
Cancel
Save