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

Fix duplicate path in old Network API versions (Network January branch) #5003

Merged
merged 1 commit into from
Jan 9, 2019
Merged

Fix duplicate path in old Network API versions (Network January branch) #5003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 37 additions & 39 deletions ...n/network/resource-manager/Microsoft.Network/stable/2015-06-15/virtualNetworkGateway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,45 +437,6 @@
"x-ms-long-running-operation": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{connectionSharedKeyName}/sharedkey": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@number213 can you explain how you are fixing duplicate nw paths here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are two duplicate paths in old API versions

  • GET /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{connectionSharedKeyName}/sharedkey
  • PUT /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey

I moved them under one entry, like it's done in newer API versions

"get": {
"tags": [
"VirtualNetworkGatewayConnections"
],
"operationId": "VirtualNetworkGatewayConnections_GetSharedKey",
"description": "The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.",
"parameters": [
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group."
},
{
"name": "connectionSharedKeyName",
"in": "path",
"required": true,
"type": "string",
"description": "The virtual network gateway connection shared key name."
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/ConnectionSharedKeyResult"
}
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections": {
"get": {
"tags": [
Expand Down Expand Up @@ -616,6 +577,43 @@
}
},
"x-ms-long-running-operation": true
},
"get": {
"tags": [
"VirtualNetworkGatewayConnections"
],
"operationId": "VirtualNetworkGatewayConnections_GetSharedKey",
"description": "The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.",
"parameters": [
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group."
},
{
"name": "virtualNetworkGatewayConnectionName",
"in": "path",
"required": true,
"type": "string",
"description": "The virtual network gateway connection shared key name."
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/ConnectionSharedKeyResult"
}
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways/{localNetworkGatewayName}": {
Expand Down
82 changes: 37 additions & 45 deletions specification/network/resource-manager/Microsoft.Network/stable/2016-03-30/network.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3282,45 +3282,6 @@
"x-ms-long-running-operation": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{connectionSharedKeyName}/sharedkey": {
"get": {
"tags": [
"VirtualNetworkGatewayConnections"
],
"operationId": "VirtualNetworkGatewayConnections_GetSharedKey",
"description": "The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.",
"parameters": [
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group."
},
{
"name": "connectionSharedKeyName",
"in": "path",
"required": true,
"type": "string",
"description": "The virtual network gateway connection shared key name."
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/ConnectionSharedKeyResult"
}
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections": {
"get": {
"tags": [
Expand Down Expand Up @@ -3461,6 +3422,43 @@
}
},
"x-ms-long-running-operation": true
},
"get": {
"tags": [
"VirtualNetworkGatewayConnections"
],
"operationId": "VirtualNetworkGatewayConnections_GetSharedKey",
"description": "The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.",
"parameters": [
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group."
},
{
"name": "virtualNetworkGatewayConnectionName",
"in": "path",
"required": true,
"type": "string",
"description": "The virtual network gateway connection shared key name."
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/ConnectionSharedKeyResult"
}
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}": {
Expand Down Expand Up @@ -5146,9 +5144,6 @@
"description": "path ."
}
},
"required": [
"nextHopType"
],
"description": "The routes table associated with the ExpressRouteCircuit"
},
"ExpressRouteCircuitsRoutesTableListResult": {
Expand Down Expand Up @@ -5192,9 +5187,6 @@
"description": "Current state of the BGP session, and the number of prefixes that have been received from a neighbor or peer group."
}
},
"required": [
"nextHopType"
],
"description": "The routes table associated with the ExpressRouteCircuit"
},
"ExpressRouteCircuitsRoutesTableSummaryListResult": {
Expand Down
82 changes: 37 additions & 45 deletions specification/network/resource-manager/Microsoft.Network/stable/2016-06-01/network.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3564,45 +3564,6 @@
"x-ms-long-running-operation": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{connectionSharedKeyName}/sharedkey": {
"get": {
"tags": [
"VirtualNetworkGatewayConnections"
],
"operationId": "VirtualNetworkGatewayConnections_GetSharedKey",
"description": "The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.",
"parameters": [
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group."
},
{
"name": "connectionSharedKeyName",
"in": "path",
"required": true,
"type": "string",
"description": "The virtual network gateway connection shared key name."
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/ConnectionSharedKeyResult"
}
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections": {
"get": {
"tags": [
Expand Down Expand Up @@ -3743,6 +3704,43 @@
}
},
"x-ms-long-running-operation": true
},
"get": {
"tags": [
"VirtualNetworkGatewayConnections"
],
"operationId": "VirtualNetworkGatewayConnections_GetSharedKey",
"description": "The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.",
"parameters": [
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group."
},
{
"name": "virtualNetworkGatewayConnectionName",
"in": "path",
"required": true,
"type": "string",
"description": "The virtual network gateway connection shared key name."
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/ConnectionSharedKeyResult"
}
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}": {
Expand Down Expand Up @@ -5557,9 +5555,6 @@
"description": "path ."
}
},
"required": [
"nextHopType"
],
"description": "The routes table associated with the ExpressRouteCircuit"
},
"ExpressRouteCircuitsRoutesTableListResult": {
Expand Down Expand Up @@ -5603,9 +5598,6 @@
"description": "Current state of the BGP session, and the number of prefixes that have been received from a neighbor or peer group."
}
},
"required": [
"nextHopType"
],
"description": "The routes table associated with the ExpressRouteCircuit"
},
"ExpressRouteCircuitsRoutesTableSummaryListResult": {
Expand Down