Merge lp:~fgimenez/snappy-tests-job/openstack-client into lp:snappy-tests-job

[Federico Gimenez]

Updated cloud client from nova to the generric openstack client to prevent https://bugs.launchpad.net/ubuntu/+source/python-keystoneclient/+bug/1242992

Updated cloud client from nova to the generric openstack client to prevent https://bugs.launchpad.net/ubuntu/+source/python-keystoneclient/+bug/1242992

[Leo Arias (elopio)]

review: Approve

=== modified file 'cloud/openstack.go'
--- cloud/openstack.go	2015-12-01 03:50:02 +0000
+++ cloud/openstack.go	2016-01-15 10:11:08 +0000
@@ -35,10 +35,10 @@
 
 const (
 	imgTpl                   = ".*custom.*%s-snappy-core-amd64-%s.*"
-	listImagesCmd            = "nova image-list"
-	launchInstanceCmdTpl     = "nova boot --security-groups ssh --flavor %s --image %s test-%d"
-	describeInstanceCmdTpl   = "nova show %s"
-	killInstanceCmdTpl       = "nova delete %s"
+	listImagesCmd            = "openstack image list"
+	launchInstanceCmdTpl     = "openstack server create --security-group ssh --flavor %s --image %s test-%d"
+	describeInstanceCmdTpl   = "openstack server show %s"
+	killInstanceCmdTpl       = "openstack server delete %s"
 	maxAttempsInstanceWait   = 10
 	secondsToWaitForInstance = 20
 )
@@ -199,7 +199,6 @@
 
 	for i := 0; i < maxAttempsInstanceWait; i++ {
 		output, _ := c.Util.ExecCommand(params)
-
 		if instanceIP = extractInstanceIP(output); instanceIP == "" {
 			log.Print("IP not found, waiting...")
 
@@ -232,7 +231,7 @@
 			   | OS-SRV-USG:terminated_at             | -                                                                                                         |
 			   | accessIPv4                           |                                                                                                           |
 			   | accessIPv6                           |                                                                                                           |
-			   | <networkid> network                  | instance_ip                                                                                               |
+			   | addresses                            | <networkid>=instance_ip                                                                                   |
 			   | config_drive                         |                                                                                                           |
 			   | created                              | 2015-07-27T09:28:49Z                                                                                      |
 			   | flavor                               | m1.small (2)                                                                                              |
@@ -262,8 +261,8 @@
 		line := scanner.Text()
 		fields := strings.Fields(line)
 
-		if len(fields) > 3 && fields[2] == "network" {
-			instanceIP = fields[4]
+		if len(fields) > 4 && fields[1] == "addresses" {
+			instanceIP = strings.Split(fields[3], "=")[1]
 			break
 		}
 	}
 
=== modified file 'cloud/openstack_test.go'
--- cloud/openstack_test.go	2015-12-01 03:43:15 +0000
+++ cloud/openstack_test.go	2016-01-15 10:11:08 +0000
@@ -31,7 +31,7 @@
 )
 
 const (
-	defaultFlavor = "m1.quitelarge"
+	defaultFlavor  = "m1.quitelarge"
 	defaultRelease = "1504"
 	defaultChannel = "edge"
 	imageListTpl   = `| e37ef727-014d-48e8-b0e4-94cf39e1dbbc | ubuntu-released/ubuntu-wily-alpha1-amd64-server-20150624-disk1.img                                   | ACTIVE |                                      |
@@ -84,7 +84,7 @@
 | OS-SRV-USG:terminated_at             | -                                                                                                         |
 | accessIPv4                           |                                                                                                           |
 | accessIPv6                           |                                                                                                           |
-| generic_networkid_string network     | %s                                                                                                        |
+| addresses                            | generic_networkid_string=%s                                                                               |
 | config_drive                         |                                                                                                           |
 | created                              | 2015-07-27T09:28:49Z                                                                                      |
 | flavor                               | m1.small (2)                                                                                              |