a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue:37307 Add support for changes in pfc output in onyx 3.6.6000 (#37651) 

* issue:37307 Add support for changes in pfc output in onyx 3.6.6000

Signed-off-by: Samer Deeb <samerd@mellanox.com>
pull/4420/head
Samer Deeb 2018-03-28 09:13:54 -07:00 committed by John R Barker
parent 7324f49829
commit 9dfb665e43
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ansible/modules/network/onyx/onyx_pfc_interface.py
View File

@ -140,12 +140,20 @@ class OnyxPfcInterfaceModule(BaseOnyxModule):
def load_current_config(self): def load_current_config(self):
# called in base class in run function # called in base class in run function
self._os_version = self._get_os_version()
self._current_config = dict() self._current_config = dict()
pfc_config = self._get_pfc_config() pfc_config = self._get_pfc_config()
if not pfc_config: if not pfc_config:
return return
if 'Table 2' in pfc_config: if self._os_version >= self.ONYX_API_VERSION:
pfc_config = pfc_config['Table 2'] if len(pfc_config) >= 3:
pfc_config = pfc_config[2]
else:
pfc_config = dict()
else:
if 'Table 2' in pfc_config:
pfc_config = pfc_config['Table 2']
for if_name, if_pfc_data in iteritems(pfc_config): for if_name, if_pfc_data in iteritems(pfc_config):
match = self.PFC_IF_REGEX.match(if_name) match = self.PFC_IF_REGEX.match(if_name)
if not match: if not match:

5
test/units/modules/network/onyx/test_onyx_pfc_interface.py
View File

@ -27,11 +27,15 @@ class TestOnyxPfcInterfaceModule(TestOnyxModule):
self.mock_load_config = patch( self.mock_load_config = patch(
'ansible.module_utils.network.onyx.onyx.load_config') 'ansible.module_utils.network.onyx.onyx.load_config')
self.load_config = self.mock_load_config.start() self.load_config = self.mock_load_config.start()
self.mock_get_version = patch.object(
onyx_pfc_interface.OnyxPfcInterfaceModule, "_get_os_version")
self.get_version = self.mock_get_version.start()
def tearDown(self): def tearDown(self):
super(TestOnyxPfcInterfaceModule, self).tearDown() super(TestOnyxPfcInterfaceModule, self).tearDown()
self.mock_get_config.stop() self.mock_get_config.stop()
self.mock_load_config.stop() self.mock_load_config.stop()
self.mock_get_version.stop()
def load_fixtures(self, commands=None, transport='cli'): def load_fixtures(self, commands=None, transport='cli'):
if self._pfc_enabled: if self._pfc_enabled:
@ -42,6 +46,7 @@ class TestOnyxPfcInterfaceModule(TestOnyxModule):
self.get_config.return_value = load_fixture(config_file) self.get_config.return_value = load_fixture(config_file)
self.load_config.return_value = None self.load_config.return_value = None
self.get_version.return_value = "3.6.5000"
def _test_pfc_if(self, if_name, enabled, changed, commands): def _test_pfc_if(self, if_name, enabled, changed, commands):
state = 'enabled' if enabled else 'disabled' state = 'enabled' if enabled else 'disabled'