openstack
/
tacker
Code Issues Proposed changes

Use main port_security_enabled port propert instead of value_specs 

port_security_enabled flag is no supported anymore in Heat's
value_specs property due to [1]. Move port_security_enabled into
the main heat port resource property.

[1] https://review.openstack.org/#/c/248719/

Change-Id: I08d9eb1880eceb7e0b59271a43f7c716159cfe66
Closes-Bug: 1522196
This commit is contained in:
Sridhar Ramaswamy 2015-12-03 00:55:57 +00:00
parent fb1c08adc5
commit 380e45bb7c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tacker/tests/unit/vm/drivers/heat/test_heat.py
View File

@ -67,8 +67,8 @@ class TestDeviceHeat(testtools.TestCase):
' - port: {get_resource: vdu1-net_mgmt-port}\n - ' ' - port: {get_resource: vdu1-net_mgmt-port}\n - '
'{network: net0}\n - {network: net1}\n type: OS::Nova::' '{network: net0}\n - {network: net1}\n type: OS::Nova::'
'Server\n vdu1-net_mgmt-port:\n properties:\n fixed_ips: ' 'Server\n vdu1-net_mgmt-port:\n properties:\n fixed_ips: '
'[]\n network: net_mgmt\n value_specs: {' '[]\n network: net_mgmt\n port_security_enabled: false\n'
'port_security_enabled: false}\n type: OS::Neutron::Port\n'} ' type: OS::Neutron::Port\n'}
def _get_expected_fields_user_data(self): def _get_expected_fields_user_data(self):
return {'stack_name': 'tacker.vm.drivers.heat.heat_DeviceHeat-18685f68' return {'stack_name': 'tacker.vm.drivers.heat.heat_DeviceHeat-18685f68'
@ -87,8 +87,8 @@ class TestDeviceHeat(testtools.TestCase):
'df -h > /home/cirros/diskinfo\n\n \'\n ' 'df -h > /home/cirros/diskinfo\n\n \'\n '
'user_data_format: RAW\n type: OS::Nova::Server\n ' 'user_data_format: RAW\n type: OS::Nova::Server\n '
'vdu1-net_mgmt-port:\n properties:\n fixed_ips: []\n ' 'vdu1-net_mgmt-port:\n properties:\n fixed_ips: []\n '
'network: net_mgmt\n value_specs: {port_security_enabled: ' 'network: net_mgmt\n port_security_enabled: false\n '
'false}\n type: OS::Neutron::Port\n'} 'type: OS::Neutron::Port\n'}
def _get_expected_fields_ipaddr_data(self): def _get_expected_fields_ipaddr_data(self):
return {'stack_name': 'tacker.vm.drivers.heat.heat_DeviceHeat-d1337add' return {'stack_name': 'tacker.vm.drivers.heat.heat_DeviceHeat-d1337add'
@ -105,13 +105,13 @@ class TestDeviceHeat(testtools.TestCase):
'\n - port: {get_resource: vdu1-net1-port}\n type: ' '\n - port: {get_resource: vdu1-net1-port}\n type: '
'OS::Nova::Server\n vdu1-net0-port:\n properties:\n ' 'OS::Nova::Server\n vdu1-net0-port:\n properties:\n '
'fixed_ips:\n - {ip_address: 10.10.0.98}\n network: net0' 'fixed_ips:\n - {ip_address: 10.10.0.98}\n network: net0'
'\n value_specs: {port_security_enabled: false}\n type: ' '\n port_security_enabled: false\n type: '
'OS::Neutron::Port\n vdu1-net1-port:\n properties:\n ' 'OS::Neutron::Port\n vdu1-net1-port:\n properties:\n '
'fixed_ips:\n - {ip_address: 10.10.1.98}\n network: net1' 'fixed_ips:\n - {ip_address: 10.10.1.98}\n network: net1'
'\n value_specs: {port_security_enabled: false}\n type: ' '\n port_security_enabled: false\n type: '
'OS::Neutron::Port\n vdu1-net_mgmt-port:\n properties:\n ' 'OS::Neutron::Port\n vdu1-net_mgmt-port:\n properties:\n '
'fixed_ips:\n - {ip_address: 192.168.120.98}\n network: ' 'fixed_ips:\n - {ip_address: 192.168.120.98}\n network: '
'net_mgmt\n value_specs: {port_security_enabled: false}\n ' 'net_mgmt\n port_security_enabled: false\n '
'type: OS::Neutron::Port\n'} 'type: OS::Neutron::Port\n'}
def _get_expected_device_wait_obj(self): def _get_expected_device_wait_obj(self):
@ -226,4 +226,4 @@ class TestDeviceHeat(testtools.TestCase):
self.heat_driver.update(None, self.context, self.heat_driver.update(None, self.context,
device_id, device_obj, device_id, device_obj,
device_config_obj) device_config_obj)
self.assertEqual(device_obj, expected_device_update) self.assertEqual(device_obj, expected_device_update)

2
tacker/vm/drivers/heat/heat.py
View File

@ -148,7 +148,7 @@ class DeviceHeat(abstract_driver.DeviceAbstractDriver):
port_dict = { port_dict = {
'type': 'OS::Neutron::Port', 'type': 'OS::Neutron::Port',
'properties': { 'properties': {
'value_specs': {'port_security_enabled': False} 'port_security_enabled': False
} }
} }
port_dict['properties'].setdefault('fixed_ips', []) port_dict['properties'].setdefault('fixed_ips', [])