diff --git a/python/nav/ipdevpoll/dataloader.py b/python/nav/ipdevpoll/dataloader.py index 8eefd5355f..b37a56dbb9 100644 --- a/python/nav/ipdevpoll/dataloader.py +++ b/python/nav/ipdevpoll/dataloader.py @@ -178,9 +178,9 @@ def is_netbox_changed(netbox1, netbox2): 'type', 'up', 'snmp_up', + 'snmp_parameters', 'deleted_at', ): - # TODO Need some way to detect an updated SNMP profile if getattr(netbox1, attr) != getattr(netbox2, attr): _logger.debug( "%s.%s changed from %r to %r", diff --git a/python/nav/ipdevpoll/shadows/netbox.py b/python/nav/ipdevpoll/shadows/netbox.py index bc4ccb19e2..59d07599fb 100644 --- a/python/nav/ipdevpoll/shadows/netbox.py +++ b/python/nav/ipdevpoll/shadows/netbox.py @@ -62,13 +62,15 @@ def is_up(self): return self.up == manage.Netbox.UP_UP def copy(self, other): + """In addition to copying the 'official' attrs of another Netbox object, + this also copies 'computed'/'internal' attributes that are only part of the + Netbox shadow class definition. + """ super(Netbox, self).copy(other) for attr in ( "snmp_up", "last_updated", - "snmp_version", - "read_only", - "read_write", + "snmp_parameters", ): if hasattr(other, attr): setattr(self, attr, getattr(other, attr))