Skip to content

Commit 34be437

Browse files
author
Jordan
committed
Merge remote-tracking branch 'origin' into jl/add-null-to-common-issues
2 parents fcd5f8e + 84e928c commit 34be437

10 files changed

+341
-341
lines changed

‎articles/operator-service-manager/how-to-manage-artifacts-nexus.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,28 +58,28 @@ resource acrArtifactManifest 'Microsoft.Hybridnetwork/publishers/artifactStores/
5858

5959
1. Get repository-scoped permissions from the artifact manifest resource
6060

61-
```azurecli
62-
az rest --method POST --url 'https://management.azure.com/subscriptions/<subscription-id>/resourceGroups/<resource-group>/providers/Microsoft.HybridNetwork/publishers/<publisher>/artifactStores/<artifact-store-name>/artifactManifests/<artifact-manifest-name>/listCredential?api-version=2023-09-01'
63-
```
64-
65-
This command returns the username and password you'll use to sign in to the ACR backing the artifact store. The password is in the `token` field.
66-
67-
```bash
68-
{
69-
"acrServerUrl": "https://<acr-name>.azurecr.io",
70-
"acrToken": "<token>",
71-
"credentialType": "AzureContainerRegistryScopedToken",
72-
"expiry": "2024-03-27T10:25:03.9217887+00:00",
73-
"repositories": [
74-
"<artifact-name>"
75-
],
76-
"username": "<artifact-manifest-name>"
77-
}
78-
```
61+
```azurecli
62+
az rest --method POST --url 'https://management.azure.com/subscriptions/<subscription-id>/resourceGroups/<resource-group>/providers/Microsoft.HybridNetwork/publishers/<publisher>/artifactStores/<artifact-store-name>/artifactManifests/<artifact-manifest-name>/listCredential?api-version=2023-09-01'
63+
```
64+
65+
This command returns the username and password you'll use to sign in to the ACR backing the artifact store. The password is in the `token` field.
66+
67+
```bash
68+
{
69+
"acrServerUrl": "https://<acr-name>.azurecr.io",
70+
"acrToken": "<token>",
71+
"credentialType": "AzureContainerRegistryScopedToken",
72+
"expiry": "2024-03-27T10:25:03.9217887+00:00",
73+
"repositories": [
74+
"<artifact-name>"
75+
],
76+
"username": "<artifact-manifest-name>"
77+
}
78+
```
79+
80+
>[!IMPORTANT]
81+
> The artifact manifest resource grants tightly scoped permissions for push and pull operations. You must use an artifact manifest that contains an entry for the artifact you want to push or pull. The `artifactName` must match the artifact name in the repository. The `artifactVersion` must match the artifact tag
7982
80-
>[!IMPORTANT]
81-
> The artifact manifest resource grants tightly scoped permissions for push and pull operations. You must use an artifact manifest that contains an entry for the artifact you want to push or pull. The `artifactName` must match the artifact name in the repository. The `artifactVersion` must match the artifact tag
82-
8383
1. Find the name of the ACR that backs the artifact store resource by opening the navigating to the artifact store and copying the `Backing storage` field
8484
8585
:::image type="content" source="media/how-to-find-backing-artifact-store.png" alt-text="Diagram showing the Azure portal Artifact Store backing resource field." lightbox="media/how-to-find-backing-artifact-store.png":::

‎articles/operator-service-manager/how-to-onboard-azure-resource-manager-resources-cli.md

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -75,73 +75,73 @@ az extension add --name aosm
7575

7676
1. Open the NSDV input file you generated when you onboarded your CNF.
7777

78-
> [!NOTE]
79-
> You can generate a new input file using the `az aosm nsd generate-config --output-file <nsd-output-filename.jsonc>` command if you do not have the NSDV input file from your CNF onboarding.
78+
> [!NOTE]
79+
> You can generate a new input file using the `az aosm nsd generate-config --output-file <nsd-output-filename.jsonc>` command if you do not have the NSDV input file from your CNF onboarding.
8080
8181
1. Enter the required values using the inline comments in your input file. This example shows the Az CLI AOSM extension input file for a fictional Contoso NSDV that can be used to deploy a fictional Contoso CNF onto an Arc-connected Nexus Kubernetes cluster and an AKV instance in an Azure location.
8282

83-
```json
84-
{
85-
// Azure location to use when creating resources e.g uksouth
86-
"location": "eastus",
87-
// Name of the Publisher resource you want your definition published to.
88-
// Will be created if it does not exist.
89-
"publisher_name": "contoso",
90-
// Resource group for the Publisher resource.
91-
// Will be created if it does not exist.
92-
"publisher_resource_group_name": "contoso",
93-
// Name of the ACR Artifact Store resource.
94-
// Will be created if it does not exist.
95-
"acr_artifact_store_name": "contoso-artifact-store",
96-
// Network Service Design (NSD) name. This is the collection of Network Service Design Versions. Will be created if it does not exist.
97-
"nsd_name": "contoso-nsd",
98-
// Version of the NSD to be created. This should be in the format A.B.C
99-
"nsd_version": "1.0.0",
100-
// Optional. Description of the Network Service Design Version (NSDV).
101-
"nsdv_description": "An NSD that deploys the onboarded contoso-cnf NFD and an Azure Key Vault",
102-
// List of Resource Element Templates (RETs).
103-
// There must be at least one NF RET.
104-
// ArmTemplate RETs are optional. Delete if not required.
105-
"resource_element_templates": [
106-
{
107-
// Type of Resource Element. Either NF or ArmTemplate
108-
"resource_element_type": "NF",
109-
"properties": {
110-
// The name of the existing publisher for the NSD.
111-
"publisher": "contoso",
112-
// The resource group that the publisher is hosted in.
113-
"publisher_resource_group": "contoso",
114-
// The name of the existing Network Function Definition Group to deploy using this NSD.
115-
// This will be the same as the NF name if you published your NFDV using the CLI.
116-
"name": "contoso-cnf-nfd",
117-
// The version of the existing Network Function Definition to base this NSD on.
118-
// This NSD will be able to deploy any NFDV with deployment parameters compatible with this version.
119-
"version": "1.0.0",
120-
// The region that the NFDV is published to.
121-
"publisher_offering_location": "eastus",
122-
// Type of Network Function. Valid values are 'cnf' or 'vnf'.
123-
"type": "cnf"
124-
}
125-
},
126-
{
127-
// Type of Resource Element. Either NF or ArmTemplate
128-
"resource_element_type": "ArmTemplate",
129-
// Properties of the Resource Element.
130-
"properties": {
131-
// Name of the artifact. Used as internal reference only.
132-
"artifact_name": "contoso-keyvault",
133-
// Version of the artifact in 1.1.1 format (three integers separated by dots).
134-
"version": "1.0.0",
135-
// File path (absolute or relative to this configuration file) of the artifact you wish to upload from your local disk.
136-
// Use Linux slash (/) file separator even if running on Windows.
137-
"file_path": "./contoso-keyvault.json"
138-
}
139-
}
140-
]
141-
}
142-
```
143-
> [!NOTE]
144-
> The resource element template section defines which NFD is included in the NSD. The properties must match those used in the input file passed to the `az aosm nfd build` command. This is because the Azure CLI AOSM Extension validates that the NFD has been correctly onboarded when building the NSD.
83+
```json
84+
{
85+
// Azure location to use when creating resources e.g uksouth
86+
"location": "eastus",
87+
// Name of the Publisher resource you want your definition published to.
88+
// Will be created if it does not exist.
89+
"publisher_name": "contoso",
90+
// Resource group for the Publisher resource.
91+
// Will be created if it does not exist.
92+
"publisher_resource_group_name": "contoso",
93+
// Name of the ACR Artifact Store resource.
94+
// Will be created if it does not exist.
95+
"acr_artifact_store_name": "contoso-artifact-store",
96+
// Network Service Design (NSD) name. This is the collection of Network Service Design Versions. Will be created if it does not exist.
97+
"nsd_name": "contoso-nsd",
98+
// Version of the NSD to be created. This should be in the format A.B.C
99+
"nsd_version": "1.0.0",
100+
// Optional. Description of the Network Service Design Version (NSDV).
101+
"nsdv_description": "An NSD that deploys the onboarded contoso-cnf NFD and an Azure Key Vault",
102+
// List of Resource Element Templates (RETs).
103+
// There must be at least one NF RET.
104+
// ArmTemplate RETs are optional. Delete if not required.
105+
"resource_element_templates": [
106+
{
107+
// Type of Resource Element. Either NF or ArmTemplate
108+
"resource_element_type": "NF",
109+
"properties": {
110+
// The name of the existing publisher for the NSD.
111+
"publisher": "contoso",
112+
// The resource group that the publisher is hosted in.
113+
"publisher_resource_group": "contoso",
114+
// The name of the existing Network Function Definition Group to deploy using this NSD.
115+
// This will be the same as the NF name if you published your NFDV using the CLI.
116+
"name": "contoso-cnf-nfd",
117+
// The version of the existing Network Function Definition to base this NSD on.
118+
// This NSD will be able to deploy any NFDV with deployment parameters compatible with this version.
119+
"version": "1.0.0",
120+
// The region that the NFDV is published to.
121+
"publisher_offering_location": "eastus",
122+
// Type of Network Function. Valid values are 'cnf' or 'vnf'.
123+
"type": "cnf"
124+
}
125+
},
126+
{
127+
// Type of Resource Element. Either NF or ArmTemplate
128+
"resource_element_type": "ArmTemplate",
129+
// Properties of the Resource Element.
130+
"properties": {
131+
// Name of the artifact. Used as internal reference only.
132+
"artifact_name": "contoso-keyvault",
133+
// Version of the artifact in 1.1.1 format (three integers separated by dots).
134+
"version": "1.0.0",
135+
// File path (absolute or relative to this configuration file) of the artifact you wish to upload from your local disk.
136+
// Use Linux slash (/) file separator even if running on Windows.
137+
"file_path": "./contoso-keyvault.json"
138+
}
139+
}
140+
]
141+
}
142+
```
143+
> [!NOTE]
144+
> The resource element template section defines which NFD is included in the NSD. The properties must match those used in the input file passed to the `az aosm nfd build` command. This is because the Azure CLI AOSM Extension validates that the NFD has been correctly onboarded when building the NSD.
145145

146146
1. Execute the following command to build the Network Service Design Group and Version BICEP templates.
147147

0 commit comments

Comments
 (0)