cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #46410 Onyx show facts module does not work for onyx version 3.6.6000 and higher (#49414)

Browse source 
Signed-off-by: Anas Badaha <anasb@mellanox.com>
This commit is contained in:
anasbadaha 2018-12-17 07:23:54 +02:00 committed by Ganesh Nalawade
parent 369354547e
commit 1580afbd62
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/ansible/modules/network/onyx/onyx_facts.py
View file

@ -42,12 +42,10 @@ EXAMPLES = """
- name: Collect all facts from the device - name: Collect all facts from the device
onyx_facts: onyx_facts:
gather_subset: all gather_subset: all
- name: Collect only the interfaces facts - name: Collect only the interfaces facts
onyx_facts: onyx_facts:
gather_subset: gather_subset:
- interfaces - interfaces
- name: Do not collect version facts - name: Do not collect version facts
onyx_facts: onyx_facts:
gather_subset: gather_subset:
@ -59,19 +57,16 @@ ansible_net_gather_subset:
description: The list of fact subsets collected from the device description: The list of fact subsets collected from the device
returned: always returned: always
type: list type: list
# version # version
ansible_net_version: ansible_net_version:
description: A hash of all curently running system image information description: A hash of all curently running system image information
returned: when version is configured or when no gather_subset is provided returned: when version is configured or when no gather_subset is provided
type: dict type: dict
# modules # modules
ansible_net_modules: ansible_net_modules:
description: A hash of all modules on the systeme with status description: A hash of all modules on the systeme with status
returned: when modules is configured returned: when modules is configured
type: dict type: dict
# interfaces # interfaces
ansible_net_interfaces: ansible_net_interfaces:
description: A hash of all interfaces running on the system description: A hash of all interfaces running on the system
@ -196,24 +191,37 @@ class Module(FactsBase):
class Interfaces(FactsBase): class Interfaces(FactsBase):
COMMANDS = ['show interfaces ethernet'] COMMANDS = ['show version', 'show interfaces ethernet']
def populate(self): def populate(self):
super(Interfaces, self).populate() super(Interfaces, self).populate()
data = self.responses[0] version_data = self.responses[0]
if data: os_version = version_data['Product release']
self.facts['interfaces'] = self.populate_interfaces(data) data = self.responses[1]
def populate_interfaces(self, interfaces): if data:
self.facts['interfaces'] = self.populate_interfaces(data, os_version)
def extractIfData(self, interface_data):
return {"MAC Address": interface_data["Mac address"],
"Actual Speed": interface_data["Actual speed"],
"MTU": interface_data["MTU"],
"Admin State": interface_data["Admin state"],
"Operational State": interface_data["Operational state"]}
def populate_interfaces(self, interfaces, os_version):
interfaces_dict = dict() interfaces_dict = dict()
for if_data in interfaces: for if_data in interfaces:
if_dict = dict() if_dict = dict()
if_dict["MAC Address"] = if_data["Mac address"] if os_version >= BaseOnyxModule.ONYX_API_VERSION:
if_dict["Actual Speed"] = if_data["Actual speed"] for if_name, interface_data in iteritems(if_data):
if_dict["MTU"] = if_data["MTU"] interface_data = interface_data[0]
if_dict["Admin State"] = if_data["Admin state"] if_dict = self.extractIfData(interface_data)
if_dict["Operational State"] = if_data["Operational state"] if_name = if_dict["Interface Name"] = if_name
else:
if_dict = self.extractIfData(if_data)
if_name = if_dict["Interface Name"] = if_data["header"] if_name = if_dict["Interface Name"] = if_data["header"]
interfaces_dict[if_name] = if_dict interfaces_dict[if_name] = if_dict
return interfaces_dict return interfaces_dict