Resource Navigation Link and Service Association Link merge issues (#…

…6074) * Added missed features * Fix validation issues * Mark nextLink as read only
Azure · May 23, 2019 · e3d845c · e3d845c
1 parent b03ac09
commit e3d845c
Show file tree

Hide file tree

Showing 3 changed files with 210 additions and 0 deletions.
diff --git a/...icrosoft.Network/stable/2019-04-01/examples/VirtualNetworkGetResourceNavigationLinks.json b/...icrosoft.Network/stable/2019-04-01/examples/VirtualNetworkGetResourceNavigationLinks.json
@@ -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"
+            }
+          }
+        ]
+}
+    }
+  }
+}
diff --git a/...icrosoft.Network/stable/2019-04-01/examples/VirtualNetworkGetServiceAssociationLinks.json b/...icrosoft.Network/stable/2019-04-01/examples/VirtualNetworkGetServiceAssociationLinks.json
@@ -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"
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2019-04-01/virtualNetwork.json b/...fication/network/resource-manager/Microsoft.Network/stable/2019-04-01/virtualNetwork.json
@@ -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": [
@@ -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."
@@ -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": [
@@ -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": [
@@ -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": {