From 932b54815ed72d2d362c273a441d1f9d64aaffbb Mon Sep 17 00:00:00 2001 From: naveenchekuri Date: Sun, 7 Jun 2020 04:10:31 -0700 Subject: [PATCH] Add nvaSku property for NetworkVirtualAppliance (#9682) --- .../examples/NetworkVirtualApplianceGet.json | 10 +++---- ...rkVirtualApplianceListByResourceGroup.json | 10 +++---- ...orkVirtualApplianceListBySubscription.json | 10 +++---- .../examples/NetworkVirtualAppliancePut.json | 30 +++++++++---------- .../NetworkVirtualApplianceUpdateTags.json | 10 +++---- .../2020-05-01/networkVirtualAppliance.json | 10 +++---- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceGet.json index 9fb93a24ab53..2b85ebcb976e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceGet.json @@ -16,11 +16,6 @@ "tags": { "key1": "value1" }, - "sku": { - "vendor": "Cisco SDWAN", - "bundledScaleUnit": "1", - "marketPlaceVersion": "12.1" - }, "identity": { "type": "UserAssigned", "userAssignedIdentities": { @@ -28,6 +23,11 @@ } }, "properties": { + "nvaSku": { + "vendor": "Cisco SDWAN", + "bundledScaleUnit": "1", + "marketPlaceVersion": "12.1" + }, "virtualHub": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1" }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListByResourceGroup.json index ed3f5d188e7c..1130edb38cc1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListByResourceGroup.json @@ -17,11 +17,6 @@ "tags": { "key1": "value1" }, - "sku": { - "vendor": "Cisco SDWAN", - "bundledScaleUnit": "1", - "marketPlaceVersion": "12.1" - }, "identity": { "type": "UserAssigned", "userAssignedIdentities": { @@ -29,6 +24,11 @@ } }, "properties": { + "nvaSku": { + "vendor": "Cisco SDWAN", + "bundledScaleUnit": "1", + "marketPlaceVersion": "12.1" + }, "virtualHub": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1" }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListBySubscription.json index 8c614c9f74b8..b950a32535db 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListBySubscription.json @@ -16,11 +16,6 @@ "tags": { "key1": "value1" }, - "sku": { - "vendor": "Cisco SDWAN", - "bundledScaleUnit": "1", - "marketPlaceVersion": "12.1" - }, "identity": { "type": "UserAssigned", "userAssignedIdentities": { @@ -28,6 +23,11 @@ } }, "properties": { + "nvaSku": { + "vendor": "Cisco SDWAN", + "bundledScaleUnit": "1", + "marketPlaceVersion": "12.1" + }, "virtualHub": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1" }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualAppliancePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualAppliancePut.json index 2e95a2d455e7..9954c35baad4 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualAppliancePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualAppliancePut.json @@ -8,11 +8,6 @@ "tags": { "key1": "value1" }, - "sku": { - "vendor": "Cisco SDWAN", - "bundledScaleUnit": "1", - "marketPlaceVersion": "12.1" - }, "identity": { "type": "UserAssigned", "userAssignedIdentities": { @@ -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" }, @@ -45,11 +45,6 @@ "tags": { "key1": "value1" }, - "sku": { - "vendor": "Cisco SDWAN", - "bundledScaleUnit": "1", - "marketPlaceVersion": "12.1" - }, "identity": { "type": "UserAssigned", "userAssignedIdentities": { @@ -57,6 +52,11 @@ } }, "properties": { + "nvaSku": { + "vendor": "Cisco SDWAN", + "bundledScaleUnit": "1", + "marketPlaceVersion": "12.1" + }, "virtualHub": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1" }, @@ -97,11 +97,6 @@ "tags": { "key1": "value1" }, - "sku": { - "vendor": "Cisco SDWAN", - "bundledScaleUnit": "1", - "marketPlaceVersion": "12.1" - }, "identity": { "type": "UserAssigned", "userAssignedIdentities": { @@ -109,6 +104,11 @@ } }, "properties": { + "nvaSku": { + "vendor": "Cisco SDWAN", + "bundledScaleUnit": "1", + "marketPlaceVersion": "12.1" + }, "virtualHub": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1" }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceUpdateTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceUpdateTags.json index 48933d83d7e5..9f7db9998f6a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceUpdateTags.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceUpdateTags.json @@ -23,11 +23,6 @@ "key1": "value1", "key2": "value2" }, - "sku": { - "vendor": "Cisco SDWAN", - "bundledScaleUnit": "1", - "marketPlaceVersion": "12.1" - }, "identity": { "type": "UserAssigned", "userAssignedIdentities": { @@ -35,6 +30,11 @@ } }, "properties": { + "nvaSku": { + "vendor": "Cisco SDWAN", + "bundledScaleUnit": "1", + "marketPlaceVersion": "12.1" + }, "virtualHub": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1" }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/networkVirtualAppliance.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/networkVirtualAppliance.json index 326717a4e31d..12fce323288a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/networkVirtualAppliance.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/networkVirtualAppliance.json @@ -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, @@ -716,6 +711,11 @@ }, "NetworkVirtualAppliancePropertiesFormat": { "properties": { + "nvaSku": { + "readOnly": false, + "description": "Network Virtual Appliance SKU.", + "$ref": "#/definitions/VirtualApplianceSkuProperties" + }, "bootStrapConfigurationBlobs": { "type": "array", "readOnly": false,