Merge pull request Azure#16 from jddarby/jl/manifest-location-bug

Fix wrong location creation bug

src/aosm/azext_aosm/deploy/deploy_with_arm.py

@@ -178,6 +178,7 @@ def construct_vnfd_parameters(self) -> Dict[str, Any]:
         """
         assert isinstance(self.config, VNFConfiguration)
         return {
+            "location" : {"value": self.config.location},
             "publisherName": {"value": self.config.publisher_name},
             "acrArtifactStoreName": {"value": self.config.acr_artifact_store_name},
             "saArtifactStoreName": {"value": self.config.blob_artifact_store_name},
@@ -196,6 +197,7 @@ def construct_manifest_parameters(self) -> Dict[str, Any]:
         """
         assert isinstance(self.config, VNFConfiguration)
         return {
+            "location" : {"value": self.config.location},
             "publisherName": {"value": self.config.publisher_name},
             "acrArtifactStoreName": {"value": self.config.acr_artifact_store_name},
             "saArtifactStoreName": {"value": self.config.blob_artifact_store_name},

src/aosm/azext_aosm/generate_nfd/templates/cnfartifactmanifest.bicep.j2

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 
 // This file creates an Artifact Manifest for a CNF
-param location string = resourceGroup().location
+param location string
 @description('Name of an existing publisher, expected to be in the resource group where you deploy the template')
 param publisherName string 
 @description('Name of an existing ACR-backed Artifact Store, deployed under the publisher.')

src/aosm/azext_aosm/generate_nfd/templates/cnfdefinition.bicep.j2

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 
 // This file creates an NF definition for a CNF
-param location string = resourceGroup().location
+param location string
 @description('Name of an existing publisher, expected to be in the resource group where you deploy the template')
 param publisherName string
 @description('Name of an existing ACR-backed Artifact Store, deployed under the publisher.')

src/aosm/azext_aosm/generate_nfd/templates/vnfartifactmanifests.bicep

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 
 // This file creates an NF definition for a VNF
-param location string = resourceGroup().location
+param location string 
 @description('Name of an existing publisher, expected to be in the resource group where you deploy the template')
 param publisherName string 
 @description('Name of an existing ACR-backed Artifact Store, deployed under the publisher.')

src/aosm/azext_aosm/generate_nfd/templates/vnfdefinition.bicep

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 
 // This file creates an NF definition for a VNF
-param location string = resourceGroup().location
+param location string
 @description('Name of an existing publisher, expected to be in the resource group where you deploy the template')
 param publisherName string 
 @description('Name of an existing ACR-backed Artifact Store, deployed under the publisher.')