openstack-attic/melange
Code Issues Proposed changes

GET on /ipam/tenants/{tenant_id}/networks/{network_id} lists ip_blocks of the network

Browse Source
This commit is contained in:
Rajaram Mallya 2011-11-09 15:45:58 +05:30
parent 1704cd4f25
commit 140da59aff
2 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
melange/ipam/service.py
View File

@ -351,6 +351,13 @@ class PoliciesController(BaseController):
policy.delete() policy.delete()
class NetworksController(BaseController):
def index(self, request, tenant_id, network_id):
network = models.Network.find_by(network_id, tenant_id=tenant_id)
return dict(ip_blocks=[block.data() for block in network.ip_blocks])
class InterfaceIpAllocationsController(BaseController): class InterfaceIpAllocationsController(BaseController):
def create(self, request, network_id, interface_id, def create(self, request, network_id, interface_id,
@ -432,7 +439,8 @@ class API(wsgi.Router):
InsideLocalsController().create_resource()) InsideLocalsController().create_resource())
self._block_and_nested_resource_mapper(mapper) self._block_and_nested_resource_mapper(mapper)
self._policy_and_rules_mapper(mapper) self._policy_and_rules_mapper(mapper)
self._network_mapper(mapper) self._networks_maper(mapper)
self._interface_ip_allocations_mapper(mapper)
self._allocated_ips_mapper(mapper) self._allocated_ips_mapper(mapper)
self._ip_routes_mapper(mapper) self._ip_routes_mapper(mapper)
self._interface_mapper(mapper) self._interface_mapper(mapper)
@ -471,7 +479,12 @@ class API(wsgi.Router):
path = ("/ipam/mac_address_ranges") path = ("/ipam/mac_address_ranges")
mapper.resource("mac_address_ranges", path, controller=range_res) mapper.resource("mac_address_ranges", path, controller=range_res)
def _network_mapper(self, mapper): def _networks_maper(self, mapper):
resource = NetworksController().create_resource()
path = "/ipam/tenants/{tenant_id}/networks/{network_id}"
mapper.resource("networks", path, controller=resource)
def _interface_ip_allocations_mapper(self, mapper):
path = ("/ipam/tenants/{tenant_id}/networks" path = ("/ipam/tenants/{tenant_id}/networks"
"/{network_id}/interfaces/{interface_id}") "/{network_id}/interfaces/{interface_id}")
resource = InterfaceIpAllocationsController().create_resource() resource = InterfaceIpAllocationsController().create_resource()

51
melange/tests/unit/test_ipam_service.py
View File

@ -1870,18 +1870,33 @@ class TestPoliciesController(BaseTestController):
"Policy Not Found") "Policy Not Found")
class TestNetworksController(BaseTestController):
def test_index_returns_all_ip_blocks_in_subnet(self):
factory = factory_models.PrivateIpBlockFactory
blocks = [factory(tenant_id="tnt_id", network_id="1"),
factory(tenant_id="tnt_id", network_id="1")]
other_tenant_block = factory(tenant_id="other_tnt_id", network_id="1")
other_networks_block = factory(tenant_id="tnt_id", network_id="22")
response = self.app.get("/ipam/tenants/tnt_id/networks/1")
self.assertEqual(response.status_int, 200)
response_blocks = response.json['ip_blocks']
self.assertItemsEqual(response_blocks, _data(blocks))
class TestInterfaceIpAllocationsController(BaseTestController): class TestInterfaceIpAllocationsController(BaseTestController):
def setUp(self): def setUp(self):
self.network_path = "/ipam/tenants/tnt_id"
super(TestInterfaceIpAllocationsController, self).setUp() super(TestInterfaceIpAllocationsController, self).setUp()
def test_create(self): def test_create(self):
ip_block = factory_models.PrivateIpBlockFactory(tenant_id="tnt_id", ip_block = factory_models.PrivateIpBlockFactory(tenant_id="tnt_id",
network_id=1) network_id=1)
response = self.app.post("{0}/networks/1/interfaces/123/" response = self.app.post("/ipam/tenants/tnt_id/networks/1/"
"ip_allocations".format(self.network_path)) "interfaces/123/ip_allocations")
ip_address = models.IpAddress.find_by(ip_block_id=ip_block.id) ip_address = models.IpAddress.find_by(ip_block_id=ip_block.id)
self.assertEqual(response.status_int, 201) self.assertEqual(response.status_int, 201)
@ -1904,8 +1919,8 @@ class TestInterfaceIpAllocationsController(BaseTestController):
network_id=1, network_id=1,
cidr="10.0.0.0/24") cidr="10.0.0.0/24")
response = self.app.post_json("{0}/networks/1/interfaces/123" response = self.app.post_json("/ipam/tenants/tnt_id/networks/1/"
"/ip_allocations".format(self.network_path), "interfaces/123/ip_allocations",
{'network': {'addresses': ['10.0.0.2']}}) {'network': {'addresses': ['10.0.0.2']}})
ip_address = models.IpAddress.find_by(ip_block_id=ip_block.id, ip_address = models.IpAddress.find_by(ip_block_id=ip_block.id,
@ -1926,9 +1941,8 @@ class TestInterfaceIpAllocationsController(BaseTestController):
} }
} }
self.app.post_json("{0}/networks/1/interfaces/123" self.app.post_json("/ipam/tenants/tnt_id/networks/1/"
"/ip_allocations".format(self.network_path), "interfaces/123/ip_allocations", body)
body)
ip_address = models.IpAddress.find_by(ip_block_id=ip_block.id) ip_address = models.IpAddress.find_by(ip_block_id=ip_block.id)
interface = models.Interface.find(ip_address.interface_id) interface = models.Interface.find(ip_address.interface_id)
@ -1942,8 +1956,8 @@ class TestInterfaceIpAllocationsController(BaseTestController):
network_id=1, network_id=1,
cidr="10.0.0.0/24") cidr="10.0.0.0/24")
self.app.post_json("{0}/networks/1/interfaces/123" self.app.post_json("/ipam/tenants/tnt_id/networks/1/"
"/ip_allocations".format(self.network_path)) "interfaces/123/ip_allocations")
ip_address = models.IpAddress.find_by(ip_block_id=ip_block.id) ip_address = models.IpAddress.find_by(ip_block_id=ip_block.id)
self.assertEqual(ip_address.mac_address.eui_format, self.assertEqual(ip_address.mac_address.eui_format,
@ -1963,8 +1977,8 @@ class TestInterfaceIpAllocationsController(BaseTestController):
self.mock.ReplayAll() self.mock.ReplayAll()
response = self.app.post_json("{0}/networks/1/interfaces/123" response = self.app.post_json("/ipam/tenants/tnt_id/networks/1/"
"/ip_allocations".format(self.network_path), "interfaces/123/ip_allocations",
{'network': {'mac_address': mac_address, {'network': {'mac_address': mac_address,
'tenant_id': "tnt_id", 'tenant_id': "tnt_id",
}, },
@ -1993,17 +2007,16 @@ class TestInterfaceIpAllocationsController(BaseTestController):
interface = factory_models.InterfaceFactory(virtual_interface_id="123") interface = factory_models.InterfaceFactory(virtual_interface_id="123")
ip = ip_block.allocate_ip(interface=interface) ip = ip_block.allocate_ip(interface=interface)
response = self.app.delete("{0}/networks/1/interfaces/123/" response = self.app.delete("/ipam/tenants/tnt_id/networks/1/"
"ip_allocations".format(self.network_path)) "interfaces/123/ip_allocations")
ip_address = models.IpAddress.get(ip.id) ip_address = models.IpAddress.get(ip.id)
self.assertEqual(response.status_int, 200) self.assertEqual(response.status_int, 200)
self.assertTrue(ip_address.marked_for_deallocation) self.assertTrue(ip_address.marked_for_deallocation)
def test_bulk_delete_when_network_does_not_exist(self): def test_bulk_delete_when_network_does_not_exist(self):
response = self.app.delete("{0}/networks/1/interfaces/123/" response = self.app.delete("/ipam/tenants/tnt_id/networks/1/"
"ip_allocations".format(self.network_path), "interfaces/123/ip_allocations", status="*")
status="*")
self.assertErrorResponse(response, webob.exc.HTTPNotFound, self.assertErrorResponse(response, webob.exc.HTTPNotFound,
"Network 1 not found") "Network 1 not found")
@ -2022,8 +2035,8 @@ class TestInterfaceIpAllocationsController(BaseTestController):
ip2 = ipv4_block.allocate_ip(interface=iface) ip2 = ipv4_block.allocate_ip(interface=iface)
ip3 = ipv6_block.allocate_ip(interface=iface) ip3 = ipv6_block.allocate_ip(interface=iface)
response = self.app.get("{0}/networks/1/interfaces/123/" response = self.app.get("/ipam/tenants/tnt_id/networks/1/"
"ip_allocations".format(self.network_path)) "interfaces/123/ip_allocations")
self.assertEqual(response.status_int, 200) self.assertEqual(response.status_int, 200)
self.assertItemsEqual(views.IpConfigurationView(ip1, ip2, ip3).data(), self.assertItemsEqual(views.IpConfigurationView(ip1, ip2, ip3).data(),