Merge lp:~axwalk/gwacl/vnet-location-docalignment into lp:gwacl

[Andrew Wilkins]

Virtual networking changes

- Add Location field to NetworkConfiguration,
  so we can use that instead of AffinityGroup
  as the docs recommend.
- Use text/plain content-type in network config
  PUT, as specified in the docs.
- Use the most recent version for the network
  config APIs, which is actually older than what
  was in the code.
- Fix various "omitempty" tags.

Virtual networking changes

- Add Location field to NetworkConfiguration,
  so we can use that instead of AffinityGroup
  as the docs recommend.
- Use text/plain content-type in network config
  PUT, as specified in the docs.
- Use the most recent version for the network
  config APIs, which is actually older than what
  was in the code.
- Fix various "omitempty" tags.

[Ian Booth (wallyworld)]

review: Approve

=== modified file 'management_base.go'
--- management_base.go	2014-03-12 03:56:53 +0000
+++ management_base.go	2014-06-24 09:45:42 +0000
@@ -593,7 +593,7 @@
 // be nil.
 // See http://msdn.microsoft.com/en-us/library/windowsazure/jj157196.aspx
 func (api *ManagementAPI) GetNetworkConfiguration() (*NetworkConfiguration, error) {
-    response, err := api.session.get("services/networking/media", "2013-10-01")
+    response, err := api.session.get("services/networking/media", "2012-03-01")
     if err != nil {
         if IsNotFoundError(err) {
             return nil, nil
@@ -618,8 +618,9 @@
         return err
     }
     response, err := api.session.put(
-        "services/networking/media", "2013-10-01", []byte(body),
-        "application/octet-stream")
+        "services/networking/media", "2012-03-01", []byte(body),
+        "text/plain",
+    )
     if err != nil {
         return err
     }

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2014-03-10 03:56:29 +0000
+++ xmlobjects.go	2014-06-24 09:45:42 +0000
@@ -499,7 +499,7 @@
     Locked             string             `xml:"Locked,omitempty"`          // Only used for "Get Deployment."
     RollbackAllowed    string             `xml:"RollbackAllowed,omitempty"` // Only used for "Get Deployment."
     VirtualNetworkName string             `xml:VirtualNetworkName,omitempty"`
-    DNS                []DnsServer        `xml:"Dns>DnsServers>DnsServer",omitempty`
+    DNS                []DnsServer        `xml:"Dns>DnsServers>DnsServer,omitempty"`
     ExtendedProperties []ExtendedProperty `xml:"ExtendedProperties>ExtendedProperty,omitempty"` // Only used for "Get Deployment."
 }
 
@@ -667,18 +667,19 @@
 
 type VirtualNetworkSite struct {
     Name                 string          `xml:"name,attr"`
-    AffinityGroup        string          `xml:"AffinityGroup,attr"`
+    AffinityGroup        string          `xml:"AffinityGroup,attr,omitempty"`
+    Location             string          `xml:"Location,attr,omitempty"`
     AddressSpacePrefixes []string        `xml:"AddressSpace>AddressPrefix"`
-    Subnets              *[]Subnet       `xml:"Subnets>Subnet",omitempty`
-    DnsServersRef        *[]DnsServerRef `xml:"DnsServersRef>DnsServerRef",omitempty`
-    Gateway              *Gateway        `xml:"Gateway",omitempty`
+    Subnets              *[]Subnet       `xml:"Subnets>Subnet,omitempty"`
+    DnsServersRef        *[]DnsServerRef `xml:"DnsServersRef>DnsServerRef,omitempty"`
+    Gateway              *Gateway        `xml:"Gateway,omitempty"`
 }
 
 type NetworkConfiguration struct {
     XMLNS               string                 `xml:"xmlns,attr"`
-    DNS                 *[]VirtualNetDnsServer `xml:"VirtualNetworkConfiguration>Dns>DnsServers>DnsServer",omitempty`
-    LocalNetworkSites   *[]LocalNetworkSite    `xml:"VirtualNetworkConfiguration>LocalNetworkSites>LocalNetworkSite",omitempty`
-    VirtualNetworkSites *[]VirtualNetworkSite  `xml:"VirtualNetworkConfiguration>VirtualNetworkSites>VirtualNetworkSite",omitempty`
+    DNS                 *[]VirtualNetDnsServer `xml:"VirtualNetworkConfiguration>Dns>DnsServers>DnsServer,omitempty"`
+    LocalNetworkSites   *[]LocalNetworkSite    `xml:"VirtualNetworkConfiguration>LocalNetworkSites>LocalNetworkSite,omitempty"`
+    VirtualNetworkSites *[]VirtualNetworkSite  `xml:"VirtualNetworkConfiguration>VirtualNetworkSites>VirtualNetworkSite,omitempty"`
 }
 
 func (nc *NetworkConfiguration) Serialize() (string, error) {
@@ -698,7 +699,7 @@
     XMLNS       string `xml:"xmlns,attr"`
     Name        string `xml:"Name"`
     Label       string `xml:"Label"` // Must be base64 encoded.
-    Description string `xml:"Description",omitempty`
+    Description string `xml:"Description,omitempty"`
     Location    string `xml:"Location"` // Value comes from ListLocations.
 }
 
@@ -721,7 +722,7 @@
 type UpdateAffinityGroup struct {
     XMLNS       string `xml:"xmlns,attr"`
     Label       string `xml:"Label"` // Must be base64 encoded.
-    Description string `xml:"Description",omitempty`
+    Description string `xml:"Description,omitempty"`
 }
 
 func (u *UpdateAffinityGroup) Serialize() (string, error) {