Changeset 5236

Timestamp:

08/15/09 11:19:58 (4 years ago)

Author:

luis

Message:

Fixing #223
When a new host was added, and no information about fingerprint (as described in ticket) is available it is marked as "Added".
It is wrong. The patch doesn't show this information once it is not added, or merged. It is not available and just it.

Regarding the patch nobody made comments about it. If someone else have another solution reopen the ticket and put it on table.

Files:

• trunk/umit/inventory/ChangesDiff.py (modified) (4 diffs)

trunk/umit/inventory/ChangesDiff.py

@@ -149 +149 @@
             tcp_ts_seq_o, ip_id_seq_o,
             osclasses_o, osmatch_o) = self.get_data_for_host_from_db(hostid_old)
+            
 
         # ports diff
-        self.port_diff(ports_o, ports_n, do_diff)
+        if self.__verify_if_available([ports_o, ports_n]):
+            self.port_diff(ports_o, ports_n, do_diff)
 
         # Extraports
-        self.extraports_diff(ep_o, ep_n, do_diff)
+        if self.__verify_if_available([ep_o, ep_n]):
+            self.extraports_diff(ep_o, ep_n, do_diff)
 
         # Fingerprint
-        self.fingerprint_diff(uptime_o, uptime_n, tcp_seq_o, tcp_seq_n,
-            tcp_ts_seq_o, tcp_ts_seq_n, ip_id_seq_o, ip_id_seq_n, do_diff)
+        diff_fingerprint = [uptime_o, uptime_n, tcp_seq_o, tcp_seq_n,
+                                  tcp_ts_seq_o, tcp_ts_seq_n, ip_id_seq_o, 
+                                  ip_id_seq_n]
+        if self.__verify_if_available(diff_fingerprint):
+            self.fingerprint_diff(uptime_o, uptime_n, tcp_seq_o, tcp_seq_n,
+                                  tcp_ts_seq_o, tcp_ts_seq_n, ip_id_seq_o, 
+                                  ip_id_seq_n, do_diff)
 
         # OS Classes
-        self.osclasses_diff(osclasses_o, osclasses_n, do_diff)
+        if self.__verify_if_available([osclasses_o, osclasses_n]):
+            self.osclasses_diff(osclasses_o, osclasses_n, do_diff)
 
         # OS Match
-        self.osmatch_diff(osmatch_o, osmatch_n, do_diff)
+        if self.__verify_if_available([osmatch_o, osmatch_n]):
+            self.osmatch_diff(osmatch_o, osmatch_n, do_diff)
 
 
@@ -288 +298 @@
         Do fingerprint diff.
         """
+        
         if not diff:
             status = "Added"
@@ -455 +466 @@
         If diff=False, will classify all as 'Added'.
         """
+        some_available = self.__verify_if_available([old,new])
+        if not some_available:
+            return 
         if not diff:
             status = "Added"
@@ -617 +631 @@
         dlg.run()
         dlg.destroy()
-
-
+    
+    def __verify_if_available(self, list_values):
+        """
+        Verify if some fiends are available
+        """
+        all_not_available = True
+        for d in list_values:
+            if not all_not_available:
+                break
+            for k in d.keys():
+                if k != "Not Available" or d[k] != "Not Available":
+                    all_not_available = False
+                    break
+        return not all_not_available
+        
+        
+        
     def __layout(self):
         """