x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V3: clean up parent/tag handling"

Browse Source
This commit is contained in:
Jenkins 2017-07-04 17:26:14 +00:00 committed by Gerrit Code Review
commit f0c0b4b54e
2 changed files with 1 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -17,7 +17,6 @@ import netaddr
from neutron_lib.api.definitions import network as net_def
from neutron_lib.api.definitions import port_security as psec
from neutron_lib.exceptions import port_security as psec_exc
import six
from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
from neutron.api.rpc.handlers import dhcp_rpc
@ -1439,41 +1438,6 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
[db_utils.resource_fields(network,
fields) for network in networks])
def _get_data_from_binding_profile(self, context, port):
if (pbin.PROFILE not in port or
not validators.is_attr_set(port[pbin.PROFILE])):
return None, None
parent_name = (
port[pbin.PROFILE].get('parent_name'))
tag = port[pbin.PROFILE].get('tag')
if not any((parent_name, tag)):
# An empty profile is fine.
return None, None
if not all((parent_name, tag)):
# If one is set, they both must be set.
msg = _('Invalid binding:profile. parent_name and tag are '
'both required.')
LOG.error(msg)
raise n_exc.InvalidInput(error_message=msg)
if not isinstance(parent_name, six.string_types):
msg = _('Invalid binding:profile. parent_name "%s" must be '
'a string.') % parent_name
LOG.error(msg)
raise n_exc.InvalidInput(error_message=msg)
if not n_utils.is_valid_vlan_tag(tag):
msg = _('Invalid binding:profile. tag "%s" must be '
'an int between 1 and 4096, inclusive.') % tag
LOG.error(msg)
raise n_exc.InvalidInput(error_message=msg)
# Make sure we can successfully look up the port indicated by
# parent_name. Just let it raise the right exception if there is a
# problem.
# NOTE(arosen): For demo reasons the parent_port might not be a
# a neutron managed port so for now do not perform this check.
# self.get_port(context, parent_name)
return parent_name, tag
def _get_port_name(self, context, port_data):
device_owner = port_data.get('device_owner')
device_id = port_data.get('device_id')
@ -1562,8 +1526,6 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
tags.append({'scope': security.PORT_SG_SCOPE,
'tag': NSX_V3_DEFAULT_SECTION})
parent_name, tag = self._get_data_from_binding_profile(
context, port_data)
address_bindings = (self._build_address_bindings(port_data)
if psec_is_on else [])
@ -1629,7 +1591,6 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
admin_state=port_data['admin_state_up'],
address_bindings=address_bindings,
attachment_type=attachment_type,
parent_vif_id=parent_name, traffic_tag=tag,
switch_profile_ids=profiles)
except nsx_lib_exc.ManagerError as inst:
# we may fail if the QoS is not supported for this port
@ -2296,9 +2257,6 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
tags_update = nsxlib_utils.add_v3_tag(
tags_update, resource_type, updated_device_id)
parent_vif_id, tag = self._get_data_from_binding_profile(
context, updated_port)
if updated_device_owner in (original_device_owner,
l3_db.DEVICE_OWNER_ROUTER_INTF,
nsxlib_consts.BRIDGE_ENDPOINT):
@ -2399,9 +2357,7 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
admin_state=updated_port.get('admin_state_up'),
address_bindings=address_bindings,
switch_profile_ids=switch_profile_ids,
tags_update=tags_update,
parent_vif_id=parent_vif_id,
traffic_tag=tag)
tags_update=tags_update)
except nsx_lib_exc.ManagerError as inst:
# we may fail if the QoS is not supported for this port
# (for example - transport zone with KVM)

56
vmware_nsx/tests/unit/nsx_v3/test_parent_tag.py
View File

@ -1,56 +0,0 @@
# Copyright (c) 2015 OpenStack Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from neutron_lib.api.definitions import portbindings as pbin
from vmware_nsx.tests.unit.nsx_v3 import test_plugin as test_nsx_v3_plugin
class TestParentTagPortBinding(test_nsx_v3_plugin.NsxV3PluginTestCaseMixin):
# NOTE(arosen): commenting out this test for now for demo setup.
# def test_create_port_with_invalid_parent(self):
# binding = {pbin.PROFILE: {"parent_name": 'invalid', 'tag': 1}}
# with self.network() as n:
# with self.subnet(n):
# # FIXME(arosen): we shouldn't be returning 404 in this case.
# self._create_port(
# self.fmt, n['network']['id'],
# expected_res_status=404,
# arg_list=(pbin.PROFILE,),
# **binding)
def test_create_port_with_parent_and_tag(self):
binding = {pbin.PROFILE: {"parent_name": '', 'tag': 1}}
with self.network() as n:
with self.subnet(n) as s:
with self.port(s) as p:
binding[pbin.PROFILE]['parent_name'] = p['port']['id']
res = self._create_port(self.fmt, n['network']['id'],
arg_list=(pbin.PROFILE,),
**binding)
port = self.deserialize(self.fmt, res)
self.assertEqual(port['port'][pbin.PROFILE],
binding[pbin.PROFILE])
def test_create_port_with_invalid_tag(self):
binding = {pbin.PROFILE: {"parent_name": '', 'tag': 10000000}}
with self.network() as n:
with self.subnet(n) as s:
with self.port(s) as p:
binding[pbin.PROFILE]['parent_name'] = p['port']['id']
self._create_port(self.fmt, n['network']['id'],
arg_list=(pbin.PROFILE,),
expected_res_status=400,
**binding)