From 4190cbe0a835a65dfbd21783c65057e1caf944d7 Mon Sep 17 00:00:00 2001 From: Sumit Naiksatam Date: Wed, 12 Jul 2017 17:04:07 -0700 Subject: [PATCH] Ocata sync Change-Id: I359c17ae209b6edc6d04fc3e4ee1c3ee32c51b5e --- gbpautomation/heat/tests/test_grouppolicy.py | 38 +++++++++---------- gbpautomation/heat/tests/test_servicechain.py | 6 +-- requirements.txt | 4 +- test-requirements.txt | 10 ++--- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/gbpautomation/heat/tests/test_grouppolicy.py b/gbpautomation/heat/tests/test_grouppolicy.py index 648db77..557142a 100644 --- a/gbpautomation/heat/tests/test_grouppolicy.py +++ b/gbpautomation/heat/tests/test_grouppolicy.py @@ -491,7 +491,7 @@ class ApplicationPolicyGroupTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['name'] = 'new name' + update_template._properties['name'] = 'new name' scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() @@ -654,7 +654,7 @@ class PolicyTargetTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['policy_target_group_id'] = ( + update_template._properties['policy_target_group_id'] = ( 'ptg_id_update') scheduler.TaskRunner(rsrc.update, update_template)() @@ -834,8 +834,8 @@ class PolicyTargetGroupTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['l2_policy_id'] = 'l2_id_update' - update_template['Properties']['provided_policy_rule_sets'] = [ + update_template._properties['l2_policy_id'] = 'l2_id_update' + update_template._properties['provided_policy_rule_sets'] = [ {'policy_rule_set_id': 'policy_rule_set1', 'policy_rule_set_scope': 'scope1'}, {'policy_rule_set_id': 'policy_rule_set2', @@ -843,7 +843,7 @@ class PolicyTargetGroupTest(HeatTestCase): {'policy_rule_set_id': 'policy_rule_set5', 'policy_rule_set_scope': 'scope5'} ] - update_template['Properties']['consumed_policy_rule_sets'] = [ + update_template._properties['consumed_policy_rule_sets'] = [ {'policy_rule_set_id': 'policy_rule_set3', 'policy_rule_set_scope': 'scope3'}, {'policy_rule_set_id': 'policy_rule_set4', @@ -851,7 +851,7 @@ class PolicyTargetGroupTest(HeatTestCase): {'policy_rule_set_id': 'policy_rule_set6', 'policy_rule_set_scope': 'scope6'} ] - update_template['Properties']['intra_ptg_allow'] = True + update_template._properties['intra_ptg_allow'] = True scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() @@ -965,7 +965,7 @@ class L2PolicyTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['l3_policy_id'] = 'l3_id_update' + update_template._properties['l3_policy_id'] = 'l3_id_update' scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() @@ -1085,8 +1085,8 @@ class L3PolicyTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['subnet_prefix_length'] = 28 - update_template['Properties']['external_segments'] = [ + update_template._properties['subnet_prefix_length'] = 28 + update_template._properties['external_segments'] = [ {'external_segment_id': 'es2', 'allocated_address': '2.1.1.1'}] scheduler.TaskRunner(rsrc.update, update_template)() @@ -1210,7 +1210,7 @@ class PolicyClassifierTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['protocol'] = 'udp' + update_template._properties['protocol'] = 'udp' scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() @@ -1324,7 +1324,7 @@ class PolicyActionTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['action_type'] = 'allow' + update_template._properties['action_type'] = 'allow' scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() @@ -1440,7 +1440,7 @@ class PolicyRuleTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['enabled'] = False + update_template._properties['enabled'] = False scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() @@ -1556,7 +1556,7 @@ class PolicyRuleSetTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['child_policy_rule_sets'] = ["1234"] + update_template._properties['child_policy_rule_sets'] = ["1234"] scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() @@ -1679,7 +1679,7 @@ class NetworkServicePolicyTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['network_service_params'] = [ + update_template._properties['network_service_params'] = [ {'name': 'vip-update'}] scheduler.TaskRunner(rsrc.update, update_template)() @@ -1825,9 +1825,9 @@ class ExternalPolicyTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['external_segments'] = [ + update_template._properties['external_segments'] = [ '9876'] - update_template['Properties']['provided_policy_rule_sets'] = [ + update_template._properties['provided_policy_rule_sets'] = [ {'policy_rule_set_id': '2345', 'policy_rule_set_scope': 'scope1'}, {'policy_rule_set_id': '8901', @@ -1835,7 +1835,7 @@ class ExternalPolicyTest(HeatTestCase): {'policy_rule_set_id': '1122', 'policy_rule_set_scope': 'scope5'} ] - update_template['Properties']['consumed_policy_rule_sets'] = [ + update_template._properties['consumed_policy_rule_sets'] = [ {'policy_rule_set_id': '9012', 'policy_rule_set_scope': 'scope3'}, {'policy_rule_set_id': '9210', @@ -1975,7 +1975,7 @@ class ExternalSegmentTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['port_address_translation'] = False + update_template._properties['port_address_translation'] = False scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() @@ -2098,7 +2098,7 @@ class NATPoolTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['external_segment_id'] = '9876' + update_template._properties['external_segment_id'] = '9876' scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() diff --git a/gbpautomation/heat/tests/test_servicechain.py b/gbpautomation/heat/tests/test_servicechain.py index bfd7e9e..b697802 100644 --- a/gbpautomation/heat/tests/test_servicechain.py +++ b/gbpautomation/heat/tests/test_servicechain.py @@ -195,7 +195,7 @@ class ServiceChainNodeTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['name'] = 'node_update' + update_template._properties['name'] = 'node_update' scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() @@ -309,7 +309,7 @@ class ServiceChainSpecTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['name'] = 'spec_update' + update_template._properties['name'] = 'spec_update' scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() @@ -428,7 +428,7 @@ class ServiceProfileTest(HeatTestCase): scheduler.TaskRunner(rsrc.create)() update_template = copy.deepcopy(rsrc.t) - update_template['Properties']['name'] = 'profile_update' + update_template._properties['name'] = 'profile_update' scheduler.TaskRunner(rsrc.update, update_template)() self.m.VerifyAll() diff --git a/requirements.txt b/requirements.txt index 2594ccb..2a5abde 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,5 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.6 # Apache-2.0 -Babel>=1.3 +pbr>=1.8 # Apache-2.0 +Babel>=2.3.4 diff --git a/test-requirements.txt b/test-requirements.txt index 67be7a3..1a7024f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. --e git://github.com/openstack/heat.git@stable/newton#egg=heat +-e git://github.com/openstack/heat.git@stable/ocata#egg=heat -e git://git.openstack.org/openstack/python-group-based-policy-client.git@master#egg=gbpclient # Hacking already pins down pep8, pyflakes and flake8 hacking<0.11,>=0.10.0 @@ -11,16 +11,14 @@ coverage>=3.6 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD kombu<4.0.0,>=3.0.25 # BSD mock>=2.0 # BSD -mox3>=0.7.0 # Apache-2.0 -PyMySQL!=0.7.7,>=0.6.2 # MIT License +mox3!=0.19.0,>=0.7.0 # Apache-2.0 +PyMySQL>=0.7.6 # MIT License openstackdocstheme>=1.5.0 # Apache-2.0 os-api-ref>=1.0.0 # Apache-2.0 -oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 +oslosphinx>=4.7.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 qpid-python;python_version=='2.7' # Apache-2.0 psycopg2>=2.5 # LGPL/ZPL -python-glanceclient>=2.3.0,!=2.4.0,<2.6.0 -python-troveclient<2.6.0 sphinx!=1.3b1,<1.3,>=1.2.1 # BSD testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD