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/Edit Outbound Rule on Load Balancer and Examples #3592

Merged
merged 13 commits into from
Aug 16, 2018
Merged

Add/Edit Outbound Rule on Load Balancer and Examples #3592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3cc4c28
Add/Edit Outbound Rule on Load Balancer and Examples
khannarheams Aug 7, 2018
481039b
Merge branch 'Network-August-Release' into Network-August-Release
sergey-shandar Aug 7, 2018
b2d4971
Merge branch 'Network-August-Release' into Network-August-Release
sergey-shandar Aug 8, 2018
bae0c0d
Merge branch 'Network-August-Release' into Network-August-Release
sergey-shandar Aug 13, 2018
8052cdf
Merge branch 'Network-August-Release' into Network-August-Release
sergey-shandar Aug 14, 2018
bce2d9b
Adding properties enabletcpreset, idletimeoutinminutes and protocol
khannarheams Aug 15, 2018
d772f45
Merge branch 'Network-August-Release' of https://github.com/khannarhe…
khannarheams Aug 15, 2018
5af4f63
Merge branch 'Network-August-Release' into Network-August-Release
sergey-shandar Aug 15, 2018
64995db
Merge branch 'Network-August-Release' into Network-August-Release
sergey-shandar Aug 15, 2018
899ed49
Adding a reference to Public IP Prefix
khannarheams Aug 15, 2018
6fe1cb2
Merge branch 'Network-August-Release' of https://github.com/khannarhe…
khannarheams Aug 15, 2018
5b5a9db
Dummy Commit
khannarheams Aug 16, 2018
496d0d6
Merge branch 'Network-August-Release' into Network-August-Release
sergey-shandar Aug 16, 2018
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
6 changes: 3 additions & 3 deletions ...ork/resource-manager/Microsoft.Network/stable/2018-07-01/examples/LoadBalancerCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
}
],
"inboundNatPools": [],
"outboundNatRules": []
"outboundRules": []
}
}
},
Expand Down Expand Up @@ -212,7 +212,7 @@
}
}
],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
}
Expand Down Expand Up @@ -329,7 +329,7 @@
}
}
],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...e-manager/Microsoft.Network/stable/2018-07-01/examples/LoadBalancerCreateStandardSku.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
}
],
"inboundNatPools": [],
"outboundNatRules": []
"outboundRules": []
}
}
},
Expand Down Expand Up @@ -211,7 +211,7 @@
}
}
],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
}
Expand Down Expand Up @@ -326,7 +326,7 @@
}
}
],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...er/Microsoft.Network/stable/2018-07-01/examples/LoadBalancerCreateWithInboundNatPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatPools/test"
}
],
"outboundNatRules": []
"outboundRules": []
}
}
},
Expand Down Expand Up @@ -84,7 +84,7 @@
"loadBalancingRules": [],
"probes": [],
"inboundNatRules": [],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": [
{
"name": "test",
Expand Down Expand Up @@ -141,7 +141,7 @@
"loadBalancingRules": [],
"probes": [],
"inboundNatRules": [],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": [
{
"name": "test",
Expand Down
6 changes: 3 additions & 3 deletions ...rce-manager/Microsoft.Network/stable/2018-07-01/examples/LoadBalancerCreateWithZones.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
}
],
"inboundNatPools": [],
"outboundNatRules": []
"outboundRules": []
}
}
},
Expand Down Expand Up @@ -210,7 +210,7 @@
}
}
],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
}
Expand Down Expand Up @@ -326,7 +326,7 @@
}
}
],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...etwork/resource-manager/Microsoft.Network/stable/2018-07-01/examples/LoadBalancerGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
}
}
],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...twork/resource-manager/Microsoft.Network/stable/2018-07-01/examples/LoadBalancerList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
}
}
],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
},
Expand All @@ -131,7 +131,7 @@
"loadBalancingRules": [],
"probes": [],
"inboundNatRules": [],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...rk/resource-manager/Microsoft.Network/stable/2018-07-01/examples/LoadBalancerListAll.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
}
}
],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
},
Expand All @@ -130,7 +130,7 @@
"loadBalancingRules": [],
"probes": [],
"inboundNatRules": [],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...resource-manager/Microsoft.Network/stable/2018-07-01/examples/LoadBalancerUpdateTags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
}
}
],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...anager/Microsoft.Network/stable/2018-07-01/examples/NetworkInterfaceLoadBalancerList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
}
}
],
"outboundNatRules": [],
"outboundRules": [],
"inboundNatPools": []
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...tion/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/UsageList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@
},
{
"currentValue": 0.0,
"id": "/subscriptions/subid/providers/Microsoft.Network/locations/westus/usages/OutboundNatRulesPerLoadBalancer",
"id": "/subscriptions/subid/providers/Microsoft.Network/locations/westus/usages/outboundRulesPerLoadBalancer",
"limit": 5.0,
"name": {
"localizedValue": "Outbound NAT Rules per Load Balancer",
"value": "OutboundNatRulesPerLoadBalancer"
"localizedValue": "Outbound Rules per Load Balancer",
"value": "outboundRulesPerLoadBalancer"
},
"unit": "Count"
},
Expand Down
43 changes: 32 additions & 11 deletions specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/loadBalancer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@
},
"description": "Read only. Inbound pools URIs that use this frontend IP."
},
"outboundNatRules": {
"outboundRules": {
"readOnly": true,
"type": "array",
"items": {
Expand Down Expand Up @@ -1017,6 +1017,10 @@
"$ref": "./publicIpAddress.json#/definitions/PublicIPAddress",
"description": "The reference of the Public IP resource."
},
"publicIPPrefix": {
"$ref":"./network.json#/definitions/SubResource",
"description": "The reference of the Public IP Prefix resource."
},
"provisioningState": {
"type": "string",
"description": "Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'."
Expand Down Expand Up @@ -1072,7 +1076,7 @@
},
"description": "Gets load balancing rules that use this backend address pool."
},
"outboundNatRule": {
"outboundRule": {
"readOnly": true,
"$ref": "./network.json#/definitions/SubResource",
"description": "Gets outbound rules that use this backend address pool."
Expand Down Expand Up @@ -1414,7 +1418,7 @@
],
"description": "Inbound NAT pool of the load balancer."
},
"OutboundNatRulePropertiesFormat": {
"OutboundRulePropertiesFormat": {
"properties": {
"allocatedOutboundPorts": {
"type": "integer",
Expand All @@ -1435,19 +1439,36 @@
"provisioningState": {
"type": "string",
"description": "Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'."
},
"protocol": {
"type": "string",
"description": "Protocol - TCP, UDP or All",
"enum": [
"Tcp",
"Udp",
"All"
]
},
"enableTcpReset": {
"type": "boolean",
"description": "Receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP."
},
"idleTimeoutInMinutes": {
"type": "integer",
"description": "The timeout for the TCP idle connection"
}
},
"required": [
"backendAddressPool"
],
"description": "Outbound NAT pool of the load balancer."
"description": "Outbound pool of the load balancer."
},
"OutboundNatRule": {
"OutboundRule": {
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/OutboundNatRulePropertiesFormat",
"description": "Properties of load balancer outbound nat rule."
"$ref": "#/definitions/OutboundRulePropertiesFormat",
"description": "Properties of load balancer outbound rule."
},
"name": {
"type": "string",
Expand All @@ -1463,7 +1484,7 @@
"$ref": "./network.json#/definitions/SubResource"
}
],
"description": "Outbound NAT pool of the load balancer."
"description": "Outbound pool of the load balancer."
},
"LoadBalancerPropertiesFormat": {
"properties": {
Expand Down Expand Up @@ -1509,12 +1530,12 @@
},
"description": "Defines an external port range for inbound NAT to a single backend port on NICs associated with a load balancer. Inbound NAT rules are created automatically for each NIC associated with the Load Balancer using an external port from this range. Defining an Inbound NAT pool on your Load Balancer is mutually exclusive with defining inbound Nat rules. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an inbound NAT pool. They have to reference individual inbound NAT rules."
},
"outboundNatRules": {
"outboundRules": {
Copy link
Contributor

@yugangw-msft yugangw-msft Aug 15, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Any reason why we want to change the type name here? This will force client applications to update their code from new OutboundNatRule() to new OutboundRule() when migrate from old api-version to this new one. Is this necessary? Or the old name is just wrong?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, this is name change for new feature which is approved by dev and pm team

Copy link
Contributor

Choose a reason for hiding this comment

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

So , functionality wise, I assume the outbound rules here will be a super set of the old NAT rules?
CC @tjprescott

Copy link

Choose a reason for hiding this comment

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

@yugangw-msft NAT rules in load balancer context implies port forwarding (inbound NAT rule). These rules specify outbound translations and have nothing to do with port forwarding. To avoid this confusion, we opted for removing Nat from the rule name and not reuse what was begun 2+ years ago and never finished and never released.

Yes, OutboundRules are similar in shape, but different in how they are modeled.

OutboundNatRules were never available to anyone.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for the clarification. This is a zero impact breaking change.

Copy link
Member

Choose a reason for hiding this comment

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

They were never commands in the CLI.

"type": "array",
"items": {
"$ref": "#/definitions/OutboundNatRule"
"$ref": "#/definitions/OutboundRule"
},
"description": "The outbound NAT rules."
"description": "The outbound rules."
},
"resourceGuid": {
"type": "string",
Expand Down