Update ManagedNetwork Swagger (#7035)

* UpdateManagedNetworkSwagger * rename required type * Update readme.md * Update readme.md
Azure · Aug 28, 2019 · 961312c · 961312c
1 parent af43231
commit 961312c
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 40 deletions.
diff --git a/...ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksGet.json b/...ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksGet.json
@@ -12,7 +12,7 @@
         "name": "myManagedNetwork",
         "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork",
         "type": "Microsoft.ManagedNetwork/managedNetworks",
-        "tags": {},
+        "tags": [],
         "location": "eastus",
         "properties": {
           "provisioningState": "Succeeded",

diff --git a/...review/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListByResourceGroup.json b/...review/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListByResourceGroup.json
@@ -13,7 +13,7 @@
             "name": "myManagedNetwork",
             "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork",
             "type": "Microsoft.ManagedNetwork/managedNetworks",
-            "tags": {},
+            "tags": [],
             "location": "eastus",
             "properties": {
               "provisioningState": "Succeeded",

diff --git a/...preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListBySubscription.json b/...preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListBySubscription.json
@@ -12,7 +12,7 @@
             "name": "myManagedNetwork",
             "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork",
             "type": "Microsoft.ManagedNetwork/managedNetworks",
-            "tags": {},
+            "tags": [],
             "location": "eastus",
             "properties": {
               "provisioningState": "Succeeded",

diff --git a/...nagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPatch.json b/...nagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPatch.json
@@ -6,7 +6,7 @@
     "resourceGroupName": "myResourceGroup",
     "managedNetworkName": "myManagedNetwork",
     "parameters": {
-      "tags": {}
+      "tags": []
     }
   },
   "responses": {
@@ -15,7 +15,7 @@
         "name": "myManagedNetwork",
         "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork",
         "type": "Microsoft.ManagedNetwork/managedNetworks",
-        "tags": {},
+        "tags": [],
         "location": "eastus",
         "properties": {
           "provisioningState": "Succeeded",
@@ -66,7 +66,7 @@
         "name": "myManagedNetwork",
         "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork",
         "type": "Microsoft.ManagedNetwork/managedNetworks",
-        "tags": {},
+        "tags": [],
         "location": "eastus",
         "properties": {
           "provisioningState": "Succeeded",

diff --git a/...ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPut.json b/...ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPut.json
@@ -6,7 +6,7 @@
     "resourceGroupName": "myResourceGroup",
     "managedNetworkName": "myManagedNetwork",
     "managedNetwork": {
-      "tags": {},
+      "tags": [],
       "location": "eastus",
       "properties": {
         "scope": {
@@ -52,7 +52,7 @@
         "name": "myManagedNetwork",
         "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork",
         "type": "Microsoft.ManagedNetwork/managedNetworks",
-        "tags": {},
+        "tags": [],
         "location": "eastus",
         "properties": {
           "provisioningState": "Succeeded",
@@ -103,7 +103,7 @@
         "name": "myManagedNetwork",
         "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork",
         "type": "Microsoft.ManagedNetwork/managedNetworks",
-        "tags": {},
+        "tags": [],
         "location": "eastus",
         "properties": {
           "provisioningState": "Succeeded",

diff --git a/...-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesGet.json b/...-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesGet.json
@@ -16,7 +16,7 @@
         "properties": {
           "provisioningState": "Succeeded",
           "etag": "asdf-asdf-asdf2",
-          "peeringPolicyType": "HubAndSpokeTopology",
+          "type": "HubAndSpokeTopology",
           "hub": {
             "id": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet"
           },

diff --git a/...amples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesListByManagedNetwork.json b/...amples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesListByManagedNetwork.json
@@ -17,7 +17,7 @@
             "properties": {
               "provisioningState": "Succeeded",
               "etag": "asdf-asdf-asdf2",
-              "peeringPolicyType": "HubAndSpokeTopology",
+              "type": "HubAndSpokeTopology",
               "hub": {
                 "id": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet"
               },

diff --git a/...-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesPut.json b/...-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesPut.json
@@ -8,7 +8,7 @@
     "managedNetworkPeeringPolicyName": "myHubAndSpoke",
     "managedNetworkPolicy": {
       "properties": {
-        "peeringPolicyType": "HubAndSpokeTopology",
+        "type": "HubAndSpokeTopology",
         "hub": {
           "id": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet"
         },
@@ -29,7 +29,7 @@
         "properties": {
           "provisioningState": "Succeeded",
           "etag": "asdf-asdf-asdf2",
-          "peeringPolicyType": "HubAndSpokeTopology",
+          "type": "HubAndSpokeTopology",
           "hub": {
             "id": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet"
           },
@@ -49,7 +49,7 @@
         "properties": {
           "provisioningState": "Succeeded",
           "etag": "asdf-asdf-asdf2",
-          "peeringPolicyType": "HubAndSpokeTopology",
+          "type": "HubAndSpokeTopology",
           "hub": {
             "id": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet"
           },

diff --git a/.../resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json b/.../resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json
@@ -991,7 +991,6 @@
       "type": "object",
       "properties": {
         "scope": {
-          "readOnly": true,
           "$ref": "#/definitions/Scope",
           "description": "The collection of management groups, subscriptions, virtual networks, and subnets by the Managed Network. This is a read-only property that is reflective of all ScopeAssignments for this Managed Network"
         },
@@ -1012,8 +1011,11 @@
       "type": "object",
       "properties": {
         "tags": {
-          "x-ms-client-flatten": true,
-          "$ref": "#/definitions/TagsObject",
+          "type": "array",
+          "items": {
+                "x-ms-client-flatten": true,
+                "$ref": "#/definitions/TagsObject"
+                },
           "description": "Updates the tags property of the Managed Network"
         }
       },
@@ -1230,9 +1232,8 @@
       "description": "The Managed Network Peering Policy resource"
     },
     "ManagedNetworkPeeringPolicyProperties": {
-      "discriminator": "peeringPolicyType",
       "properties": {
-        "peeringPolicyType": {
+        "type": {
           "type": "string",
           "enum": [
             "HubAndSpokeTopology",
@@ -1269,7 +1270,7 @@
         }
       ],
       "required": [
-        "peeringPolicyType"
+        "type"
       ],
       "description": "Properties of a Managed Network Peering Policy"
     },
@@ -1413,15 +1414,15 @@
       "description": "The resource model definition for a ARM tracked top level resource",
       "properties": {
         "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "x-ms-mutability": [
-            "read",
-            "create",
-            "update"
-          ],
+            "type": "array",
+            "items": {
+                  "type": "string",
+                  "x-ms-mutability": [
+                    "read",
+                    "create",
+                    "update"
+                  ]
+                },
           "description": "Resource tags."
         },
         "location": {
@@ -1460,10 +1461,7 @@
       "description": "Generic pointer to a resource"
     },
     "TagsObject": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      },
+      "type": "string",
       "description": "Resource tags."
     },
     "ResourceProperties": {

diff --git a/specification/managednetwork/resource-manager/readme.md b/specification/managednetwork/resource-manager/readme.md
@@ -29,7 +29,7 @@ openapi-type: arm
 tag: package-2019-06-01-preview
 ```
 
-### Tag: package-2019-03-01-preview
+### Tag: package-2019-06-01-preview
 
 These settings apply only when `--tag=package-2019-06-01-preview` is specified on the command line.
 
@@ -54,25 +54,31 @@ swagger-to-sdk:
   - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
-    after_scripts:
-      - bundle install && rake arm:regen_all_profiles['azure_mgmt_managed_network']
 ```
 
+## C#
+These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
-## Multi-API/Profile support for AutoRest v3 generators 
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION
+  namespace: Microsoft.Azure.Management.ManagedNetwork
+  clear-output-folder: true
+```
 
+## Multi-API/Profile support for AutoRest v3 generators 
 AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files.
 
 This block is updated by an automatic script. Edits may be lost!
 
 ``` yaml $(tag) == 'all-api-versions' /* autogenerated */
 # include the azure profile definitions from the standard location
 require: $(this-folder)/../../../profiles/readme.md
-
 # all the input files across all versions
 input-file:
   - $(this-folder)/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json
-
 ```
 
 If there are files that should not be in the `all-api-versions` set, 
@@ -82,4 +88,3 @@ uncomment the  `exclude-file` section below and add the file paths.
 #exclude-file: 
 #  - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json
 ```
-