[NDM][NDMII-2634]move snmp_listener config under network_devices (#17388)

* move snmp_listener config under network_devices

* update config name to autodiscovery

Author: jedupau

snmp/tests/conftest.py

@@ -104,65 +104,67 @@ def create_datadog_conf_file(tmp_dir):
         # Setting check_runners to a negative number to disable check runners is a workaround,
         # Datadog Agent might not guarantee this behaviour in the future.
         'check_runners': -1,
-        'snmp_listener': {
-            'workers': 4,
-            'discovery_interval': 10,
-            'configs': [
-                {
-                    'network': '{}.0/29'.format(prefix),
-                    'port': PORT,
-                    'community': 'generic-device',
-                    'version': 2,
-                    'timeout': 1,
-                    'retries': 2,
-                    'tags': [
-                        "tag1:val1",
-                        "tag2:val2",
-                    ],
-                    'loader': 'core',
-                },
-                {
-                    'network': '{}.0/28'.format(prefix),
-                    'port': PORT,
-                    'community': 'apc_ups',
-                    'version': 2,
-                    'timeout': 1,
-                    'retries': 2,
-                    'loader': 'python',
-                },
-                {
-                    'network': '{}.0/27'.format(prefix),
-                    'namespace': 'test-auth-proto-sha',
-                    'port': PORT,
-                    'version': 3,
-                    'timeout': 1,
-                    'retries': 2,
-                    'user': 'datadogSHADES',
-                    'authentication_key': 'doggiepass',
-                    'authentication_protocol': 'sha',
-                    'privacy_key': 'doggiePRIVkey',
-                    'privacy_protocol': 'des',
-                    'context_name': 'public',
-                    'ignored_ip_addresses': {'{}.2'.format(prefix): True},
-                    'loader': 'core',
-                },
-                {
-                    'network': '{}.0/27'.format(prefix),
-                    'namespace': 'test-auth-proto-sha256',
-                    'port': PORT,
-                    'version': 3,
-                    'timeout': 1,
-                    'retries': 2,
-                    'user': 'datadogSHA256AES',
-                    'authentication_key': 'doggiepass',
-                    'authentication_protocol': 'SHA256',
-                    'privacy_key': 'doggiePRIVkey',
-                    'privacy_protocol': 'AES',
-                    'context_name': 'public',
-                    'ignored_ip_addresses': {'{}.2'.format(prefix): True},
-                    'loader': 'core',
-                },
-            ],
+        'network_devices': {
+            'autodiscovery': {
+                'workers': 4,
+                'discovery_interval': 10,
+                'configs': [
+                    {
+                        'network': '{}.0/29'.format(prefix),
+                        'port': PORT,
+                        'community': 'generic-device',
+                        'version': 2,
+                        'timeout': 1,
+                        'retries': 2,
+                        'tags': [
+                            "tag1:val1",
+                            "tag2:val2",
+                        ],
+                        'loader': 'core',
+                    },
+                    {
+                        'network': '{}.0/28'.format(prefix),
+                        'port': PORT,
+                        'community': 'apc_ups',
+                        'version': 2,
+                        'timeout': 1,
+                        'retries': 2,
+                        'loader': 'python',
+                    },
+                    {
+                        'network': '{}.0/27'.format(prefix),
+                        'namespace': 'test-auth-proto-sha',
+                        'port': PORT,
+                        'version': 3,
+                        'timeout': 1,
+                        'retries': 2,
+                        'user': 'datadogSHADES',
+                        'authentication_key': 'doggiepass',
+                        'authentication_protocol': 'sha',
+                        'privacy_key': 'doggiePRIVkey',
+                        'privacy_protocol': 'des',
+                        'context_name': 'public',
+                        'ignored_ip_addresses': {'{}.2'.format(prefix): True},
+                        'loader': 'core',
+                    },
+                    {
+                        'network': '{}.0/27'.format(prefix),
+                        'namespace': 'test-auth-proto-sha256',
+                        'port': PORT,
+                        'version': 3,
+                        'timeout': 1,
+                        'retries': 2,
+                        'user': 'datadogSHA256AES',
+                        'authentication_key': 'doggiepass',
+                        'authentication_protocol': 'SHA256',
+                        'privacy_key': 'doggiePRIVkey',
+                        'privacy_protocol': 'AES',
+                        'context_name': 'public',
+                        'ignored_ip_addresses': {'{}.2'.format(prefix): True},
+                        'loader': 'core',
+                    },
+                ],
+            }
         },
         'listeners': [{'name': 'snmp'}],
     }