x
/
vmware-nsxlib
Code Issues Proposed changes

Merge "Add match_ports argument while adding NAT rule"

This commit is contained in:
Jenkins 2017-01-27 22:34:50 +00:00 committed by Gerrit Code Review
parent fe1816d4c4 6b99e7693a
commit 04ee1b3512
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vmware_nsxlib/v3/__init__.py
View File

@ -355,7 +355,9 @@ class NsxLibLogicalRouter(utils.NsxLibApiBase):
def add_nat_rule(self, logical_router_id, action, translated_network,
source_net=None, dest_net=None,
enabled=True, rule_priority=None):
enabled=True, rule_priority=None,
match_ports=None, match_protocol=None,
match_resource_type=None):
resource = 'logical-routers/%s/nat/rules' % logical_router_id
body = {'action': action,
'enabled': enabled,
@ -366,6 +368,12 @@ class NsxLibLogicalRouter(utils.NsxLibApiBase):
body['match_destination_network'] = dest_net
if rule_priority:
body['rule_priority'] = rule_priority
if match_ports is not None:
body['match_service'] = {
'resource_type': (match_resource_type or
nsx_constants.L4_PORT_SET_NSSERVICE),
'destination_ports': match_ports,
'l4_protocol': match_protocol or nsx_constants.TCP}
return self.client.create(resource, body)
def add_static_route(self, logical_router_id, dest_cidr, nexthop):

16
vmware_nsxlib/v3/router.py
View File

@ -158,7 +158,8 @@ class RouterLib(object):
return self._router_port_client.update(
port['id'], subnets=address_groups)
def add_fip_nat_rules(self, logical_router_id, ext_ip, int_ip):
def add_fip_nat_rules(self, logical_router_id, ext_ip, int_ip,
match_ports=None):
self.nsxlib.logical_router.add_nat_rule(
logical_router_id, action="SNAT",
translated_network=ext_ip,
@ -168,7 +169,18 @@ class RouterLib(object):
logical_router_id, action="DNAT",
translated_network=int_ip,
dest_net=ext_ip,
rule_priority=FIP_NAT_PRI)
rule_priority=FIP_NAT_PRI,
match_ports=match_ports or [])
def delete_fip_nat_rules_by_internal_ip(self, logical_router_id, int_ip):
self.nsxlib.logical_router.delete_nat_rule_by_values(
logical_router_id,
action="SNAT",
match_source_network=int_ip)
self.nsxlib.logical_router.delete_nat_rule_by_values(
logical_router_id,
action="DNAT",
translated_network=int_ip)
def delete_fip_nat_rules(self, logical_router_id, ext_ip, int_ip):
self.nsxlib.logical_router.delete_nat_rule_by_values(