Add support of instance tags (#39)

Author: outcatcher

driver/opentelekomcloud.go

@@ -112,6 +112,7 @@ type Driver struct {
 	RootVolumeOpts         *services.DiskOpts `json:"-"`
 	UserDataFile           string             `json:"-"`
 	UserData               []byte             `json:"-"`
+	Tags                   []string           `json:"-"`
 	IPVersion              int                `json:"-"`
 	skipEIPCreation        bool
 	eipConfig              *services.ElasticIPOpts
@@ -407,6 +408,13 @@ func (d *Driver) createInstance() error {
 		return err
 	}
 	d.InstanceID = instance.ID
+
+	if len(d.Tags) > 0 {
+		if err := d.client.AddTags(d.InstanceID, d.Tags); err != nil {
+			return err
+		}
+	}
+
 	if err := d.client.WaitForInstanceStatus(d.InstanceID, services.InstanceStatusRunning); err != nil {
 		return err
 	}
@@ -662,6 +670,11 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			Usage:  "Set volume size of root partition",
 			Value:  defaultVolumeSize,
 		},
+		mcnflag.StringFlag{
+			Name:   "otc-tags",
+			EnvVar: "OS_TAGS",
+			Usage:  "Comma-separated list of instance tags",
+		},
 		mcnflag.StringFlag{
 			Name:   "otc-root-volume-type",
 			EnvVar: "ROOT_VOLUME_TYPE",
@@ -982,6 +995,10 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 	d.UserData = []byte(flags.String("otc-user-data-raw"))
 	d.ServerGroup = flags.String("otc-server-group")
 	d.ServerGroupID = flags.String("otc-server-group-id")
+	tags := flags.String("otc-tags")
+	if tags != "" {
+		d.Tags = strings.Split(tags, ",")
+	}
 	d.AccessKey = services.AccessKey{
 		AccessKey: flags.String("otc-access-key-id"),
 		SecretKey: flags.String("otc-access-key-key"),

driver/opentelekomcloud_test.go

@@ -29,6 +29,7 @@ var defaultFlags = map[string]interface{}{
 	"otc-cloud":       "otc",
 	"otc-subnet-name": subnetName,
 	"otc-vpc-name":    vpcName,
+	"otc-tags":        "machine,test",
 }
 
 func newDriverFromFlags(driverFlags map[string]interface{}) (*Driver, error) {

driver/services/compute.go

@@ -29,6 +29,7 @@ import (
 	"github.com/huaweicloud/golangsdk/openstack/compute/v2/extensions/secgroups"
 	"github.com/huaweicloud/golangsdk/openstack/compute/v2/extensions/servergroups"
 	"github.com/huaweicloud/golangsdk/openstack/compute/v2/extensions/startstop"
+	"github.com/huaweicloud/golangsdk/openstack/compute/v2/extensions/tags"
 	"github.com/huaweicloud/golangsdk/openstack/compute/v2/flavors"
 	"github.com/huaweicloud/golangsdk/openstack/compute/v2/servers"
 	"github.com/huaweicloud/golangsdk/openstack/imageservice/v2/images"
@@ -457,3 +458,8 @@ func (c *Client) FindServerGroup(groupName string) (result string, err error) {
 	})
 	return
 }
+
+func (c *Client) AddTags(instanceID string, serverTags []string) error {
+	opts := tags.CreateOpts{Tags: serverTags}
+	return tags.Create(c.ComputeV2, instanceID, opts).Err
+}