Merge pull request #195 from terraform-providers/group_ipset

Support IPSet type in ns group membership criteria
vmware · Oct 23, 2019 · 7b0f3c1 · 7b0f3c1
2 parents bd8d0a1 + 4610e17
commit 7b0f3c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/nsxt/resource_nsxt_ip_set.go b/nsxt/resource_nsxt_ip_set.go
@@ -139,6 +139,7 @@ func resourceNsxtIPSetDelete(d *schema.ResourceData, m interface{}) error {
 	}
 
 	localVarOptionals := make(map[string]interface{})
+	localVarOptionals["force"] = true
 	resp, err := nsxClient.GroupingObjectsApi.DeleteIPSet(nsxClient.Context, id, localVarOptionals)
 	if err != nil {
 		return fmt.Errorf("Error during IpSet delete: %v", err)

diff --git a/nsxt/resource_nsxt_ns_group.go b/nsxt/resource_nsxt_ns_group.go
@@ -11,7 +11,7 @@ import (
 )
 
 var nsGroupTargetTypeValues = []string{"NSGroup", "IPSet", "LogicalPort", "LogicalSwitch", "MACSet"}
-var nsGroupMembershipCriteriaTargetTypeValues = []string{"LogicalPort", "LogicalSwitch", "VirtualMachine"}
+var nsGroupMembershipCriteriaTargetTypeValues = []string{"LogicalPort", "LogicalSwitch", "VirtualMachine", "IPSet"}
 var nsGroupTagOperationValues = []string{"EQUALS"}
 
 func resourceNsxtNsGroup() *schema.Resource {