Update bicep templates to use 2023-09-01

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

@@ -3,25 +3,25 @@
 // This file creates an Artifact Manifest for a CNF
 param location string
 @description('Name of an existing publisher, expected to be in the resource group where you deploy the template')
-param publisherName string 
+param publisherName string
 @description('Name of an existing ACR-backed Artifact Store, deployed under the publisher.')
 param acrArtifactStoreName string
 @description('Name of the manifest to deploy for the ACR-backed Artifact Store')
 param acrManifestName string
 
 // Created by the az aosm definition publish command before the template is deployed
-resource publisher 'Microsoft.HybridNetwork/publishers@2023-04-01-preview' existing = {
+resource publisher 'Microsoft.HybridNetwork/publishers@2023-09-01' existing = {
   name: publisherName
   scope: resourceGroup()
 }
 
 // Created by the az aosm definition publish command before the template is deployed
-resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-04-01-preview' existing = {
+resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-09-01' existing = {
   parent: publisher
   name: acrArtifactStoreName
 }
 
-resource acrArtifactManifest 'Microsoft.Hybridnetwork/publishers/artifactStores/artifactManifests@2023-04-01-preview' = {
+resource acrArtifactManifest 'Microsoft.Hybridnetwork/publishers/artifactStores/artifactManifests@2023-09-01' = {
   parent: acrArtifactStore
   name: acrManifestName
   location: location

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

@@ -12,24 +12,24 @@ param nfDefinitionGroup string
 param nfDefinitionVersion string
 
 // Created by the az aosm definition publish command before the template is deployed
-resource publisher 'Microsoft.HybridNetwork/publishers@2023-04-01-preview' existing = {
+resource publisher 'Microsoft.HybridNetwork/publishers@2023-09-01' existing = {
   name: publisherName
   scope: resourceGroup()
 }
 
 // Created by the az aosm definition publish command before the template is deployed
-resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-04-01-preview' existing = {
+resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-09-01' existing = {
   parent: publisher
   name: acrArtifactStoreName
 }
 
 // Created by the az aosm definition publish command before the template is deployed
-resource nfdg 'Microsoft.Hybridnetwork/publishers/networkfunctiondefinitiongroups@2023-04-01-preview' existing = {
+resource nfdg 'Microsoft.Hybridnetwork/publishers/networkfunctiondefinitiongroups@2023-09-01' existing = {
   parent: publisher
   name: nfDefinitionGroup
 }
 
-resource nfdv 'Microsoft.Hybridnetwork/publishers/networkfunctiondefinitiongroups/networkfunctiondefinitionversions@2023-04-01-preview' = {
+resource nfdv 'Microsoft.Hybridnetwork/publishers/networkfunctiondefinitiongroups/networkfunctiondefinitionversions@2023-09-01' = {
   parent: nfdg
   name: nfDefinitionVersion
   location: location
@@ -43,7 +43,7 @@ resource nfdv 'Microsoft.Hybridnetwork/publishers/networkfunctiondefinitiongroup
     networkFunctionType: 'ContainerizedNetworkFunction'
     networkFunctionTemplate: {
       nfviType: 'AzureArcKubernetes'
-      networkFunctionApplications: [ 
+      networkFunctionApplications: [
       {%- for configuration in nf_application_configurations %}
         {
           artifactType: 'HelmPackage'

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

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 
 // This file creates an NF definition for a VNF
-param location string 
+param location string
 @description('Name of an existing publisher, expected to be in the resource group where you deploy the template')
-param publisherName string 
+param publisherName string
 @description('Name of an existing ACR-backed Artifact Store, deployed under the publisher.')
 param acrArtifactStoreName string
 @description('Name of an existing Storage Account-backed Artifact Store, deployed under the publisher.')
@@ -20,24 +20,24 @@ param vhdVersion string
 param armTemplateVersion string
 
 // Created by the az aosm definition publish command before the template is deployed
-resource publisher 'Microsoft.HybridNetwork/publishers@2023-04-01-preview' existing = {
+resource publisher 'Microsoft.HybridNetwork/publishers@2023-09-01' existing = {
   name: publisherName
   scope: resourceGroup()
 }
 
 // Created by the az aosm definition publish command before the template is deployed
-resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-04-01-preview' existing = {
+resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-09-01' existing = {
   parent: publisher
   name: acrArtifactStoreName
 }
 
 // Created by the az aosm definition publish command before the template is deployed
-resource saArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-04-01-preview' existing = {
+resource saArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-09-01' existing = {
   parent: publisher
   name: saArtifactStoreName
 }
 
-resource saArtifactManifest 'Microsoft.Hybridnetwork/publishers/artifactStores/artifactManifests@2023-04-01-preview' = {
+resource saArtifactManifest 'Microsoft.Hybridnetwork/publishers/artifactStores/artifactManifests@2023-09-01' = {
   parent: saArtifactStore
   name: saManifestName
   location: location
@@ -52,7 +52,7 @@ resource saArtifactManifest 'Microsoft.Hybridnetwork/publishers/artifactStores/a
   }
 }
 
-resource acrArtifactManifest 'Microsoft.Hybridnetwork/publishers/artifactStores/artifactManifests@2023-04-01-preview' = {
+resource acrArtifactManifest 'Microsoft.Hybridnetwork/publishers/artifactStores/artifactManifests@2023-09-01' = {
   parent: acrArtifactStore
   name: acrManifestName
   location: location

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

@@ -3,7 +3,7 @@
 // This file creates an NF definition for a VNF
 param location string
 @description('Name of an existing publisher, expected to be in the resource group where you deploy the template')
-param publisherName string 
+param publisherName string
 @description('Name of an existing ACR-backed Artifact Store, deployed under the publisher.')
 param acrArtifactStoreName string
 @description('Name of an existing Storage Account-backed Artifact Store, deployed under the publisher.')
@@ -20,30 +20,30 @@ param vhdVersion string
 param armTemplateVersion string
 
 // Created by the az aosm definition publish command before the template is deployed
-resource publisher 'Microsoft.HybridNetwork/publishers@2023-04-01-preview' existing = {
+resource publisher 'Microsoft.HybridNetwork/publishers@2023-09-01' existing = {
   name: publisherName
   scope: resourceGroup()
 }
 
 // Created by the az aosm definition publish command before the template is deployed
-resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-04-01-preview' existing = {
+resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-09-01' existing = {
   parent: publisher
   name: acrArtifactStoreName
 }
 
 // Created by the az aosm definition publish command before the template is deployed
-resource saArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-04-01-preview' existing = {
+resource saArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-09-01' existing = {
   parent: publisher
   name: saArtifactStoreName
 }
 
 // Created by the az aosm definition publish command before the template is deployed
-resource nfdg 'Microsoft.Hybridnetwork/publishers/networkfunctiondefinitiongroups@2023-04-01-preview' existing = {
+resource nfdg 'Microsoft.Hybridnetwork/publishers/networkfunctiondefinitiongroups@2023-09-01' existing = {
   parent: publisher
   name: nfDefinitionGroup
 }
 
-resource nfdv 'Microsoft.Hybridnetwork/publishers/networkfunctiondefinitiongroups/networkfunctiondefinitionversions@2023-04-01-preview' = {
+resource nfdv 'Microsoft.Hybridnetwork/publishers/networkfunctiondefinitiongroups/networkfunctiondefinitionversions@2023-09-01' = {
   parent: nfdg
   name: nfDefinitionVersion
   location: location

src/aosm/azext_aosm/generate_nsd/templates/artifact_manifest_template.bicep

@@ -3,7 +3,7 @@
 // This file creates an Artifact Manifest for a NSD
 param location string
 @description('Name of an existing publisher, expected to be in the resource group where you deploy the template')
-param publisherName string 
+param publisherName string
 @description('Name of an existing ACR-backed Artifact Store, deployed under the publisher.')
 param acrArtifactStoreName string
 @description('Name of the manifest to deploy for the ACR-backed Artifact Store')
@@ -13,17 +13,17 @@ param armTemplateNames array
 @description('The version that you want to name the NFM template artifact, in format A.B.C. e.g. 6.13.0. If testing for development, you can use any numbers you like.')
 param armTemplateVersion string
 
-resource publisher 'Microsoft.HybridNetwork/publishers@2023-04-01-preview' existing = {
+resource publisher 'Microsoft.HybridNetwork/publishers@2023-09-01' existing = {
   name: publisherName
   scope: resourceGroup()
 }
 
-resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-04-01-preview' existing = {
+resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-09-01' existing = {
   parent: publisher
   name: acrArtifactStoreName
 }
 
-resource acrArtifactManifests 'Microsoft.Hybridnetwork/publishers/artifactStores/artifactManifests@2023-04-01-preview' = [for (values, i) in armTemplateNames: {
+resource acrArtifactManifests 'Microsoft.Hybridnetwork/publishers/artifactStores/artifactManifests@2023-09-01' = [for (values, i) in armTemplateNames: {
   parent: acrArtifactStore
   name: acrManifestNames[i]
   location: location

src/aosm/azext_aosm/generate_nsd/templates/nf_template.bicep.j2

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Highly Confidential Material
 //
-// The template that the NSD invokes to create the Network Function from a published NFDV. 
+// The template that the NSD invokes to create the Network Function from a published NFDV.
 
 @description('Publisher where the NFD is published')
 param publisherName string = '{{publisher_name}}'
@@ -40,7 +40,7 @@ var identityObject = (managedIdentity == '')  ? {
   }
 }
 
-resource nf_resource 'Microsoft.HybridNetwork/networkFunctions@2023-04-01-preview' = [for (values, i) in deploymentParameters: {
+resource nf_resource 'Microsoft.HybridNetwork/networkFunctions@2023-09-01' = [for (values, i) in deploymentParameters: {
   name: '{{network_function_name}}${i}'
   location: location
   identity: identityObject

src/aosm/azext_aosm/generate_nsd/templates/nsd_template.bicep.j2

@@ -18,29 +18,29 @@ param nsDesignVersion string
 param nfviSiteName string = '{{nfvi_site_name}}'
 
 // The publisher resource is the top level AOSM resource under which all other designer resources
-// are created. 
-resource publisher 'Microsoft.HybridNetwork/publishers@2023-04-01-preview' existing = {
+// are created.
+resource publisher 'Microsoft.HybridNetwork/publishers@2023-09-01' existing = {
   name: publisherName
   scope: resourceGroup()
 }
 
-// The artifact store is the resource in which all the artifacts required to deploy the NF are stored. 
+// The artifact store is the resource in which all the artifacts required to deploy the NF are stored.
 // The artifact store is created by the az aosm CLI before this template is deployed.
-resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-04-01-preview' existing = {
+resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-09-01' existing = {
   parent: publisher
   name: acrArtifactStoreName
 }
 
 // Created up-front, the NSD Group is the parent resource under which all NSD versions will be created.
-resource nsdGroup 'Microsoft.Hybridnetwork/publishers/networkservicedesigngroups@2023-04-01-preview' existing = {
+resource nsdGroup 'Microsoft.Hybridnetwork/publishers/networkservicedesigngroups@2023-09-01' existing = {
   parent: publisher
   name: nsDesignGroup
 }
 
 // The configuration group schema defines the configuration required to deploy the NSD. The NSD references this object in the
 // `configurationgroupsSchemaReferences` and references the values in the schema in the `parameterValues`.
 // The operator will create a config group values object that will satisfy this schema.
-resource cgSchema 'Microsoft.Hybridnetwork/publishers/configurationGroupSchemas@2023-04-01-preview' = {
+resource cgSchema 'Microsoft.Hybridnetwork/publishers/configurationGroupSchemas@2023-09-01' = {
   parent: publisher
   name: '{{cg_schema_name}}'
   location: location
@@ -50,7 +50,7 @@ resource cgSchema 'Microsoft.Hybridnetwork/publishers/configurationGroupSchemas@
 }
 
 // The NSD version
-resource nsdVersion 'Microsoft.Hybridnetwork/publishers/networkservicedesigngroups/networkservicedesignversions@2023-04-01-preview' = {
+resource nsdVersion 'Microsoft.Hybridnetwork/publishers/networkservicedesigngroups/networkservicedesignversions@2023-09-01' = {
   parent: nsdGroup
   name: nsDesignVersion
   location: location
@@ -102,7 +102,7 @@ resource nsdVersion 'Microsoft.Hybridnetwork/publishers/networkservicedesigngrou
           updateDependsOn: []
         }
       }
-{%- endfor %}     
+{%- endfor %}
     ]
   }
 }

src/aosm/azext_aosm/tests/latest/nsd_output/test_build/artifact_manifest.bicep

@@ -3,7 +3,7 @@
 // This file creates an Artifact Manifest for a NSD
 param location string
 @description('Name of an existing publisher, expected to be in the resource group where you deploy the template')
-param publisherName string 
+param publisherName string
 @description('Name of an existing ACR-backed Artifact Store, deployed under the publisher.')
 param acrArtifactStoreName string
 @description('Name of the manifest to deploy for the ACR-backed Artifact Store')
@@ -13,17 +13,17 @@ param armTemplateNames array
 @description('The version that you want to name the NFM template artifact, in format A.B.C. e.g. 6.13.0. If testing for development, you can use any numbers you like.')
 param armTemplateVersion string
 
-resource publisher 'Microsoft.HybridNetwork/publishers@2023-04-01-preview' existing = {
+resource publisher 'Microsoft.HybridNetwork/publishers@2023-09-01' existing = {
   name: publisherName
   scope: resourceGroup()
 }
 
-resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-04-01-preview' existing = {
+resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-09-01' existing = {
   parent: publisher
   name: acrArtifactStoreName
 }
 
-resource acrArtifactManifests 'Microsoft.Hybridnetwork/publishers/artifactStores/artifactManifests@2023-04-01-preview' = [for (values, i) in armTemplateNames: {
+resource acrArtifactManifests 'Microsoft.Hybridnetwork/publishers/artifactStores/artifactManifests@2023-09-01' = [for (values, i) in armTemplateNames: {
   parent: acrArtifactStore
   name: acrManifestNames[i]
   location: location
@@ -36,4 +36,4 @@ resource acrArtifactManifests 'Microsoft.Hybridnetwork/publishers/artifactStores
       }
     ]
   }
-}]
+}]

src/aosm/azext_aosm/tests/latest/nsd_output/test_build/nsd_definition.bicep

@@ -18,29 +18,29 @@ param nsDesignVersion string
 param nfviSiteName string = 'ubuntu_NFVI'
 
 // The publisher resource is the top level AOSM resource under which all other designer resources
-// are created. 
-resource publisher 'Microsoft.HybridNetwork/publishers@2023-04-01-preview' existing = {
+// are created.
+resource publisher 'Microsoft.HybridNetwork/publishers@2023-09-01' existing = {
   name: publisherName
   scope: resourceGroup()
 }
 
-// The artifact store is the resource in which all the artifacts required to deploy the NF are stored. 
+// The artifact store is the resource in which all the artifacts required to deploy the NF are stored.
 // The artifact store is created by the az aosm CLI before this template is deployed.
-resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-04-01-preview' existing = {
+resource acrArtifactStore 'Microsoft.HybridNetwork/publishers/artifactStores@2023-09-01' existing = {
   parent: publisher
   name: acrArtifactStoreName
 }
 
 // Created up-front, the NSD Group is the parent resource under which all NSD versions will be created.
-resource nsdGroup 'Microsoft.Hybridnetwork/publishers/networkservicedesigngroups@2023-04-01-preview' existing = {
+resource nsdGroup 'Microsoft.Hybridnetwork/publishers/networkservicedesigngroups@2023-09-01' existing = {
   parent: publisher
   name: nsDesignGroup
 }
 
 // The configuration group schema defines the configuration required to deploy the NSD. The NSD references this object in the
 // `configurationgroupsSchemaReferences` and references the values in the schema in the `parameterValues`.
 // The operator will create a config group values object that will satisfy this schema.
-resource cgSchema 'Microsoft.Hybridnetwork/publishers/configurationGroupSchemas@2023-04-01-preview' = {
+resource cgSchema 'Microsoft.Hybridnetwork/publishers/configurationGroupSchemas@2023-09-01' = {
   parent: publisher
   name: 'ubuntu_ConfigGroupSchema'
   location: location
@@ -50,7 +50,7 @@ resource cgSchema 'Microsoft.Hybridnetwork/publishers/configurationGroupSchemas@
 }
 
 // The NSD version
-resource nsdVersion 'Microsoft.Hybridnetwork/publishers/networkservicedesigngroups/networkservicedesignversions@2023-04-01-preview' = {
+resource nsdVersion 'Microsoft.Hybridnetwork/publishers/networkservicedesigngroups/networkservicedesignversions@2023-09-01' = {
   parent: nsdGroup
   name: nsDesignVersion
   location: location
@@ -100,7 +100,7 @@ resource nsdVersion 'Microsoft.Hybridnetwork/publishers/networkservicedesigngrou
           uninstallDependsOn: []
           updateDependsOn: []
         }
-      }     
+      }
     ]
   }
-}
+}

src/aosm/azext_aosm/tests/latest/nsd_output/test_build/ubuntu-vm-nfdg_nf.bicep

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Highly Confidential Material
 //
-// The template that the NSD invokes to create the Network Function from a published NFDV. 
+// The template that the NSD invokes to create the Network Function from a published NFDV.
 
 @description('Publisher where the NFD is published')
 param publisherName string = 'jamie-mobile-publisher'
@@ -35,7 +35,7 @@ var identityObject = (managedIdentity == '')  ? {
   }
 }
 
-resource nf_resource 'Microsoft.HybridNetwork/networkFunctions@2023-04-01-preview' = [for (values, i) in deploymentParameters: {
+resource nf_resource 'Microsoft.HybridNetwork/networkFunctions@2023-09-01' = [for (values, i) in deploymentParameters: {
   name: 'ubuntu-vm-nfdg${i}'
   location: location
   identity: identityObject
@@ -50,4 +50,4 @@ resource nf_resource 'Microsoft.HybridNetwork/networkFunctions@2023-04-01-previe
     allowSoftwareUpdate: true
     deploymentValues: string(values)
   }
-}]
+}]