openstack
/
heat
Code Issues Proposed changes

Merge "Remove default for DISTRIBUTED property"

This commit is contained in:
Jenkins 2015-01-19 15:27:42 +00:00 committed by Gerrit Code Review
parent 0eb637706b 4797811cf3
commit b45bed287d
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/resources/neutron/router.py
View File

@ -93,9 +93,8 @@ class Router(neutron.NeutronResource):
properties.Schema.BOOLEAN, properties.Schema.BOOLEAN,
_('Indicates whether or not to create a distributed router. ' _('Indicates whether or not to create a distributed router. '
'NOTE: The default policy setting in Neutron restricts usage ' 'NOTE: The default policy setting in Neutron restricts usage '
'of this property to administrative users only. And do not ' 'of this property to administrative users only. This property '
'specific L3 agent ID when creating a distributed router.'), 'can not be used in conjunction with the L3 agent ID.'),
default=False,
support_status=support.SupportStatus(version='2015.1') support_status=support.SupportStatus(version='2015.1')
), ),
} }

6
heat/tests/test_neutron.py
View File

@ -1391,7 +1391,6 @@ class NeutronRouterTest(common.HeatTestCase):
'router': { 'router': {
'name': utils.PhysName('test_stack', 'router'), 'name': utils.PhysName('test_stack', 'router'),
'admin_state_up': True, 'admin_state_up': True,
'distributed': False,
} }
}).AndReturn({ }).AndReturn({
"router": { "router": {
@ -1401,7 +1400,6 @@ class NeutronRouterTest(common.HeatTestCase):
"admin_state_up": True, "admin_state_up": True,
"tenant_id": "3e21026f2dc94372b105808c0e721661", "tenant_id": "3e21026f2dc94372b105808c0e721661",
"id": "3e46229d-8fce-4733-819a-b5fe630550f8", "id": "3e46229d-8fce-4733-819a-b5fe630550f8",
"distributed": False,
} }
}) })
neutronclient.Client.list_l3_agent_hosting_routers( neutronclient.Client.list_l3_agent_hosting_routers(
@ -1771,7 +1769,6 @@ class NeutronRouterTest(common.HeatTestCase):
'enable_snat': True 'enable_snat': True
}, },
"admin_state_up": True, "admin_state_up": True,
"distributed": False,
} }
}).AndReturn({ }).AndReturn({
"router": { "router": {
@ -1781,7 +1778,6 @@ class NeutronRouterTest(common.HeatTestCase):
"admin_state_up": True, "admin_state_up": True,
"tenant_id": "3e21026f2dc94372b105808c0e721661", "tenant_id": "3e21026f2dc94372b105808c0e721661",
"id": "3e46229d-8fce-4733-819a-b5fe630550f8", "id": "3e46229d-8fce-4733-819a-b5fe630550f8",
"distributed": False,
} }
}) })
@ -1851,7 +1847,6 @@ class NeutronRouterTest(common.HeatTestCase):
'network_id': 'fc68ea2c-b60b-4b4f-bd82-94ec81110766', 'network_id': 'fc68ea2c-b60b-4b4f-bd82-94ec81110766',
}, },
"admin_state_up": True, "admin_state_up": True,
"distributed": False,
} }
}).AndReturn({ }).AndReturn({
"router": { "router": {
@ -1861,7 +1856,6 @@ class NeutronRouterTest(common.HeatTestCase):
"admin_state_up": True, "admin_state_up": True,
"tenant_id": "3e21026f2dc94372b105808c0e721661", "tenant_id": "3e21026f2dc94372b105808c0e721661",
"id": "3e46229d-8fce-4733-819a-b5fe630550f8", "id": "3e46229d-8fce-4733-819a-b5fe630550f8",
"distributed": False
} }
}) })