openstack/os-win
Code Issues Proposed changes

[Trivial] Add HyperVvSwitchNotFound exception

Browse Source 
At the moment, we're raising a generic HyperVException when
attempting to retrieve a non-existent vSwitch.

This change adds a 'HyperVvSwitchNotFound' exception, which will
allow callers to better handle such situations.

Change-Id: I221622bc050cf634f86edde49e26c09ee30b177e
This commit is contained in:
Lucian Petrut 2017-11-09 14:54:20 +02:00
parent c5ce9a6cf6
commit 11c92505d6
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os_win/exceptions.py
View File

@ -95,6 +95,10 @@ class HyperVvNicNotFound(NotFound, HyperVException):
msg_fmt = _("vNic not found: %(vnic_name)s") msg_fmt = _("vNic not found: %(vnic_name)s")
class HyperVvSwitchNotFound(NotFound, HyperVException):
msg_fmt = _("vSwitch not found: %(vswitch_name)s.")
class Invalid(OSWinException): class Invalid(OSWinException):
pass pass

2
os_win/tests/unit/utils/network/test_networkutils.py
View File

@ -366,7 +366,7 @@ class NetworkUtilsTestCase(test_base.OsWinBaseTestCase):
def test_get_vswitch_not_found(self): def test_get_vswitch_not_found(self):
self.netutils._switches = {} self.netutils._switches = {}
self.netutils._conn.Msvm_VirtualEthernetSwitch.return_value = [] self.netutils._conn.Msvm_VirtualEthernetSwitch.return_value = []
self.assertRaises(exceptions.HyperVException, self.assertRaises(exceptions.HyperVvSwitchNotFound,
self.netutils._get_vswitch, self.netutils._get_vswitch,
self._FAKE_VSWITCH_NAME) self._FAKE_VSWITCH_NAME)

5
os_win/utils/network/networkutils.py
View File

@ -202,9 +202,8 @@ class NetworkUtils(baseutils.BaseUtilsVirt):
vswitch = self._conn.Msvm_VirtualEthernetSwitch( vswitch = self._conn.Msvm_VirtualEthernetSwitch(
ElementName=vswitch_name) ElementName=vswitch_name)
if not len(vswitch): if not vswitch:
raise exceptions.HyperVException(_('VSwitch not found: %s') % raise exceptions.HyperVvSwitchNotFound(vswitch_name=vswitch_name)
vswitch_name)
if self._enable_cache: if self._enable_cache:
self._switches[vswitch_name] = vswitch[0] self._switches[vswitch_name] = vswitch[0]
return vswitch[0] return vswitch[0]