openstack
/
heat
Code Issues Proposed changes

Merge "Don't provide defaults for properties depending on extensions"

This commit is contained in:
Jenkins 2017-06-23 10:26:41 +00:00 committed by Gerrit Code Review
parent 4620a5f361 7891cfbf96
commit 173f03a4aa
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,6 @@ class ProviderNet(net.Net):
'provides the default value for the attribute of the ports '
'created on this network.'),
update_allowed=True,
default=True,
support_status=support.SupportStatus(version='8.0.0')
),
ROUTER_EXTERNAL: properties.Schema(

7
heat/tests/openstack/neutron/test_neutron_provider_net.py
View File

@ -37,7 +37,6 @@ resources:
network_type: vlan
physical_network: physnet_1
segmentation_id: 101
port_security_enabled: False
router_external: False
shared: true
'''
@ -52,7 +51,6 @@ stpna = {
"provider:network_type": "vlan",
"provider:physical_network": "physnet_1",
"provider:segmentation_id": "101",
"port_security_enabled": False,
"router:external": False,
"tenant_id": "c1210485b2424d48804aad5d39c61b8f",
"id": "fc68ea2c-b60b-4b4f-bd82-94ec81110766"
@ -83,7 +81,6 @@ class NeutronProviderNetTest(common.HeatTestCase):
'provider:network_type': 'vlan',
'provider:physical_network': 'physnet_1',
'provider:segmentation_id': '101',
'port_security_enabled': False,
'router:external': False,
'shared': True}
}).AndReturn(stpnb)
@ -159,7 +156,7 @@ class NeutronProviderNetTest(common.HeatTestCase):
'provider:network_type': 'vlan',
'provider:physical_network': 'physnet_1',
'provider:segmentation_id': '102',
'port_security_enabled': True,
'port_security_enabled': False,
'router:external': True
}}).AndReturn(None)
@ -180,7 +177,7 @@ class NeutronProviderNetTest(common.HeatTestCase):
'network_type': 'vlan',
'physical_network': 'physnet_1',
'segmentation_id': '102',
'port_security_enabled': True,
'port_security_enabled': False,
'router_external': True
}
update_snippet = rsrc_defn.ResourceDefinition(rsrc.name, rsrc.type(),