x/quark
Code Issues Proposed changes

Updates Mac Address port return format

Browse Source
This commit is contained in:
Matt Dietz
2013-09-04 22:14:11 +00:00
parent debd9e976e
commit 185e4bdfab
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
quark/plugin_views.py
View File

@@ -139,9 +139,10 @@ def _port_dict(port, fields=None):
port.get("security_groups", None)], port.get("security_groups", None)],
"device_id": port.get("device_id"), "device_id": port.get("device_id"),
"device_owner": port.get("device_owner")} "device_owner": port.get("device_owner")}
if isinstance(res["mac_address"], (int, long)):
res["mac_address"] = str(netaddr.EUI(res["mac_address"], if res["mac_address"]:
dialect=netaddr.mac_unix)) mac = str(netaddr.EUI(res["mac_address"])).replace('-', ':')
res["mac_address"] = mac
return res return res

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

@@ -69,11 +69,11 @@ class TestQuarkGetPorts(test_quark_plugin.TestQuarkPlugin):
def test_port_list_with_ports(self): def test_port_list_with_ports(self):
ip = dict(id=1, address=3232235876, address_readable="192.168.1.100", ip = dict(id=1, address=3232235876, address_readable="192.168.1.100",
subnet_id=1, network_id=2, version=4) subnet_id=1, network_id=2, version=4)
port = dict(mac_address="aa:bb:cc:dd:ee:ff", network_id=1, port = dict(mac_address="AA:BB:CC:DD:EE:FF", network_id=1,
tenant_id=self.context.tenant_id, device_id=2) tenant_id=self.context.tenant_id, device_id=2)
expected = {'status': "ACTIVE", expected = {'status': "ACTIVE",
'device_owner': None, 'device_owner': None,
'mac_address': 'aa:bb:cc:dd:ee:ff', 'mac_address': 'AA:BB:CC:DD:EE:FF',
'network_id': 1, 'network_id': 1,
'tenant_id': self.context.tenant_id, 'tenant_id': self.context.tenant_id,
'admin_state_up': None, 'admin_state_up': None,
@@ -115,7 +115,7 @@ class TestQuarkGetPorts(test_quark_plugin.TestQuarkPlugin):
tenant_id=self.context.tenant_id, device_id=2) tenant_id=self.context.tenant_id, device_id=2)
expected = {'status': "ACTIVE", expected = {'status': "ACTIVE",
'device_owner': None, 'device_owner': None,
'mac_address': 'aa:bb:cc:dd:ee:ff', 'mac_address': 'AA:BB:CC:DD:EE:FF',
'network_id': 1, 'network_id': 1,
'tenant_id': self.context.tenant_id, 'tenant_id': self.context.tenant_id,
'admin_state_up': None, 'admin_state_up': None,
@@ -155,7 +155,7 @@ class TestQuarkCreatePort(test_quark_plugin.TestQuarkPlugin):
def test_create_port(self): def test_create_port(self):
network = dict(id=1) network = dict(id=1)
mac = dict(address="aa:bb:cc:dd:ee:ff") mac = dict(address="AA:BB:CC:DD:EE:FF")
port_name = "foobar" port_name = "foobar"
ip = dict() ip = dict()
port = dict(port=dict(mac_address=mac["address"], network_id=1, port = dict(port=dict(mac_address=mac["address"], network_id=1,
@@ -179,7 +179,7 @@ class TestQuarkCreatePort(test_quark_plugin.TestQuarkPlugin):
def test_create_port_mac_address_not_specified(self): def test_create_port_mac_address_not_specified(self):
network = dict(id=1) network = dict(id=1)
mac = dict(address="aa:bb:cc:dd:ee:ff") mac = dict(address="AA:BB:CC:DD:EE:FF")
ip = dict() ip = dict()
port = dict(port=dict(mac_address=mac["address"], network_id=1, port = dict(port=dict(mac_address=mac["address"], network_id=1,
tenant_id=self.context.tenant_id, device_id=2)) tenant_id=self.context.tenant_id, device_id=2))
@@ -201,7 +201,7 @@ class TestQuarkCreatePort(test_quark_plugin.TestQuarkPlugin):
def test_create_port_fixed_ips(self): def test_create_port_fixed_ips(self):
network = dict(id=1) network = dict(id=1)
mac = dict(address="aa:bb:cc:dd:ee:ff") mac = dict(address="AA:BB:CC:DD:EE:FF")
ip = mock.MagicMock() ip = mock.MagicMock()
ip.get = lambda x, *y: 1 if x == "subnet_id" else None ip.get = lambda x, *y: 1 if x == "subnet_id" else None
ip.formatted = lambda: "192.168.10.45" ip.formatted = lambda: "192.168.10.45"
@@ -226,7 +226,7 @@ class TestQuarkCreatePort(test_quark_plugin.TestQuarkPlugin):
def test_create_port_fixed_ips_bad_request(self): def test_create_port_fixed_ips_bad_request(self):
network = dict(id=1) network = dict(id=1)
mac = dict(address="aa:bb:cc:dd:ee:ff") mac = dict(address="AA:BB:CC:DD:EE:FF")
ip = mock.MagicMock() ip = mock.MagicMock()
ip.get = lambda x: 1 if x == "subnet_id" else None ip.get = lambda x: 1 if x == "subnet_id" else None
ip.formatted = lambda: "192.168.10.45" ip.formatted = lambda: "192.168.10.45"
@@ -248,7 +248,7 @@ class TestQuarkCreatePort(test_quark_plugin.TestQuarkPlugin):
def test_create_port_net_at_max(self): def test_create_port_net_at_max(self):
network = dict(id=1, ports=[models.Port()]) network = dict(id=1, ports=[models.Port()])
mac = dict(address="aa:bb:cc:dd:ee:ff") mac = dict(address="AA:BB:CC:DD:EE:FF")
port_name = "foobar" port_name = "foobar"
ip = dict() ip = dict()
port = dict(port=dict(mac_address=mac["address"], network_id=1, port = dict(port=dict(mac_address=mac["address"], network_id=1,
@@ -260,7 +260,7 @@ class TestQuarkCreatePort(test_quark_plugin.TestQuarkPlugin):
def test_create_port_security_groups(self, groups=[1]): def test_create_port_security_groups(self, groups=[1]):
network = dict(id=1) network = dict(id=1)
mac = dict(address="aa:bb:cc:dd:ee:ff") mac = dict(address="AA:BB:CC:DD:EE:FF")
port_name = "foobar" port_name = "foobar"
ip = dict() ip = dict()
group = models.SecurityGroup() group = models.SecurityGroup()
@@ -308,6 +308,7 @@ class TestQuarkUpdatePort(test_quark_plugin.TestQuarkPlugin):
mock.patch("quark.ipam.QuarkIpam.deallocate_ip_address") mock.patch("quark.ipam.QuarkIpam.deallocate_ip_address")
) as (port_find, port_update, alloc_ip, dealloc_ip): ) as (port_find, port_update, alloc_ip, dealloc_ip):
port_find.return_value = port_model port_find.return_value = port_model
port_update.return_value = port_model
yield port_find, port_update, alloc_ip, dealloc_ip yield port_find, port_update, alloc_ip, dealloc_ip
def test_update_port_not_found(self): def test_update_port_not_found(self):