x/vmware-nsx
Code Issues Proposed changes

NSX|v3 refactor trunk driver to use nsxlib api

Browse Source 
Change-Id: Iaf5ac1d32147f090b601e646f4d23b93eb5f3073
This commit is contained in:
Adit Sarfaty 2017-07-03 14:49:21 +03:00
parent 706154c181
commit a64511173f
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vmware_nsx/services/trunk/nsx_v3/driver.py
View File

@ -28,7 +28,6 @@ from vmware_nsx.common import nsx_constants as nsx_consts
from vmware_nsx.common import utils as nsx_utils from vmware_nsx.common import utils as nsx_utils
from vmware_nsx.db import db as nsx_db from vmware_nsx.db import db as nsx_db
from vmware_nsxlib.v3 import exceptions as nsxlib_exc from vmware_nsxlib.v3 import exceptions as nsxlib_exc
from vmware_nsxlib.v3 import resources as nsx_resources
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -46,15 +45,14 @@ class NsxV3TrunkHandler(object):
def __init__(self, plugin_driver): def __init__(self, plugin_driver):
self.plugin_driver = plugin_driver self.plugin_driver = plugin_driver
#TODO(abhiraut): Refactor nsxlib code and reuse here. @property
def _nsxlib(self):
return self.plugin_driver.nsxlib
def _build_switching_profile_ids(self, profiles): def _build_switching_profile_ids(self, profiles):
switch_profile_ids = [] switching_profile = self._nsxlib.switching_profile
for profile in profiles: return switching_profile.build_switch_profile_ids(
switch_profile = nsx_resources.SwitchingProfileTypeId( switching_profile.client, profiles)
profile_type=profile['key'],
profile_id=profile['value'])
switch_profile_ids.append(switch_profile)
return switch_profile_ids
def _update_port_at_backend(self, context, parent_port_id, subport): def _update_port_at_backend(self, context, parent_port_id, subport):
# Retrieve the child port details # Retrieve the child port details
@ -64,7 +62,7 @@ class NsxV3TrunkHandler(object):
session=context.session, neutron_id=subport.port_id)[1] session=context.session, neutron_id=subport.port_id)[1]
# Retrieve child logical port from the backend # Retrieve child logical port from the backend
try: try:
nsx_child_port = self.plugin_driver.nsxlib.logical_port.get( nsx_child_port = self._nsxlib.logical_port.get(
nsx_child_port_id) nsx_child_port_id)
except nsxlib_exc.ResourceNotFound: except nsxlib_exc.ResourceNotFound:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
@ -90,7 +88,7 @@ class NsxV3TrunkHandler(object):
seg_id = None seg_id = None
# Update logical port in the backend to set/unset parent port # Update logical port in the backend to set/unset parent port
try: try:
self.plugin_driver.nsxlib.logical_port.update( self._nsxlib.logical_port.update(
lport_id=nsx_child_port.get('id'), lport_id=nsx_child_port.get('id'),
vif_uuid=subport.port_id, vif_uuid=subport.port_id,
name=nsx_child_port.get('display_name'), name=nsx_child_port.get('display_name'),