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

Jump to bottom

VLAN Support #201

Merged
merged 3 commits into from
Apr 29, 2024
Merged

VLAN Support #201

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
478952c
vlan support
uzaxirr Mar 29, 2024
d2801d3
mod tidy
uzaxirr Mar 29, 2024
2d3a6d8
Merge branch 'master' into vlan
uzaxirr Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 44 additions & 0 deletions civo/network/resource_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,37 @@ func ResourceNetwork() *schema.Resource {
Computed: true,
Description: "If the network is default, this will be `true`",
},
// VLAN Network
"vlan_id": {
Type: schema.TypeInt,
Optional: true,
Description: "VLAN ID for the network",
},
"vlan_cidr_v4": {
Type: schema.TypeString,
Optional: true,
Description: "CIDR for VLAN IPv4",
},
"vlan_gateway_ip_v4": {
Type: schema.TypeString,
Optional: true,
Description: "Gateway IP for VLAN IPv4",
},
"vlan_hardware_addr": {
Type: schema.TypeString,
Optional: true,
Description: "Hardware address for VLAN",
},
"vlan_allocation_pool_v4_start": {
Type: schema.TypeString,
Optional: true,
Description: "Start of the IPv4 allocation pool for VLAN",
},
"vlan_allocation_pool_v4_end": {
Type: schema.TypeString,
Optional: true,
Description: "End of the IPv4 allocation pool for VLAN",
},
},
CreateContext: resourceNetworkCreate,
ReadContext: resourceNetworkRead,
Expand All @@ -75,12 +106,25 @@ func resourceNetworkCreate(ctx context.Context, d *schema.ResourceData, m interf
}

log.Printf("[INFO] creating the new network %s", d.Get("label").(string))
vlanConfig := civogo.VLANConnectConfig{
VlanID: d.Get("vlan_id").(int),
HardwareAddr: d.Get("vlan_hardware_addr").(string),
CIDRv4: d.Get("vlan_cidr_v4").(string),
GatewayIPv4: d.Get("vlan_gateway_ip_v4").(string),
AllocationPoolV4Start: d.Get("vlan_allocation_pool_v4_start").(string),
AllocationPoolV4End: d.Get("vlan_allocation_pool_v4_end").(string),
}

configs := civogo.NetworkConfig{
Label: d.Get("label").(string),
CIDRv4: d.Get("cidr_v4").(string),
Region: apiClient.Region,
NameserversV4: expandStringList(d.Get("nameservers_v4")),
}
// Only add VLAN configuration if VLAN ID is set
if vlanConfig.VlanID > 0 {
configs.VLanConfig = &vlanConfig
}
network, err := apiClient.CreateNetwork(configs)
if err != nil {
return diag.Errorf("[ERR] failed to create a new network: %s", err)
Expand Down