x/quark
Code Issues Proposed changes

Added bridge to backend port filter list

Browse Source 
JIRA:NCP-1743
This commit is contained in:
Amir Sadoughi
2015-10-27 14:44:38 +00:00
parent 334686a1dc
commit 5e650d5cd8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quark/plugin_modules/ports.py
View File

@@ -63,7 +63,7 @@ def _get_net_driver(network, port=None):
# so we can avoid any collisions with real port data. # so we can avoid any collisions with real port data.
def _filter_backend_port(backend_port): def _filter_backend_port(backend_port):
# Collect a list of allowed keys in the driver response # Collect a list of allowed keys in the driver response
required_keys = ["uuid"] required_keys = ["uuid", "bridge"]
tag_keys = [tag for tag in PORT_TAG_REGISTRY.tags.keys()] tag_keys = [tag for tag in PORT_TAG_REGISTRY.tags.keys()]
allowed_keys = required_keys + tag_keys allowed_keys = required_keys + tag_keys

9
quark/tests/plugin_modules/test_ports.py
View File

@@ -1159,8 +1159,9 @@ class TestPortNetworkPlugin(test_quark_plugin.TestQuarkPlugin):
network["ipam_strategy"] = "ANY" network["ipam_strategy"] = "ANY"
# Response from the backend driver # Response from the backend driver
self.expected_bridge = "backend-drivers-bridge"
if driver_res is None: if driver_res is None:
driver_res = {"uuid": 1} driver_res = {"uuid": 1, "bridge": self.expected_bridge}
# Mock out the driver registry # Mock out the driver registry
foo_driver = mock.Mock() foo_driver = mock.Mock()
@@ -1304,14 +1305,14 @@ class TestPortNetworkPlugin(test_quark_plugin.TestQuarkPlugin):
mac_address=expected_mac, use_forbidden_mac_range=False) mac_address=expected_mac, use_forbidden_mac_range=False)
port_create.assert_called_once_with( port_create.assert_called_once_with(
admin_ctx, bridge=expected_bridge, uuid=1, name="foobar", admin_ctx, bridge=self.expected_bridge, uuid=1, name="foobar",
admin_state_up=expected_admin_state, network_id=1, admin_state_up=expected_admin_state, network_id=1,
tenant_id="fake", id=1, device_owner=expected_device_owner, tenant_id="fake", id=1, device_owner=expected_device_owner,
mac_address=mac["address"], device_id=2, backend_key=1, mac_address=mac["address"], device_id=2, backend_key=1,
security_groups=[], addresses=[], security_groups=[], addresses=[],
network_plugin=expected_network_plugin) network_plugin=expected_network_plugin)
def test_create_port_with_compatable_port_network_plugin(self): def test_create_port_with_compatible_port_network_plugin(self):
network = dict(id=1, tenant_id=self.context.tenant_id, network = dict(id=1, tenant_id=self.context.tenant_id,
network_plugin="FOO") network_plugin="FOO")
mac = dict(address="AA:BB:CC:DD:EE:FF") mac = dict(address="AA:BB:CC:DD:EE:FF")
@@ -1350,7 +1351,7 @@ class TestPortNetworkPlugin(test_quark_plugin.TestQuarkPlugin):
mac_address=expected_mac, use_forbidden_mac_range=False) mac_address=expected_mac, use_forbidden_mac_range=False)
port_create.assert_called_once_with( port_create.assert_called_once_with(
admin_ctx, bridge=expected_bridge, uuid=1, name="foobar", admin_ctx, bridge=self.expected_bridge, uuid=1, name="foobar",
admin_state_up=expected_admin_state, network_id=1, admin_state_up=expected_admin_state, network_id=1,
tenant_id="fake", id=1, device_owner=expected_device_owner, tenant_id="fake", id=1, device_owner=expected_device_owner,
mac_address=mac["address"], device_id=2, backend_key=1, mac_address=mac["address"], device_id=2, backend_key=1,