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

Update ManagedNetwork Swagger #7035

Merged
merged 5 commits into from
Aug 28, 2019
Merged

Update ManagedNetwork Swagger #7035

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3a136d
Merge pull request #1 from Azure/master
yanfa317 Aug 23, 2019
d309cca
UpdateManagedNetworkSwagger
yanfa317 Aug 23, 2019
d00ef20
rename required type
yanfa317 Aug 23, 2019
79eb876
Update readme.md
fearthecowboy Aug 27, 2019
1f55923
Update readme.md
fearthecowboy Aug 27, 2019
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
2 changes: 1 addition & 1 deletion ...ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...review/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions ...nagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPatch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"resourceGroupName": "myResourceGroup",
"managedNetworkName": "myManagedNetwork",
"parameters": {
"tags": {}
"tags": []
}
},
"responses": {
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions ...ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"resourceGroupName": "myResourceGroup",
"managedNetworkName": "myManagedNetwork",
"managedNetwork": {
"tags": {},
"tags": [],
"location": "eastus",
"properties": {
"scope": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion ...amples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesListByManagedNetwork.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions ...-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"managedNetworkPeeringPolicyName": "myHubAndSpoke",
"managedNetworkPolicy": {
"properties": {
"peeringPolicyType": "HubAndSpokeTopology",
"type": "HubAndSpokeTopology",
"hub": {
"id": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet"
},
Expand All @@ -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"
},
Expand All @@ -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"
},
Expand Down
36 changes: 17 additions & 19 deletions .../resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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"
}
},
Expand Down Expand Up @@ -1230,9 +1232,8 @@
"description": "The Managed Network Peering Policy resource"
},
"ManagedNetworkPeeringPolicyProperties": {
"discriminator": "peeringPolicyType",
"properties": {
"peeringPolicyType": {
"type": {
"type": "string",
"enum": [
"HubAndSpokeTopology",
Expand Down Expand Up @@ -1269,7 +1270,7 @@
}
],
"required": [
"peeringPolicyType"
"type"
],
"description": "Properties of a Managed Network Peering Policy"
},
Expand Down Expand Up @@ -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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As this is a breaking change, is the APIs for 2019-06-01-preview already released?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lirenhe, we are still doing internal test. Currently I am the only user for this api.

"items": {
"type": "string",
"x-ms-mutability": [
"read",
"create",
"update"
]
},
"description": "Resource tags."
},
"location": {
Expand Down Expand Up @@ -1460,10 +1461,7 @@
"description": "Generic pointer to a resource"
},
"TagsObject": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"type": "string",
"description": "Resource tags."
},
"ResourceProperties": {
Expand Down
34 changes: 10 additions & 24 deletions specification/managednetwork/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -54,32 +54,18 @@ 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#

## Multi-API/Profile support for AutoRest v3 generators
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>`.

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,
uncomment the `exclude-file` section below and add the file paths.

``` yaml $(tag) == 'all-api-versions'
#exclude-file:
# - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json
``` yaml $(csharp)
csharp:
azure-arm: true
license-header: MICROSOFT_MIT_NO_VERSION
namespace: Microsoft.Azure.Management.ManagedNetwork
clear-output-folder: true
```