Rolling

naspy/CiscoElement.py

@@ -3,7 +3,7 @@
 import re
 from utilities import EntryNotFoundException, ElementException
 from paramiko import Channel
-
+import traceback
 
 class CiscoElement(Element):
     def connectionSSH(self, database: dict) -> str:
@@ -176,14 +176,14 @@ def showArp(self, shell: Channel) -> None:
 
     def parseARP(self, text: str) -> None:
         text = re.compile("\s\s+").split(text)
-        ip = text[0]
+        ip = text[1]
         mac = text[3]
-
         element = self.manager.getElementByIp(ip)
         if element is None:
             element = Element("", ip, "", "", self.manager)
         element.setMac(mac)
 
+
     def getHostname(self, shell: Channel) -> None:
         # aggiustare anche inserendo il dominio
         shell.send("show running-config\n")

naspy/Naspy.py

@@ -33,7 +33,7 @@ def visit(self) -> None:
             print("\ndevice founded:")
             count = 1
             for hostname in self.manager.elementsByHostname:
-                print(f"    [{count}]: {hostname}\n")
+                print(f"    [{count}]: {hostname} | mac: {self.manager.elementsByHostname[hostname].macAddress}\n")
                 count += 1
             self.buildJson()
             pass
@@ -104,7 +104,8 @@ def buildJson(self) -> None:
                          + self.manager.getElementByHostname(hostname).macAddress + '"}'
 
             for link in self.manager.getElementByHostname(hostname).links:
-                if (hostname, link.element.hostname) not in computed and (link.element.hostname, hostname) not in computed:
+                if (hostname, link.element.hostname) not in computed or (link.element.hostname, hostname) not in computed:
+                    print(f"entrato per {hostname}")
                     if firstEdge:
                         edges += '{"id":' + str(cont) + ', "source":"' + self.manager.elementsByHostname[hostname].ip \
                                  + '", "target": "' + link.element.ip \

naspy/utilities.py

@@ -27,12 +27,13 @@ def popToVisit(self) -> Element:
             return self.toVisit.pop(0)
 
     def getElementByIp(self, ip):
-        with self.lock:
-            for key in self.elementsByHostname.keys():
-                if ip == self.elementsByHostname[key].ip:
-                    return self.elementsByHostname[key]
+        print("getElementByIp()")
+        for key in self.elementsByHostname.keys():
+            print(f"if {ip} == {self.elementsByHostname[key].ip}")
+            if ip == self.elementsByHostname[key].ip:
+                return self.elementsByHostname[key]
 
-            return None
+        return None
 
     def getElementByMac(self, mac):
         with self.lock: