Merge pull request #19 from OpenIxia/sysinfo_fixes

Sysinfo fixes
OpenIxia · Feb 15, 2019 · 92a529f · 92a529f
2 parents 6ace910 + 6185d0b
commit 92a529f
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/ixvision_ztp_sysinfo.py b/ixvision_ztp_sysinfo.py
@@ -28,19 +28,19 @@
 # |_Type
 
 def print_sysinfo(name, value):
-    print("%s%s%s" % (name, ' ' * (16 - len(name)), value))
+    print("%s%s%s" % (name, ' ' * (20 - len(name)), value))
 
 def nto_get_sysinfo(host_ip, port, username, password):
 
     sysinfo_strings = {
         'name': 'System name:',\
         'location': 'Location:',\
         'contact_info': 'Contact:',\
-        'ipv4_address': 'Management IP:',\
+        'ipv4_address': 'Management IPv4:',\
+        'ipv6_address': 'Management IPv6:',\
         'mac_address': 'MAC:',\
         'software_version': 'Software ver.:',\
-        'part_num': 'Part number:',\
-        'serial_num': 'Serial:'
+        'serial_num': 'Serial number:'
     }
 
     nto = NtoApiClient(host=host_ip, username=username, password=password, port=port, debug=False, logFile="ixvision_status_debug.log")
@@ -55,15 +55,12 @@ def nto_get_sysinfo(host_ip, port, username, password):
     print_sysinfo(sysinfo_strings['contact_info'], nto_system_info['contact_info'])
     print
 
-    print_sysinfo(sysinfo_strings['contact_info'], nto_ip_info['ipv4_address'])
-    print_sysinfo(sysinfo_strings['mac_address'], ':'.join(nto_hardware_info['mac_address'][i:i+2] for i in range(0,12,2)).upper())
+    print_sysinfo(sysinfo_strings['serial_num'], nto_hardware_info['system_id'])
+    print_sysinfo(sysinfo_strings['software_version'], nto_system_properties['software_version'])
     print
 
-    print_sysinfo(sysinfo_strings['software_version'], nto_system_properties['software_version'])
+    print_sysinfo(sysinfo_strings['ipv4_address'], nto_ip_info['ipv4_address'])
+    print_sysinfo(sysinfo_strings['ipv6_address'], nto_ip_info['ipv6_address'])
+    print_sysinfo(sysinfo_strings['mac_address'], ':'.join(nto_hardware_info['mac_address'][i:i+2] for i in range(0,12,2)).upper())
     print
-
-    for module in nto_hardware_info['module_list']:
-        if module['id']['module_type'] == 'MAIN':
-            print_sysinfo(sysinfo_strings['part_num'], module['part_num'])
-            print_sysinfo(sysinfo_strings['serial_num'], module['serial_num'])
-            print
+