From b35d7fa3cbcd68ef10b9c40a47c0698c7e0a2089 Mon Sep 17 00:00:00 2001 From: Miguel Lavalle Date: Wed, 3 Aug 2016 10:56:44 -0500 Subject: [PATCH] Publish segment id in port responses In this patchset, attribute 'ipam_segment_id' is added to ports to contain the id of the segment where the port is bound in the case of a routed network. This new attribute will be used by the Nova scheduler to place an instance using the port in a host bound to the segment Change-Id: Ide13a7c53c5f4a33894f459c38924830ba583f98 Partially-Implements: blueprint routed-networks --- etc/policy.json | 1 + neutron/extensions/segment.py | 5 +++++ neutron/services/segments/plugin.py | 21 ++++++++++++------- neutron/tests/etc/policy.json | 1 + neutron/tests/unit/extensions/test_segment.py | 7 +++++-- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/etc/policy.json b/etc/policy.json index 3d9830d610a..fc1268c28ff 100644 --- a/etc/policy.json +++ b/etc/policy.json @@ -86,6 +86,7 @@ "get_port:binding:vif_details": "rule:admin_only", "get_port:binding:host_id": "rule:admin_only", "get_port:binding:profile": "rule:admin_only", + "get_port:ipam_segment_id": "rule:admin_only", "update_port": "rule:admin_or_owner or rule:context_is_advsvc", "update_port:device_owner": "not rule:network_device or rule:context_is_advsvc or rule:admin_or_network_owner", "update_port:mac_address": "rule:admin_only or rule:context_is_advsvc", diff --git a/neutron/extensions/segment.py b/neutron/extensions/segment.py index 0911726d806..0b9be9394a1 100644 --- a/neutron/extensions/segment.py +++ b/neutron/extensions/segment.py @@ -31,6 +31,7 @@ SEGMENT_ID = 'segment_id' NETWORK_TYPE = 'network_type' PHYSICAL_NETWORK = 'physical_network' SEGMENTATION_ID = 'segmentation_id' +IPAM_SEGMENT_ID = 'ipam_segment_id' # Attribute Map RESOURCE_ATTRIBUTE_MAP = { @@ -73,6 +74,10 @@ RESOURCE_ATTRIBUTE_MAP = { 'validate': {'type:uuid_or_none': None}, 'is_visible': True, }, }, + attributes.PORTS: { + IPAM_SEGMENT_ID: {'allow_post': False, 'allow_put': False, + 'is_visible': True}, + }, } diff --git a/neutron/services/segments/plugin.py b/neutron/services/segments/plugin.py index 7dcc77c12f6..e30e742f210 100644 --- a/neutron/services/segments/plugin.py +++ b/neutron/services/segments/plugin.py @@ -45,16 +45,23 @@ def _extend_port_dict_binding(plugin, port_res, port_db): return value = ip_allocation.IP_ALLOCATION_IMMEDIATE - if not port_res.get('fixed_ips'): - # NOTE Only routed network ports have deferred allocation. Check if it - # is routed by looking for subnets associated with segments. - object_session = session.Session.object_session(port_db) - query = object_session.query(models_v2.Subnet) - query = query.filter_by(network_id=port_db.network_id) - query = query.filter(models_v2.Subnet.segment_id.isnot(None)) + segment_id = None + # TODO(Carl) eliminate this query entirely and use optimistic joins + object_session = session.Session.object_session(port_db) + query = object_session.query(models_v2.Subnet) + query = query.filter_by(network_id=port_db.network_id) + query = query.filter(models_v2.Subnet.segment_id.isnot(None)) + ips = port_res.get('fixed_ips') + if not ips: if query.count(): value = ip_allocation.IP_ALLOCATION_DEFERRED + else: + query = query.filter_by(id=ips[0]['subnet_id']) + routed_subnet = query.one_or_none() + if routed_subnet: + segment_id = routed_subnet[segment.SEGMENT_ID] port_res[ip_allocation.IP_ALLOCATION] = value + port_res[segment.IPAM_SEGMENT_ID] = segment_id class Plugin(db.SegmentDbMixin, segment.SegmentPluginBase): diff --git a/neutron/tests/etc/policy.json b/neutron/tests/etc/policy.json index 3d9830d610a..fc1268c28ff 100644 --- a/neutron/tests/etc/policy.json +++ b/neutron/tests/etc/policy.json @@ -86,6 +86,7 @@ "get_port:binding:vif_details": "rule:admin_only", "get_port:binding:host_id": "rule:admin_only", "get_port:binding:profile": "rule:admin_only", + "get_port:ipam_segment_id": "rule:admin_only", "update_port": "rule:admin_or_owner or rule:context_is_advsvc", "update_port:device_owner": "not rule:network_device or rule:context_is_advsvc or rule:admin_or_network_owner", "update_port:mac_address": "rule:admin_only or rule:context_is_advsvc", diff --git a/neutron/tests/unit/extensions/test_segment.py b/neutron/tests/unit/extensions/test_segment.py index 93b14215340..57032a0ea00 100644 --- a/neutron/tests/unit/extensions/test_segment.py +++ b/neutron/tests/unit/extensions/test_segment.py @@ -720,7 +720,8 @@ class TestSegmentAwareIpam(SegmentTestCase): arg_list=(portbindings.HOST_ID,), **{portbindings.HOST_ID: 'fakehost'}) res = self.deserialize(self.fmt, response) - self._validate_immediate_ip_allocation(res['port']['id']) + self._validate_immediate_ip_allocation( + res['port']['id'], segment_id=segments[1]['segment']['id']) # Since host mapped to middle segment, IP must come from middle subnet self._assert_one_ip_in_subnet(response, subnets[1]['subnet']['cidr']) @@ -909,7 +910,7 @@ class TestSegmentAwareIpam(SegmentTestCase): ips = response['port']['fixed_ips'] self.assertEqual(0, len(ips)) - def _validate_immediate_ip_allocation(self, port_id): + def _validate_immediate_ip_allocation(self, port_id, segment_id=None): request = self.new_show_request('ports', port_id) response = self.deserialize(self.fmt, request.get_response(self.api)) @@ -917,6 +918,8 @@ class TestSegmentAwareIpam(SegmentTestCase): response['port'][ip_allocation.IP_ALLOCATION]) ips = response['port']['fixed_ips'] self.assertNotEqual(0, len(ips)) + self.assertEqual(segment_id, + response['port'][ext_segment.IPAM_SEGMENT_ID]) def _create_deferred_ip_port(self, network): response = self._create_port(self.fmt,