equal
deleted
inserted
replaced
185 # second scan: nodes by ethernet |
185 # second scan: nodes by ethernet |
186 for host in hosts : |
186 for host in hosts : |
187 for ethernet in host.ethernet.itervalues() : |
187 for ethernet in host.ethernet.itervalues() : |
188 hosts_by_ethernet[ethernet] = host |
188 hosts_by_ethernet[ethernet] = host |
189 |
189 |
190 if host.location : |
190 if host.location and host.location_domain: |
|
191 hosts_by_location[(host.location_domain, host.location)] = host |
|
192 elif host.location: |
191 hosts_by_location[(host.domain, host.location)] = host |
193 hosts_by_location[(host.domain, host.location)] = host |
192 |
194 |
193 # first graph: lldp remotes |
195 # first graph: lldp remotes |
194 for host, host_attrs in snmp.iteritems() : |
196 for host, host_attrs in snmp.iteritems() : |
195 local_node = host |
197 local_node = host |