openstack
/
heat
Code Issues Proposed changes

Merge "Remove default of port_security_enabled"

This commit is contained in:
Jenkins 2015-06-30 22:35:27 +00:00 committed by Gerrit Code Review
parent fa4ba5f9a1 e2a64923c5
commit 69b692a09b
5 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
heat/engine/resources/openstack/neutron/net.py
View File

@ -83,7 +83,6 @@ class Net(neutron.NeutronResource):
_('Flag to enable/disable port security on the network. It '
'provides the default value for the attribute of the ports '
'created on this network'),
default=True,
update_allowed=True,
support_status=support.SupportStatus(version='5.0.0')
),

1
heat/engine/resources/openstack/neutron/port.py
View File

@ -226,7 +226,6 @@ class Port(neutron.NeutronResource):
_('Flag to enable/disable port security on the port. '
'When disable this feature(set it to False), there will be no '
'packages filtering, like security-group and address-pairs.'),
default=True,
update_allowed=True,
support_status=support.SupportStatus(version='5.0.0')
),

1
heat/tests/neutron/test_neutron.py
View File

@ -84,7 +84,6 @@ class NeutronTest(common.HeatTestCase):
self.assertEqual({'name': 'resource_name',
'router:external': True,
'admin_state_up': False,
'port_security_enabled': True,
'shared': False}, props)
def test_is_built(self):

4
heat/tests/neutron/test_neutron_floating_ip.py
View File

@ -246,7 +246,6 @@ class NeutronFloatingIPTest(common.HeatTestCase):
{'subnet_id': u'sub1234', 'ip_address': u'10.0.0.10'}
],
'name': utils.PhysName('test_stack', 'port_floating'),
'port_security_enabled': True,
'admin_state_up': True}}
).AndReturn({'port': {
"status": "BUILD",
@ -284,7 +283,6 @@ class NeutronFloatingIPTest(common.HeatTestCase):
'name': 'test_port',
'device_id': 'd6b4d3a5-c700-476f-b609-1493dd9dadc2',
'device_owner': 'network:floatingip',
'port_security_enabled': True,
'security_groups': [
'8a2f582a-e1cd-480f-b85d-b02631c10656']
}
@ -358,7 +356,6 @@ class NeutronFloatingIPTest(common.HeatTestCase):
{'subnet_id': u'sub1234', 'ip_address': u'10.0.0.10'}
],
'name': utils.PhysName('test_stack', 'port_floating'),
'port_security_enabled': True,
'admin_state_up': True}}
).AndReturn({'port': {
"status": "BUILD",
@ -605,7 +602,6 @@ class NeutronFloatingIPTest(common.HeatTestCase):
{'subnet_id': u'sub1234', 'ip_address': u'10.0.0.10'}
],
'name': utils.PhysName('test_stack', 'port_floating'),
'port_security_enabled': True,
'admin_state_up': True}}
).AndReturn({'port': {
"status": "BUILD",

12
heat/tests/neutron/test_neutron_port.py
View File

@ -89,7 +89,6 @@ class NeutronPortTest(common.HeatTestCase):
],
'name': utils.PhysName('test_stack', 'port'),
'admin_state_up': True,
'port_security_enabled': True,
'device_owner': u'network:dhcp'}}
).AndReturn({'port': {
"status": "BUILD",
@ -132,7 +131,6 @@ class NeutronPortTest(common.HeatTestCase):
],
'name': utils.PhysName('test_stack', 'port'),
'admin_state_up': True,
'port_security_enabled': True,
'device_owner': u'network:dhcp'}}
).AndReturn({'port': {
"status": "BUILD",
@ -165,7 +163,6 @@ class NeutronPortTest(common.HeatTestCase):
'network_id': u'net1234',
'name': utils.PhysName('test_stack', 'port'),
'admin_state_up': True,
'port_security_enabled': True,
'device_owner': u'network:dhcp'}}
).AndReturn({'port': {
"status": "BUILD",
@ -205,7 +202,6 @@ class NeutronPortTest(common.HeatTestCase):
'mac_address': u'00-B0-D0-86-BB-F7'
}],
'name': utils.PhysName('test_stack', 'port'),
'port_security_enabled': True,
'admin_state_up': True}}
).AndReturn({'port': {
"status": "BUILD",
@ -272,7 +268,6 @@ class NeutronPortTest(common.HeatTestCase):
'ip_address': u'10.0.3.21',
}],
'name': utils.PhysName('test_stack', 'port'),
'port_security_enabled': True,
'admin_state_up': True}}
).AndReturn({'port': {
"status": "BUILD",
@ -331,7 +326,6 @@ class NeutronPortTest(common.HeatTestCase):
],
'name': utils.PhysName('test_stack', 'port'),
'admin_state_up': True,
'port_security_enabled': True,
'device_owner': u'network:dhcp'}
self._mock_create_with_security_groups(port_prop)
@ -356,7 +350,6 @@ class NeutronPortTest(common.HeatTestCase):
],
'name': utils.PhysName('test_stack', 'port'),
'admin_state_up': True,
'port_security_enabled': True,
'device_owner': u'network:dhcp'}
self._mock_create_with_security_groups(port_prop)
@ -374,7 +367,6 @@ class NeutronPortTest(common.HeatTestCase):
props = {'network_id': u'net1234',
'name': utils.PhysName('test_stack', 'port'),
'admin_state_up': True,
'port_security_enabled': True,
'device_owner': u'network:dhcp'}
new_props = props.copy()
new_props['name'] = "new_name"
@ -459,7 +451,6 @@ class NeutronPortTest(common.HeatTestCase):
props = {'network_id': u'net1234',
'name': utils.PhysName('test_stack', 'port'),
'admin_state_up': True,
'port_security_enabled': True,
'device_owner': u'network:dhcp'}
neutronV20.find_resourceid_by_name_or_id(
@ -533,7 +524,6 @@ class NeutronPortTest(common.HeatTestCase):
'network_id': u'net1234',
'name': utils.PhysName('test_stack', 'port'),
'admin_state_up': True,
'port_security_enabled': True,
'device_owner': u'network:dhcp'}}
).AndReturn({'port': {
'status': 'BUILD',
@ -596,7 +586,6 @@ class NeutronPortTest(common.HeatTestCase):
'network_id': u'net1234',
'name': utils.PhysName('test_stack', 'port'),
'admin_state_up': True,
'port_security_enabled': True,
'device_owner': u'network:dhcp'}}
).AndReturn({'port': {
'status': 'BUILD',
@ -643,7 +632,6 @@ class NeutronPortTest(common.HeatTestCase):
],
'name': utils.PhysName('test_stack', 'port'),
'admin_state_up': True,
'port_security_enabled': True,
'device_owner': 'network:dhcp',
'binding:vnic_type': 'direct'
}