Merge lp:~rvb/gwacl/fix-conflict into lp:gwacl

[Raphaël Badin]

Fix semantic conflict between Julian's branch and mine. (NetworkConfiguration is not an object anymore, it's just a ConfigurationSet object with a 'NetworkConfiguration' type.)

[Gavin Panella (allenap)]

review: Approve

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-07-02 14:21:28 +0000
+++ xmlobjects.go	2013-07-02 15:40:33 +0000
@@ -496,17 +496,17 @@
 // GetRole response bits
 //
 type GetRole struct {
-    XMLName                           xml.Name               `xml:"PersistentVMRole"`
-    XMLNS                             string                 `xml:"xmlns,attr"`
-    XMLNS_I                           string                 `xml:"xmlns:i,attr"`
-    RoleName                          string                 `xml:"RoleName"`
-    OsVersion                         string                 `xml:"OsVersion"`
-    RoleType                          string                 `xml:"RoleType"` // Always PersistentVMRole
-    ConfigurationSets                 []NetworkConfiguration `xml:"ConfigurationSets>ConfigurationSet"`
-    AvailabilitySetName               string                 `xml:"AvailabilitySetName"`
-    OSVirtualHardDisk                 OSVirtualHardDisk      `xml:"OSVirtualHardDisk"`
-    RoleSize                          string                 `xml:"RoleSize"`
-    DefaultWinRmCertificateThumbprint string                 `xml:"DefaultWinRmCertificateThumbprint"`
+    XMLName                           xml.Name           `xml:"PersistentVMRole"`
+    XMLNS                             string             `xml:"xmlns,attr"`
+    XMLNS_I                           string             `xml:"xmlns:i,attr"`
+    RoleName                          string             `xml:"RoleName"`
+    OsVersion                         string             `xml:"OsVersion"`
+    RoleType                          string             `xml:"RoleType"` // Always PersistentVMRole
+    ConfigurationSets                 []ConfigurationSet `xml:"ConfigurationSets>ConfigurationSet"`
+    AvailabilitySetName               string             `xml:"AvailabilitySetName"`
+    OSVirtualHardDisk                 OSVirtualHardDisk  `xml:"OSVirtualHardDisk"`
+    RoleSize                          string             `xml:"RoleSize"`
+    DefaultWinRmCertificateThumbprint string             `xml:"DefaultWinRmCertificateThumbprint"`
     // TODO: DataVirtualHardDisks and other info we don't need right now
 }
 

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-07-02 14:21:28 +0000
+++ xmlobjects_test.go	2013-07-02 15:40:33 +0000
@@ -149,9 +149,10 @@
         RoleName:  "name-of-the-vm",
         OsVersion: "operating-system-version",
         RoleType:  "PersistentVMRole",
-        ConfigurationSets: []NetworkConfiguration{
+        ConfigurationSets: []ConfigurationSet{
             {
-                InputEndpoints: []InputEndpoint{
+                ConfigurationSetType: "NetworkConfiguration",
+                InputEndpoints: &[]InputEndpoint{
                     {
                         LoadBalancedEndpointSetName: "name-of-load-balanced-endpoint-set",
                         LocalPort:                   1,