nxos bugfix cherry-pick 2.6 (#42724)
* Add get_capabilities in nxapi module_utils (#42688)
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit d5e9653c96
)
* add changelog
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
This commit is contained in:
parent
2b87a84301
commit
26f8b67fbd
3 changed files with 30 additions and 2 deletions
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- get_capabilities in nxapi module_utils should not return empty dictionary (https://github.com/ansible/ansible/pull/42688).
|
|
@ -378,8 +378,34 @@ class Nxapi:
|
|||
else:
|
||||
return []
|
||||
|
||||
def get_device_info(self):
|
||||
device_info = {}
|
||||
|
||||
device_info['network_os'] = 'nxos'
|
||||
reply = self.run_commands({'command': 'show version', 'output': 'json'})
|
||||
data = reply[0]
|
||||
|
||||
platform_reply = self.run_commands({'command': 'show inventory', 'output': 'json'})
|
||||
platform_info = platform_reply[0]
|
||||
|
||||
device_info['network_os_version'] = data.get('sys_ver_str') or data.get('kickstart_ver_str')
|
||||
device_info['network_os_model'] = data['chassis_id']
|
||||
device_info['network_os_hostname'] = data['host_name']
|
||||
device_info['network_os_image'] = data.get('isan_file_name') or data.get('kick_file_name')
|
||||
|
||||
if platform_info:
|
||||
inventory_table = platform_info['TABLE_inv']['ROW_inv']
|
||||
for info in inventory_table:
|
||||
if 'Chassis' in info['name']:
|
||||
device_info['network_os_platform'] = info['productid']
|
||||
|
||||
return device_info
|
||||
|
||||
def get_capabilities(self):
|
||||
return {}
|
||||
result = {}
|
||||
result['device_info'] = self.get_device_info()
|
||||
result['network_api'] = 'nxapi'
|
||||
return result
|
||||
|
||||
|
||||
def is_json(cmd):
|
||||
|
|
|
@ -393,7 +393,7 @@ def main():
|
|||
|
||||
try:
|
||||
info = get_capabilities(module)
|
||||
api = info.get('network_api', 'nxapi')
|
||||
api = info.get('network_api')
|
||||
device_info = info.get('device_info', {})
|
||||
os_platform = device_info.get('network_os_platform', '')
|
||||
except ConnectionError:
|
||||
|
|
Loading…
Reference in a new issue