x/quark
Code Issues Proposed changes

Updating ip_address plugin_view with correct keys

Browse Source 
JIRA:NCP-1968

plugin_views.py returned an ip as "address", which is not symmetrical with
the calling json. Changing response body to display "ip_address" for
symmetry.

Updated associated unit tests with correct keys.

Change-Id: I38eecd48edc2051308d42b4f803c8e7bd575f089
Closes-Bug: #1595267
This commit is contained in:
Kyle Haley
2016-06-21 19:00:22 -07:00
parent 6b0e51d4c5
commit 2c372f2ccd
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quark/plugin_views.py
View File

@@ -305,7 +305,7 @@ def _make_route_dict(route):
def _make_ip_dict(address): def _make_ip_dict(address):
return {"id": address["id"], return {"id": address["id"],
"network_id": address["network_id"], "network_id": address["network_id"],
"address": address.formatted(), "ip_address": address.formatted(),
"port_ids": [assoc.port_id "port_ids": [assoc.port_id
for assoc in address["associations"]], for assoc in address["associations"]],
"subnet_id": address["subnet_id"], "subnet_id": address["subnet_id"],

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

@@ -103,7 +103,7 @@ class TestIpAddresses(test_quark_plugin.TestQuarkPlugin):
self.assertEqual(response["subnet_id"], ip["subnet_id"]) self.assertEqual(response["subnet_id"], ip["subnet_id"])
self.assertEqual(response['type'], None) self.assertEqual(response['type'], None)
self.assertEqual(response["version"], 4) self.assertEqual(response["version"], 4)
self.assertEqual(response["address"], "192.168.1.100") self.assertEqual(response["ip_address"], "192.168.1.100")
self.assertEqual(response["tenant_id"], 1) self.assertEqual(response["tenant_id"], 1)
cfg.CONF.set_override('ipaddr_allow_fixed_ip', old_cfg, "QUARK") cfg.CONF.set_override('ipaddr_allow_fixed_ip', old_cfg, "QUARK")
@@ -599,7 +599,7 @@ class TestQuarkGetIpAddress(test_quark_plugin.TestQuarkPlugin):
res = self.plugin.get_ip_address(self.context, 1) res = self.plugin.get_ip_address(self.context, 1)
self.assertEqual(ip["id"], res["id"]) self.assertEqual(ip["id"], res["id"])
self.assertEqual(ip["subnet_id"], res["subnet_id"]) self.assertEqual(ip["subnet_id"], res["subnet_id"])
self.assertEqual(ip["address_readable"], res["address"]) self.assertEqual(ip["address_readable"], res["ip_address"])
self.assertEqual(res["port_ids"][0], port["id"]) self.assertEqual(res["port_ids"][0], port["id"])
def test_get_ip_address_no_ip_fails(self): def test_get_ip_address_no_ip_fails(self):
@@ -645,7 +645,7 @@ class TestQuarkGetIpAddresses(test_quark_plugin.TestQuarkPlugin):
addr_res = res[0] addr_res = res[0]
self.assertEqual(ip["id"], addr_res["id"]) self.assertEqual(ip["id"], addr_res["id"])
self.assertEqual(ip["subnet_id"], addr_res["subnet_id"]) self.assertEqual(ip["subnet_id"], addr_res["subnet_id"])
self.assertEqual(ip["address_readable"], addr_res["address"]) self.assertEqual(ip["address_readable"], addr_res["ip_address"])
self.assertEqual(addr_res["port_ids"][0], port["id"]) self.assertEqual(addr_res["port_ids"][0], port["id"])
def test_get_ip_addresses_multiple(self): def test_get_ip_addresses_multiple(self):
@@ -660,7 +660,8 @@ class TestQuarkGetIpAddresses(test_quark_plugin.TestQuarkPlugin):
for i, addr in enumerate(sorted(res, key=lambda x: x['id'])): for i, addr in enumerate(sorted(res, key=lambda x: x['id'])):
self.assertEqual(ips[i]["id"], addr["id"]) self.assertEqual(ips[i]["id"], addr["id"])
self.assertEqual(ips[i]["subnet_id"], addr["subnet_id"]) self.assertEqual(ips[i]["subnet_id"], addr["subnet_id"])
self.assertEqual(ips[i]["address_readable"], addr["address"]) self.assertEqual(ips[i]["address_readable"],
addr["ip_address"])
@mock.patch("quark.plugin_modules.ip_addresses" @mock.patch("quark.plugin_modules.ip_addresses"