Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add nvaSku property for NetworkVirtualAppliance #9682

Merged
merged 22 commits into from
Jun 7, 2020
Merged

Add nvaSku property for NetworkVirtualAppliance #9682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
920c589
Adds base for updating Microsoft.Network from version stable/2020-03-…
dexiang-ms Apr 29, 2020
c75bb83
Updates readme
dexiang-ms Apr 29, 2020
15c7e54
Updates API version in new specs and examples
dexiang-ms Apr 29, 2020
05a06c3
Final changes
naveenchekuri May 6, 2020
d921bdb
Fix formatting issues
naveenchekuri May 6, 2020
143436c
Merge remote-tracking branch 'Azure/network-may-release' into network…
naveenchekuri May 6, 2020
4712540
Fix merge and formatting issues
naveenchekuri May 6, 2020
721c574
Fix formatiing
naveenchekuri May 6, 2020
7993ee7
Ipconfig properties
naveenchekuri May 6, 2020
d23fcad
Fix build errors
naveenchekuri May 6, 2020
7658f1f
Lint check
naveenchekuri May 6, 2020
23f0d70
Fix semantics errors
naveenchekuri May 7, 2020
b48a379
Address review comments
naveenchekuri May 9, 2020
8a32909
Fix prettier and nextLink checks
naveenchekuri May 9, 2020
39ce69b
Fix dots
naveenchekuri May 9, 2020
0a56b42
Address errors
naveenchekuri May 10, 2020
41db203
Fix Ipconfig version
naveenchekuri May 11, 2020
e858e20
Merge branch 'network-may-release' of https://github.com/Azure/azure-…
naveenchekuri Jun 3, 2020
8c83ea6
Change sku reference in NetworkVirtualAppliance resource
naveenchekuri Jun 3, 2020
95c51ad
Fix merge conflicts
naveenchekuri Jun 3, 2020
4bf8264
fix merge conflicts
naveenchekuri Jun 3, 2020
f299428
Fix build error
naveenchekuri Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...urce-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
"tags": {
"key1": "value1"
},
"sku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
}
},
"properties": {
"nvaSku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
Expand Down
10 changes: 5 additions & 5 deletions ...rosoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
"tags": {
"key1": "value1"
},
"sku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
}
},
"properties": {
"nvaSku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
Expand Down
10 changes: 5 additions & 5 deletions ...crosoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
"tags": {
"key1": "value1"
},
"sku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
}
},
"properties": {
"nvaSku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
Expand Down
30 changes: 15 additions & 15 deletions ...urce-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualAppliancePut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
"tags": {
"key1": "value1"
},
"sku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
Expand All @@ -21,6 +16,11 @@
},
"location": "West US",
"properties": {
"nvaSku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
Expand All @@ -45,18 +45,18 @@
"tags": {
"key1": "value1"
},
"sku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
}
},
"properties": {
"nvaSku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
Expand Down Expand Up @@ -97,18 +97,18 @@
"tags": {
"key1": "value1"
},
"sku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
}
},
"properties": {
"nvaSku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
Expand Down
10 changes: 5 additions & 5 deletions ...nager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceUpdateTags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
"key1": "value1",
"key2": "value2"
},
"sku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
}
},
"properties": {
"nvaSku": {
"vendor": "Cisco SDWAN",
"bundledScaleUnit": "1",
"marketPlaceVersion": "12.1"
},
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
Expand Down
10 changes: 5 additions & 5 deletions ...network/resource-manager/Microsoft.Network/stable/2020-05-01/networkVirtualAppliance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,11 +696,6 @@
"$ref": "./network.json#/definitions/ManagedServiceIdentity",
"description": "The service principal that has read access to cloud-init and config blob."
},
"sku": {
"readOnly": false,
"description": "Network Virtual Appliance SKU.",
"$ref": "#/definitions/VirtualApplianceSkuProperties"
},
"etag": {
"type": "string",
"readOnly": true,
Expand All @@ -716,6 +711,11 @@
},
"NetworkVirtualAppliancePropertiesFormat": {
"properties": {
"nvaSku": {
pilor marked this conversation as resolved.
Show resolved Hide resolved
"readOnly": false,
"description": "Network Virtual Appliance SKU.",
"$ref": "#/definitions/VirtualApplianceSkuProperties"
},
"bootStrapConfigurationBlobs": {
"type": "array",
"readOnly": false,
Expand Down