openstack
/
heat
Code Issues Proposed changes

Add HIDDEN status to Neutron::RouterInterface 

Add HIDDEN status and translation rules to RouterInterface
resource.

bp deprecating-improvements

Change-Id: I3744c8645f1ec74020bad7b0b712b2f5ccadce8e
This commit is contained in:
Peter Razumovsky 2015-06-29 10:46:08 +03:00
parent 97f7b4f5cd
commit 7c49395316
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
heat/engine/resources/openstack/neutron/router.py
View File

@ -290,9 +290,14 @@ class RouterInterface(neutron.NeutronResource):
SUBNET_ID: properties.Schema(
properties.Schema.STRING,
support_status=support.SupportStatus(
status=support.DEPRECATED,
status=support.HIDDEN,
message=_('Use property %s.') % SUBNET,
version='2014.2'),
version='5.0.0',
previous_status=support.SupportStatus(
status=support.DEPRECATED,
version='2014.2'
)
),
constraints=[
constraints.CustomConstraint('neutron.subnet')
]
@ -328,6 +333,16 @@ class RouterInterface(neutron.NeutronResource):
)
}
def translation_rules(self):
return [
properties.TranslationRule(
self.properties,
properties.TranslationRule.REPLACE,
[self.SUBNET],
value_path=[self.SUBNET_ID]
)
]
@staticmethod
def _validate_deprecated_keys(props, key, deprecated_key):
value = props.get(key)

28
heat/tests/neutron/test_neutron_router.py
View File

@ -443,14 +443,7 @@ class NeutronRouterTest(common.HeatTestCase):
def test_router_interface_depr_router(self):
self._test_router_interface(resolve_router=False)
def test_router_interface_depr_subnet(self):
self._test_router_interface(resolve_subnet=False)
def test_router_interface_depr_router_and_subnet(self):
self._test_router_interface(resolve_router=False, resolve_subnet=False)
def _test_router_interface(self, resolve_subnet=True,
resolve_router=True):
def _test_router_interface(self, resolve_router=True):
neutronclient.Client.add_interface_router(
'3e46229d-8fce-4733-819a-b5fe630550f8',
{'subnet_id': '91e47a57-7508-46fe-afc9-fc454e8580e1'}
@ -465,7 +458,6 @@ class NeutronRouterTest(common.HeatTestCase):
).AndRaise(qe.NeutronClientException(status_code=404))
t = template_format.parse(neutron_template)
stack = utils.parse_stack(t)
subnet_key = 'subnet_id'
router_key = 'router_id'
self.stub_SubnetConstraint_validate()
self.stub_RouterConstraint_validate()
@ -476,13 +468,12 @@ class NeutronRouterTest(common.HeatTestCase):
'3e46229d-8fce-4733-819a-b5fe630550f8'
).AndReturn('3e46229d-8fce-4733-819a-b5fe630550f8')
router_key = 'router'
if resolve_subnet:
neutronV20.find_resourceid_by_name_or_id(
mox.IsA(neutronclient.Client),
'subnet',
'91e47a57-7508-46fe-afc9-fc454e8580e1'
).AndReturn('91e47a57-7508-46fe-afc9-fc454e8580e1')
subnet_key = 'subnet'
neutronV20.find_resourceid_by_name_or_id(
mox.IsA(neutronclient.Client),
'subnet',
'91e47a57-7508-46fe-afc9-fc454e8580e1'
).AndReturn('91e47a57-7508-46fe-afc9-fc454e8580e1')
subnet_key = 'subnet'
self.m.ReplayAll()
rsrc = self.create_router_interface(
@ -498,6 +489,11 @@ class NeutronRouterTest(common.HeatTestCase):
def test_router_interface_with_old_data(self):
self.stub_SubnetConstraint_validate()
self.stub_RouterConstraint_validate()
neutronV20.find_resourceid_by_name_or_id(
mox.IsA(neutronclient.Client),
'subnet',
'91e47a57-7508-46fe-afc9-fc454e8580e1'
).AndReturn('91e47a57-7508-46fe-afc9-fc454e8580e1')
neutronclient.Client.add_interface_router(
'3e46229d-8fce-4733-819a-b5fe630550f8',
{'subnet_id': '91e47a57-7508-46fe-afc9-fc454e8580e1'}