diff --git a/napalm_s350/s350.py b/napalm_s350/s350.py index 97df73f..02eb367 100644 --- a/napalm_s350/s350.py +++ b/napalm_s350/s350.py @@ -234,14 +234,16 @@ class S350Driver(NetworkDriver): os_version = self._get_facts_parse_os_version(show_ver) # hostname, uptime + hostname = '' for line in show_sys.splitlines(): if line.startswith('System Name:'): _, hostname = line.split('System Name:') hostname = hostname.strip() continue - elif line.startswith('System Up Time (days,hour:min:sec):'): - _, uptime_str = line.split('System Up Time (days,hour:min:sec):') - uptime = self._parse_uptime(uptime_str) + + # uptime + uptime_str = self._get_facts_uptime(show_sys) + uptime = self._parse_uptime(uptime_str) # serial_number and model inventory = self._get_facts_parse_inventory(show_inv)['1'] @@ -254,7 +256,10 @@ class S350Driver(NetworkDriver): domainname = domainname['domain_name'] if domainname == 'Domain': domainname = '' - fqdn = '{0}.{1}'.format(hostname, domainname) + if domainname == '' and hostname == '': + fqdn = '' + else: + fqdn = '{0}.{1}'.format(hostname, domainname) # interface_list interfaces = [] @@ -281,6 +286,35 @@ class S350Driver(NetworkDriver): 'vendor': u'Cisco', } + def _get_facts_uptime(self, show_sys): + i = 0 + syslines = [] + fields = [] + uptime_header_lineNo = None + uptime_str = None + for line in show_sys.splitlines(): + # All models except SG500 fw 1.4.x + if line.startswith('System Up Time (days,hour:min:sec):'): + _, uptime_str = line.split('System Up Time (days,hour:min:sec):') + break + + line = re.sub(r' *', ' ', line, re.M) + line = line.strip() + + fields = line.split(' ') + syslines.append(fields) + + if 'Unit' in syslines[i] and 'time' in syslines[i]: + uptime_header_lineNo = i + + i += 1 + + # SG500 fw 1.4.x + if not uptime_str: + uptime_str = syslines[uptime_header_lineNo+2][1] + + return uptime_str + def _get_facts_parse_inventory(self, show_inventory): """ inventory can list more modules/devices """ # make 1 module 1 line @@ -310,18 +344,28 @@ class S350Driver(NetworkDriver): def _get_facts_parse_os_version(self, show_ver): # os_version # detect os ver > 2 - if 'Active-image' in show_ver: + if re.search(r"^Active-image", show_ver): for line in show_ver.splitlines(): # First version line is the active version - if 'Version' in line: + if re.search(r"Version:", line): _, os_version = line.split('Version: ') break - else: + elif re.search(r"^SW version", show_ver): for line in show_ver.splitlines(): - if 'SW version' in line: + if re.search(r"^SW version", line): _, ver = line.split(' ') os_version, _ = ver.split(' (') break + else: + # show_ver = re.sub(r'^\n', '', show_ver, re.M) + for line in show_ver.splitlines(): + line = re.sub(r' *', ' ', line, re.M) + line = line.strip() + line_comps= line.split(' ') + if line_comps[0] == '1': + os_version = line_comps[1] + break + return os_version def get_interfaces(self): @@ -406,12 +450,8 @@ class S350Driver(NetworkDriver): line_elems = self._get_ip_int_line_to_fields(line, fields_end) # only valid interfaces - # v 2.x firmware - if 7 in line_elems.keys(): - if line_elems[7] != 'Valid': - continue - # v 1.x firmware - elif line_elems[5] != 'Valid': + # in diferent firmwares there is 'Status' field allwais on last place + if line_elems[len(line_elems) -1] != 'Valid': continue cidr = line_elems[0] @@ -444,7 +484,7 @@ class S350Driver(NetworkDriver): def _get_ip_int_fields_end(self, dashline): """ fields length are diferent device to device, detect them on horizontal lin """ - fields_end = [m.start() for m in re.finditer(' ', dashline)] + fields_end = [m.start() for m in re.finditer(' ', dashline.strip())] # fields_position.insert(0,0) fields_end.append(len(dashline)) diff --git a/test/unit/mocked_data/test_get_facts/SG500-28-K9/expected_result.json b/test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/expected_result.json similarity index 91% rename from test/unit/mocked_data/test_get_facts/SG500-28-K9/expected_result.json rename to test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/expected_result.json index 11240c8..917e2ec 100644 --- a/test/unit/mocked_data/test_get_facts/SG500-28-K9/expected_result.json +++ b/test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/expected_result.json @@ -1,6 +1,6 @@ { - "fqdn" : "switch1.", - "hostname" : "switch1", + "fqdn" : "", + "hostname" : "", "interface_list" : [ "gi1/1/1", "gi1/1/2", @@ -61,9 +61,9 @@ "Po31", "Po32" ], - "model" : "SG500-28", + "model" : "SG500-28-K9", "os_version" : "1.4.11.5", "serial_number" : "A1B2C3F4G5", - "uptime" : 1232968, + "uptime" : 1287, "vendor" : "Cisco" } diff --git a/test/unit/mocked_data/test_get_facts/SG500-28-K9/show_hosts.txt b/test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/show_hosts.txt similarity index 100% rename from test/unit/mocked_data/test_get_facts/SG500-28-K9/show_hosts.txt rename to test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/show_hosts.txt diff --git a/test/unit/mocked_data/test_get_facts/SG500-28-K9/show_interface_status.txt b/test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/show_interface_status.txt similarity index 100% rename from test/unit/mocked_data/test_get_facts/SG500-28-K9/show_interface_status.txt rename to test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/show_interface_status.txt diff --git a/test/unit/mocked_data/test_get_facts/SG500-28-K9/show_inventory.txt b/test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/show_inventory.txt similarity index 100% rename from test/unit/mocked_data/test_get_facts/SG500-28-K9/show_inventory.txt rename to test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/show_inventory.txt diff --git a/test/unit/mocked_data/test_get_facts/SG500-28-K9/show_system.txt b/test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/show_system.txt similarity index 100% rename from test/unit/mocked_data/test_get_facts/SG500-28-K9/show_system.txt rename to test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/show_system.txt diff --git a/test/unit/mocked_data/test_get_facts/SG500-28-K9/show_version.txt b/test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/show_version.txt similarity index 100% rename from test/unit/mocked_data/test_get_facts/SG500-28-K9/show_version.txt rename to test/unit/mocked_data/test_get_facts/SG500-28-K9-no_hostname/show_version.txt diff --git a/test/unit/mocked_data/test_get_lldp_neighbors/SG500-28-K9/show_lldp_neighbors.txt b/test/unit/mocked_data/test_get_lldp_neighbors/SG500-28-K9/show_lldp_neighbors.txt index 69e33a0..b438054 100644 --- a/test/unit/mocked_data/test_get_lldp_neighbors/SG500-28-K9/show_lldp_neighbors.txt +++ b/test/unit/mocked_data/test_get_lldp_neighbors/SG500-28-K9/show_lldp_neighbors.txt @@ -6,7 +6,7 @@ TP - Two Ports MAC Relay; S - S-VLAN; C - C-VLAN; O - Other Port Device ID Port ID System Name Capabilities TTL --------- ----------------- ------------- ----------------- ------------ ----- -gi1/1/3 00:23:24:02:66:e4 00:23:24:02:6 pc123.cli H 118 +gi1/1/3 00:23:24:02:66:e4 00:23:24:02:6 pc123.cli H 118 6:e4 ents.test.net gi1/1/14 dc:4a:3e:53:fd:af dc:4a:3e:53:f O 3255 d:af