[DCS] tags support (#629)

[DCS] tags support

What this PR does / why we need it
Which issue this PR fixes

Special notes for your reviewer
Tags

Reviewed-by: Aloento
Reviewed-by: Artem Lifshits

Author: anton-sidelnikov

acceptance/openstack/dcs/v1/configs_test.go

@@ -1,11 +1,15 @@
 package v1
 
 import (
+	"fmt"
 	"testing"
 
+	golangsdk "github.com/opentelekomcloud/gophertelekomcloud"
 	"github.com/opentelekomcloud/gophertelekomcloud/acceptance/clients"
 	"github.com/opentelekomcloud/gophertelekomcloud/openstack/common/pointerto"
+	"github.com/opentelekomcloud/gophertelekomcloud/openstack/common/tags"
 	"github.com/opentelekomcloud/gophertelekomcloud/openstack/dcs/v1/configs"
+	dcsTags "github.com/opentelekomcloud/gophertelekomcloud/openstack/dcs/v2/tags"
 	"github.com/opentelekomcloud/gophertelekomcloud/openstack/dcs/v2/whitelists"
 	th "github.com/opentelekomcloud/gophertelekomcloud/testhelper"
 )
@@ -53,8 +57,66 @@ func TestDcsConfigLifeCycle(t *testing.T) {
 	th.AssertDeepEquals(t, updateOpts.RedisConfigs[0].ParamName, configList.RedisConfigs[0].ParamName)
 
 	t.Logf("Retrieving whitelist configuration")
-	whitelistResp, err := whitelists.Get(client, dcsInstance.InstanceID)
+	err = WaitForAWhitelistToBeRetrieved(client, dcsInstance.InstanceID, 180)
+	if err == nil {
+		whitelistResp, err := whitelists.Get(client, dcsInstance.InstanceID)
+		th.AssertNoErr(t, err)
+		th.AssertEquals(t, whitelistResp.InstanceID, dcsInstance.InstanceID)
+		th.AssertEquals(t, whitelistResp.Groups[0].GroupName, "test-group-1")
+	}
+
+	t.Logf("Retrieving instance tags")
+	instanceTags, err := tags.Get(client, "instances", dcsInstance.InstanceID).Extract()
+	th.AssertNoErr(t, err)
+	th.AssertEquals(t, len(instanceTags), 2)
+	th.AssertEquals(t, instanceTags[0].Key, "muh")
+	th.AssertEquals(t, instanceTags[0].Value, "kuh")
+
+	t.Logf("Updating instance tags")
+	err = updateDcsTags(client, dcsInstance.InstanceID, instanceTags,
+		[]tags.ResourceTag{
+			{
+				Key:   "muhUpdated",
+				Value: "kuhUpdated",
+			},
+		})
+	th.AssertNoErr(t, err)
+	t.Logf("Retrieving updated instance tags")
+	instanceTagsUpdated, err := tags.Get(client, "instances", dcsInstance.InstanceID).Extract()
 	th.AssertNoErr(t, err)
-	th.AssertEquals(t, whitelistResp.InstanceID, dcsInstance.InstanceID)
-	th.AssertEquals(t, whitelistResp.Groups[0].GroupName, "test-group-1")
+	th.AssertEquals(t, len(instanceTagsUpdated), 1)
+	th.AssertEquals(t, instanceTagsUpdated[0].Key, "muhUpdated")
+	th.AssertEquals(t, instanceTagsUpdated[0].Value, "kuhUpdated")
+}
+
+// WaitForAWhitelistToBeRetrieved - wait until whitelist is retrieved
+func WaitForAWhitelistToBeRetrieved(client *golangsdk.ServiceClient, id string, timeoutSeconds int) error {
+	return golangsdk.WaitFor(timeoutSeconds, func() (bool, error) {
+		wl, err := whitelists.Get(client, id)
+		if err != nil {
+			return false, fmt.Errorf("error retriving whitelist: %w", err)
+		}
+		if wl.InstanceID != "" {
+			return true, nil
+		}
+		return false, nil
+	})
+}
+
+func updateDcsTags(client *golangsdk.ServiceClient, id string, old, new []tags.ResourceTag) error {
+	// remove old tags
+	if len(old) > 0 {
+		err := dcsTags.Delete(client, id, old)
+		if err != nil {
+			return err
+		}
+	}
+	// add new tags
+	if len(new) > 0 {
+		err := dcsTags.Create(client, id, new)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }

acceptance/openstack/dcs/v1/helpers.go

@@ -3,6 +3,7 @@ package v1
 import (
 	"testing"
 
+	"github.com/opentelekomcloud/gophertelekomcloud/openstack/common/tags"
 	"github.com/opentelekomcloud/gophertelekomcloud/openstack/dcs/v1/others"
 
 	"github.com/opentelekomcloud/gophertelekomcloud"
@@ -69,6 +70,16 @@ func createDCSInstance(t *testing.T, client *golangsdk.ServiceClient) *lifecycle
 		SpecCode:             specCode,
 		SecurityGroupID:      openstack.DefaultSecurityGroup(t),
 		InstanceBackupPolicy: &plan,
+		Tags: []tags.ResourceTag{
+			{
+				Key:   "muh",
+				Value: "kuh",
+			},
+			{
+				Key:   "muh2",
+				Value: "kuh2",
+			},
+		},
 	})
 	th.AssertNoErr(t, err)
 	t.Cleanup(func() {

openstack/dcs/v1/lifecycle/Create.go

@@ -4,6 +4,7 @@ import (
 	"github.com/opentelekomcloud/gophertelekomcloud"
 	"github.com/opentelekomcloud/gophertelekomcloud/internal/build"
 	"github.com/opentelekomcloud/gophertelekomcloud/internal/extract"
+	"github.com/opentelekomcloud/gophertelekomcloud/openstack/common/tags"
 )
 
 type CreateOps struct {
@@ -114,6 +115,8 @@ type CreateOps struct {
 	// true: indicates that a DCS instance can be accessed without a password.
 	// false: indicates that a DCS instance can be accessed only after password authentication.
 	NoPasswordAccess string `json:"no_password_access"`
+	// Tags
+	Tags []tags.ResourceTag `json:"tags,omitempty"`
 }
 
 type InstanceBackupPolicy struct {

openstack/dcs/v2/tags/Create.go

@@ -0,0 +1,32 @@
+package tags
+
+import (
+	"strings"
+
+	golangsdk "github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/build"
+	"github.com/opentelekomcloud/gophertelekomcloud/openstack/common/tags"
+)
+
+type tagsActionOpts struct {
+	Action string             `json:"action" required:"true"`
+	Tags   []tags.ResourceTag `json:"tags,omitempty"`
+}
+
+// Create an instance tags with given parameters.
+func Create(client *golangsdk.ServiceClient, instanceID string, tags []tags.ResourceTag) error {
+	opts := tagsActionOpts{
+		Action: "create",
+		Tags:   tags,
+	}
+	b, err := build.RequestBody(opts, "")
+	if err != nil {
+		return err
+	}
+	url := client.ServiceURL("dcs", instanceID, "tags", "action")
+	_, err = client.Post(strings.Replace(url, "v1.0", "v2", 1), b, nil, &golangsdk.RequestOpts{
+		OkCodes:     []int{204},
+		MoreHeaders: map[string]string{"Content-Type": "application/json", "X-Language": "en-us"},
+	})
+	return err
+}

openstack/dcs/v2/tags/Delete.go

@@ -0,0 +1,27 @@
+package tags
+
+import (
+	"strings"
+
+	"github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/build"
+	"github.com/opentelekomcloud/gophertelekomcloud/openstack/common/tags"
+)
+
+// Delete an instance tags
+func Delete(client *golangsdk.ServiceClient, instanceID string, tags []tags.ResourceTag) error {
+	opts := tagsActionOpts{
+		Action: "delete",
+		Tags:   tags,
+	}
+	b, err := build.RequestBody(opts, "")
+	if err != nil {
+		return err
+	}
+	url := client.ServiceURL("dcs", instanceID, "tags", "action")
+	_, err = client.Post(strings.Replace(url, "v1.0", "v2", 1), b, nil, &golangsdk.RequestOpts{
+		OkCodes:     []int{204},
+		MoreHeaders: map[string]string{"Content-Type": "application/json", "X-Language": "en-us"},
+	})
+	return err
+}