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

Add Service Association Link and IP Configuration Profiles on Subnet #3840

Merged
merged 4 commits into from
Sep 10, 2018
Merged

Add Service Association Link and IP Configuration Profiles on Subnet #3840

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26e8a0c
add service association links for virtual network
Sep 7, 2018
4a663e4
add ipconfig profiles on subnet
Sep 7, 2018
aa04ea5
fixed example issue
Sep 7, 2018
1b9baca
Review for tabfix and properties fromat rename
Sep 10, 2018
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
69 changes: 69 additions & 0 deletions ...osoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"parameters": {
"api-version": "2018-08-01",
"subscriptionId": "subId",
"resourceGroupName": "rg1",
"virtualNetworkName": "test-vnet"
},
"responses": {
"200": {
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: replace tab with 2 spaces and indent

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Could you clarify? Do you mean tab == 2 spaces (as opposed to 4)? These are already spaces, not tabs.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yep, 2 space tabs instead of 4

"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": []
}
}
}
}
}
62 changes: 60 additions & 2 deletions ...fication/network/resource-manager/Microsoft.Network/stable/2018-08-01/virtualNetwork.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -823,6 +824,48 @@
}
},
"definitions": {
"ServiceAssociationLinkFormat": {
Copy link
Contributor

Choose a reason for hiding this comment

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

A better name would be ServiceAssociationLinkProperties

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, will change this to ServiceAssociationLinkPropertiesFormat, since this appears to be the pattern in the rest of the file.

"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": {
Copy link
Contributor

Choose a reason for hiding this comment

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

Please check if this is readonly

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The name of the service association link should not be marked as read only

"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": {
Expand Down Expand Up @@ -959,13 +1002,28 @@
},
"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": {
"$ref": "#/definitions/ResourceNavigationLink"
},
"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": {
Expand Down