Merge lp:~wallyworld/gwacl/cloud-init-fix into lp:gwacl

[Ian Booth]

This branch tweaks an earlier fix for the Azure API change. It reverts part of that fix and puts a base64 encode operation in the correct place.

This branch tweaks an earlier fix for the Azure API change. It reverts part of that fix and puts a base64 encode operation in the correct place.

[lp:~wallyworld/gwacl/cloud-init-fix]

230. By Ian Booth on 2013-10-31

Reorder import

231. By Ian Booth on 2013-10-31

Reorder import

[Ian Booth (wallyworld)]

Self review - revert part of previous fix and add a trivial change to test utility.

review: Approve

=== modified file 'example/management/run.go'
--- example/management/run.go	2013-08-14 13:09:37 +0000
+++ example/management/run.go	2013-10-31 08:08:53 +0000
@@ -10,6 +10,7 @@
 package main
 
 import (
+    "encoding/base64"
     "flag"
     "fmt"
     "launchpad.net/gwacl"
@@ -187,8 +188,9 @@
     password := "Ubuntu123"
     username := "ubuntu"
     vhdName := gwacl.MakeRandomDiskName("gwacldisk")
+	userdata := base64.StdEncoding.EncodeToString([]byte("TEST_USER_DATA"))
     linuxConfigurationSet := gwacl.NewLinuxProvisioningConfigurationSet(
-        hostname, username, password, "TEST_USER_DATA", "false")
+        hostname, username, password, userdata, "false")
     inputendpoint := gwacl.InputEndpoint{LocalPort: 22, Name: "sshport", Port: 22, Protocol: "TCP"}
     networkConfigurationSet := gwacl.NewNetworkConfigurationSet([]gwacl.InputEndpoint{inputendpoint}, nil)
 

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-10-31 02:54:33 +0000
+++ xmlobjects.go	2013-10-31 08:08:53 +0000
@@ -89,7 +89,7 @@
         Hostname:                         Hostname,
         Username:                         Username,
         Password:                         Password,
-        CustomData:                       base64.StdEncoding.EncodeToString([]byte(CustomData)),
+        CustomData:                       CustomData,
         DisableSSHPasswordAuthentication: DisableSSHPasswordAuthentication,
     }
 }

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-10-31 04:13:46 +0000
+++ xmlobjects_test.go	2013-10-31 08:08:53 +0000
@@ -1322,7 +1322,7 @@
     c.Check(config.Hostname, Equals, hostname)
     c.Check(config.Username, Equals, username)
     c.Check(config.Password, Equals, password)
-    c.Check(config.CustomData, Equals, base64.StdEncoding.EncodeToString([]byte(customdata)))
+    c.Check(config.CustomData, Equals, customdata)
     c.Check(config.DisableSSHPasswordAuthentication, Equals, disablessh)
     c.Check(config.ConfigurationSetType, Equals, "LinuxProvisioningConfiguration")
 }