Merge lp:~allenap/gwacl/test-unused-osimage-fields into lp:gwacl

[Gavin Panella]

Test OSImage for use with Add OS Image, List OS Images, and Update OS Image calls.

Previously several fields of OSImage were untested.

[Julian Edwards (julian-edwards)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 review: approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlHCWNMACgkQWhGlTF8G/HeASwCfXoe06ybQa075rkb9To1MXAyi
n2gAniX5MJddHLEKjYnXTXZs0RXqW1Er
=gNvw
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-06-18 15:43:10 +0000
+++ xmlobjects.go	2013-06-19 13:09:58 +0000
@@ -172,8 +172,13 @@
     PublishedDate     string  `xml:"PublishedDate,omitempty"`
     IsPremium         string  `xml:"IsPremium,omitempty"`
     PrivacyURI        string  `xml:"PrivacyUri,omitempty"`
+    PricingDetailLink string  `xml:"PricingDetailLink,omitempty"`
+    IconURI           string  `xml:"IconUri,omitempty"`
     RecommendedVMSize string  `xml:"RecommendedVMSize,omitempty"`
     PublisherName     string  `xml:"PublisherName"`
+    ShowInGUI         string  `xml:"ShowInGui"`
+    SmallIconURI      string  `xml:"SmallIconUri,omitempty"`
+    Language          string  `xml:"Language"`
 }
 
 func (image *OSImage) hasLocation(location string) bool {

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-05-15 07:51:24 +0000
+++ xmlobjects_test.go	2013-06-19 13:09:58 +0000
@@ -746,6 +746,153 @@
     c.Check(string(xml), Equals, expectedXML)
 }
 
+// TestOSImageWRTAddOSImage demonstrates the OSImage is a suitable container
+// for the OSImage XML trees that are required for the Add OS Image API call.
+func (suite *xmlSuite) TestOSImageWRTAddOSImage(c *C) {
+    // From http://msdn.microsoft.com/en-us/library/windowsazure/jj157192.aspx
+    input := `
+        <OSImage xmlns="http://schemas.microsoft.com/windowsazure">
+           <Label>image-label</Label>
+           <MediaLink>uri-of-the-containing-blob</MediaLink>
+           <Name>image-name</Name>
+           <OS>Linux|Windows</OS>
+           <Eula>image-eula</Eula>
+           <Description>image-description</Description>
+           <ImageFamily>image-family</ImageFamily>
+           <PublishedDate>published-date</PublishedDate>
+           <IsPremium>true/false</IsPremium>
+           <ShowInGui>true/false</ShowInGui>
+           <PrivacyUri>http://www.example.com/privacypolicy.html</PrivacyUri>
+           <IconUri>http://www.example.com/favicon.png</IconUri>
+           <RecommendedVMSize>Small/Large/Medium/ExtraLarge</RecommendedVMSize>
+           <SmallIconUri>http://www.example.com/smallfavicon.png</SmallIconUri>
+           <Language>language-of-image</Language>
+        </OSImage>
+        `
+    expected := &OSImage{
+        Label:             "image-label",
+        MediaLink:         "uri-of-the-containing-blob",
+        Name:              "image-name",
+        OS:                "Linux|Windows",
+        EULA:              "image-eula",
+        Description:       "image-description",
+        ImageFamily:       "image-family",
+        PublishedDate:     "published-date",
+        IsPremium:         "true/false",
+        ShowInGUI:         "true/false",
+        PrivacyURI:        "http://www.example.com/privacypolicy.html",
+        IconURI:           "http://www.example.com/favicon.png",
+        RecommendedVMSize: "Small/Large/Medium/ExtraLarge",
+        SmallIconURI:      "http://www.example.com/smallfavicon.png",
+        Language:          "language-of-image",
+    }
+
+    osimage := &OSImage{}
+    err := osimage.Deserialize([]byte(input))
+    c.Assert(err, IsNil)
+    c.Assert(osimage, DeepEquals, expected)
+}
+
+// TestOSImageWRTListOSImages demonstrates that OSImage is a suitable
+// container for the OSImage XML subtrees that are returned from the List OS
+// Images API call.
+func (suite *xmlSuite) TestOSImageWRTListOSImages(c *C) {
+    // From http://msdn.microsoft.com/en-us/library/windowsazure/jj157191.aspx
+    input := `
+        <OSImage xmlns="http://schemas.microsoft.com/windowsazure">
+          <AffinityGroup>name-of-the-affinity-group</AffinityGroup>
+          <Category>category-of-the-image</Category>
+          <Label>image-description</Label>
+          <Location>geo-location-of-the-stored-image</Location>
+          <LogicalSizeInGB>123.456</LogicalSizeInGB>
+          <MediaLink>url-of-the-containing-blob</MediaLink>
+          <Name>image-name</Name>
+          <OS>operating-system-of-the-image</OS>
+          <Eula>image-eula</Eula>
+          <Description>image-description</Description>
+          <ImageFamily>image-family</ImageFamily>
+          <ShowInGui>true|false</ShowInGui>
+          <PublishedDate>published-date</PublishedDate>
+          <IsPremium>true|false</IsPremium>
+          <PrivacyUri>uri-of-privacy-policy</PrivacyUri>
+          <RecommendedVMSize>size-of-the-virtual-machine</RecommendedVMSize>
+          <PublisherName>publisher-identifier</PublisherName>
+          <PricingDetailLink>pricing-details</PricingDetailLink>
+          <SmallIconUri>uri-of-icon</SmallIconUri>
+          <Language>language-of-image</Language>
+        </OSImage>
+        `
+    expected := &OSImage{
+        AffinityGroup:     "name-of-the-affinity-group",
+        Category:          "category-of-the-image",
+        Label:             "image-description",
+        Location:          "geo-location-of-the-stored-image",
+        LogicalSizeInGB:   123.456,
+        MediaLink:         "url-of-the-containing-blob",
+        Name:              "image-name",
+        OS:                "operating-system-of-the-image",
+        EULA:              "image-eula",
+        Description:       "image-description",
+        ImageFamily:       "image-family",
+        ShowInGUI:         "true|false",
+        PublishedDate:     "published-date",
+        IsPremium:         "true|false",
+        PrivacyURI:        "uri-of-privacy-policy",
+        RecommendedVMSize: "size-of-the-virtual-machine",
+        PublisherName:     "publisher-identifier",
+        PricingDetailLink: "pricing-details",
+        SmallIconURI:      "uri-of-icon",
+        Language:          "language-of-image",
+    }
+
+    osimage := &OSImage{}
+    err := osimage.Deserialize([]byte(input))
+    c.Assert(err, IsNil)
+    c.Assert(osimage, DeepEquals, expected)
+}
+
+// TestOSImageWRTUpdateOSImage demonstrates the OSImage is a suitable
+// container for the OSImage XML trees that are required for the Update OS
+// Image API call.
+func (suite *xmlSuite) TestOSImageWRTUpdateOSImage(c *C) {
+    // From http://msdn.microsoft.com/en-us/library/windowsazure/jj157198.aspx
+    input := `
+        <OSImage xmlns="http://schemas.microsoft.com/windowsazure">
+          <Label>image-label</Label>
+          <Eula>image-eula</Eula>
+          <Description>Image-Description</Description>
+          <ImageFamily>Image-Family</ImageFamily>
+          <PublishedDate>published-date</PublishedDate>
+          <IsPremium>true/false</IsPremium>
+          <ShowInGui>true/false</ShowInGui>
+          <PrivacyUri>http://www.example.com/privacypolicy.html</PrivacyUri>
+          <IconUri>http://www.example.com/favicon.png</IconUri>
+          <RecommendedVMSize>Small/Large/Medium/ExtraLarge</RecommendedVMSize>
+          <SmallIconUri>http://www.example.com/smallfavicon.png</SmallIconUri>
+          <Language>language-of-image</Language>
+        </OSImage>
+        `
+    expected := &OSImage{
+        Label:             "image-label",
+        EULA:              "image-eula",
+        Description:       "Image-Description",
+        ImageFamily:       "Image-Family",
+        PublishedDate:     "published-date",
+        IsPremium:         "true/false",
+        ShowInGUI:         "true/false",
+        PrivacyURI:        "http://www.example.com/privacypolicy.html",
+        IconURI:           "http://www.example.com/favicon.png",
+        RecommendedVMSize: "Small/Large/Medium/ExtraLarge",
+        SmallIconURI:      "http://www.example.com/smallfavicon.png",
+        Language:          "language-of-image",
+    }
+
+    osimage := &OSImage{}
+    err := osimage.Deserialize([]byte(input))
+    c.Assert(err, IsNil)
+    c.Assert(osimage, DeepEquals, expected)
+}
+
 func (suite *xmlSuite) TestOSImageHasLocation(c *C) {
     image := &OSImage{
         Location: "East Asia;Southeast Asia;North Europe;West Europe;East US;West US",