Add Service Association Link and IP Configuration Profiles on Subnet (#…

…3840) * add service association links for virtual network * add ipconfig profiles on subnet * fixed example issue * Review for tabfix and properties fromat rename
Azure · Sep 10, 2018 · c60ac4a · c60ac4a
1 parent e9e8c83
commit c60ac4a
Show file tree

Hide file tree

Showing 2 changed files with 129 additions and 2 deletions.
diff --git a/...osoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json b/...osoft.Network/stable/2018-08-01/examples/VirtualNetworkGetWithServiceAssociationLink.json
@@ -0,0 +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": []
+        }
+      }
+    }
+  }
+}
diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2018-08-01/virtualNetwork.json b/...fication/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": {
+    "ServiceAssociationLinkPropertiesFormat": {
+      "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/ServiceAssociationLinkPropertiesFormat",
+          "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": {
@@ -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": {