From d3f1ab7aff4da7a2e367a9a05ab5b2c6c919fcca Mon Sep 17 00:00:00 2001 From: Vikas Bhardwaj Date: Wed, 28 Apr 2021 18:13:27 -0700 Subject: [PATCH 1/3] Add ipv6 flag to OutboundNatPolicySetting Signed-off-by: Vikas Bhardwaj --- hcn/hcnpolicy.go | 1 + 1 file changed, 1 insertion(+) diff --git a/hcn/hcnpolicy.go b/hcn/hcnpolicy.go index c032d79490..9ab96bb9eb 100644 --- a/hcn/hcnpolicy.go +++ b/hcn/hcnpolicy.go @@ -135,6 +135,7 @@ type OutboundNatPolicySetting struct { VirtualIP string `json:",omitempty"` Exceptions []string `json:",omitempty"` Destinations []string `json:",omitempty"` + Flags NatFlags `json:",omitempty"` } // SDNRoutePolicySetting sets SDN Route on an Endpoint. From f568d433f83efc97f2eaecb882ef8e1e79357f23 Mon Sep 17 00:00:00 2001 From: Vikas Bhardwaj Date: Thu, 29 Apr 2021 15:58:53 -0700 Subject: [PATCH 2/3] CR feedback Signed-off-by: Vikas Bhardwaj --- hcn/hcnloadbalancer.go | 1 + hcn/hcnpolicy.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/hcn/hcnloadbalancer.go b/hcn/hcnloadbalancer.go index e74c77654b..1b434b07b3 100644 --- a/hcn/hcnloadbalancer.go +++ b/hcn/hcnloadbalancer.go @@ -36,6 +36,7 @@ var ( LoadBalancerFlagsNone LoadBalancerFlags = 0 // LoadBalancerFlagsDSR enables Direct Server Return (DSR) LoadBalancerFlagsDSR LoadBalancerFlags = 1 + LoadBalancerFlagsIPv6 LoadBalancerFlags = 2 ) // LoadBalancerPortMappingFlags are special settings on a loadbalancer. diff --git a/hcn/hcnpolicy.go b/hcn/hcnpolicy.go index 9ab96bb9eb..9966300c19 100644 --- a/hcn/hcnpolicy.go +++ b/hcn/hcnpolicy.go @@ -75,6 +75,12 @@ type SubnetPolicy struct { // NatFlags are flags for portmappings. type NatFlags uint32 +const ( + NatFlagsNone NatFlags = 0 + NatFlagsLocalRoutedVip NatFlags = 1 + NatFlagsIPv6 NatFlags = 2 +) + /// Endpoint Policy objects // PortMappingPolicySetting defines Port Mapping (NAT) From 716eddc8e0ab29db0341108d1c523bd08e1c80cc Mon Sep 17 00:00:00 2001 From: Vikas Bhardwaj Date: Thu, 29 Apr 2021 16:33:51 -0700 Subject: [PATCH 3/3] CR feedback Signed-off-by: Vikas Bhardwaj --- hcn/hcnpolicy.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hcn/hcnpolicy.go b/hcn/hcnpolicy.go index 9966300c19..562c7d80e3 100644 --- a/hcn/hcnpolicy.go +++ b/hcn/hcnpolicy.go @@ -76,9 +76,9 @@ type SubnetPolicy struct { type NatFlags uint32 const ( - NatFlagsNone NatFlags = 0 - NatFlagsLocalRoutedVip NatFlags = 1 - NatFlagsIPv6 NatFlags = 2 + NatFlagsNone NatFlags = iota + NatFlagsLocalRoutedVip + NatFlagsIPv6 ) /// Endpoint Policy objects