Skip to content

Resource Navigation Link and Service Association Link merge issues #6074

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

Merged
dsgouda merged 3 commits into from
May 23, 2019
Merged

Resource Navigation Link and Service Association Link merge issues #6074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d69c51
Added missed features
EvgenyAgafonchikov May 21, 2019
6fe24d7
Fix validation issues
May 22, 2019
c2754f9
Mark nextLink as read only
May 22, 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
28 changes: 28 additions & 0 deletions ...icrosoft.Network/stable/2019-04-01/examples/VirtualNetworkGetResourceNavigationLinks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parameters": {
"api-version": "2019-04-01",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"virtualNetworkName": "vnet",
"subnetName": "subnet"
},
"responses": {
"200": {
"body": {
"value": [
{
"name": "redisCache_redis-tester",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet/resourceNavigationLinks/redisCache_redis-tester",
"etag": "W/\"00000000-0000-0000-0000-000000000000\"",
"type": "Microsoft.Network/virtualNetworks/subnets/resourceNavigationLinks",
"properties": {
"provisioningState": "Succeeded",
"linkedResourceType": "Microsoft.Cache/redis",
"link": "/subscriptions/subid/resourceGroups/another-rg/providers/Microsoft.Cache/Redis/redis-tester"
}
}
]
}
}
}
}
31 changes: 31 additions & 0 deletions ...icrosoft.Network/stable/2019-04-01/examples/VirtualNetworkGetServiceAssociationLinks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"parameters": {
"api-version": "2019-04-01",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"virtualNetworkName": "vnet",
"subnetName": "subnet"
},
"responses": {
"200": {
"body": {
"value": [
{
"name": "acisal",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet/serviceAssociationLinks/acisal",
"etag": "W/\"00000000-0000-0000-0000-000000000000\"",
"type": "Microsoft.Network/virtualNetworks/subnets/serviceAssociationLinks",
"properties": {
"provisioningState": "Succeeded",
"linkedResourceType": "Microsoft.ContainerInstance/containerGroups",
"allowDelete": true,
"locations": [
"westus"
]
}
}
]
}
}
}
}
151 changes: 151 additions & 0 deletions ...fication/network/resource-manager/Microsoft.Network/stable/2019-04-01/virtualNetwork.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,98 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/ResourceNavigationLinks": {
"get": {
"operationId": "ResourceNavigationLinks_List",
"description": "Gets a list of resource navigation links for a subnet.",
"parameters": [
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group."
},
{
"name": "virtualNetworkName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the virtual network."
},
{
"name": "subnetName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the subnet."
},
{
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "Request successful. The operation returns a list of resource navigation links for the subnet.",
"schema": {
"$ref": "#/definitions/ResourceNavigationLinksListResult"
}
}
},
"x-ms-examples": {
"Get Resource Navigation Links": { "$ref": "./examples/VirtualNetworkGetResourceNavigationLinks.json" }
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/ServiceAssociationLinks": {
"get": {
"operationId": "ServiceAssociationLinks_List",
"description": "Gets a list of service association links for a subnet.",
"parameters": [
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group."
},
{
"name": "virtualNetworkName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the virtual network."
},
{
"name": "subnetName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the subnet."
},
{
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "Request successful. The operation returns a list of service association links for the subnet.",
"schema": {
"$ref": "#/definitions/ServiceAssociationLinksListResult"
}
}
},
"x-ms-examples": {
"Get Service Association Links": { "$ref": "./examples/VirtualNetworkGetServiceAssociationLinks.json" }
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets": {
"get": {
"tags": [
Expand Down Expand Up @@ -916,6 +1008,17 @@
"readOnly": true,
"type": "string",
"description": "Provisioning state of the ServiceAssociationLink resource."
},
"allowDelete": {
"type": "boolean",
"description": "If true, the resource can be deleted."
},
"locations": {
"type": "array",
"items": {
"type": "string"
},
"description": "A list of locations."
}
},
"description": "Properties of ServiceAssociationLink."
Expand All @@ -935,6 +1038,10 @@
"readOnly": true,
"type": "string",
"description": "A unique read-only string that changes whenever the resource is updated."
},
"type": {
"type": "string",
"description": "Resource type"
}
},
"allOf": [
Expand Down Expand Up @@ -973,10 +1080,20 @@
"type": "string",
"description": "Name of the resource that is unique within a resource group. This name can be used to access the resource."
},
"id": {
"type": "string",
"readOnly": true,
"description": "Resource navigation link identifier."
},
"etag": {
"readOnly": true,
"type": "string",
"description": "A unique read-only string that changes whenever the resource is updated."
},
"type": {
"readOnly": true,
"type": "string",
"description": "Resource type"
}
},
"allOf": [
Expand Down Expand Up @@ -1254,6 +1371,40 @@
},
"description": "Response for ListSubnets API service callRetrieves all subnet that belongs to a virtual network."
},
"ResourceNavigationLinksListResult": {
"properties": {
"value": {
"type": "array",
"items": {
"$ref": "#/definitions/ResourceNavigationLink"
},
"description": "The resource navigation links in a subnet."
},
"nextLink": {
"type": "string",
"readOnly": true,
"description": "The URL to get the next set of results."
}
},
"description": "Response for ResourceNavigationLinks_List operation."
},
"ServiceAssociationLinksListResult": {
"properties": {
"value": {
"type": "array",
"items": {
"$ref": "#/definitions/ServiceAssociationLink"
},
"description": "The service association links in a subnet."
},
"nextLink": {
"type": "string",
"readOnly": true,
"description": "The URL to get the next set of results."
}
},
"description": "Response for ServiceAssociationLinks_List operation."
},
"VirtualNetworkPeeringListResult": {
"properties": {
"value": {
Expand Down