-
Notifications
You must be signed in to change notification settings - Fork 452
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: vmware_distributed_virtual_switch_pvlan_mapping resource (#2291)
- Loading branch information
1 parent
122c732
commit da5dd22
Showing
8 changed files
with
335 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
142 changes: 142 additions & 0 deletions
142
vsphere/resource_vsphere_distributed_virtual_switch_pvlan_mapping.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| // Copyright (c) HashiCorp, Inc. | ||
| // SPDX-License-Identifier: MPL-2.0 | ||
|
|
||
| package vsphere | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "sync" | ||
|
|
||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" | ||
| "github.com/hashicorp/terraform-provider-vsphere/vsphere/internal/helper/viapi" | ||
| "github.com/vmware/govmomi/vim25/types" | ||
| ) | ||
|
|
||
| var vsphereDistributedVirtualSwitchModificationMutex sync.Mutex | ||
|
|
||
| func resourceVSphereDistributedVirtualSwitchPvlanMapping() *schema.Resource { | ||
| s := map[string]*schema.Schema{ | ||
| "distributed_virtual_switch_id": { | ||
| Type: schema.TypeString, | ||
| Description: "The ID of the distributed virtual switch to attach this mapping to.", | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
| "primary_vlan_id": { | ||
| Type: schema.TypeInt, | ||
| Required: true, | ||
| Description: "The primary VLAN ID. The VLAN IDs of 0 and 4095 are reserved and cannot be used in this property.", | ||
| ValidateFunc: validation.IntBetween(1, 4094), | ||
| ForceNew: true, | ||
| }, | ||
| "secondary_vlan_id": { | ||
| Type: schema.TypeInt, | ||
| Required: true, | ||
| Description: "The secondary VLAN ID. The VLAN IDs of 0 and 4095 are reserved and cannot be used in this property.", | ||
| ValidateFunc: validation.IntBetween(1, 4094), | ||
| ForceNew: true, | ||
| }, | ||
| "pvlan_type": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| Description: "The private VLAN type. Valid values are promiscuous, community and isolated.", | ||
| ValidateFunc: validation.StringInSlice(privateVLANTypeAllowedValues, false), | ||
| ForceNew: true, | ||
| }, | ||
| } | ||
|
|
||
| return &schema.Resource{ | ||
| Create: resourceVSphereDistributedVirtualSwitchPvlanMappingCreate, | ||
| Read: resourceVSphereDistributedVirtualSwitchPvlanMappingRead, | ||
| Delete: resourceVSphereDistributedVirtualSwitchPvlanMappingDelete, | ||
| Schema: s, | ||
| } | ||
| } | ||
|
|
||
| func resourceVSphereDistributedVirtualSwitchPvlanMappingOperation(operation types.ConfigSpecOperation, d *schema.ResourceData, meta interface{}) error { | ||
| client := meta.(*Client).vimClient | ||
| if err := viapi.ValidateVirtualCenter(client); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // vSphere only allows one modification operation at a time, so lock locally | ||
| // to avoid errors if multiple pvlan mappings are created at once. | ||
| vsphereDistributedVirtualSwitchModificationMutex.Lock() | ||
|
|
||
| // Fetch the target dvswitch | ||
| dvs, err := dvsFromUUID(client, d.Get("distributed_virtual_switch_id").(string)) | ||
| if err != nil { | ||
| return fmt.Errorf("cannot locate distributed_virtual_switch: %s", err) | ||
| } | ||
|
|
||
| // Perform operation | ||
| entry := types.VMwareDVSPvlanMapEntry{ | ||
| PrimaryVlanId: int32(d.Get("primary_vlan_id").(int)), | ||
| SecondaryVlanId: int32(d.Get("secondary_vlan_id").(int)), | ||
| PvlanType: d.Get("pvlan_type").(string), | ||
| } | ||
|
|
||
| pvlanConfig := []types.VMwareDVSPvlanConfigSpec{ | ||
| { | ||
| Operation: string(operation), | ||
| PvlanEntry: entry, | ||
| }, | ||
| } | ||
|
|
||
| err = updateDVSPvlanMappings(dvs, pvlanConfig) | ||
| if err != nil { | ||
| return fmt.Errorf("cannot reconfigure distributed virtual switch: %s", err) | ||
| } | ||
|
|
||
| vsphereDistributedVirtualSwitchModificationMutex.Unlock() | ||
| return nil | ||
| } | ||
|
|
||
| func resourceVSphereDistributedVirtualSwitchPvlanMappingCreate(d *schema.ResourceData, meta interface{}) error { | ||
| err := resourceVSphereDistributedVirtualSwitchPvlanMappingOperation(types.ConfigSpecOperationAdd, d, meta) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Try to read the mapping back, which will also generate the ID. | ||
| return resourceVSphereDistributedVirtualSwitchPvlanMappingRead(d, meta) | ||
| } | ||
|
|
||
| func resourceVSphereDistributedVirtualSwitchPvlanMappingDelete(d *schema.ResourceData, meta interface{}) error { | ||
| return resourceVSphereDistributedVirtualSwitchPvlanMappingOperation(types.ConfigSpecOperationRemove, d, meta) | ||
| } | ||
|
|
||
| func resourceVSphereDistributedVirtualSwitchPvlanMappingRead(d *schema.ResourceData, meta interface{}) error { | ||
| client := meta.(*Client).vimClient | ||
| if err := viapi.ValidateVirtualCenter(client); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Ensure the DVSwitch still exists | ||
| dvs, err := dvsFromUUID(client, d.Get("distributed_virtual_switch_id").(string)) | ||
| if err != nil { | ||
| return fmt.Errorf("cannot locate distributed_virtual_switch: %s", err) | ||
| } | ||
|
|
||
| // Get its properties | ||
| props, err := dvsProperties(dvs) | ||
| if err != nil { | ||
| return fmt.Errorf("cannot read properties of distributed_virtual_switch: %s", err) | ||
| } | ||
| d.Set("distributed_virtual_switch_id", props.Uuid) | ||
|
|
||
| // Loop through the existing mappings on the switch to try and find one matching our spec | ||
| for _, mapping := range props.Config.(*types.VMwareDVSConfigInfo).PvlanConfig { | ||
| // Check if the existing mapping matches the one specified by the resource | ||
| if mapping.PrimaryVlanId == int32(d.Get("primary_vlan_id").(int)) && mapping.SecondaryVlanId == int32(d.Get("secondary_vlan_id").(int)) && mapping.PvlanType == d.Get("pvlan_type").(string) { | ||
| d.SetId(fmt.Sprintf("dvswitch-%s-mapping-%d-%d-%s", props.Config.(*types.VMwareDVSConfigInfo).Uuid, mapping.PrimaryVlanId, mapping.SecondaryVlanId, mapping.PvlanType)) | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| // If we don't find a mapping on the switch matching the current spec, then tell Terraform | ||
| // that the resource no longer exists | ||
| d.SetId("") | ||
| return nil | ||
| } |
Oops, something went wrong.