GCLOUD2-16594 Add support for allowed address pairs (v2) (#142)

client/loadbalancers/v1/testing/loadbalancers_test.go

@@ -22,7 +22,7 @@ const (
 )
 
 func createTestLoadBalancerWithListener(client *gcorecloud.ServiceClient, opts loadbalancers.CreateOpts) (string, error) {
-	res, err := loadbalancers.Create(client, opts).Extract()
+	res, err := loadbalancers.Create(client, opts, nil).Extract()
 	if err != nil {
 		return "", err
 	}
@@ -69,7 +69,7 @@ func TestLBSMetadata(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	defer loadbalancers.Delete(client, resourceID)
+	defer loadbalancers.Delete(client, resourceID, nil)
 
 	err = gtest.MetadataTest(func() ([]metadata.Metadata, error) {
 		res, err := loadbalancers.Get(client, resourceID, nil).Extract()

client/loadbalancers/v2/testing/loadbalancers_test.go

@@ -27,7 +27,7 @@ const (
 )
 
 func createTestLoadBalancerWithListener(client *gcorecloud.ServiceClient, opts loadbalancers.CreateOpts) (string, error) {
-	res, err := loadbalancers.Create(client, opts).Extract()
+	res, err := loadbalancers.Create(client, opts, nil).Extract()
 	if err != nil {
 		return "", err
 	}
@@ -146,7 +146,7 @@ func TestLBSMetadataV2(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	defer loadbalancers.Delete(clientV1, resourceID)
+	defer loadbalancers.Delete(clientV1, resourceID, nil)
 
 	clientV2, err := v2client.NewLoadbalancerClientV2(ctx)
 	if err != nil {

client/ports/v1/ports/ports.go

@@ -2,10 +2,15 @@ package ports
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/G-Core/gcorelabscloud-go/client/ports/v1/client"
+	client2 "github.com/G-Core/gcorelabscloud-go/client/ports/v2/client"
 	"github.com/G-Core/gcorelabscloud-go/gcore/port/v1/ports"
+	ports1 "github.com/G-Core/gcorelabscloud-go/gcore/port/v1/ports"
+	ports2 "github.com/G-Core/gcorelabscloud-go/gcore/port/v2/ports"
 	"github.com/G-Core/gcorelabscloud-go/gcore/reservedfixedip/v1/reservedfixedips"
+	"github.com/G-Core/gcorelabscloud-go/gcore/task/v1/tasks"
 
 	"github.com/G-Core/gcorelabscloud-go/client/flags"
 	"github.com/G-Core/gcorelabscloud-go/client/utils"
@@ -73,7 +78,7 @@ var assignAllowedAddressPairsSubCommand = cli.Command{
 	Usage:     "Assign allowed address pairs for instance port",
 	ArgsUsage: "<port_id>",
 	Category:  "portsecurity",
-	Flags: []cli.Flag{
+	Flags: append([]cli.Flag{
 		&cli.StringSliceFlag{
 			Name:  "ip-address",
 			Usage: "IP address of the port specified in allowed_address_pairs",
@@ -82,14 +87,19 @@ var assignAllowedAddressPairsSubCommand = cli.Command{
 			Name:  "mac-address",
 			Usage: "MAC address of the port specified in allowed_address_pairs",
 		},
-	},
+	}, flags.WaitCommandFlags...),
 	Action: func(c *cli.Context) error {
 		portID, err := flags.GetFirstStringArg(c, portIDText)
 		if err != nil {
 			_ = cli.ShowCommandHelp(c, "assign")
 			return err
 		}
-		client, err := client.NewPortClientV1(c)
+		clientV1, err := client.NewPortClientV1(c)
+		if err != nil {
+			_ = cli.ShowAppHelp(c)
+			return cli.NewExitError(err, 1)
+		}
+		clientV2, err := client2.NewPortClientV2(c)
 		if err != nil {
 			_ = cli.ShowAppHelp(c)
 			return cli.NewExitError(err, 1)
@@ -101,16 +111,22 @@ var assignAllowedAddressPairsSubCommand = cli.Command{
 			return cli.NewExitError(err, 1)
 		}
 
-		opts := ports.AllowAddressPairsOpts{
+		opts := ports1.AllowAddressPairsOpts{
 			AllowedAddressPairs: addressPairs,
 		}
 
-		result, err := ports.AllowAddressPairs(client, portID, opts).Extract()
+		results, err := ports2.AllowAddressPairs(clientV2, portID, opts).Extract()
 		if err != nil {
 			return cli.NewExitError(err, 1)
 		}
-		utils.ShowResults(result, c.String("format"))
-		return nil
+
+		return utils.WaitTaskAndShowResult(c, clientV1, results, true, func(task tasks.TaskID) (interface{}, error) {
+			_, err := tasks.Get(clientV1, string(task)).Extract()
+			if err != nil {
+				return nil, fmt.Errorf("cannot get task with ID: %s. Error: %w", task, err)
+			}
+			return nil, nil
+		})
 	},
 }
 

client/ports/v2/client/client.go

@@ -0,0 +1,11 @@
+package client
+
+import (
+	gcorecloud "github.com/G-Core/gcorelabscloud-go"
+	"github.com/G-Core/gcorelabscloud-go/client/common"
+	"github.com/urfave/cli/v2"
+)
+
+func NewPortClientV2(c *cli.Context) (*gcorecloud.ServiceClient, error) {
+	return common.BuildClient(c, "ports", "v2")
+}

client/subnets/v1/subnets/subnets.go

@@ -137,7 +137,7 @@ var subnetDeleteCommand = cli.Command{
 			return cli.NewExitError(err, 1)
 		}
 		results, err := subnets.Delete(client, subnetID, &gcorecloud.RequestOpts{
-			ConflictRetryAmount: c.Int("retry-amount"),
+			ConflictRetryAmount:   c.Int("retry-amount"),
 			ConflictRetryInterval: c.Int("retry-interval"),
 		}).Extract()
 		if err != nil {
@@ -322,7 +322,7 @@ var subnetCreateCommand = cli.Command{
 		}
 
 		results, err := subnets.Create(client, opts, &gcorecloud.RequestOpts{
-			ConflictRetryAmount: c.Int("retry-amount"),
+			ConflictRetryAmount:   c.Int("retry-amount"),
 			ConflictRetryInterval: c.Int("retry-interval"),
 		}).Extract()
 		if err != nil {

client/subnets/v1/testing/subnets_test.go

@@ -28,7 +28,7 @@ func createTestSubnet(client *gcorecloud.ServiceClient, opts subnets.CreateOpts,
 	gccidr.Mask = netIPNet.Mask
 	opts.CIDR = gccidr
 
-	res, err := subnets.Create(client, opts).Extract()
+	res, err := subnets.Create(client, opts, nil).Extract()
 	if err != nil {
 		return "", err
 	}
@@ -51,7 +51,7 @@ func createTestSubnet(client *gcorecloud.ServiceClient, opts subnets.CreateOpts,
 }
 
 func deleteTestSubnet(client *gcorecloud.ServiceClient, subnetID string) error {
-	results, err := subnets.Delete(client, subnetID).Extract()
+	results, err := subnets.Delete(client, subnetID, nil).Extract()
 	if err != nil {
 		return err
 	}

gcore/instance/v1/instances/results.go

@@ -9,6 +9,7 @@ import (
 	"github.com/G-Core/gcorelabscloud-go/gcore/ddos/v1/ddos"
 	"github.com/G-Core/gcorelabscloud-go/gcore/flavor/v1/flavors"
 	"github.com/G-Core/gcorelabscloud-go/gcore/instance/v1/types"
+	"github.com/G-Core/gcorelabscloud-go/gcore/reservedfixedip/v1/reservedfixedips"
 	"github.com/G-Core/gcorelabscloud-go/gcore/task/v1/tasks"
 	"github.com/G-Core/gcorelabscloud-go/gcore/utils/metadata"
 	"github.com/G-Core/gcorelabscloud-go/pagination"
@@ -167,15 +168,16 @@ type Instance struct {
 
 // Interface represents a instance port interface.
 type Interface struct {
-	Name                *string        `json:"interface_name"`
-	PortID              string         `json:"port_id"`
-	MacAddress          gcorecloud.MAC `json:"mac_address"`
-	NetworkID           string         `json:"network_id"`
-	PortSecurityEnabled bool           `json:"port_security_enabled"`
-	IPAssignments       []PortIP       `json:"ip_assignments"`
-	NetworkDetails      NetworkDetail  `json:"network_details"`
-	FloatingIPDetails   []FloatingIP   `json:"floatingip_details"`
-	SubPorts            []SubPort      `json:"sub_ports"`
+	Name                *string                                `json:"interface_name"`
+	PortID              string                                 `json:"port_id"`
+	MacAddress          gcorecloud.MAC                         `json:"mac_address"`
+	NetworkID           string                                 `json:"network_id"`
+	PortSecurityEnabled bool                                   `json:"port_security_enabled"`
+	IPAssignments       []PortIP                               `json:"ip_assignments"`
+	NetworkDetails      NetworkDetail                          `json:"network_details"`
+	FloatingIPDetails   []FloatingIP                           `json:"floatingip_details"`
+	SubPorts            []SubPort                              `json:"sub_ports"`
+	AllowedAddressPairs []reservedfixedips.AllowedAddressPairs `json:"allowed_address_pairs"`
 }
 
 // SubPort represent a instance sub port interface

gcore/loadbalancer/v1/lbpools/requests.go

@@ -185,6 +185,9 @@ func Update(c *gcorecloud.ServiceClient, lbpoolID string, opts UpdateOptsBuilder
 		r.Err = err
 		return
 	}
+	if reqOpts == nil {
+		reqOpts = &gcorecloud.RequestOpts{}
+	}
 	reqOpts.OkCodes = []int{200, 201}
 	_, r.Err = c.Patch(updateURL(c, lbpoolID), b, &r.Body, reqOpts)
 	return
@@ -222,6 +225,9 @@ func Unset(c *gcorecloud.ServiceClient, lbpoolID string, opts UnsetOptsBuilder,
 		r.Err = err
 		return
 	}
+	if reqOpts == nil {
+		reqOpts = &gcorecloud.RequestOpts{}
+	}
 	reqOpts.OkCodes = []int{200, 201}
 	_, r.Err = c.Patch(updateURL(c, lbpoolID), b, &r.Body, reqOpts)
 	return
@@ -261,6 +267,9 @@ func DeleteMember(c *gcorecloud.ServiceClient, lbpoolID string, memberID string,
 
 // DeleteHealthMonitor accepts a unique ID and deletes the lbpool's healthmonitor associated with it.
 func DeleteHealthMonitor(c *gcorecloud.ServiceClient, lbpoolID string, reqOpts *gcorecloud.RequestOpts) (r DeleteHealthMonitorResult) {
+	if reqOpts == nil {
+		reqOpts = &gcorecloud.RequestOpts{}
+	}
 	reqOpts.OkCodes = []int{http.StatusNoContent}
 	_, r.Err = c.Delete(healthMonitorURL(c, lbpoolID), reqOpts)
 	return

gcore/loadbalancer/v1/lbpools/testing/fixtures.go

@@ -138,10 +138,7 @@ const CreatePoolMemberRequest = `
 
 const UpdateRequest = `
 {
-	"name": "lbaas_test_pool",
-	"timeout_client_data": 0,
-    "timeout_member_connect": 0,
-    "timeout_member_data": 0
+	"name": "lbaas_test_pool"
 }	
 `
 

gcore/loadbalancer/v1/lbpools/testing/requests_test.go

@@ -194,7 +194,7 @@ func TestCreate(t *testing.T) {
 	}
 
 	client := fake.ServiceTokenClient("lbpools", "v1")
-	tasks, err := lbpools.Create(client, options).Extract()
+	tasks, err := lbpools.Create(client, options, nil).Extract()
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)
 }
@@ -214,7 +214,7 @@ func TestDelete(t *testing.T) {
 	})
 
 	client := fake.ServiceTokenClient("lbpools", "v1")
-	tasks, err := lbpools.Delete(client, LBPool1.ID).Extract()
+	tasks, err := lbpools.Delete(client, LBPool1.ID, nil).Extract()
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)
 
@@ -248,7 +248,7 @@ func TestUpdate(t *testing.T) {
 		Name: LBPool1.Name,
 	}
 
-	tasks, err := lbpools.Update(client, LBPool1.ID, opts).Extract()
+	tasks, err := lbpools.Update(client, LBPool1.ID, opts, nil).Extract()
 
 	require.NoError(t, err)
 	require.NoError(t, err)
@@ -284,7 +284,7 @@ func TestUnset(t *testing.T) {
 		SessionPersistence: true,
 	}
 
-	tasks, err := lbpools.Unset(client, LBPool1.ID, opts).Extract()
+	tasks, err := lbpools.Unset(client, LBPool1.ID, opts, nil).Extract()
 
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)
@@ -308,7 +308,7 @@ func TestDeleteMember(t *testing.T) {
 	})
 
 	client := fake.ServiceTokenClient("lbpools", "v1")
-	tasks, err := lbpools.DeleteMember(client, LBPool1.ID, memberID).Extract()
+	tasks, err := lbpools.DeleteMember(client, LBPool1.ID, memberID, nil).Extract()
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)
 
@@ -342,7 +342,7 @@ func TestCreateMember(t *testing.T) {
 	}
 
 	client := fake.ServiceTokenClient("lbpools", "v1")
-	tasks, err := lbpools.CreateMember(client, LBPool1.ID, options).Extract()
+	tasks, err := lbpools.CreateMember(client, LBPool1.ID, options, nil).Extract()
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)
 }
@@ -358,7 +358,7 @@ func TestDeleteHealthMonitor(t *testing.T) {
 	})
 
 	client := fake.ServiceTokenClient("lbpools", "v1")
-	err := lbpools.DeleteHealthMonitor(client, LBPool1.ID).ExtractErr()
+	err := lbpools.DeleteHealthMonitor(client, LBPool1.ID, nil).ExtractErr()
 	require.NoError(t, err)
 
 }
@@ -395,7 +395,7 @@ func TestCreateHealthMonitor(t *testing.T) {
 	}
 
 	client := fake.ServiceTokenClient("lbpools", "v1")
-	tasks, err := lbpools.CreateHealthMonitor(client, LBPool1.ID, opts).Extract()
+	tasks, err := lbpools.CreateHealthMonitor(client, LBPool1.ID, opts, nil).Extract()
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)
 }

gcore/loadbalancer/v1/listeners/requests.go

@@ -129,6 +129,9 @@ func Update(c *gcorecloud.ServiceClient, listenerID string, opts UpdateOptsBuild
 		r.Err = err
 		return
 	}
+	if reqOpts == nil {
+		reqOpts = &gcorecloud.RequestOpts{}
+	}
 	reqOpts.OkCodes = []int{200, 201}
 	_, r.Err = c.Patch(updateURL(c, listenerID), b, &r.Body, reqOpts)
 	return
@@ -173,6 +176,9 @@ func Unset(c *gcorecloud.ServiceClient, listenerID string, opts UnsetOptsBuilder
 	} else {
 		delete(b, "user_list")
 	}
+	if reqOpts == nil {
+		reqOpts = &gcorecloud.RequestOpts{}
+	}
 	reqOpts.OkCodes = []int{200, 201}
 	_, r.Err = c.Patch(updateURL(c, listenerID), b, &r.Body, reqOpts)
 	return

gcore/loadbalancer/v1/listeners/testing/requests_test.go

@@ -159,11 +159,11 @@ func TestCreate(t *testing.T) {
 		Protocol:       types.ProtocolTypeTCP,
 		ProtocolPort:   80,
 		LoadBalancerID: Listener1.ID,
-		AllowedCIDRS: []string{"10.10.0.0/24"},
+		AllowedCIDRS:   []string{"10.10.0.0/24"},
 	}
 
 	client := fake.ServiceTokenClient("lblisteners", "v1")
-	tasks, err := listeners.Create(client, options).Extract()
+	tasks, err := listeners.Create(client, options, nil).Extract()
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)
 }
@@ -183,7 +183,7 @@ func TestDelete(t *testing.T) {
 	})
 
 	client := fake.ServiceTokenClient("lblisteners", "v1")
-	tasks, err := listeners.Delete(client, Listener1.ID).Extract()
+	tasks, err := listeners.Delete(client, Listener1.ID, nil).Extract()
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)
 
@@ -217,7 +217,7 @@ func TestUpdate(t *testing.T) {
 		Name: Listener1.Name,
 	}
 
-	task, err := listeners.Update(client, Listener1.ID, opts).Extract()
+	task, err := listeners.Update(client, Listener1.ID, opts, nil).Extract()
 
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *task)
@@ -252,7 +252,7 @@ func TestUnset(t *testing.T) {
 		AllowedCIDRS: true,
 	}
 
-	tasks, err := listeners.Unset(client, Listener1.ID, opts).Extract()
+	tasks, err := listeners.Unset(client, Listener1.ID, opts, nil).Extract()
 
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)

gcore/loadbalancer/v1/loadbalancers/testing/requests_test.go

@@ -216,7 +216,7 @@ func TestCreate(t *testing.T) {
 	}
 
 	client := fake.ServiceTokenClient("loadbalancers", "v1")
-	tasks, err := loadbalancers.Create(client, options).Extract()
+	tasks, err := loadbalancers.Create(client, options, nil).Extract()
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)
 }
@@ -236,7 +236,7 @@ func TestDelete(t *testing.T) {
 	})
 
 	client := fake.ServiceTokenClient("loadbalancers", "v1")
-	tasks, err := loadbalancers.Delete(client, LoadBalancer1.ID).Extract()
+	tasks, err := loadbalancers.Delete(client, LoadBalancer1.ID, nil).Extract()
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)
 
@@ -347,7 +347,7 @@ func TestResizeLoadBalancer(t *testing.T) {
 		Flavor: Flavor,
 	}
 
-	tasks, err := loadbalancers.Resize(client, LoadBalancer1.ID, opts).Extract()
+	tasks, err := loadbalancers.Resize(client, LoadBalancer1.ID, opts, nil).Extract()
 	require.NoError(t, err)
 	require.Equal(t, Tasks1, *tasks)
 }