openstack/heat
Code Issues Proposed changes

Merge "Adds validation to support 'port' only if using neutron"

Browse Source
This commit is contained in:
Jenkins 2016-02-05 07:00:22 +00:00 committed by Gerrit Code Review
commit 1b064640d0
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/resources/openstack/nova/server_network_mixin.py
View File

@ -68,6 +68,11 @@ class ServerNetworkMixin(object):
network=network[self.NETWORK_ID],
server=self.name))
if port and not self.is_using_neutron():
msg = _('Property "%s" is supported only for '
'Neutron.') % self.NETWORK_PORT
raise exception.StackValidationFailed(message=msg)
# Nova doesn't allow specify ip and port at the same time
if fixed_ip and port:
raise exception.ResourcePropertyConflict(

24
heat/tests/openstack/nova/test_server.py
View File

@ -1400,6 +1400,30 @@ class ServersTest(common.HeatTestCase):
six.text_type(error))
self.m.VerifyAll()
def test_server_validate_with_port_not_using_neutron(self):
stack_name = 'with_port_in_nova_network'
(tmpl, stack) = self._setup_test_stack(stack_name)
tmpl['Resources']['WebServer']['Properties']['networks'] = (
[{'port': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'}])
resource_defns = tmpl.resource_definitions(stack)
server = servers.Server('validate_port_in_nova_network',
resource_defns['WebServer'], stack)
self.m.StubOutWithMock(nova.NovaClientPlugin, '_create')
nova.NovaClientPlugin._create().AndReturn(self.fc)
self.stub_ImageConstraint_validate()
self.stub_NetworkConstraint_validate()
self.stub_PortConstraint_validate()
self.patchobject(server, 'is_using_neutron', return_value=False)
self.m.ReplayAll()
error = self.assertRaises(exception.StackValidationFailed,
server.validate)
self.assertEqual('Property "port" is supported only for Neutron.',
six.text_type(error))
self.m.VerifyAll()
def test_server_validate_with_uuid_fixed_ip(self):
stack_name = 'srv_net'
(tmpl, stack) = self._setup_test_stack(stack_name)