Merge lp:~rvb/gwacl/example-clean-up into lp:gwacl

[Raphaël Badin]

Use virtual network and affinity group in example script.

This branch fixes the management example script: now the created hosted service used the created affinity group and the created deployment is tied to the created virtual network.

Drive-by fix: only print the hostname/password/username when pausing (otherwise the host is short-lived anyway).

[Gavin Panella (allenap)]

Consider wrapping some of the longer lines.

review: Approve

[Raphaël Badin (rvb)]

> Consider wrapping some of the longer lines.

Done, thanks for the review.

[Julian Edwards (julian-edwards)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'example/management/run.go'
--- example/management/run.go	2013-08-06 05:11:29 +0000
+++ example/management/run.go	2013-08-14 13:09:44 +0000
@@ -137,15 +137,16 @@
     Infof("Getting OS Image for release '%s' and location '%s'...\n", release, location)
     images, err := api.ListOSImages()
     checkError(err)
-    preciseImage, err := images.GetLatestUbuntuImage(release, location)
+    image, err := images.GetLatestUbuntuImage(release, location)
     checkError(err)
-    sourceImageName := preciseImage.Name
+    sourceImageName := image.Name
     Infof("Got image named '%s'\n", sourceImageName)
     Info("Done getting OS Image\n")
 
     hostServiceName := gwacl.MakeRandomHostedServiceName("gwacl")
     Infof("Creating a hosted service: '%s'...\n", hostServiceName)
     createHostedService := gwacl.NewCreateHostedServiceWithLocation(hostServiceName, "testLabel", location)
+    createHostedService.AffinityGroup = affinityGroupName
     err = api.AddHostedService(createHostedService)
     checkError(err)
     Info("Done creating a hosted service\n")
@@ -186,7 +187,8 @@
     password := "Ubuntu123"
     username := "ubuntu"
     vhdName := gwacl.MakeRandomDiskName("gwacldisk")
-    linuxConfigurationSet := gwacl.NewLinuxProvisioningConfigurationSet(hostname, username, password, "TEST_USER_DATA", "false")
+    linuxConfigurationSet := gwacl.NewLinuxProvisioningConfigurationSet(
+        hostname, username, password, "TEST_USER_DATA", "false")
     inputendpoint := gwacl.InputEndpoint{LocalPort: 22, Name: "sshport", Port: 22, Protocol: "TCP"}
     networkConfigurationSet := gwacl.NewNetworkConfigurationSet([]gwacl.InputEndpoint{inputendpoint}, nil)
 
@@ -210,9 +212,12 @@
     diskLabel := makeRandomIdentifier("gwacl", 64)
     vhd := gwacl.NewOSVirtualHardDisk("", diskLabel, diskName, mediaLink, sourceImageName, "Linux")
     roleName := gwacl.MakeRandomRoleName("gwaclrole")
-    role := gwacl.NewRole("ExtraSmall", roleName, []gwacl.ConfigurationSet{*linuxConfigurationSet, *networkConfigurationSet}, []gwacl.OSVirtualHardDisk{*vhd})
+    role := gwacl.NewRole("ExtraSmall", roleName,
+        []gwacl.ConfigurationSet{*linuxConfigurationSet, *networkConfigurationSet},
+        []gwacl.OSVirtualHardDisk{*vhd})
     machineName := makeRandomIdentifier("gwaclmachine", 20)
-    deployment := gwacl.NewDeploymentForCreateVMDeployment(machineName, "Staging", machineName, []gwacl.Role{*role}, "")
+    deployment := gwacl.NewDeploymentForCreateVMDeployment(
+        machineName, "Production", machineName, []gwacl.Role{*role}, virtualNetworkName)
     err = api.AddDeployment(deployment, hostServiceName)
     checkError(err)
     Info("Done adding VM deployment\n")
@@ -236,11 +241,6 @@
     checkError(err)
     Info("Got deployment info\n")
 
-    Info("host:", fqdn)
-    Info("username:", username)
-    Info("password:", password)
-    Info("")
-
     Info("Adding role input endpoint...")
     endpoint := gwacl.InputEndpoint{
         Name:      gwacl.MakeRandomHostname("endpoint-"),
@@ -271,6 +271,10 @@
 
     if pause {
         var wait string
+        fmt.Println("host:", fqdn)
+        fmt.Println("username:", username)
+        fmt.Println("password:", password)
+        fmt.Println("")
         fmt.Println("Pausing so you can play with the newly-created VM")
         fmt.Println("To clear up, type something and press enter to continue")
         fmt.Scan(&wait)