Allow vlan range in policy vlan segments

nsxt/resource_nsxt_policy_vlan_segment_test.go

@@ -59,8 +59,7 @@ func TestAccResourceNsxtPolicyVlanSegment_basicUpdate(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccNsxtPolicyVlanSegmentExists(testResourceName),
 					resource.TestCheckResourceAttr(testResourceName, "display_name", updatedName),
-					// TODO: file bug for description not being updated
-					// resource.TestCheckResourceAttr(testResourceName, "description", "Acceptance Test2"),
+					resource.TestCheckResourceAttr(testResourceName, "description", "Acceptance Test2"),
 					resource.TestCheckResourceAttr(testResourceName, "domain_name", "tftest2.org"),
 					resource.TestCheckResourceAttr(testResourceName, "vlan_ids.#", "2"),
 					resource.TestCheckResourceAttr(testResourceName, "tag.#", "2"),
@@ -272,10 +271,10 @@ func testAccNsxtPolicyVlanSegmentBasicUpdateTemplate(name string) string {
 
 resource "nsxt_policy_vlan_segment" "test" {
   display_name        = "%s"
-  description         = "Acceptance Test"
+  description         = "Acceptance Test2"
   transport_zone_path = data.nsxt_policy_transport_zone.vlantz.path
   domain_name         = "tftest2.org"
-  vlan_ids            = ["101", "102"]
+  vlan_ids            = ["101", "104-110"]
 
   tag {
     scope = "color"

nsxt/segment_common.go

@@ -261,7 +261,7 @@ func getPolicyCommonSegmentSchema() map[string]*schema.Schema {
 			Description: "VLAN IDs for VLAN backed Segment",
 			Elem: &schema.Schema{
 				Type:         schema.TypeString,
-				ValidateFunc: validateVLANId,
+				ValidateFunc: validateVLANIdOrRange,
 			},
 			Required: true,
 		},

nsxt/validators.go

@@ -407,12 +407,31 @@ func validateVLANId(i interface{}, k string) (s []string, es []error) {
 		}
 	}
 	if vlan < 0 || vlan > 4095 {
-		es = append(es, fmt.Errorf("invalid VLAN ID %d", vlan))
+		es = append(es, fmt.Errorf("Invalid VLAN ID %d", vlan))
 		return
 	}
 	return
 }
 
+func validateVLANIdOrRange(i interface{}, k string) (s []string, es []error) {
+	v, ok := i.(string)
+	if !ok {
+		s, es = validateVLANId(i, k)
+		return
+	}
+
+	tokens := strings.Split(v, "-")
+	if len(tokens) > 2 {
+		es = append(es, fmt.Errorf("Invalid vlan range %s", v))
+		return
+	}
+	for _, token := range tokens {
+		s, es = validateVLANId(token, k)
+	}
+
+	return
+}
+
 func validateStringIntBetween(start int, end int) schema.SchemaValidateFunc {
 	return func(i interface{}, k string) (s []string, es []error) {
 		v, ok := i.(string)

website/docs/r/policy_vlan_segment.html.markdown

@@ -56,7 +56,7 @@ The following arguments are supported:
 * `nsx_id` - (Optional) The NSX ID of this resource. If set, this ID will be used to create the resource.
 * `domain_name`- (Optional) DNS domain names.
 * `transport_zone_path` - (Required) Policy path to the VLAN backed transport zone.
-* `vlan_ids` - (Optional) VLAN IDs for VLAN backed Segment.
+* `vlan_ids` - (Optional) List of VLAN IDs or VLAN ranges.
 * `dhcp_config_path` - (Optional) Policy path to DHCP server or relay configuration to use for subnets configured on this segment. This attribute is supported with NSX 3.0.0 onwards.
 * `subnet` - (Required) Subnet configuration block.
   * `cidr` - (Required) Gateway IP address CIDR.