Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make TZ optional in segment for sake of GM #513

Merged
merged 1 commit into from
Nov 23, 2020
Merged

Make TZ optional in segment for sake of GM #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions nsxt/resource_nsxt_policy_segment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,54 @@ func TestAccResourceNsxtPolicySegment_updateAdvConfig(t *testing.T) {
})
}

func TestAccResourceNsxtPolicySegment_noTransportZone(t *testing.T) {
name := "test-nsx-policy-segment"
updatedName := fmt.Sprintf("%s-update", name)
testResourceName := "nsxt_policy_segment.test"
cidr := "4003::1/64"
updatedCidr := "4004::1/64"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccOnlyGlobalManager(t) },
Providers: testAccProviders,
CheckDestroy: func(state *terraform.State) error {
return testAccNsxtPolicySegmentCheckDestroy(state, name)
},
Steps: []resource.TestStep{
{
Config: testAccNsxtPolicySegmentNoTransportZoneTemplate(name, cidr),
Check: resource.ComposeTestCheckFunc(
testAccNsxtPolicySegmentExists(testResourceName),
resource.TestCheckResourceAttr(testResourceName, "display_name", name),
resource.TestCheckResourceAttr(testResourceName, "description", "Acceptance Test"),
resource.TestCheckResourceAttr(testResourceName, "subnet.#", "1"),
resource.TestCheckResourceAttr(testResourceName, "subnet.0.cidr", cidr),
resource.TestCheckResourceAttr(testResourceName, "domain_name", "tftest.org"),
resource.TestCheckResourceAttr(testResourceName, "overlay_id", "1011"),
resource.TestCheckResourceAttr(testResourceName, "vlan_ids.#", "0"),
resource.TestCheckResourceAttr(testResourceName, "tag.#", "0"),
resource.TestCheckResourceAttr(testResourceName, "advanced_config.#", "0"),
),
},
{
Config: testAccNsxtPolicySegmentNoTransportZoneTemplate(updatedName, updatedCidr),
Check: resource.ComposeTestCheckFunc(
testAccNsxtPolicySegmentExists(testResourceName),
resource.TestCheckResourceAttr(testResourceName, "display_name", updatedName),
resource.TestCheckResourceAttr(testResourceName, "description", "Acceptance Test"),
resource.TestCheckResourceAttr(testResourceName, "subnet.#", "1"),
resource.TestCheckResourceAttr(testResourceName, "subnet.0.cidr", updatedCidr),
resource.TestCheckResourceAttr(testResourceName, "domain_name", "tftest.org"),
resource.TestCheckResourceAttr(testResourceName, "overlay_id", "1011"),
resource.TestCheckResourceAttr(testResourceName, "vlan_ids.#", "0"),
resource.TestCheckResourceAttr(testResourceName, "tag.#", "0"),
resource.TestCheckResourceAttr(testResourceName, "advanced_config.#", "0"),
),
},
},
})
}

// TODO: Rewrite this test based on profile resources when these are available.
const testAccSegmentQosProfileName = "test-nsx-policy-segment-qos-profile"

Expand Down Expand Up @@ -645,3 +693,25 @@ resource "nsxt_policy_segment" "test" {
}
`, name, lease, dnsServerV4, lease, preferred, dnsServerV6)
}

func testAccNsxtPolicySegmentNoTransportZoneTemplate(name string, cidr string) string {
return fmt.Sprintf(`

resource "nsxt_policy_tier1_gateway" "tier1ForSegments" {
display_name = "terraform-segment-test"
failover_mode = "NON_PREEMPTIVE"
}

resource "nsxt_policy_segment" "test" {
display_name = "%s"
description = "Acceptance Test"
domain_name = "tftest.org"
overlay_id = 1011
connectivity_path = nsxt_policy_tier1_gateway.tier1ForSegments.path

subnet {
cidr = "%s"
}
}
`, name, cidr)
}
62 changes: 62 additions & 0 deletions nsxt/resource_nsxt_policy_vlan_segment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,52 @@ func TestAccResourceNsxtPolicyVlanSegment_updateAdvConfig(t *testing.T) {
})
}

func TestAccResourceNsxtPolicyiVlanSegment_noTransportZone(t *testing.T) {
name := "test-nsx-policy-segment"
updatedName := fmt.Sprintf("%s-update", name)
testResourceName := "nsxt_policy_vlan_segment.test"
cidr := "4003::1/64"
updatedCidr := "4004::1/64"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccOnlyGlobalManager(t) },
Providers: testAccProviders,
CheckDestroy: func(state *terraform.State) error {
return testAccNsxtPolicySegmentCheckDestroy(state, name)
},
Steps: []resource.TestStep{
{
Config: testAccNsxtPolicyVlanSegmentNoTransportZoneTemplate(name, cidr),
Check: resource.ComposeTestCheckFunc(
testAccNsxtPolicySegmentExists(testResourceName),
resource.TestCheckResourceAttr(testResourceName, "display_name", name),
resource.TestCheckResourceAttr(testResourceName, "description", "Acceptance Test"),
resource.TestCheckResourceAttr(testResourceName, "subnet.#", "1"),
resource.TestCheckResourceAttr(testResourceName, "subnet.0.cidr", cidr),
resource.TestCheckResourceAttr(testResourceName, "domain_name", "tftest.org"),
resource.TestCheckResourceAttr(testResourceName, "vlan_ids.#", "1"),
resource.TestCheckResourceAttr(testResourceName, "tag.#", "0"),
resource.TestCheckResourceAttr(testResourceName, "advanced_config.#", "0"),
),
},
{
Config: testAccNsxtPolicyVlanSegmentNoTransportZoneTemplate(updatedName, updatedCidr),
Check: resource.ComposeTestCheckFunc(
testAccNsxtPolicySegmentExists(testResourceName),
resource.TestCheckResourceAttr(testResourceName, "display_name", updatedName),
resource.TestCheckResourceAttr(testResourceName, "description", "Acceptance Test"),
resource.TestCheckResourceAttr(testResourceName, "subnet.#", "1"),
resource.TestCheckResourceAttr(testResourceName, "subnet.0.cidr", updatedCidr),
resource.TestCheckResourceAttr(testResourceName, "domain_name", "tftest.org"),
resource.TestCheckResourceAttr(testResourceName, "vlan_ids.#", "1"),
resource.TestCheckResourceAttr(testResourceName, "tag.#", "0"),
resource.TestCheckResourceAttr(testResourceName, "advanced_config.#", "0"),
),
},
},
})
}

func TestAccResourceNsxtPolicyVlanSegment_withDhcp(t *testing.T) {
name := "test-nsx-policy-vlan-segment"
updatedName := fmt.Sprintf("%s-update", name)
Expand Down Expand Up @@ -395,3 +441,19 @@ resource "nsxt_policy_vlan_segment" "test" {
}
`, getEdgeClusterName(), name, lease, dnsServerV4, lease, preferred, dnsServerV6)
}

func testAccNsxtPolicyVlanSegmentNoTransportZoneTemplate(name string, cidr string) string {
return fmt.Sprintf(`

resource "nsxt_policy_segment" "test" {
display_name = "%s"
description = "Acceptance Test"
domain_name = "tftest.org"
vlan_ids = ["101"]

subnet {
cidr = "%s"
}
}
`, name, cidr)
}
12 changes: 8 additions & 4 deletions nsxt/segment_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ func getPolicyCommonSegmentSchema(vlanRequired bool, isFixed bool) map[string]*s
"transport_zone_path": {
Type: schema.TypeString,
Description: "Policy path to the transport zone",
Required: true,
Optional: true,
ValidateFunc: validatePolicyPath(),
},
"vlan_ids": {
Expand Down Expand Up @@ -618,7 +618,7 @@ func nsxtPolicySegmentAddGatewayToInfraStruct(d *schema.ResourceData, dataValue
return dataValue1.(*data.StructValue), nil
}

func policySegmentResourceToInfraStruct(id string, d *schema.ResourceData, isVlan bool, isFixed bool) (model.Infra, error) {
func policySegmentResourceToInfraStruct(id string, d *schema.ResourceData, isVlan bool, isFixed bool, isGlobalManager bool) (model.Infra, error) {
// Read the rest of the configured parameters
var infraChildren []*data.StructValue

Expand All @@ -631,6 +631,10 @@ func policySegmentResourceToInfraStruct(id string, d *schema.ResourceData, isVla
revision := int64(d.Get("revision").(int))
resourceType := "Segment"

if (tzPath == "") && !isGlobalManager {
return model.Infra{}, fmt.Errorf("transport_zone_path needs to be specified for segment on local manager")
}

obj := model.Segment{
Id: &id,
DisplayName: &displayName,
Expand Down Expand Up @@ -1329,7 +1333,7 @@ func nsxtPolicySegmentCreate(d *schema.ResourceData, m interface{}, isVlan bool,
return err
}

obj, err := policySegmentResourceToInfraStruct(id, d, isVlan, isFixed)
obj, err := policySegmentResourceToInfraStruct(id, d, isVlan, isFixed, isPolicyGlobalManager(m))
if err != nil {
return err
}
Expand All @@ -1352,7 +1356,7 @@ func nsxtPolicySegmentUpdate(d *schema.ResourceData, m interface{}, isVlan bool,
return fmt.Errorf("Error obtaining Segment ID")
}

obj, err := policySegmentResourceToInfraStruct(id, d, isVlan, isFixed)
obj, err := policySegmentResourceToInfraStruct(id, d, isVlan, isFixed, isPolicyGlobalManager(m))
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/policy_segment.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ The following arguments are supported:
* `domain_name`- (Optional) DNS domain names.
* `overlay_id` - (Optional) Overlay connectivity ID for this Segment.
* `vlan_ids` - (Optional) List of VLAN IDs or ranges. Specifying vlan ids can be useful for overlay segments, f.e. for EVPN.
* `transport_zone_path` - (Required) Policy path to the Overlay transport zone. This property is required if more than one overlay transport zone is defined, and none is marked as default.
* `transport_zone_path` - (Optional) Policy path to the Overlay transport zone. This property is required for NSX Local Manager, and should not be specified for NSX Global Manager, where NSX will automatically assign default transport zone on each site.
* `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` - (Optional) Subnet configuration block.
* `cidr` - (Required) Gateway IP address CIDR. This argument can not be changed if DHCP is enabled for the subnet.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/policy_vlan_segment.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ The following arguments are supported:
* `tag` - (Optional) A list of scope + tag pairs to associate with this policy.
* `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.
* `transport_zone_path` - (Optional) Policy path to the VLAN backed transport zone. This property is required for NSX Local Manager, and should not be specified for NSX Global Manager, where NSX will automatically assign default transport zone on each site.
* `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` - (Optional) Subnet configuration block.
Expand Down