Minor fixes

src/aosm/azext_aosm/_configuration.py

@@ -287,9 +287,10 @@ def __post_init__(self):
 
         Used when creating CNFConfiguration object from a loaded json config file.
         """
-        for package in self.helm_packages:
+        for package_index in range(len(self.helm_packages)):
+            package = self.helm_packages[package_index]
             if isinstance(package, dict):
-                package = HelmPackageConfig(**dict(package))
+                self.helm_packages[package_index] = HelmPackageConfig(**dict(package))
 
     @property
     def build_output_folder_name(self) -> str:

src/aosm/azext_aosm/custom.py

@@ -165,10 +165,6 @@ def publish_definition(
         config_file=config_file, configuration_type=definition_type
     )
 
-    for package in config.helm_packages:
-        print(f"Type of package: {type(package)}")
-
-    return
     if definition_type == VNF:
         deployer = DeployerViaArm(api_clients, config=config)
         deployer.deploy_vnfd_from_bicep(

src/aosm/azext_aosm/deploy/artifact.py

@@ -31,14 +31,12 @@ def upload(self, artifact_config: ArtifactConfig or HelmPackageConfig) -> None:
         :param artifact_config: configuration for the artifact being uploaded
         """
         if type(self.artifact_client) == OrasClient:
-            self._upload_helm_to_acr(artifact_config)
-
-            ## TODO: pk5 fix this
-
-            # if type(artifact_config) == HelmPackageConfig:
-            #     self._upload_helm_to_acr(artifact_config)
-            # elif type(artifact_config) == ArtifactConfig:
-            #     self._upload_arm_to_acr(artifact_config)
+            if type(artifact_config) == HelmPackageConfig:
+                self._upload_helm_to_acr(artifact_config)
+            elif type(artifact_config) == ArtifactConfig:
+                self._upload_arm_to_acr(artifact_config)
+            else:
+                raise ValueError(f"Unsupported artifact type: {type(artifact_config)}.")
         else:
             self._upload_to_storage_account(artifact_config)
 
@@ -77,11 +75,11 @@ def _upload_helm_to_acr(self, artifact_config: HelmPackageConfig) -> None:
         # If not included in config, the file path value will be the description of
         # the field.
 
-        if artifact_config["path_to_chart"]:
+        if artifact_config.path_to_chart:
             target = f"{self.artifact_client.remote.hostname.replace('https://', '')}/{self.artifact_name}:{self.artifact_version}"
-            logger.debug(f"Uploading {artifact_config['path_to_chart']} to {target}")
+            logger.debug(f"Uploading {artifact_config.path_to_chart} to {target}")
             self.artifact_client.push(
-                files=[artifact_config["path_to_chart"]],
+                files=[artifact_config.path_to_chart],
                 target=target,
             )
 

src/aosm/azext_aosm/deploy/deploy_with_arm.py

@@ -348,11 +348,11 @@ def deploy_cnfd_from_bicep(
             artifact_dictionary[artifact.artifact_name] = artifact
 
         for package_number in range(len(self.config.helm_packages)):
-            helm_package_name = self.config.helm_packages[package_number]["name"]
+            helm_package_name = self.config.helm_packages[package_number].name
 
             if helm_package_name not in artifact_dictionary.keys():
                 print(
-                    f"Artifact {self.config.helm_packages[package_number]['name']} not found in the artifact manifest"
+                    f"Artifact {helm_package_name} not found in the artifact manifest"
                 )
                 continue