openstack/shade
Code Issues Proposed changes

Merge "remove_router_interface: check subnet_id or port_id is provided"

Browse Source
This commit is contained in:
Jenkins 2016-10-09 10:49:18 +00:00 committed by Gerrit Code Review
commit 7427ad5ebe
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shade/openstackcloud.py
View File

@ -2503,6 +2503,8 @@ class OpenStackCloud(object):
def remove_router_interface(self, router, subnet_id=None, port_id=None):
"""Detach a subnet from an internal router interface.
At least one of subnet_id or port_id must be supplied.
If you specify both subnet and port ID, the subnet ID must
correspond to the subnet ID of the first IP address on the port
specified by the port ID. Otherwise an error occurs.
@ -2521,6 +2523,10 @@ class OpenStackCloud(object):
if port_id:
body['port_id'] = port_id
if not body:
raise ValueError(
"At least one of subnet_id or port_id must be supplied.")
with _utils.neutron_exceptions(
"Error detaching interface from router {0}".format(router['id'])
):

5
shade/tests/unit/test_shade.py
View File

@ -214,6 +214,11 @@ class TestShade(base.TestCase):
router='123', body={'subnet_id': 'abc'}
)
@mock.patch.object(shade.OpenStackCloud, 'neutron_client')
def test_remove_router_interface_missing_argument(self, mock_client):
self.assertRaises(ValueError, self.cloud.remove_router_interface,
{'id': '123'})
@mock.patch.object(shade.OpenStackCloud, 'get_router')
@mock.patch.object(shade.OpenStackCloud, 'neutron_client')
def test_update_router(self, mock_client, mock_get):