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 type field to child resources. Fix routefilter reference. Add ipv6peering property #5975

Merged
merged 2 commits into from
May 15, 2019
Merged

Add type field to child resources. Fix routefilter reference. Add ipv6peering property #5975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51c3176
add type field to child resources, fix routefilter def. add ipv6 peer…
syfarogh May 15, 2019
ac2fbb3
updated examples
syfarogh May 15, 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
3 changes: 2 additions & 1 deletion ...ger/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitAuthorizationGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"provisioningState": "Succeeded",
"authorizationKey": "authKey",
"authorizationUseStatus": "Available"
}
},
"type": "Microsoft.Network/expressRouteCircuits/authorizations"
}
}
}
3 changes: 2 additions & 1 deletion ...anager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitConnectionGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"addressPrefix": "10.0.0.0/24",
"circuitConnectionStatus": "Connected",
"provisioningState":"Succeeded"
}
},
"type": "Microsoft.Network/expressRouteCircuits/peerings/connections"
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion ...e-manager/Microsoft.Network/stable/2019-04-01/examples/ExpressRouteCircuitPeeringGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@
"legacyMode": 0,
"routingRegistryName": "ARIN"
}
},
"routeFilter": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/routeFilters/filterName"
}
}
},
"type": "Microsoft.Network/expressRouteCircuits/peerings"
}
}
}
31 changes: 30 additions & 1 deletion ...ion/network/resource-manager/Microsoft.Network/stable/2019-04-01/expressRouteCircuit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down
7 changes: 7 additions & 0 deletions specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/routeFilter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down