allowed_address_pairs management added

Author: [Partner] Alexander Sokolov

gcore/resource_gcore_reservedfixedip.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	gcorecloud "github.com/G-Core/gcorelabscloud-go"
+	"github.com/G-Core/gcorelabscloud-go/gcore/port/v1/ports"
 	"github.com/G-Core/gcorelabscloud-go/gcore/reservedfixedip/v1/reservedfixedips"
 	"github.com/G-Core/gcorelabscloud-go/gcore/task/v1/tasks"
 	"github.com/hashicorp/go-cty/cty"
@@ -17,6 +18,7 @@ import (
 
 const (
 	reservedFixedIPsPoint        = "reserved_fixed_ips"
+	portsPoint                   = "ports"
 	ReservedFixedIPCreateTimeout = 1200
 )
 
@@ -135,17 +137,17 @@ func resourceReservedFixedIP() *schema.Resource {
 			},
 			"allowed_address_pairs": {
 				Type:        schema.TypeList,
-				Computed:    true,
+				Optional:    true,
 				Description: "Group of IP addresses that share the current IP as VIP",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"ip_address": {
 							Type:     schema.TypeString,
-							Computed: true,
+							Optional: true,
 						},
 						"mac_address": {
 							Type:     schema.TypeString,
-							Computed: true,
+							Optional: true,
 						},
 					},
 				},
@@ -295,15 +297,37 @@ func resourceReservedFixedIPUpdate(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
+	id := d.Id()
 	if d.HasChange("is_vip") {
-		id := d.Id()
 		opts := reservedfixedips.SwitchVIPOpts{IsVip: d.Get("is_vip").(bool)}
 		_, err := reservedfixedips.SwitchVIP(client, id, opts).Extract()
 		if err != nil {
 			return diag.FromErr(err)
 		}
 	}
 
+	if d.HasChange("allowed_address_pairs") {
+		aap := d.Get("allowed_address_pairs").([]interface{})
+		allowedAddressPairs := make([]reservedfixedips.AllowedAddressPairs, len(aap))
+		for i, p := range aap {
+			pair := p.(map[string]interface{})
+			allowedAddressPairs[i] = reservedfixedips.AllowedAddressPairs{
+				IPAddress:  pair["ip_address"].(string),
+				MacAddress: pair["mac_address"].(string),
+			}
+		}
+
+		clientPort, err := CreateClient(provider, d, portsPoint, versionPointV1)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		opts := ports.AllowAddressPairsOpts{AllowedAddressPairs: allowedAddressPairs}
+		if _, err := ports.AllowAddressPairs(clientPort, id, opts).Extract(); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	d.Set("last_updated", time.Now().Format(time.RFC850))
 	log.Println("[DEBUG] Finish ReservedFixedIP updating")
 	return resourceReservedFixedIPRead(ctx, d, m)

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/G-Core/gcore-dns-sdk-go v0.2.3
 	github.com/G-Core/gcore-storage-sdk-go v0.1.3
 	github.com/G-Core/gcorelabscdn-go v0.1.20
-	github.com/G-Core/gcorelabscloud-go v0.4.51
+	github.com/G-Core/gcorelabscloud-go v0.4.54
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
 	github.com/mitchellh/mapstructure v1.4.3

go.sum

@@ -85,8 +85,8 @@ github.com/G-Core/gcore-storage-sdk-go v0.1.3 h1:vzgt5pKB3jsxbUs7jdEX1jyRC2YqbwL
 github.com/G-Core/gcore-storage-sdk-go v0.1.3/go.mod h1:e/5w5R2Uh6T7g6oAc5SpTKZJInFG6FyYYvGpUgRwCQ4=
 github.com/G-Core/gcorelabscdn-go v0.1.20 h1:RT/k4olBTPuVyE2LUlu5D9GTvj3hPA9NnBZwXYHFZxc=
 github.com/G-Core/gcorelabscdn-go v0.1.20/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
-github.com/G-Core/gcorelabscloud-go v0.4.51 h1:D47GHttvpeK2EFC2N9EnmyZmad/KwUyniowK2vyLHDQ=
-github.com/G-Core/gcorelabscloud-go v0.4.51/go.mod h1:nuDFy76Eja1EXBrG+q+dqpC2KqrHfID3JS8833LDJG8=
+github.com/G-Core/gcorelabscloud-go v0.4.54 h1:KDMRSGj/StmvFyqdIFng5Eb4eZB5W5GgIHZzrysh8VY=
+github.com/G-Core/gcorelabscloud-go v0.4.54/go.mod h1:nuDFy76Eja1EXBrG+q+dqpC2KqrHfID3JS8833LDJG8=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=