Merge lp:~elopio/snappy-tests-job/snappy-cloud-client into lp:snappy-tests-job

[Leo Arias]

Added a snappy-cloud-client command.

[Federico Gimenez (fgimenez)]

Looks good, a couple of comments, the most important IMO is related to the constructor.

Thanks!

review: Needs Fixing

[lp:~elopio/snappy-tests-job/snappy-cloud-client]

71. By Leo Arias on 2015-11-30

Updated the default cloud provider.

[Leo Arias (elopio)]

I fixed the default cloud provider.
The reason I didn't use the constructor is that it receives a flavor. I could pass an empty string there if you prefer.
I left a question about why is the flavor passed in the contructor and not on the Create method, but forgot to hit save.

[Federico Gimenez (fgimenez)]

Yes, it makes more sense to pass the flavor to the Create method, we can iterate on that later.

In order to use the constructor we could define an options type, so that the constructor gets as the only parameter an instance of that type and we can pass only the required opntions as fields, but also for the next iteration IMO.

review: Approve

[Leo Arias (elopio)]

Ok, merging then. I'll make the flavor change in the evening.

review: Approve

[Leo Arias (elopio)]

oh, you merged already :) thanks.

=== modified file 'cloud/cloud.go'
--- cloud/cloud.go	2015-11-27 16:29:33 +0000
+++ cloud/cloud.go	2015-11-30 15:31:39 +0000
@@ -23,7 +23,7 @@
 
 // Clouder is the interface for all the cloud clients
 type Clouder interface {
-	CreateInstance(release, channel string) (ip string, err error)
+	CreateInstance(release, channel string) (ip string, id string, err error)
 	KillInstance() error
 }
 

=== modified file 'cloud/openstack.go'
--- cloud/openstack.go	2015-11-27 16:29:33 +0000
+++ cloud/openstack.go	2015-11-30 15:31:39 +0000
@@ -45,26 +45,26 @@
 
 // OpenstackClient is the client for connecting to Openstack
 type OpenstackClient struct {
-	util       utils.Utilizer
+	Util       utils.Utilizer
 	flavor     string
-	instanceID string
+	InstanceID string
 }
 
 // CreateInstance launches a snappy instance from the latest image with the passed release
-// and channel and returns its ip
-func (c *OpenstackClient) CreateInstance(release, channel string) (ip string, err error) {
+// and channel and returns its ip and id
+func (c *OpenstackClient) CreateInstance(release, channel string) (ip string, id string, err error) {
 	log.Printf("*** Creating Snappy instance for release %s and channel %s ***", release, channel)
 	imageID, err := c.listImages(release, channel)
 	if err == nil {
-		ip, err = c.launchInstance(imageID)
+		ip, id, err = c.launchInstance(imageID)
 	}
 	return
 }
 
 // KillInstance kills the current running instance if any
 func (c *OpenstackClient) KillInstance() (err error) {
-	if c.instanceID != "" {
-		log.Printf("*** Killing instance %s ***", c.instanceID)
+	if c.InstanceID != "" {
+		log.Printf("*** Killing instance %s ***", c.InstanceID)
 		err = c.killInstance()
 	}
 	return
@@ -72,7 +72,7 @@
 
 // NewOpenstackClient is OpenstackClient's constructor
 func NewOpenstackClient(flavor string, util utils.Utilizer) *OpenstackClient {
-	return &OpenstackClient{flavor: flavor, util: util}
+	return &OpenstackClient{flavor: flavor, Util: util}
 }
 
 func (c *OpenstackClient) imgTemplate(release, channel string) string {
@@ -82,7 +82,7 @@
 
 func (c *OpenstackClient) listImages(release, channel string) (imageID string, err error) {
 	params := utils.NewExecCommandParams("", strings.Fields(listImagesCmd), false)
-	list, err := c.util.ExecCommand(params)
+	list, err := c.Util.ExecCommand(params)
 	if err == nil {
 		imageID = c.getLatestImageID(release, channel, list)
 		log.Printf("Found image with id %s for release %s and channel %s", imageID, release, channel)
@@ -90,29 +90,29 @@
 	return
 }
 
-func (c *OpenstackClient) launchInstance(imageID string) (ip string, err error) {
+func (c *OpenstackClient) launchInstance(imageID string) (ip string, id string, err error) {
 	log.Printf("Launching instance for Snappy image %s", imageID)
 
 	launchInstanceCmd := fmt.Sprintf(launchInstanceCmdTpl, c.flavor, imageID, os.Getpid())
 	params := utils.NewExecCommandParams("", strings.Fields(launchInstanceCmd), false)
 
-	output, err := c.util.ExecCommand(params)
+	output, err := c.Util.ExecCommand(params)
 	if err == nil {
-		c.instanceID = c.getinstanceID(output)
+		c.InstanceID = c.getinstanceID(output)
 		log.Print("Instance launch requested, getting IP...")
 		ip, err = c.getInstanceIP()
 		if ip != "" {
 			log.Printf("Got IP %s", ip)
 		}
 	}
-	return
+	return ip, c.InstanceID, err
 }
 
 func (c *OpenstackClient) killInstance() (err error) {
-	killInstanceCmd := fmt.Sprintf(killInstanceCmdTpl, c.instanceID)
+	killInstanceCmd := fmt.Sprintf(killInstanceCmdTpl, c.InstanceID)
 	params := utils.NewExecCommandParams("", strings.Fields(killInstanceCmd), false)
 
-	_, err = c.util.ExecCommand(params)
+	_, err = c.Util.ExecCommand(params)
 	return
 }
 
@@ -194,12 +194,12 @@
 }
 
 func (c *OpenstackClient) getInstanceIP() (instanceIP string, err error) {
-	describeInstanceCmd := fmt.Sprintf(describeInstanceCmdTpl, c.instanceID)
+	describeInstanceCmd := fmt.Sprintf(describeInstanceCmdTpl, c.InstanceID)
 
 	params := utils.NewExecCommandParams("", strings.Fields(describeInstanceCmd), false)
 
 	for i := 0; i < maxAttempsInstanceWait; i++ {
-		output, _ := c.util.ExecCommand(params)
+		output, _ := c.Util.ExecCommand(params)
 
 		if instanceIP = extractInstanceIP(output); instanceIP == "" {
 			log.Print("IP not found, waiting...")
@@ -207,13 +207,13 @@
 			time.Sleep(time.Duration(secondsToWaitForInstance) * time.Second)
 		} else {
 
-			log.Printf("The IP asigned to instance %s is %s", c.instanceID, instanceIP)
+			log.Printf("The IP asigned to instance %s is %s", c.InstanceID, instanceIP)
 			break
 		}
 	}
 
 	if instanceIP == "" {
-		err = errors.New("Instance IP not found for instance " + c.instanceID)
+		err = errors.New("Instance IP not found for instance " + c.InstanceID)
 	}
 	return
 }

=== modified file 'cloud/openstack_test.go'
--- cloud/openstack_test.go	2015-11-27 16:29:33 +0000
+++ cloud/openstack_test.go	2015-11-30 15:31:39 +0000
@@ -150,7 +150,7 @@
 
 func (s *openstackSuite) TestCreateInstanceReturnsErrorOnListError(c *check.C) {
 	s.fakeUtil.FailExec = true
-	_, err := s.subject.CreateInstance(defaultRelease, defaultChannel)
+	_, _, err := s.subject.CreateInstance(defaultRelease, defaultChannel)
 
 	c.Assert(err, check.NotNil, check.Commentf("Expected error from euca list images"))
 }
@@ -177,12 +177,19 @@
 }
 
 func (s *openstackSuite) TestCreateInstanceReturnsInstanceIP(c *check.C) {
-	ip, _ := s.subject.CreateInstance(defaultRelease, defaultChannel)
+	ip, _, _ := s.subject.CreateInstance(defaultRelease, defaultChannel)
 
 	c.Assert(ip, check.Equals, instanceIP,
 		check.Commentf("Expected instance IP not returned %s, got %s", instanceIP, ip))
 }
 
+func (s *openstackSuite) TestCreateInstanceReturnsInstanceID(c *check.C) {
+	_, id, _ := s.subject.CreateInstance(defaultRelease, defaultChannel)
+
+	c.Assert(id, check.Equals, s.instanceID,
+		check.Commentf("Expected instance ID not returned %s, got %s", s.instanceID, id))
+}
+
 func (s *openstackSuite) TestKillInstanceCallsKillCommand(c *check.C) {
 	s.subject.CreateInstance(defaultRelease, defaultChannel)
 	s.subject.KillInstance()

=== added directory 'cmd'
=== added directory 'cmd/snappy-cloud-client'
=== added file 'cmd/snappy-cloud-client/main.go'
--- cmd/snappy-cloud-client/main.go	1970-01-01 00:00:00 +0000
+++ cmd/snappy-cloud-client/main.go	2015-11-30 15:31:39 +0000
@@ -0,0 +1,70 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+
+	"launchpad.net/snappy-tests-job/cloud"
+	"launchpad.net/snappy-tests-job/utils"
+)
+
+const (
+	defaultCloudProvider = "openstack"
+	defaultFlavor        = "m1.medium"
+	defaultRelease       = "rolling"
+	defaultChannel       = "edge"
+)
+
+func main() {
+	fCreate := flag.NewFlagSet("fCreate", flag.ContinueOnError)
+	var (
+		flavor = fCreate.String("flavor", defaultFlavor,
+			"Cloud flavor to use, defaults to "+defaultFlavor)
+		release = fCreate.String("release", defaultRelease,
+			"Release of the image, defaults to "+defaultRelease)
+		channel = fCreate.String("channel", defaultChannel,
+			"Channel of the image, defaults to "+defaultChannel)
+	)
+	fKill := flag.NewFlagSet("fKill", flag.ContinueOnError)
+	var instanceID = fKill.String("instance-id", "", "ID of the instance to kill")
+
+	utilHandler := utils.NewBasicHandler()
+	switch os.Args[1] {
+	case "create":
+		if err := fCreate.Parse(os.Args[2:]); err == nil {
+			cloudClient := cloud.NewCloudClient(defaultCloudProvider, *flavor, utilHandler)
+			ip, id, err := cloudClient.CreateInstance(*release, *channel)
+			if err != nil {
+				log.Panicf("Error creating image for release %s and channel %s, %s", *release, *channel, err)
+			}
+			fmt.Println("Instance ID: " + id)
+			fmt.Println("IP address: " + ip)
+		}
+	case "kill":
+		if err := fKill.Parse(os.Args[2:]); err == nil {
+			cloudClient := &cloud.OpenstackClient{InstanceID: *instanceID, Util: utilHandler}
+			cloudClient.KillInstance()
+		}
+	}
+}

=== renamed directory 'snappy-tests-job' => 'cmd/snappy-tests-job'
=== modified file 'cmd/snappy-tests-job/main.go'
--- snappy-tests-job/main.go	2015-11-27 16:29:33 +0000
+++ cmd/snappy-tests-job/main.go	2015-11-30 15:31:39 +0000
@@ -81,7 +81,7 @@
 	ipString := *ip
 	if ipString == "" {
 		cloudClient := cloud.NewCloudClient(*cloudProvider, *flavor, utilHandler)
-		ipString, err = cloudClient.CreateInstance(*release, *channel)
+		ipString, _, err = cloudClient.CreateInstance(*release, *channel)
 		defer cloudClient.KillInstance()
 
 		if err != nil {