x/vmware-nsx
Code Issues Proposed changes

Merge "remove policy check for host_routes in update_port"

Browse Source
This commit is contained in:
Jenkins 2012-08-30 11:49:48 +00:00 committed by Gerrit Code Review
commit 9198ca803a
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/policy.json
View File

@ -32,11 +32,9 @@
"create_port": [], "create_port": [],
"create_port:mac_address": [["rule:admin_or_network_owner"]], "create_port:mac_address": [["rule:admin_or_network_owner"]],
"create_port:host_routes": [["rule:admin_or_network_owner"]],
"create_port:fixed_ips": [["rule:admin_or_network_owner"]], "create_port:fixed_ips": [["rule:admin_or_network_owner"]],
"get_port": [["rule:admin_or_owner"]], "get_port": [["rule:admin_or_owner"]],
"update_port": [["rule:admin_or_owner"]], "update_port": [["rule:admin_or_owner"]],
"update_port:host_routes": [["rule:admin_or_network_owner"]],
"update_port:fixed_ips": [["rule:admin_or_network_owner"]], "update_port:fixed_ips": [["rule:admin_or_network_owner"]],
"delete_port": [["rule:admin_or_owner"]] "delete_port": [["rule:admin_or_owner"]]
} }

4
quantum/api/v2/attributes.py
View File

@ -220,10 +220,6 @@ RESOURCE_ATTRIBUTE_MAP = {
'default': ATTR_NOT_SPECIFIED, 'default': ATTR_NOT_SPECIFIED,
'enforce_policy': True, 'enforce_policy': True,
'is_visible': True}, 'is_visible': True},
'host_routes': {'allow_post': True, 'allow_put': True,
'default': ATTR_NOT_SPECIFIED,
'enforce_policy': True,
'is_visible': False},
'device_id': {'allow_post': True, 'allow_put': True, 'device_id': {'allow_post': True, 'allow_put': True,
'default': '', 'default': '',
'is_visible': True}, 'is_visible': True},

4
quantum/tests/unit/test_api_v2.py
View File

@ -494,13 +494,11 @@ class JSONV2TestCase(APIv2TestBase):
full_input = {'port': {'admin_state_up': True, full_input = {'port': {'admin_state_up': True,
'mac_address': attributes.ATTR_NOT_SPECIFIED, 'mac_address': attributes.ATTR_NOT_SPECIFIED,
'fixed_ips': attributes.ATTR_NOT_SPECIFIED, 'fixed_ips': attributes.ATTR_NOT_SPECIFIED,
'device_owner': '', 'device_owner': ''}}
'host_routes': attributes.ATTR_NOT_SPECIFIED}}
full_input['port'].update(initial_input['port']) full_input['port'].update(initial_input['port'])
return_value = {'id': _uuid(), 'status': 'ACTIVE', return_value = {'id': _uuid(), 'status': 'ACTIVE',
'admin_state_up': True, 'admin_state_up': True,
'mac_address': 'ca:fe:de:ad:be:ef', 'mac_address': 'ca:fe:de:ad:be:ef',
'host_routes': [],
'device_id': device_id, 'device_id': device_id,
'device_owner': ''} 'device_owner': ''}
return_value.update(initial_input['port']) return_value.update(initial_input['port'])