From 9776320972e2091906fbe6b29ee848783a4c2937 Mon Sep 17 00:00:00 2001 From: Solvik Blum Date: Thu, 12 Sep 2019 11:56:11 +0200 Subject: [PATCH 1/4] fix rack comparison while updating location --- netbox_agent/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox_agent/server.py b/netbox_agent/server.py index 9a32042..54925e9 100644 --- a/netbox_agent/server.py +++ b/netbox_agent/server.py @@ -50,7 +50,7 @@ class ServerBase(): update = True server.site = nb_dc.id - if rack and server.rack != nb_rack: + if rack and server.rack.id != nb_rack.id: logging.info('Rack location has changed from {} to {}, updating'.format( server.rack, nb_rack, -- 2.47.1 From e9ec69bc3b6e14abc0dcbf8130f7938acd7ac7c8 Mon Sep 17 00:00:00 2001 From: Solvik Date: Thu, 12 Sep 2019 12:03:13 +0200 Subject: [PATCH 2/4] fix rack comparison while updating location (#82) --- netbox_agent/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox_agent/server.py b/netbox_agent/server.py index 9a32042..54925e9 100644 --- a/netbox_agent/server.py +++ b/netbox_agent/server.py @@ -50,7 +50,7 @@ class ServerBase(): update = True server.site = nb_dc.id - if rack and server.rack != nb_rack: + if rack and server.rack.id != nb_rack.id: logging.info('Rack location has changed from {} to {}, updating'.format( server.rack, nb_rack, -- 2.47.1 From 06328e745cad8315ce61de19b963b5f1b7731c0d Mon Sep 17 00:00:00 2001 From: Solvik Date: Thu, 12 Sep 2019 17:43:39 +0200 Subject: [PATCH 3/4] Revert "fix rack comparison while updating location (#82)" (#83) This reverts commit e9ec69bc3b6e14abc0dcbf8130f7938acd7ac7c8. --- netbox_agent/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox_agent/server.py b/netbox_agent/server.py index 54925e9..9a32042 100644 --- a/netbox_agent/server.py +++ b/netbox_agent/server.py @@ -50,7 +50,7 @@ class ServerBase(): update = True server.site = nb_dc.id - if rack and server.rack.id != nb_rack.id: + if rack and server.rack != nb_rack: logging.info('Rack location has changed from {} to {}, updating'.format( server.rack, nb_rack, -- 2.47.1 From 35b90339f0f8c95866e1b26aed74c7df0fa5f39c Mon Sep 17 00:00:00 2001 From: Solvik Date: Thu, 12 Sep 2019 17:44:25 +0200 Subject: [PATCH 4/4] Update server.py --- netbox_agent/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox_agent/server.py b/netbox_agent/server.py index 54925e9..5e78876 100644 --- a/netbox_agent/server.py +++ b/netbox_agent/server.py @@ -42,7 +42,7 @@ class ServerBase(): nb_dc = self.get_netbox_datacenter() update = False - if dc and server.site.slug != nb_dc.slug: + if dc and server.site and server.site.slug != nb_dc.slug: logging.info('Datacenter location has changed from {} to {}, updating'.format( server.site.slug, nb_dc.slug, @@ -50,7 +50,7 @@ class ServerBase(): update = True server.site = nb_dc.id - if rack and server.rack.id != nb_rack.id: + if rack and server.rack and server.rack.id != nb_rack.id: logging.info('Rack location has changed from {} to {}, updating'.format( server.rack, nb_rack, -- 2.47.1