Linting and fix UTs

snehapar9 · Sep 5, 2023 · e5a6e44 · e5a6e44
1 parent 86c3e1e
commit e5a6e44
Show file tree

Hide file tree

Showing 10 changed files with 1,220 additions and 1,800 deletions.
diff --git a/src/aosm/azext_aosm/_client_factory.py b/src/aosm/azext_aosm/_client_factory.py
@@ -5,6 +5,7 @@
 
 from azure.cli.core.commands.client_factory import get_mgmt_service_client
 from azure.cli.core.profiles import ResourceType
+from azure.mgmt.containerregistry import ContainerRegistryManagementClient
 
 from .vendored_sdks import HybridNetworkManagementClient
 

diff --git a/src/aosm/azext_aosm/_configuration.py b/src/aosm/azext_aosm/_configuration.py
@@ -377,7 +377,7 @@ def validate(self):
 
 
 @dataclass
-class NFDRETConfiguration:
+class NFDRETConfiguration:  # pylint: disable=too-many-instance-attributes
     """The configuration required for an NFDV that you want to include in an NSDV."""
 
     publisher: str = PUBLISHER_NAME

diff --git a/src/aosm/azext_aosm/deploy/artifact.py b/src/aosm/azext_aosm/deploy/artifact.py
@@ -297,6 +297,7 @@ def _get_acr(self) -> str:
 
         :return: The name of the ACR
         """
+        assert hasattr(self.artifact_client, "remote")
         if not self.artifact_client.remote.hostname:
             raise ValueError(
                 "Cannot upload artifact. Oras client has no remote hostname."
@@ -390,6 +391,7 @@ def _push_image_from_local_registry(
         :param target_password: The password to use for the az acr login attempt
         :type target_password: str
         """
+        assert hasattr(self.artifact_client, "remote")
         target_acr = self._get_acr()
         try:
             target = self._get_acr_target_image()

diff --git a/src/aosm/azext_aosm/tests/latest/mock_nsd/input.json b/src/aosm/azext_aosm/tests/latest/mock_nsd/input.json
@@ -11,7 +11,8 @@
             "type": "vnf",
             "multiple_instances": false,
             "publisher": "jamie-mobile-publisher",
-            "publisher_resource_group": "Jamie-publisher"
+            "publisher_resource_group": "Jamie-publisher",
+            "publisher_scope": "private"
         }
     ],
     "nsdg_name": "ubuntu",

diff --git a/src/aosm/azext_aosm/tests/latest/mock_nsd/input_multi_nf_nsd.json b/src/aosm/azext_aosm/tests/latest/mock_nsd/input_multi_nf_nsd.json
@@ -7,6 +7,7 @@
         {
             "publisher": "reference-publisher",
             "publisher_resource_group": "Reference-publisher",
+            "publisher_scope": "private",
             "name": "nginx-nfdg",
             "version": "1.0.0",
             "publisher_offering_location": "eastus",
@@ -16,6 +17,7 @@
         {
             "publisher": "reference-publisher",
             "publisher_resource_group": "Reference-publisher",
+            "publisher_scope": "private",
             "name": "ubuntu-nfdg",
             "version": "1.0.0",
             "publisher_offering_location": "eastus",

diff --git a/src/aosm/azext_aosm/tests/latest/mock_nsd/input_multiple_instances.json b/src/aosm/azext_aosm/tests/latest/mock_nsd/input_multiple_instances.json
@@ -10,6 +10,7 @@
             "publisher_offering_location": "eastus",
             "type": "vnf",
             "multiple_instances": true,
+            "publisher_scope": "private",
             "publisher": "jamie-mobile-publisher",
             "publisher_resource_group": "Jamie-publisher"
         }

diff --git a/src/aosm/azext_aosm/tests/latest/recordings/test_vnf_nsd_publish_and_delete.yaml b/src/aosm/azext_aosm/tests/latest/recordings/test_vnf_nsd_publish_and_delete.yaml
diff --git a/...xt_aosm/tests/latest/scenario_test_mocks/mock_input_templates/cnf_nsd_input_template.json b/...xt_aosm/tests/latest/scenario_test_mocks/mock_input_templates/cnf_nsd_input_template.json
@@ -11,6 +11,7 @@
             "type": "cnf",
             "multiple_instances": false,
             "publisher": "nginx-publisher",
+            "publisher_scope": "private",
             "publisher_resource_group": "{{publisher_resource_group_name}}"
         }
     ],

diff --git a/...xt_aosm/tests/latest/scenario_test_mocks/mock_input_templates/vnf_nsd_input_template.json b/...xt_aosm/tests/latest/scenario_test_mocks/mock_input_templates/vnf_nsd_input_template.json
@@ -11,6 +11,7 @@
             "type": "vnf",
             "multiple_instances": false,
             "publisher": "ubuntuPublisher",
+            "publisher_scope": "private",
             "publisher_resource_group": "{{publisher_resource_group_name}}"
         }
     ],

diff --git a/src/aosm/azext_aosm/tests/latest/test_nsd.py b/src/aosm/azext_aosm/tests/latest/test_nsd.py
@@ -131,7 +131,7 @@ def get(self, network_function_definition_group_name, **_):
 
 class AOSMClient:
     def __init__(self) -> None:
-        self.network_function_definition_versions = NFDVs()
+        self.proxy_network_function_definition_versions = NFDVs()
 
 
 mock_client = AOSMClient()