Merge lp:~julian-edwards/gwacl/getrole into lp:gwacl

[Julian Edwards]

Define XML response struct for the GetRole API call.

This will be required for port listing/opening/closing.

[Jeroen T. Vermeulen (jtv)]

The test is ginormous. All that, basically, just to establish that the struct represents the right XML! I see the value though.

review: Approve

[Julian Edwards (julian-edwards)]

On 02/07/13 17:39, Jeroen T. Vermeulen wrote:
> Review: Approve
>
> The test is ginormous. All that, basically, just to establish that the struct represents the right XML! I see the value though.
>

Yeah, we learned our lesson previously not testing these structs
thoroughly! The XML tags are very important and easy to get wrong.

Thanks!

=== modified file 'storage_test.go'
--- storage_test.go	2013-07-02 04:18:26 +0000
+++ storage_test.go	2013-07-02 06:12:22 +0000
@@ -397,7 +397,7 @@
         DeepEquals, url.Values{
             "restype": {"container"},
             "comp":    {"list"},
-    })
+        })
 
     // Check the DeleteBlob exchanges.
     c.Check(

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-07-02 00:29:45 +0000
+++ xmlobjects.go	2013-07-02 06:12:22 +0000
@@ -479,6 +479,28 @@
 var restartRoleOperation = newRoleOperation("RestartRoleOperation")
 
 //
+// 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"`
+    // TODO: DataVirtualHardDisks and other info we don't need right now
+}
+
+func (g *GetRole) Deserialize(data []byte) error {
+    return xml.Unmarshal(data, g)
+}
+
+//
 // Storage Services bits
 //
 

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-07-01 01:14:04 +0000
+++ xmlobjects_test.go	2013-07-02 06:12:22 +0000
@@ -140,6 +140,118 @@
     c.Check(xml, Equals, expected)
 }
 
+func (suite *xmlSuite) TestGetRole(c *C) {
+    expected := &GetRole{
+        XMLName: xml.Name{
+            Space: "http://schemas.microsoft.com/windowsazure",
+            Local: "PersistentVMRole"},
+        XMLNS:     XMLNS,
+        RoleName:  "name-of-the-vm",
+        OsVersion: "operating-system-version",
+        RoleType:  "PersistentVMRole",
+        ConfigurationSets: []NetworkConfiguration{
+            {
+                InputEndpoints: []InputEndpoint{
+                    {
+                        LoadBalancedEndpointSetName: "name-of-load-balanced-endpoint-set",
+                        LocalPort:                   1,
+                        Name:                        "name-of-input-endpoint",
+                        Port:                        1,
+                        Protocol:                    "TCP|UDP",
+                    },
+                    {
+                        LoadBalancedEndpointSetName: "name-of-load-balanced-endpoint-set",
+                        LocalPort:                   2,
+                        Name:                        "name-of-input-endpoint",
+                        Port:                        2,
+                        Protocol:                    "TCP|UDP",
+                    },
+                },
+            },
+        },
+        AvailabilitySetName: "name-of-availability-set",
+        OSVirtualHardDisk: OSVirtualHardDisk{
+            HostCaching:     "host-caching-mode-of-os-disk",
+            DiskName:        "name-of-os-disk",
+            MediaLink:       "path-to-vhd",
+            SourceImageName: "image-used-to-create-os-disk",
+            OS:              "operating-system-on-os-disk",
+        },
+        RoleSize: "size-of-instance",
+        DefaultWinRmCertificateThumbprint: "winrm-cert-thumbprint",
+    }
+
+    // This template is from
+    // http://msdn.microsoft.com/en-us/library/windowsazure/jj157193.aspx
+    template := dedent.Dedent(`
+        <PersistentVMRole xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+          <RoleName>name-of-the-vm</RoleName>
+          <OsVersion>operating-system-version</OsVersion>
+          <RoleType>PersistentVMRole</RoleType>      
+          <ConfigurationSets>
+            <ConfigurationSet>
+              <ConfigurationSetType>NetworkConfiguration</ConfigurationSetType>          
+              <InputEndpoints>
+                <InputEndpoint>                
+                  <LoadBalancedEndpointSetName>name-of-load-balanced-endpoint-set</LoadBalancedEndpointSetName>
+                  <LocalPort>1</LocalPort>
+                  <Name>name-of-input-endpoint</Name>
+                  <Port>1</Port>
+                  <LoadBalancerProbe>
+                    <Path>path-of-probe</Path>
+                    <Port>port-assigned-to-probe</Port>
+                    <Protocol>protocol-of-input-endpoint</Protocol>                    
+                  </LoadBalancerProbe>
+                  <Protocol>TCP|UDP</Protocol>                    
+                  <Vip>virtual-ip-address-of-input-endpoint</Vip>
+                </InputEndpoint>
+                <InputEndpoint>                
+                  <LoadBalancedEndpointSetName>name-of-load-balanced-endpoint-set</LoadBalancedEndpointSetName>
+                  <LocalPort>2</LocalPort>
+                  <Name>name-of-input-endpoint</Name>
+                  <Port>2</Port>
+                  <LoadBalancerProbe>
+                    <Path>path-of-probe</Path>
+                    <Port>port-assigned-to-probe</Port>
+                    <Protocol>protocol-of-input-endpoint</Protocol>                    
+                  </LoadBalancerProbe>
+                  <Protocol>TCP|UDP</Protocol>                    
+                  <Vip>virtual-ip-address-of-input-endpoint</Vip>
+                </InputEndpoint>
+              </InputEndpoints>
+              <SubnetNames>
+                <SubnetName>name-of-subnet</SubnetName>
+              </SubnetNames>
+            </ConfigurationSet>
+          </ConfigurationSets>
+          <AvailabilitySetName>name-of-availability-set</AvailabilitySetName>
+          <DataVirtualHardDisks>
+            <DataVirtualHardDisk>
+              <HostCaching>host-caching-mode-of-data-disk</HostCaching> 
+              <DiskName>new-or-existing-disk-name</DiskName>
+              <Lun>logical-unit-number-of-data-disk</Lun>
+              <LogicalDiskSizeInGB>size-of-data-disk</LogicalDiskSizeInGB>            
+              <MediaLink>path-to-vhd</MediaLink>
+            </DataVirtualHardDisk>
+          </DataVirtualHardDisks>
+          <OSVirtualHardDisk>
+            <HostCaching>host-caching-mode-of-os-disk</HostCaching>    
+            <DiskName>name-of-os-disk</DiskName>                    
+            <MediaLink>path-to-vhd</MediaLink>
+            <SourceImageName>image-used-to-create-os-disk</SourceImageName>
+            <OS>operating-system-on-os-disk</OS>
+          </OSVirtualHardDisk>      
+          <RoleSize>size-of-instance</RoleSize>
+          <DefaultWinRmCertificateThumbprint>winrm-cert-thumbprint</DefaultWinRmCertificateThumbprint>      
+        </PersistentVMRole>
+        `)
+
+    observed := &GetRole{}
+    err := observed.Deserialize([]byte(template))
+    c.Assert(err, IsNil)
+    c.Assert(observed, DeepEquals, expected)
+}
+
 func (suite *xmlSuite) TestDeployment(c *C) {
     deployment := makeDeployment()
     dns := deployment.DNS[0]