Revert "Refactor(module_utils): Create resource submodules for fields…

… and schemas (#439)"

This reverts commit b04a887.

ansible_collections/arista/cvp/plugins/module_utils/facts_tools.py

@@ -28,9 +28,8 @@
 from typing import List
 from concurrent.futures import ThreadPoolExecutor
 import ansible_collections.arista.cvp.plugins.module_utils.logger   # noqa # pylint: disable=unused-import
-from ansible_collections.arista.cvp.plugins.module_utils.resources.api.fields import Api
-from ansible_collections.arista.cvp.plugins.module_utils.resources.modules.fields import FactsResponseFields
-import ansible_collections.arista.cvp.plugins.module_utils.tools_schema as schema   # noqa # pylint: disable=unused-import
+from ansible_collections.arista.cvp.plugins.module_utils.fields import Facts, ApiFields
+import ansible_collections.arista.cvp.plugins.module_utils.schema_v3 as schema   # noqa # pylint: disable=unused-import
 try:
     from cvprac.cvp_client import CvpClient  # noqa # pylint: disable=unused-import
     from cvprac.cvp_client_errors import CvpApiError, CvpRequestError  # noqa # pylint: disable=unused-import
@@ -78,14 +77,14 @@ def __shorten_device_facts(self, device_fact: dict):
         fact = {
             key: device_fact[key]
             for key in [
-                Api.device.HOSTNAME,
-                Api.device.FQDN,
-                Api.device.SERIAL,
-                Api.device.SYSMAC,
-                Api.generic.CONFIGLETS,
+                ApiFields.device.HOSTNAME,
+                ApiFields.device.FQDN,
+                ApiFields.device.SERIAL,
+                ApiFields.device.SYSMAC,
+                ApiFields.generic.CONFIGLETS,
             ]
         }
-        fact[Api.generic.PARENT_CONTAINER_NAME] = device_fact[Api.device.CONTAINER_NAME]
+        fact[ApiFields.generic.PARENT_NAME] = device_fact[ApiFields.device.CONTAINER_NAME]
         return fact
 
     def _get_configlet(self):
@@ -106,7 +105,7 @@ def _get_configlet(self):
             dictionary of configlets.
         """
         if isinstance(self._cache, list):
-            return {configlet[Api.generic.NAME]: configlet[Api.generic.CONFIG] for configlet in self._cache}
+            return {configlet[ApiFields.generic.NAME]: configlet['config'] for configlet in self._cache}
 
     def _get_container(self):
         """
@@ -136,10 +135,10 @@ def _get_container(self):
             dictionary of containers
         """
         if isinstance(self._cache, list):
-            return {entry[Api.generic.NAME]: {
-                Api.generic.PARENT_CONTAINER_NAME: entry[Api.container.PARENT_NAME],
-                Api.generic.CONFIGLETS: entry[Api.generic.CONFIGLETS]}
-                for entry in self._cache if Api.generic.NAME in entry.keys()}
+            return {entry[ApiFields.generic.NAME]: {
+                ApiFields.generic.PARENT_NAME: entry[ApiFields.container.PARENT_NAME],
+                ApiFields.generic.CONFIGLETS: entry[ApiFields.generic.CONFIGLETS]}
+                for entry in self._cache if ApiFields.generic.NAME in entry.keys()}
 
     def _get_device(self, verbose: bool = False):
         """
@@ -222,12 +221,12 @@ class CvFactsTools():
 
     def __init__(self, cv_connection):
         self.__cv_client = cv_connection
-        self._cache = {FactsResponseFields.CACHE_CONTAINERS: None, FactsResponseFields.CACHE_MAPPERS: None}
+        self._cache = {Facts.CACHE_CONTAINERS: None, Facts.CACHE_MAPPERS: None}
         self._max_worker = min(32, (os.cpu_count() or 1) + 4)
         self.__init_facts()
 
     def __init_facts(self):
-        self._facts = {FactsResponseFields.DEVICE: [], FactsResponseFields.CONFIGLET: [], FactsResponseFields.CONTAINER: []}
+        self._facts = {Facts.DEVICE: [], Facts.CONFIGLET: [], Facts.CONTAINER: []}
 
     def facts(self, scope: List[str], regex_filter: str = '.*'):
         """
@@ -276,7 +275,7 @@ def facts(self, scope: List[str], regex_filter: str = '.*'):
             self.__fact_configlets(filter=regex_filter)
         return self._facts
 
-    def __get_container_name(self, key: str = Api.container.UNDEFINED_CONTAINER_ID):
+    def __get_container_name(self, key: str = 'undefined_container'):
         """
         __get_container_name Helper to get container name from its key
 
@@ -292,17 +291,17 @@ def __get_container_name(self, key: str = Api.container.UNDEFINED_CONTAINER_ID):
         str
             Container name
         """
-        if self._cache[FactsResponseFields.CACHE_CONTAINERS] is None:
+        if self._cache[Facts.CACHE_CONTAINERS] is None:
             MODULE_LOGGER.warning('Build container cache from Cloudvision')
             try:
-                self._cache[FactsResponseFields.CACHE_CONTAINERS] = self.__cv_client.api.get_containers()['data']
+                self._cache[Facts.CACHE_CONTAINERS] = self.__cv_client.api.get_containers()['data']
             except CvpApiError as error:
                 MODULE_LOGGER.error('Can\'t get information from CV: %s', str(error))
                 return None
-        MODULE_LOGGER.debug('Current cache data is: %s', str(self._cache[FactsResponseFields.CACHE_CONTAINERS]))
-        for container in self._cache[FactsResponseFields.CACHE_CONTAINERS]:
-            if key == container[Api.generic.KEY]:
-                return container[Api.generic.NAME]
+        MODULE_LOGGER.debug('Current cache data is: %s', str(self._cache[Facts.CACHE_CONTAINERS]))
+        for container in self._cache[Facts.CACHE_CONTAINERS]:
+            if key == container[ApiFields.generic.KEY]:
+                return container[ApiFields.generic.NAME]
         return None
 
     def __device_update_info(self, device: dict):
@@ -322,9 +321,9 @@ def __device_update_info(self, device: dict):
             Updated information
         """
         if device['status'] != '':
-            device[Api.generic.PARENT_CONTAINER_NAME] = self.__get_container_name(key=device[Api.device.PARENT_CONTAINER_KEY])
+            device[ApiFields.container.PARENT_CONTAINER_NAME] = self.__get_container_name(key=device[ApiFields.container.PARENT_KEY])
         else:
-            device[Api.generic.PARENT_CONTAINER_NAME] = ''
+            device[ApiFields.container.PARENT_CONTAINER_NAME] = ''
         return device
 
     def __configletIds_to_configletName(self, configletIds: List[str]):
@@ -345,11 +344,11 @@ def __configletIds_to_configletName(self, configletIds: List[str]):
         """
         if not configletIds:
             return []
-        if self._cache[FactsResponseFields.CACHE_MAPPERS] is None:
+        if self._cache[Facts.CACHE_MAPPERS] is None:
             MODULE_LOGGER.warning('Build configlet mappers cache from Cloudvision')
-            self._cache[FactsResponseFields.CACHE_MAPPERS] = self.__cv_client.api.get_configlets_and_mappers()['data']
-        configlets = self._cache[FactsResponseFields.CACHE_MAPPERS][Api.generic.CONFIGLETS]
-        return [configlet[Api.generic.NAME] for configlet in configlets if configlet[Api.generic.KEY] in configletIds]
+            self._cache[Facts.CACHE_MAPPERS] = self.__cv_client.api.get_configlets_and_mappers()['data']
+        configlets = self._cache[Facts.CACHE_MAPPERS]['configlets']
+        return [configlet[ApiFields.generic.NAME] for configlet in configlets if configlet[ApiFields.generic.KEY] in configletIds]
 
     def __device_get_configlets(self, netid: str):
         # sourcery skip: class-extract-method
@@ -368,11 +367,11 @@ def __device_get_configlets(self, netid: str):
         List[str]
             List of configlets name
         """
-        if self._cache[FactsResponseFields.CACHE_MAPPERS] is None:
+        if self._cache[Facts.CACHE_MAPPERS] is None:
             MODULE_LOGGER.warning('Build configlet mappers cache from Cloudvision')
-            self._cache[FactsResponseFields.CACHE_MAPPERS] = self.__cv_client.api.get_configlets_and_mappers()['data']
-        mappers = self._cache[FactsResponseFields.CACHE_MAPPERS]['configletMappers']
-        configletIds = [mapper[Api.configlet.ID] for mapper in mappers if mapper[Api.mappers.OBJECT_ID] == netid]
+            self._cache[Facts.CACHE_MAPPERS] = self.__cv_client.api.get_configlets_and_mappers()['data']
+        mappers = self._cache[Facts.CACHE_MAPPERS]['configletMappers']
+        configletIds = [mapper[ApiFields.configlet.ID] for mapper in mappers if mapper[ApiFields.mappers.OBJECT_ID] == netid]
         MODULE_LOGGER.debug('** NetelementID is %s', str(netid))
         MODULE_LOGGER.debug('** Configlet IDs are %s', str(configletIds))
         return self.__configletIds_to_configletName(configletIds=configletIds)
@@ -393,13 +392,13 @@ def __containers_get_configlets(self, container_id):
         List[str]
             List of configlets name
         """
-        if self._cache[FactsResponseFields.CACHE_MAPPERS] is None:
+        if self._cache[Facts.CACHE_MAPPERS] is None:
             MODULE_LOGGER.warning('Build configlet mappers cache from Cloudvision')
-            self._cache[FactsResponseFields.CACHE_MAPPERS] = self.__cv_client.api.get_configlets_and_mappers()['data']
-        mappers = self._cache[FactsResponseFields.CACHE_MAPPERS]['configletMappers']
-        configletIds = [mapper[Api.configlet.ID]
+            self._cache[Facts.CACHE_MAPPERS] = self.__cv_client.api.get_configlets_and_mappers()['data']
+        mappers = self._cache[Facts.CACHE_MAPPERS]['configletMappers']
+        configletIds = [mapper[ApiFields.configlet.ID]
                         for mapper in mappers
-                        if (mapper[Api.container.ID] == container_id or mapper[Api.mappers.OBJECT_ID] == container_id)
+                        if (mapper[ApiFields.container.ID] == container_id or mapper[ApiFields.mappers.OBJECT_ID] == container_id)
                         ]
         # Deduplicate entries as containerID is present for every inherited configlets
         configletIds = list(dict.fromkeys(configletIds))
@@ -429,14 +428,14 @@ def __fact_devices(self, filter: str = '.*', verbose: bool = False):
         MODULE_LOGGER.info('Extract device data using filter %s', str(filter))
         facts_builder = CvFactResource()
         for device in cv_devices:
-            if re.match(filter, device[Api.device.HOSTNAME]):
-                MODULE_LOGGER.debug('Filter has been matched: %s - %s', str(filter), str(device[Api.device.HOSTNAME]))
+            if re.match(filter, device[ApiFields.device.HOSTNAME]):
+                MODULE_LOGGER.debug('Filter has been matched: %s - %s', str(filter), str(device[ApiFields.device.HOSTNAME]))
                 if verbose:
                     facts_builder.add(self.__device_update_info(device=device))
                 else:
-                    device[Api.generic.CONFIGLETS] = self.__device_get_configlets(netid=device[Api.generic.KEY])
+                    device[ApiFields.generic.CONFIGLETS] = self.__device_get_configlets(netid=device[ApiFields.generic.KEY])
                     facts_builder.add(device)
-        self._facts[FactsResponseFields.DEVICE] = facts_builder.get(resource_model='device', verbose=verbose)
+        self._facts[Facts.DEVICE] = facts_builder.get(resource_model='device', verbose=verbose)
 
     def __fact_containers(self):
         """
@@ -448,11 +447,11 @@ def __fact_containers(self):
             MODULE_LOGGER.error('Error when collecting containers facts: %s', str(error_msg))
         facts_builder = CvFactResource()
         for container in cv_containers['data']:
-            if container[Api.generic.NAME] != 'Tenant':
+            if container[ApiFields.generic.NAME] != 'Tenant':
                 MODULE_LOGGER.debug('Got following information for container: %s', str(container))
-                container[Api.generic.CONFIGLETS] = self.__containers_get_configlets(container_id=container[Api.container.KEY])
+                container[ApiFields.generic.CONFIGLETS] = self.__containers_get_configlets(container_id=container[ApiFields.container.KEY])
                 facts_builder.add(container)
-        self._facts[FactsResponseFields.CONTAINER] = facts_builder.get(resource_model='container')
+        self._facts[Facts.CONTAINER] = facts_builder.get(resource_model='container')
 
     def __fact_configlets(self, filter: str = '.*', configlets_per_call: int = 10):
         """
@@ -490,12 +489,12 @@ def __fact_configlets(self, filter: str = '.*', configlets_per_call: int = 10):
         facts_builder = CvFactResource()
         for future in results:
             for configlet in future['data']:
-                if re.match(filter, configlet[Api.generic.NAME]):
-                    MODULE_LOGGER.debug('Adding configlet %s', str(configlet[Api.generic.NAME]))
+                if re.match(filter, configlet[ApiFields.generic.NAME]):
+                    MODULE_LOGGER.debug('Adding configlet %s', str(configlet['name']))
                     facts_builder.add(configlet)
 
         MODULE_LOGGER.debug(
             'Final results for configlets: %s',
             str(facts_builder.get(resource_model='configlet').keys())
         )
-        self._facts[FactsResponseFields.CONFIGLET] = facts_builder.get(resource_model='configlet')
+        self._facts[Facts.CONFIGLET] = facts_builder.get(resource_model='configlet')

ansible_collections/arista/cvp/plugins/module_utils/resources/api/fields.py → ansible_collections/arista/cvp/plugins/module_utils/fields.py

@@ -3,7 +3,7 @@
 #
 # GNU General Public License v3.0+
 #
-# Copyright 2022 Arista Networks AS-EMEA
+# Copyright 2019 Arista Networks AS-EMEA
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,63 +20,57 @@
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
+
+# Will be activated in python 3.8
 # from dataclasses import dataclass
 
-# --------------------------------------------------------------------------------------------------------
-# Information:
-#
-# Provides classes to classify CONSTANT in the collection. 3 types of classes are available:
-#   - ModuleOptionValues: expose constants for ansible module option values
-#   - <module>ResponseFields: strings to use in Ansible response for all modules.
-#   - Api<ressource-type>: strings to use to get data from Cloudvision response content.
-#
-# Usage:
-#
-# If a KEY is required for more than 1 type of resource, definition MUST be in ApiGeneric class
-# If a KEY is specific to a resource, its definition SHOULD go to its dedicated class Api<resource-type>
-# If a KEY is required for more than 1 type of resource and one resource has a different syntax, then
-#       Global definition MUST go to ApiGeneric
-#       Specific definition SHALL go to resource class
-# --------------------------------------------------------------------------------------------------------
+
+# @dataclass
+class Facts():
+    """Facts Represent All fields specific to cv_facts_v3 module"""
+    # Facts headers
+    DEVICE: str = 'cvp_devices'
+    CONTAINER: str = 'cvp_containers'
+    CONFIGLET: str = 'cvp_configlets'
+    # Cache Headers
+    CACHE_CONTAINERS: str = 'containers'
+    CACHE_MAPPERS: str = 'configlets_mappers'
 
 
 # @dataclass
 class ApiGeneric():
     """Generic Keys used in all type of resources"""
-    CONFIG: str = 'config'
-    CONFIGLETS: str = 'configlets'
-    KEY: str = 'key'
+    PARENT_ID: str = 'parentContainerId'
+    PARENT_NAME: str = 'parentContainerName'
     NAME: str = 'name'
-    PARENT_CONTAINER_ID: str = 'parentContainerId'
-    PARENT_CONTAINER_NAME: str = 'parentContainerName'
+    KEY: str = 'key'
+    CONFIGLETS: str = 'configlets'
 
 
 # @dataclass
 class ApiContainer():
     """Keys specific to Container resources"""
-    CHILDREN_LIST: str = 'childContainerList'
-    CONFIGLETS_LIST: str = 'configletList'
-    COUNT_CONTAINER: str = 'childContainerCount'
-    COUNT_DEVICE: str = 'childNetElementCount'
     ID: str = 'containerId'
-    KEY: str = 'Key'
+    COUNT_DEVICE: str = 'childNetElementCount'
+    COUNT_CONTAINER: str = 'childContainerCount'
+    PARENT_CONTAINER_NAME: str = 'parentContainerName'
+    PARENT_KEY: str = 'parentContainerKey'
     TOPOLOGY: str = 'topology'
     UNDEFINED_CONTAINER_ID: str = 'undefined_container'
-    UNDEFINED_CONTAINER_NAME: str = 'Undefined'
     PARENT_NAME: str = 'parentName'
+    KEY: str = 'Key'
 
 
 # @dataclass
 class ApiDevice():
     """Keys specific to Device resources"""
-    CONTAINER_NAME: str = 'containerName'
     FQDN: str = 'fqdn'
     HOSTNAME: str = 'hostname'
+    SYSMAC: str = 'systemMacAddress'
+    SERIAL: str = 'serialNumber'
     ID: str = 'key'
+    CONTAINER_NAME: str = 'containerName'
     IMAGE_BUNDLE: str = 'image_bundle'
-    SERIAL: str = 'serialNumber'
-    SYSMAC: str = 'systemMacAddress'
-    PARENT_CONTAINER_KEY: str = 'parentContainerKey'
 
 
 # @dataclass
@@ -92,17 +86,10 @@ class ApiMappers():
 
 
 # @dataclass
-class ApiTask():
-    """Keys specific to Task resources"""
-    TASK_IDS: str = 'taskIds'
-
-
-# @dataclass
-class Api():
+class ApiFields():
     """Central point to use all CV data resource fields"""
-    configlet: ApiConfiglet = ApiConfiglet
-    container: ApiContainer = ApiContainer
-    device: ApiDevice = ApiDevice
     generic: ApiGeneric = ApiGeneric
+    device: ApiDevice = ApiDevice
+    container: ApiContainer = ApiContainer
+    configlet: ApiConfiglet = ApiConfiglet
     mappers: ApiMappers = ApiMappers
-    task: ApiTask = ApiTask