Skip to content

Commit

Permalink
Merge pull request #725 from vmware/nat-64
Browse files Browse the repository at this point in the history 
Support NAT64 option in policy nat rule resource
  • Loading branch information
@annakhm
annakhm authored Apr 5, 2022
2 parents 730f8e8 + bd0a93f commit d0161fe
Show file tree
Hide file tree
Showing 3 changed files with 133 additions and 39 deletions.
61 changes: 41 additions & 20 deletions nsxt/resource_nsxt_policy_nat_rule.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,21 @@ func resourceNsxtPolicyNATRule() *schema.Resource {
}
}

func deleteNsxtPolicyNATRule(connector *client.RestConnector, gwID string, isT0 bool, ruleID string, isGlobalManager bool) error {
func deleteNsxtPolicyNATRule(connector *client.RestConnector, gwID string, isT0 bool, natType string, ruleID string, isGlobalManager bool) error {
if isGlobalManager {
if isT0 {
client := gm_t0nat.NewNatRulesClient(connector)
return client.Delete(gwID, gm_model.PolicyNat_NAT_TYPE_USER, ruleID)
return client.Delete(gwID, natType, ruleID)
}
client := gm_t1nat.NewNatRulesClient(connector)
return client.Delete(gwID, gm_model.PolicyNat_NAT_TYPE_USER, ruleID)
return client.Delete(gwID, natType, ruleID)
}
if isT0 {
client := t0nat.NewNatRulesClient(connector)
return client.Delete(gwID, model.PolicyNat_NAT_TYPE_USER, ruleID)
return client.Delete(gwID, natType, ruleID)
}
client := t1nat.NewNatRulesClient(connector)
return client.Delete(gwID, model.PolicyNat_NAT_TYPE_USER, ruleID)
return client.Delete(gwID, natType, ruleID)
}

func resourceNsxtPolicyNATRuleDelete(d *schema.ResourceData, m interface{}) error {
Expand All @@ -164,26 +164,28 @@ func resourceNsxtPolicyNATRuleDelete(d *schema.ResourceData, m interface{}) erro
return fmt.Errorf("gateway_path is not valid")
}

err := deleteNsxtPolicyNATRule(getPolicyConnector(m), gwID, isT0, id, isPolicyGlobalManager(m))
action := d.Get("action").(string)
natType := getNatTypeByAction(action)
err := deleteNsxtPolicyNATRule(getPolicyConnector(m), gwID, isT0, natType, id, isPolicyGlobalManager(m))
if err != nil {
return handleDeleteError("NAT Rule", id, err)
}

return nil
}

func getNsxtPolicyNATRuleByID(connector *client.RestConnector, gwID string, isT0 bool, ruleID string, isGlobalManager bool) (model.PolicyNatRule, error) {
func getNsxtPolicyNATRuleByID(connector *client.RestConnector, gwID string, isT0 bool, natType string, ruleID string, isGlobalManager bool) (model.PolicyNatRule, error) {
if isGlobalManager {
var obj model.PolicyNatRule
var gmObj gm_model.PolicyNatRule
var rawObj interface{}
var err error
if isT0 {
client := gm_t0nat.NewNatRulesClient(connector)
gmObj, err = client.Get(gwID, gm_model.PolicyNat_NAT_TYPE_USER, ruleID)
gmObj, err = client.Get(gwID, natType, ruleID)
} else {
client := gm_t1nat.NewNatRulesClient(connector)
gmObj, err = client.Get(gwID, gm_model.PolicyNat_NAT_TYPE_USER, ruleID)
gmObj, err = client.Get(gwID, natType, ruleID)
}
if err != nil {
return obj, err
Expand All @@ -196,31 +198,40 @@ func getNsxtPolicyNATRuleByID(connector *client.RestConnector, gwID string, isT0
}
if isT0 {
client := t0nat.NewNatRulesClient(connector)
return client.Get(gwID, model.PolicyNat_NAT_TYPE_USER, ruleID)
return client.Get(gwID, natType, ruleID)
}
client := t1nat.NewNatRulesClient(connector)
return client.Get(gwID, model.PolicyNat_NAT_TYPE_USER, ruleID)
return client.Get(gwID, natType, ruleID)
}

func patchNsxtPolicyNATRule(connector *client.RestConnector, gwID string, rule model.PolicyNatRule, isT0 bool, isGlobalManager bool) error {
natType := getNatTypeByAction(*rule.Action)
if isGlobalManager {
rawObj, err := convertModelBindingType(rule, model.PolicyNatRuleBindingType(), gm_model.PolicyNatRuleBindingType())
if err != nil {
return err
}
if isT0 {
client := gm_t0nat.NewNatRulesClient(connector)
return client.Patch(gwID, model.PolicyNat_NAT_TYPE_USER, *rule.Id, rawObj.(gm_model.PolicyNatRule))
return client.Patch(gwID, natType, *rule.Id, rawObj.(gm_model.PolicyNatRule))
}
client := gm_t1nat.NewNatRulesClient(connector)
return client.Patch(gwID, model.PolicyNat_NAT_TYPE_USER, *rule.Id, rawObj.(gm_model.PolicyNatRule))
return client.Patch(gwID, natType, *rule.Id, rawObj.(gm_model.PolicyNatRule))
}
if isT0 {
client := t0nat.NewNatRulesClient(connector)
return client.Patch(gwID, model.PolicyNat_NAT_TYPE_USER, *rule.Id, rule)
return client.Patch(gwID, natType, *rule.Id, rule)
}
client := t1nat.NewNatRulesClient(connector)
return client.Patch(gwID, model.PolicyNat_NAT_TYPE_USER, *rule.Id, rule)
return client.Patch(gwID, natType, *rule.Id, rule)
}

func getNatTypeByAction(action string) string {
if action == model.PolicyNatRule_ACTION_NAT64 {
return model.PolicyNat_NAT_TYPE_NAT64
}

return model.PolicyNat_NAT_TYPE_USER
}

func resourceNsxtPolicyNATRuleRead(d *schema.ResourceData, m interface{}) error {
Expand All @@ -237,7 +248,9 @@ func resourceNsxtPolicyNATRuleRead(d *schema.ResourceData, m interface{}) error
return fmt.Errorf("gateway_path is not valid")
}

obj, err := getNsxtPolicyNATRuleByID(connector, gwID, isT0, id, isPolicyGlobalManager(m))
action := d.Get("action").(string)
natType := getNatTypeByAction(action)
obj, err := getNsxtPolicyNATRuleByID(connector, gwID, isT0, natType, id, isPolicyGlobalManager(m))
if err != nil {
return handleReadError(d, "NAT Rule", id, err)
}
Expand Down Expand Up @@ -275,6 +288,8 @@ func resourceNsxtPolicyNATRuleCreate(d *schema.ResourceData, m interface{}) erro
connector := getPolicyConnector(m)

gwPolicyPath := d.Get("gateway_path").(string)
action := d.Get("action").(string)
natType := getNatTypeByAction(action)
isT0, gwID := parseGatewayPolicyPath(gwPolicyPath)
if gwID == "" {
return fmt.Errorf("gateway_path is not valid")
Expand All @@ -285,7 +300,7 @@ func resourceNsxtPolicyNATRuleCreate(d *schema.ResourceData, m interface{}) erro
if id == "" {
id = newUUID()
} else {
_, err := getNsxtPolicyNATRuleByID(connector, gwID, isT0, id, isGlobalManager)
_, err := getNsxtPolicyNATRuleByID(connector, gwID, isT0, natType, id, isGlobalManager)
if err == nil {
return fmt.Errorf("NAT Rule with nsx_id '%s' already exists", id)
} else if !isNotFoundError(err) {
Expand All @@ -295,7 +310,6 @@ func resourceNsxtPolicyNATRuleCreate(d *schema.ResourceData, m interface{}) erro

displayName := d.Get("display_name").(string)
description := d.Get("description").(string)
action := d.Get("action").(string)
enabled := d.Get("enabled").(bool)
fwMatch := d.Get("firewall_match").(string)
logging := d.Get("logging").(bool)
Expand Down Expand Up @@ -418,8 +432,15 @@ func resourceNsxtPolicyNATRuleUpdate(d *schema.ResourceData, m interface{}) erro
func resourceNsxtPolicyNATRuleImport(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
importID := d.Id()
s := strings.Split(importID, "/")
if len(s) != 2 {
return nil, fmt.Errorf("Please provide <gateway-id>/<nat-rule-id> as an input")
if len(s) < 2 || len(s) > 3 {
return nil, fmt.Errorf("Please provide <gateway-id>/<nat-rule-id>/[nat-type] as an input")
}

if len(s) == 3 {
// take care of NAT64 nat-type via action
if s[2] == model.PolicyNat_NAT_TYPE_NAT64 {
d.Set("action", model.PolicyNatRule_ACTION_NAT64)
}
}

gwID := s[0]
Expand Down
Loading

0 comments on commit d0161fe

Please sign in to comment.