fixes last commit of removing deprecated config settings #107

module/sources/vmware/connection.py

@@ -97,6 +97,8 @@ class VMWareHandler(SourceBase):
         "vm_exclude_filter": None,
         "vm_include_filter": None,
         "permitted_subnets": None,
+        "netbox_host_device_role": None,
+        "netbox_vm_device_role": None,
         "collect_hardware_asset_tag": True,
         "match_host_by_serial": True,
         "cluster_site_relation": None,
@@ -124,6 +126,11 @@ class VMWareHandler(SourceBase):
         "netbox_vm_device_role": "vm_role_relation"
     }
 
+    removed_settings = [
+        "netbox_host_device_role",
+        "netbox_vm_device_role"
+    ]
+
     init_successful = False
     inventory = None
     name = None
@@ -192,10 +199,10 @@ class VMWareHandler(SourceBase):
 
         validation_failed = False
         for deprecated_setting, alternative_setting in self.deprecated_settings.items():
-            if config_settings.get(deprecated_setting) is not None and deprecated_setting not in self.settings.keys():
+            if config_settings.get(deprecated_setting) is not None and deprecated_setting in self.removed_settings:
                 log_text = f"Setting '{deprecated_setting}' has been removed."
                 if alternative_setting is not None:
-                    log_text += f" You need to switch to the '{alternative_setting}' setting."
+                    log_text += f" You need to switch to '{alternative_setting}' setting."
                 log.warning(log_text)
 
             elif config_settings.get(deprecated_setting) != self.settings.get(deprecated_setting):

settings-example.ini

@@ -135,11 +135,6 @@ permitted_subnets = 172.16.0.0/12, 10.0.0.0/8, 192.168.0.0/16, fd00::/8
 #vm_exclude_filter =
 #vm_include_filter =
 
-# Define the NetBox device role used for new hosts and VMs
-# THESE SETTINGS ARE DEPRECATED! Please use host_role_relation and vm_role_relation instead.
-#netbox_host_device_role = Server
-#netbox_vm_device_role = Server
-
 # This option defines which vCenter cluster is part of a NetBox site. This is done
 # with a comma separated key = value list.
 #   key: defines the cluster name as regex