From 26e8a0c37f0fbbcf1c9d628b80b45f2e9de0a68d Mon Sep 17 00:00:00 2001 From: Jack Knudson Date: Fri, 7 Sep 2018 15:04:31 -0700 Subject: [PATCH 1/4] add service association links for virtual network --- ...lNetworkGetWithServiceAssociationLink.json | 64 +++++++++++++++++++ .../stable/2018-08-01/virtualNetwork.json | 54 +++++++++++++++- 2 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json new file mode 100644 index 000000000000..107fe8aebfda --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json @@ -0,0 +1,64 @@ +{ + "parameters": { + "api-version": "2018-08-01", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "virtualNetworkName": "test-vnet" + }, + "responses": { + "200": { + "body": { + "name": "test-vnet", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet", + "type": "Microsoft.Network/virtualNetworks", + "location": "westus", + "properties": { + "provisioningState": "Succeeded", + "addressSpace": { + "addressPrefixes": [ + "10.0.0.0/16" + ] + }, + "subnets": [ + { + "name": "subnet1", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1", + "etag": "W/\"4d3e91b4-f67f-48be-880b-e4a8abdd019e\"", + "properties": { + "provisioningState": "Succeeded", + "addressPrefix": "10.0.214.0/24", + "serviceAssociationLinks": [ + { + "name": "serviceAssociationLink1", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1/serviceAssociationLinks/serviceAssociationLink1", + "etag": "W/\"4d3e91b4-f67f-48be-880b-e4a8abdd019e\"", + "properties": { + "provisioningState": "Succeeded", + "linkedResourceType": "Microsoft.Provider/resourceType" + } + } + ], + "serviceEndpoints": [], + "delegations": [ + { + "name": "aciDelegation", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1/delegations/aciDelegation", + "etag": "W/\"4d3e91b4-f67f-48be-880b-e4a8abdd019e\"", + "properties": { + "provisioningState": "Succeeded", + "serviceName": "Microsoft.Provider/resourceType", + "actions": [ + "Microsoft.Network/virtualNetworks/subnets/action" + ] + } + } + ] + } + } + ], + "virtualNetworkPeerings": [] + } + } + } + } +} \ No newline at end of file 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 eef7f9c5a3a5..927f09881f8d 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 @@ -124,7 +124,8 @@ }, "x-ms-examples": { "Get virtual network": { "$ref": "./examples/VirtualNetworkGet.json" }, - "Get virtual network with a delegated subnet": { "$ref": "./examples/VirtualNetworkGetWithSubnetDelegation.json" } + "Get virtual network with a delegated subnet": { "$ref": "./examples/VirtualNetworkGetWithSubnetDelegation.json" }, + "Get virtual network with service association links": { "$ref": "./examples/VirtualNetworkGetWithServiceAssociationLink.json" } } }, "put": { @@ -184,7 +185,7 @@ "Create virtual network with subnet": { "$ref": "./examples/VirtualNetworkCreateSubnet.json" }, "Create virtual network with subnet containing address prefixes": { "$ref": "./examples/VirtualNetworkCreateSubnetWithAddressPrefixes.json" }, "Create virtual network with service endpoints": { "$ref": "./examples/VirtualNetworkCreateServiceEndpoints.json" }, - "Create virtual network with delegated subnets": { "$ref": "./examples/VirtualNetworkCreateSubnetWithDelegation.json"} + "Create virtual network with delegated subnets": { "$ref": "./examples/VirtualNetworkCreateSubnetWithDelegation.json" } } }, "patch": { @@ -823,6 +824,48 @@ } }, "definitions": { + "ServiceAssociationLinkFormat": { + "properties": { + "linkedResourceType": { + "type": "string", + "description": "Resource type of the linked resource." + }, + "link": { + "type": "string", + "description": "Link to the external resource." + }, + "provisioningState": { + "readOnly": true, + "type": "string", + "description": "Provisioning state of the ServiceAssociationLink resource." + } + }, + "description": "Properties of ServiceAssociationLink." + }, + "ServiceAssociationLink": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ServiceAssociationLinkFormat", + "description": "Resource navigation link properties format." + }, + "name": { + "type": "string", + "description": "Name of the resource that is unique within a resource group. This name can be used to access the resource." + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "A unique read-only string that changes whenever the resource is updated." + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/SubResource" + } + ], + "description": "ServiceAssociationLink resource." + }, "ResourceNavigationLinkFormat": { "properties": { "linkedResourceType": { @@ -966,6 +1009,13 @@ }, "description": "Gets an array of references to the external resources using subnet." }, + "serviceAssociationLinks": { + "type": "array", + "items": { + "$ref": "#/definitions/ServiceAssociationLink" + }, + "description": "Gets an array of references to services injecting into this subnet." + }, "delegations": { "type": "array", "items": { From 4a663e4cf1d9d39203a09799202eb42b4eda604f Mon Sep 17 00:00:00 2001 From: Jack Knudson Date: Fri, 7 Sep 2018 15:22:38 -0700 Subject: [PATCH 2/4] add ipconfig profiles on subnet --- .../VirtualNetworkGetWithServiceAssociationLink.json | 11 ++++++++--- .../stable/2018-08-01/virtualNetwork.json | 8 ++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json index 107fe8aebfda..51add2794503 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json @@ -26,7 +26,12 @@ "etag": "W/\"4d3e91b4-f67f-48be-880b-e4a8abdd019e\"", "properties": { "provisioningState": "Succeeded", - "addressPrefix": "10.0.214.0/24", + "addressPrefix": "10.0.214.0/24", + "ipConfigurationProfiles": [ + { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkProfiles/networkProfile1/containerNetworkInterfaceConfigurations/eth0/ipConfigurations/ipconfigprofile1" + } + ], "serviceAssociationLinks": [ { "name": "serviceAssociationLink1", @@ -50,10 +55,10 @@ "actions": [ "Microsoft.Network/virtualNetworks/subnets/action" ] - } + }, } ] - } + }, } ], "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 927f09881f8d..76173ee8a4f6 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 @@ -1002,6 +1002,14 @@ }, "description": "Gets an array of references to the network interface IP configurations using subnet." }, + "ipConfigurationProfiles": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "./networkProfile.json#/definitions/IPConfigurationProfile" + }, + "description": "Array of IP configuration profiles which reference this subnet." + }, "resourceNavigationLinks": { "type": "array", "items": { From aa04ea5bf6346296912c9ce0289eea1cf1269008 Mon Sep 17 00:00:00 2001 From: Jack Knudson Date: Fri, 7 Sep 2018 16:08:55 -0700 Subject: [PATCH 3/4] fixed example issue --- .../examples/VirtualNetworkGetWithServiceAssociationLink.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json index 51add2794503..1f8c337178e2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json @@ -55,10 +55,10 @@ "actions": [ "Microsoft.Network/virtualNetworks/subnets/action" ] - }, + } } ] - }, + } } ], "virtualNetworkPeerings": [] From 1b9baca4130ea74d946c6df3e0999728e0ca7c3e Mon Sep 17 00:00:00 2001 From: Jack Knudson Date: Mon, 10 Sep 2018 13:05:26 -0700 Subject: [PATCH 4/4] Review for tabfix and properties fromat rename --- ...lNetworkGetWithServiceAssociationLink.json | 134 +++++++++--------- .../stable/2018-08-01/virtualNetwork.json | 4 +- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json index 1f8c337178e2..1fee9228e08e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json @@ -1,69 +1,69 @@ { - "parameters": { - "api-version": "2018-08-01", - "subscriptionId": "subId", - "resourceGroupName": "rg1", - "virtualNetworkName": "test-vnet" - }, - "responses": { - "200": { - "body": { - "name": "test-vnet", - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet", - "type": "Microsoft.Network/virtualNetworks", - "location": "westus", - "properties": { - "provisioningState": "Succeeded", - "addressSpace": { - "addressPrefixes": [ - "10.0.0.0/16" - ] - }, - "subnets": [ - { - "name": "subnet1", - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1", - "etag": "W/\"4d3e91b4-f67f-48be-880b-e4a8abdd019e\"", - "properties": { - "provisioningState": "Succeeded", - "addressPrefix": "10.0.214.0/24", - "ipConfigurationProfiles": [ - { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkProfiles/networkProfile1/containerNetworkInterfaceConfigurations/eth0/ipConfigurations/ipconfigprofile1" - } - ], - "serviceAssociationLinks": [ - { - "name": "serviceAssociationLink1", - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1/serviceAssociationLinks/serviceAssociationLink1", - "etag": "W/\"4d3e91b4-f67f-48be-880b-e4a8abdd019e\"", - "properties": { - "provisioningState": "Succeeded", - "linkedResourceType": "Microsoft.Provider/resourceType" - } - } - ], - "serviceEndpoints": [], - "delegations": [ - { - "name": "aciDelegation", - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1/delegations/aciDelegation", - "etag": "W/\"4d3e91b4-f67f-48be-880b-e4a8abdd019e\"", - "properties": { - "provisioningState": "Succeeded", - "serviceName": "Microsoft.Provider/resourceType", - "actions": [ - "Microsoft.Network/virtualNetworks/subnets/action" - ] - } - } - ] - } - } - ], - "virtualNetworkPeerings": [] - } - } - } - } + "parameters": { + "api-version": "2018-08-01", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "virtualNetworkName": "test-vnet" + }, + "responses": { + "200": { + "body": { + "name": "test-vnet", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet", + "type": "Microsoft.Network/virtualNetworks", + "location": "westus", + "properties": { + "provisioningState": "Succeeded", + "addressSpace": { + "addressPrefixes": [ + "10.0.0.0/16" + ] + }, + "subnets": [ + { + "name": "subnet1", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1", + "etag": "W/\"4d3e91b4-f67f-48be-880b-e4a8abdd019e\"", + "properties": { + "provisioningState": "Succeeded", + "addressPrefix": "10.0.214.0/24", + "ipConfigurationProfiles": [ + { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkProfiles/networkProfile1/containerNetworkInterfaceConfigurations/eth0/ipConfigurations/ipconfigprofile1" + } + ], + "serviceAssociationLinks": [ + { + "name": "serviceAssociationLink1", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1/serviceAssociationLinks/serviceAssociationLink1", + "etag": "W/\"4d3e91b4-f67f-48be-880b-e4a8abdd019e\"", + "properties": { + "provisioningState": "Succeeded", + "linkedResourceType": "Microsoft.Provider/resourceType" + } + } + ], + "serviceEndpoints": [], + "delegations": [ + { + "name": "aciDelegation", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1/delegations/aciDelegation", + "etag": "W/\"4d3e91b4-f67f-48be-880b-e4a8abdd019e\"", + "properties": { + "provisioningState": "Succeeded", + "serviceName": "Microsoft.Provider/resourceType", + "actions": [ + "Microsoft.Network/virtualNetworks/subnets/action" + ] + } + } + ] + } + } + ], + "virtualNetworkPeerings": [] + } + } + } + } } \ No newline at end of file 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 76173ee8a4f6..6f9d433fbccc 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 @@ -824,7 +824,7 @@ } }, "definitions": { - "ServiceAssociationLinkFormat": { + "ServiceAssociationLinkPropertiesFormat": { "properties": { "linkedResourceType": { "type": "string", @@ -846,7 +846,7 @@ "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/ServiceAssociationLinkFormat", + "$ref": "#/definitions/ServiceAssociationLinkPropertiesFormat", "description": "Resource navigation link properties format." }, "name": {