From 51c317658f7bed11719c9d48aeeb12ec74a12d44 Mon Sep 17 00:00:00 2001 From: Farhan Syed Date: Wed, 15 May 2019 15:05:35 -0700 Subject: [PATCH 1/2] add type field to child resources, fix routefilter def. add ipv6 peering in routefilter --- .../2019-04-01/expressRouteCircuit.json | 31 ++++++++++++++++++- .../stable/2019-04-01/routeFilter.json | 7 +++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/expressRouteCircuit.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/expressRouteCircuit.json index 3f0455d3f0b6..59a8c2df4de6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/expressRouteCircuit.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/expressRouteCircuit.json @@ -1441,6 +1441,11 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." } }, "allOf": [ @@ -1571,6 +1576,15 @@ }, "description": "Contains stats associated with the peering." }, + "RouteFilterReference": { + "properties": { + "id": { + "type":"string", + "description": "Corresponding route filter Id." + } + }, + "description": "Reference to a route filter." + }, "ExpressRouteCircuitPeeringPropertiesFormat": { "properties": { "peeringType": { @@ -1639,7 +1653,7 @@ "description": "Gets whether the provider or the customer last modified the peering." }, "routeFilter": { - "$ref": "./routeFilter.json#/definitions/RouteFilter", + "$ref": "#/definitions/RouteFilterReference", "description": "The reference of the RouteFilter resource." }, "ipv6PeeringConfig": { @@ -1683,6 +1697,11 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." } }, "allOf": [ @@ -1778,6 +1797,11 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." } }, "allOf": [ @@ -1852,6 +1876,11 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." } }, "allOf": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/routeFilter.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/routeFilter.json index d07d22e0e395..9aa90e2285e0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/routeFilter.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/routeFilter.json @@ -687,6 +687,13 @@ }, "description": "A collection of references to express route circuit peerings." }, + "ipv6Peerings": { + "type": "array", + "items": { + "$ref": "./expressRouteCircuit.json#/definitions/ExpressRouteCircuitPeering" + }, + "description": "A collection of references to express route circuit ipv6 peerings." + }, "provisioningState": { "type": "string", "readOnly": true, From ac2fbb32f4b936e10e0bc4995508310c6e216ec7 Mon Sep 17 00:00:00 2001 From: Farhan Syed Date: Wed, 15 May 2019 16:03:56 -0700 Subject: [PATCH 2/2] updated examples --- .../examples/ExpressRouteCircuitAuthorizationGet.json | 3 ++- .../examples/ExpressRouteCircuitConnectionGet.json | 3 ++- .../2019-04-01/examples/ExpressRouteCircuitPeeringGet.json | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitAuthorizationGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitAuthorizationGet.json index 4f1df3267145..3d1a7fe05f21 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitAuthorizationGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitAuthorizationGet.json @@ -15,7 +15,8 @@ "provisioningState": "Succeeded", "authorizationKey": "authKey", "authorizationUseStatus": "Available" - } + }, + "type": "Microsoft.Network/expressRouteCircuits/authorizations" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitConnectionGet.json index c4ff1699c47b..88687279571d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitConnectionGet.json @@ -24,7 +24,8 @@ "addressPrefix": "10.0.0.0/24", "circuitConnectionStatus": "Connected", "provisioningState":"Succeeded" - } + }, + "type": "Microsoft.Network/expressRouteCircuits/peerings/connections" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitPeeringGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitPeeringGet.json index 28ff1415f818..93b92d3a612e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitPeeringGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitPeeringGet.json @@ -48,8 +48,12 @@ "legacyMode": 0, "routingRegistryName": "ARIN" } + }, + "routeFilter": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/routeFilters/filterName" } - } + }, + "type": "Microsoft.Network/expressRouteCircuits/peerings" } } }