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

VirtualHub : Add Routing State and expose Effective Routes Api #9385

Merged
merged 5 commits into from
May 30, 2020
Merged

VirtualHub : Add Routing State and expose Effective Routes Api #9385

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1af1a62
Add Routing State and expose Effective Routes Api
nagula-ritvika May 7, 2020
d399ca9
updated opId name and added examples
nagula-ritvika May 9, 2020
6e07b0d
prettier fix done
nagula-ritvika May 9, 2020
5bb1398
rename variable to prevent conflict
nagula-ritvika May 10, 2020
d616c6c
Merge branch 'network-may-release' into rinagula/VirtualHub-Swagger-U…
nagula-ritvika May 18, 2020
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 .../network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/VirtualHubGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"virtualNetworkConnections": [],
"virtualHubRouteTableV2s": [],
"addressPrefix": "10.10.1.0/24",
"sku": "Basic"
"sku": "Basic",
"routingState": "Provisioned"
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions ...network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/VirtualHubList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@
}
],
"addressPrefix": "10.10.1.0/24",
"sku": "Basic"
"sku": "Basic",
"routingState": "Provisioned"
}
},
{
Expand Down Expand Up @@ -210,7 +211,8 @@
}
],
"addressPrefix": "210.10.1.0/24",
"sku": "Basic"
"sku": "Basic",
"routingState": "Provisioned"
}
}
]
Expand Down
6 changes: 4 additions & 2 deletions ...e-manager/Microsoft.Network/stable/2020-05-01/examples/VirtualHubListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@
}
],
"addressPrefix": "10.10.1.0/24",
"sku": "Basic"
"sku": "Basic",
"routingState": "Provisioned"
}
},
{
Expand Down Expand Up @@ -211,7 +212,8 @@
}
],
"addressPrefix": "210.10.1.0/24",
"sku": "Basic"
"sku": "Basic",
"routingState": "Provisioned"
}
}
]
Expand Down
6 changes: 4 additions & 2 deletions .../network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/VirtualHubPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"virtualNetworkConnections": [],
"virtualHubRouteTableV2s": [],
"addressPrefix": "10.168.0.0/24",
"sku": "Basic"
"sku": "Basic",
"routingState": "Provisioned"
}
}
},
Expand All @@ -53,7 +54,8 @@
"virtualNetworkConnections": [],
"virtualHubRouteTableV2s": [],
"addressPrefix": "10.168.0.0/24",
"sku": "Basic"
"sku": "Basic",
"routingState": "Provisioned"
}
}
}
Expand Down
135 changes: 135 additions & 0 deletions specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/virtualWan.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3882,6 +3882,66 @@
"nextLinkName": "nextLink"
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/effectiveRoutes": {
"post": {
"operationId": "EffectiveVirtualHubRoutes",
nagula-ritvika marked this conversation as resolved.
Show resolved Hide resolved
"x-ms-examples": {
"EffectiveRouteList": {
"$ref": "./examples/EffectiveRouteList.json"
}
},
"description": "Gets the effective routes configured for the Virtual Hub resource or the specified resource .",
"parameters": [
{
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
},
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The resource group name of the VirtualHub."
},
{
"name": "virtualHubName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the VirtualHub."
},
{
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"name": "effectiveRoutesParameters",
"in": "body",
"required": false,
"schema": {
"$ref": "#/definitions/EffectiveRoutesParameters"
nagula-ritvika marked this conversation as resolved.
Show resolved Hide resolved
},
"description": "Parameters supplied to get the effective routes."
}
],
"responses": {
"200": {
"description": "Request successful. Follow the location header for the effective routes list."
},
"202": {
"description": "Accepted and the operation will complete asynchronously."
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "./network.json#/definitions/CloudError"
}
}
},
"x-ms-long-running-operation": true,
"x-ms-long-running-operation-options": {
"final-state-via": "azure-async-operation"
}
}
}
},
"definitions": {
Expand Down Expand Up @@ -4204,10 +4264,29 @@
"sku": {
"type": "string",
"description": "The sku of this VirtualHub."
},
"routingState": {
"$ref": "#/definitions/RoutingState",
"description": "The routing state."
}
},
"description": "Parameters for VirtualHub."
},
"RoutingState": {
"type": "string",
"description": "The current routing state of the VirtualHub.",
"readOnly": true,
"enum": [
"None",
"Provisioned",
"Provisioning",
"Failed"
],
"x-ms-enum": {
"name": "RoutingState",
"modelAsString": true
}
},
"VirtualHubRouteTable": {
"properties": {
"routes": {
Expand Down Expand Up @@ -5724,6 +5803,62 @@
"description": "The ip address of the next hop."
}
}
},
"EffectiveRouteList": {
nagula-ritvika marked this conversation as resolved.
Show resolved Hide resolved
"description": "EffectiveRoutes List.",
"properties": {
"value": {
"type": "array",
"items": {
"$ref": "#/definitions/EffectiveRoute"
},
"description": "The list of effective routes configured on the virtual hub or the specified resource."
}
}
},
"EffectiveRoute": {
"description": "The effective route.",
"properties": {
"addressPrefixes": {
"description": "The list of address prefixes.",
"type": "array",
"items": {
"type": "string"
}
},
"nextHops": {
"description": "The list of next hops.",
"type": "array",
"items": {
"type": "string"
}
},
"nextHopType": {
"description": "The type of the next hop.",
"type": "string"
},
"asPath": {
"description": "The ASPath of this route.",
"type": "string"
},
"routeOrigin": {
"description": "The origin of this route.",
"type": "string"
}
}
},
"EffectiveRoutesParameters": {
nagula-ritvika marked this conversation as resolved.
Show resolved Hide resolved
"description": "The parameters specifying the resource whose effective routes are being requested.",
"properties": {
"resourceId": {
"$ref": "./network.json#/definitions/Resource",
"description": "The resource."
nagula-ritvika marked this conversation as resolved.
Show resolved Hide resolved
},
"virtualWanResourceType": {
"type": "string",
"description": "The type of the specified resource like RouteTable, ExpressRouteConnection, HubVirtualNetworkConnection, VpnConnection and P2SConnection."
nagula-ritvika marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
}
}