From 0139e0a3654bd29b3b57c15ad7f73ea66d9d847a Mon Sep 17 00:00:00 2001 From: Rupali Vohra Date: Fri, 31 Aug 2018 12:28:51 -0700 Subject: [PATCH] Fixing properties in Swagger & updating examples to reflect fixes --- .../examples/SubnetCreateWithDelegation.json | 12 ++++++++---- .../examples/SubnetGetWithDelegation.json | 6 ++++-- ...VirtualNetworkCreateSubnetWithDelegation.json | 6 ++++-- .../VirtualNetworkGetWithSubnetDelegation.json | 6 ++++-- .../stable/2018-08-01/virtualNetwork.json | 16 ++++++++++++++++ 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetCreateWithDelegation.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetCreateWithDelegation.json index 44db2bd9e992..bb98bfedc51d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetCreateWithDelegation.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetCreateWithDelegation.json @@ -27,11 +27,13 @@ "provisioningState": "Succeeded", "serviceName": "Microsoft.Provider/resourceType", "actions": [] - } + }, + "type": "Microsoft.Network/virtualNetworks/subnets/delegations" } ], "purpose": "" - } + }, + "type": "Microsoft.Network/virtualNetworks/subnets" } }, "201": { @@ -49,11 +51,13 @@ "provisioningState": "Succeeded", "serviceName": "Microsoft.Provider/resourceType", "actions": [] - } + }, + "type": "Microsoft.Network/virtualNetworks/subnets/delegations" } ], "purpose": "" - } + }, + "type": "Microsoft.Network/virtualNetworks/subnets" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetGetWithDelegation.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetGetWithDelegation.json index 016b786df522..36ce7c6131d1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetGetWithDelegation.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/SubnetGetWithDelegation.json @@ -22,11 +22,13 @@ "provisioningState": "Succeeded", "serviceName": "Microsoft.Provider/resourceType", "actions": [] - } + }, + "type": "Microsoft.Network/virtualNetworks/subnets/delegations" } ], "purpose": "" - } + }, + "type": "Microsoft.Network/virtualNetworks/subnets" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkCreateSubnetWithDelegation.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkCreateSubnetWithDelegation.json index 11284da69939..429543c0e42b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkCreateSubnetWithDelegation.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkCreateSubnetWithDelegation.json @@ -59,11 +59,13 @@ "provisioningState": "Succeeded", "serviceName": "Microsoft.Provider/resourceType", "actions": [] - } + }, + "type": "Microsoft.Network/virtualNetworks/subnets/delegations" } ], "purpose": "" - } + }, + "type": "Microsoft.Network/virtualNetworks/subnets" } ], "virtualNetworkPeerings" : [] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithSubnetDelegation.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithSubnetDelegation.json index 9049f496ef5b..61ee8167d8e7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithSubnetDelegation.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithSubnetDelegation.json @@ -39,11 +39,13 @@ "provisioningState": "Succeeded", "serviceName": "Microsoft.Provider/resourceType", "actions": [] - } + }, + "type": "Microsoft.Network/virtualNetworks/subnets/delegations" } ], "purpose": "" - } + }, + "type": "Microsoft.Network/virtualNetworks/subnets" } ], "virtualNetworkPeerings" : [] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/virtualNetwork.json index ec6b05252b2c..e90faf2cef0f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/virtualNetwork.json @@ -870,6 +870,17 @@ "serviceName": { "type": "string", "description": "The name of the service to whom the subnet should be delegated (e.g. Microsoft.Sql/servers)" + }, + "actions": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Describes the actions permitted to the service upon delegation" + }, + "provisioningState": { + "type": "string", + "description": "The provisioning state of the resource." } }, "description": "Properties of a service delegation." @@ -890,6 +901,11 @@ "description": "A unique read-only string that changes whenever the resource is updated." } }, + "allOf": [ + { + "$ref": "./network.json#/definitions/SubResource" + } + ], "description": "Details the service to which the subnet is delegated." }, "SubnetPropertiesFormat": {