x/vmware-nsx
Code Issues Proposed changes

NSX|V3 refactor plugin profiles init code

Browse Source 
Change-Id: I7ab23069bb7138b90e2c9d94f91401efd7271f38
This commit is contained in:
Adit Sarfaty 2016-12-26 10:30:31 +02:00
parent 909cd6d1d4
commit 586abfc5ac
2 changed files with 29 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,8 +200,7 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
self._nsx_client) self._nsx_client)
# init profiles on nsx backend # init profiles on nsx backend
(self._psec_profile, self._no_psec_profile_id, self._dhcp_profile, self._init_nsx_profiles()
self._mac_learning_profile) = self._init_nsx_profiles()
# Include exclude NSGroup # Include exclude NSGroup
LOG.debug("Initializing NSX v3 Excluded Port NSGroup") LOG.debug("Initializing NSX v3 Excluded Port NSGroup")
@ -226,14 +225,10 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
def _init_nsx_profiles(self): def _init_nsx_profiles(self):
LOG.debug("Initializing NSX v3 port spoofguard switching profile") LOG.debug("Initializing NSX v3 port spoofguard switching profile")
# TODO(asarfaty): improve logic to avoid requiring setting if not self._init_port_security_profile():
# this to none.
self._psec_profile = None
self._psec_profile = self._init_port_security_profile()
if not self._psec_profile:
msg = _("Unable to initialize NSX v3 port spoofguard " msg = _("Unable to initialize NSX v3 port spoofguard "
"switching profile: %s") % NSX_V3_PSEC_PROFILE_NAME "switching profile: %s") % NSX_V3_PSEC_PROFILE_NAME
raise nsx_exc.NsxPluginException(msg) raise nsx_exc.NsxPluginException(err_msg=msg)
profiles = nsx_resources.SwitchingProfile profiles = nsx_resources.SwitchingProfile
self._no_psec_profile_id = profiles.build_switch_profile_ids( self._no_psec_profile_id = profiles.build_switch_profile_ids(
self._switching_profiles, self._switching_profiles,
@ -242,23 +237,20 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
LOG.debug("Initializing NSX v3 DHCP switching profile") LOG.debug("Initializing NSX v3 DHCP switching profile")
try: try:
# TODO(asarfaty): improve logic to avoid requiring setting self._init_dhcp_switching_profile()
# this to none. except Exception as e:
self._dhcp_profile = None msg = (_("Unable to initialize NSX v3 DHCP switching profile: "
self._dhcp_profile = self._init_dhcp_switching_profile() "%(id)s. Reason: %(reason)s") % {
except Exception: 'id': NSX_V3_DHCP_PROFILE_NAME,
msg = _("Unable to initialize NSX v3 DHCP " 'reason': str(e)})
"switching profile: %s") % NSX_V3_DHCP_PROFILE_NAME raise nsx_exc.NsxPluginException(err_msg=msg)
raise nsx_exc.NsxPluginException(msg)
self._mac_learning_profile = None self._mac_learning_profile = None
# Only create MAC Learning profile when nsxv3 version >= 1.1.0 # Only create MAC Learning profile when nsxv3 version >= 1.1.0
if utils.is_nsx_version_1_1_0(self._nsx_version): if utils.is_nsx_version_1_1_0(self._nsx_version):
LOG.debug("Initializing NSX v3 Mac Learning switching profile") LOG.debug("Initializing NSX v3 Mac Learning switching profile")
try: try:
# TODO(asarfaty): improve logic to avoid requiring setting self._init_mac_learning_profile()
# this to none.
self._mac_learning_profile = self._init_mac_learning_profile()
# Only expose the extension if it is supported # Only expose the extension if it is supported
self.supported_extension_aliases.append('mac-learning') self.supported_extension_aliases.append('mac-learning')
except Exception as e: except Exception as e:
@ -266,8 +258,6 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
"profile: %(name)s. Reason: %(reason)s"), "profile: %(name)s. Reason: %(reason)s"),
{'name': NSX_V3_MAC_LEARNING_PROFILE_NAME, {'name': NSX_V3_MAC_LEARNING_PROFILE_NAME,
'reason': e}) 'reason': e})
return (self._psec_profile, self._no_psec_profile_id,
self._dhcp_profile, self._mac_learning_profile)
def _translate_configured_names_to_uuids(self): def _translate_configured_names_to_uuids(self):
# default VLAN transport zone name / uuid # default VLAN transport zone name / uuid
@ -375,27 +365,26 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
Exception, max_attempts=cfg.CONF.nsx_v3.retries) Exception, max_attempts=cfg.CONF.nsx_v3.retries)
def _init_dhcp_switching_profile(self): def _init_dhcp_switching_profile(self):
with locking.LockManager.get_lock('nsxv3_dhcp_profile_init'): with locking.LockManager.get_lock('nsxv3_dhcp_profile_init'):
profile = self._get_dhcp_security_profile() if not self._get_dhcp_security_profile():
if not profile:
self._switching_profiles.create_dhcp_profile( self._switching_profiles.create_dhcp_profile(
NSX_V3_DHCP_PROFILE_NAME, 'Neutron DHCP Security Profile', NSX_V3_DHCP_PROFILE_NAME, 'Neutron DHCP Security Profile',
tags=self.nsxlib.build_v3_api_version_tag()) tags=self.nsxlib.build_v3_api_version_tag())
return self._get_dhcp_security_profile() return self._get_dhcp_security_profile()
def _get_dhcp_security_profile(self): def _get_dhcp_security_profile(self):
if self._dhcp_profile: if hasattr(self, '_dhcp_profile') and self._dhcp_profile:
return self._dhcp_profile return self._dhcp_profile
profile = self._switching_profiles.find_by_display_name( profile = self._switching_profiles.find_by_display_name(
NSX_V3_DHCP_PROFILE_NAME) NSX_V3_DHCP_PROFILE_NAME)
return nsx_resources.SwitchingProfileTypeId( self._dhcp_profile = nsx_resources.SwitchingProfileTypeId(
profile_type=(nsx_resources.SwitchingProfileTypes. profile_type=(nsx_resources.SwitchingProfileTypes.
SWITCH_SECURITY), SWITCH_SECURITY),
profile_id=profile[0]['id']) if profile else None profile_id=profile[0]['id']) if profile else None
return self._dhcp_profile
def _init_mac_learning_profile(self): def _init_mac_learning_profile(self):
with locking.LockManager.get_lock('nsxv3_mac_learning_profile_init'): with locking.LockManager.get_lock('nsxv3_mac_learning_profile_init'):
profile = self._get_mac_learning_profile() if not self._get_mac_learning_profile():
if not profile:
self._switching_profiles.create_mac_learning_profile( self._switching_profiles.create_mac_learning_profile(
NSX_V3_MAC_LEARNING_PROFILE_NAME, NSX_V3_MAC_LEARNING_PROFILE_NAME,
'Neutron MAC Learning Profile', 'Neutron MAC Learning Profile',
@ -403,25 +392,28 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
return self._get_mac_learning_profile() return self._get_mac_learning_profile()
def _get_mac_learning_profile(self): def _get_mac_learning_profile(self):
if self._mac_learning_profile: if (hasattr(self, '_mac_learning_profile')
and self._mac_learning_profile):
return self._mac_learning_profile return self._mac_learning_profile
profile = self._switching_profiles.find_by_display_name( profile = self._switching_profiles.find_by_display_name(
NSX_V3_MAC_LEARNING_PROFILE_NAME) NSX_V3_MAC_LEARNING_PROFILE_NAME)
return nsx_resources.SwitchingProfileTypeId( self._mac_learning_profile = nsx_resources.SwitchingProfileTypeId(
profile_type=(nsx_resources.SwitchingProfileTypes. profile_type=(nsx_resources.SwitchingProfileTypes.
MAC_LEARNING), MAC_LEARNING),
profile_id=profile[0]['id']) if profile else None profile_id=profile[0]['id']) if profile else None
return self._mac_learning_profile
def _get_port_security_profile_id(self): def _get_port_security_profile_id(self):
return nsx_resources.SwitchingProfile.build_switch_profile_ids( return nsx_resources.SwitchingProfile.build_switch_profile_ids(
self._switching_profiles, self._get_port_security_profile())[0] self._switching_profiles, self._psec_profile)[0]
def _get_port_security_profile(self): def _get_port_security_profile(self):
if self._psec_profile: if hasattr(self, '_psec_profile') and self._psec_profile:
return self._psec_profile return self._psec_profile
profile = self._switching_profiles.find_by_display_name( profile = self._switching_profiles.find_by_display_name(
NSX_V3_PSEC_PROFILE_NAME) NSX_V3_PSEC_PROFILE_NAME)
return profile[0] if profile else None self._psec_profile = profile[0] if profile else None
return self._psec_profile
@nsxlib_utils.retry_upon_exception( @nsxlib_utils.retry_upon_exception(
Exception, max_attempts=cfg.CONF.nsx_v3.retries) Exception, max_attempts=cfg.CONF.nsx_v3.retries)

22
vmware_nsx/tests/unit/nsx_v3/test_plugin.py
View File

@ -71,17 +71,9 @@ def _mock_create_firewall_rules(*args):
def _mock_nsx_backend_calls(): def _mock_nsx_backend_calls():
mock.patch("vmware_nsxlib.v3.client.NSX3Client").start() mock.patch("vmware_nsxlib.v3.client.NSX3Client").start()
class FakeProfile(object): fake_profile = {'key': 'FakeKey',
profile_id = uuidutils.generate_uuid() 'resource_type': 'FakeResource',
profile_type = 'FakeProfile' 'id': uuidutils.generate_uuid()}
def _init_nsx_profiles():
return (
FakeProfile(), # _psec_profile
FakeProfile(), # _no_psec_profile_id
FakeProfile(), # _dhcp_profile
FakeProfile(), # _mac_learning_profile
)
def _return_id_key(*args, **kwargs): def _return_id_key(*args, **kwargs):
return {'id': uuidutils.generate_uuid()} return {'id': uuidutils.generate_uuid()}
@ -90,12 +82,8 @@ def _mock_nsx_backend_calls():
return uuidutils.generate_uuid() return uuidutils.generate_uuid()
mock.patch( mock.patch(
"vmware_nsx.plugins.nsx_v3.plugin.NsxV3Plugin._init_nsx_profiles", "vmware_nsxlib.v3.resources.SwitchingProfile.find_by_display_name",
side_effect=_init_nsx_profiles).start() return_value=[fake_profile]
mock.patch(
"vmware_nsx.plugins.nsx_v3.plugin.NsxV3Plugin"
"._get_port_security_profile_id", return_value=FakeProfile()
).start() ).start()
mock.patch( mock.patch(