Merge lp:~fgimenez/snappy-tests-job/generalized-ip-extraction into lp:snappy-tests-job

[Federico Gimenez]

Generalized ip extraction

Generalized ip extraction, valid for both canonistack and neutron based environments

[Leo Arias (elopio)]

lg. I'm just wondering about the diff in the table. Doesn't look needed.

review: Needs Information

[lp:~fgimenez/snappy-tests-job/generalized-ip-extraction]

66. By Federico Gimenez on 2015-10-29

fixed indentation

[Federico Gimenez (fgimenez)]

Don't blame me, the editor decided that :) fixed

[Leo Arias (elopio)]

+1

review: Approve

=== modified file 'cloud/canonistack.go'
--- cloud/canonistack.go	2015-08-11 10:32:38 +0000
+++ cloud/canonistack.go	2015-10-29 16:58:09 +0000
@@ -234,7 +234,7 @@
 			   | OS-SRV-USG:terminated_at             | -                                                                                                         |
 			   | accessIPv4                           |                                                                                                           |
 			   | accessIPv6                           |                                                                                                           |
-			   | canonistack network                  | instance_ip                                                                                               |
+			   | <networkid> network                  | instance_ip                                                                                               |
 			   | config_drive                         |                                                                                                           |
 			   | created                              | 2015-07-27T09:28:49Z                                                                                      |
 			   | flavor                               | m1.small (2)                                                                                              |
@@ -252,8 +252,8 @@
 			   | updated                              | 2015-07-27T09:29:27Z                                                                                      |
 			   | user_id                              | 0534127f70534300baf48e8ac1134734                                                                          |
 			   +--------------------------------------+-----------------------------------------------------------------------------------------------------------+
-		  In this case, the ip should be instace_ip
-
+			In this case, the ip should be instace_ip; <networkid> can be canonistack or, for neutron based stacks, a string containing the user name, as in
+		  net_ues-snappy-integration
 	*/
 
 	reader := strings.NewReader(output)
@@ -264,7 +264,7 @@
 		line := scanner.Text()
 		fields := strings.Fields(line)
 
-		if len(fields) > 3 && fields[1] == "canonistack" && fields[2] == "network" {
+		if len(fields) > 3 && fields[2] == "network" {
 			instanceIP = fields[4]
 			break
 		}

=== modified file 'cloud/canonistack_test.go'
--- cloud/canonistack_test.go	2015-08-11 10:32:38 +0000
+++ cloud/canonistack_test.go	2015-10-29 16:58:09 +0000
@@ -83,7 +83,7 @@
 | OS-SRV-USG:terminated_at             | -                                                                                                         |
 | accessIPv4                           |                                                                                                           |
 | accessIPv6                           |                                                                                                           |
-| canonistack network                  | %s                                                                                                        |
+| generic_networkid_string network     | %s                                                                                                        |
 | config_drive                         |                                                                                                           |
 | created                              | 2015-07-27T09:28:49Z                                                                                      |
 | flavor                               | m1.small (2)                                                                                              |