Add nvaSku property for NetworkVirtualAppliance (#9682)

Azure · Jun 7, 2020 · 932b548 · 932b548
1 parent 89331e6
commit 932b548
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 40 deletions.
diff --git a/...urce-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceGet.json b/...urce-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceGet.json
@@ -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"
           },

diff --git a/...rosoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListByResourceGroup.json b/...rosoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListByResourceGroup.json
@@ -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"
               },

diff --git a/...crosoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListBySubscription.json b/...crosoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListBySubscription.json
@@ -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"
               },

diff --git a/...urce-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualAppliancePut.json b/...urce-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,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"
           },
@@ -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"
           },

diff --git a/...nager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceUpdateTags.json b/...nager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceUpdateTags.json
@@ -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"
           },

diff --git a/...network/resource-manager/Microsoft.Network/stable/2020-05-01/networkVirtualAppliance.json b/...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,