Merge lp:~allenap/gwacl/set-network-configuration into lp:gwacl

[Gavin Panella]

Get SetNetworkConfiguration working in practice.

This is mostly yak hair.

- Azure doesn't actually like the Label tag in VirtualNetworkSite
  elements, even though the example operation docs show it.

- Other sub-elements are optional in the VirtualNetworkSite.

- PUT with the x509 dispatcher didn't work. I added a Request struct
  in the tests so that we can capture the request body content, and
  this showed up the problem. I fixed that by using the OPT_UPLOAD
  flag and requesting chunked transfers.

- PUT requests should also have a content-type, so I added this.

- I added a function for creating a random virtual network name. I
  also ensured that all random identifiers have at least 5 random
  characters, which gives about a 1 in 60 million chance of a
  collision.

- Built on the work Julian did on the example to create an affinity
  group and virtual network, then tear it down again. This is a work
  in progress; the deployed VMs are not using the virtual network or
  affinity group, and the network config gets clobbered. However,
  these are tasks for a subsequent branch.

[Julian Edwards (julian-edwards)]

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

 review: approve
 merge: approve

Nice change, thank you. I'll land it right away, if there's anything
coming out of my questions below it can get fixed later.

On 11/07/13 03:11, Gavin Panella wrote:
> - Azure doesn't actually like the Label tag in VirtualNetworkSite
> elements, even though the example operation docs show it.

Can you file a bug on ***sing please, they asked if we could do this
for any doc problems.

> - Built on the work Julian did on the example to create an
> affinity group and virtual network, then tear it down again. This
> is a work in progress; the deployed VMs are not using the virtual
> network or affinity group, and the network config gets clobbered.
> However, these are tasks for a subsequent branch.

That's cool, at least it shows the actual API calls work.

> === modified file 'example/management/run.go'

Gosh those changes looked familiar :)

> === modified file 'management_base_test.go' ---
> management_base_test.go 2013-07-10 10:08:25 +0000 +++
> management_base_test.go 2013-07-10 17:10:42 +0000 @@ -929,7 +929,6
> @@ { Name: "virtual-network-name", AffinityGroup:
> "affinity-group-name", - Label:
> "label-for-the-site", AddressSpacePrefixes: []string{
> "CIDR-identifier", }, @@ -944,7 +943,7 @@ Name:
> "primary-DNS-name", }, }, - Gateway: Gateway{ +
> Gateway: &Gateway{

Urgh, the fact that we have to work around the Go omitempty bug with
pointers like is particularly f'in annoying as it leaves our
structures inconsistently presented.

> === modified file 'x509dispatcher.go' --- x509dispatcher.go
> 2013-07-01 13:04:17 +0000 +++ x509dispatcher.go 2013-07-10 17:10:42
> +0000 @@ -61,12 +61,13 @@
>
> // newX509RequestPUT initializes an X509Request for a PUT. You may
> still // need to set further values. -func newX509RequestPUT(url
> string, payload []byte) *X509Request { +func newX509RequestPUT(url
> string, payload []byte, contentType string) *X509Request { return
> &X509Request{ - Method: "PUT", - URL:
> url, - APIVersion: baseAPIVersion, - Payload:
> payload, + Method: "PUT", + URL: url, +
> APIVersion: baseAPIVersion, + Payload: payload, +
> ContentType: contentType,

Sigh, gofmt, SIGH.

> } }
>
> @@ -201,7 +202,7 @@ if len(request.Payload) != 0 { headers =
> append(headers, "Content-Type: "+request.ContentType) // Arrange
> for the request body to be written. -
> ch.Setopt(curl.OPT_POSTFIELDSIZE, len(request.Payload)) +
> headers = append(headers, "Transfer-Encoding: chunked")
> ch.Setopt(curl.OPT_READFUNCTION, func(buf []byte, _ interface{})
> int { // Buffered request write. Copy as much of the payload as
> will // fit into the buffer curl gave us for it, and return the
> number @@ -242,7 +243,7 @@ case "POST": ch.Setopt(curl.OPT_POST,
> true) case "PUT": - ch.Setopt(curl.OPT_CUSTOMREQUEST,
> "PUT") + ch.Setopt(curl.OPT_UPLOAD, true)

Out of interest, where is PUT set now? Does OPT_UPLOAD imply PUT?
(Sorry, I know bugger all about curl)

> case "DELETE": ch.Setopt(curl.OPT_CUSTOMREQUEST, "DELETE")
> default:
>
> === modified f...

review: Approve

[Gavin Panella (allenap)]

Thanks for the review :)

> > - Azure doesn't actually like the Label tag in VirtualNetworkSite
> > elements, even though the example operation docs show it.
>
> Can you file a bug on ***sing please, they asked if we could do this
> for any doc problems.

Filed as bug 1200120.

...
> > === modified file 'management_base_test.go' ---
> > management_base_test.go     2013-07-10 10:08:25 +0000 +++
> > management_base_test.go     2013-07-10 17:10:42 +0000 @@ -929,7 +929,6
> > @@ { Name:          "virtual-network-name", AffinityGroup:
> > "affinity-group-name", -                Label:
> > "label-for-the-site", AddressSpacePrefixes: []string{
> > "CIDR-identifier", }, @@ -944,7 +943,7 @@ Name:
> > "primary-DNS-name", }, }, -                Gateway: Gateway{ +
> > Gateway: &Gateway{
>
> Urgh, the fact that we have to work around the Go omitempty bug with
> pointers like is particularly f'in annoying as it leaves our
> structures inconsistently presented.

Indeed :-/

...
> > @@ -201,7 +202,7 @@ if len(request.Payload) != 0 { headers =
> > append(headers, "Content-Type: "+request.ContentType) // Arrange
> > for the request body to be written. -
> > ch.Setopt(curl.OPT_POSTFIELDSIZE, len(request.Payload)) +
> > headers = append(headers, "Transfer-Encoding: chunked")
> > ch.Setopt(curl.OPT_READFUNCTION, func(buf []byte, _ interface{})
> > int { // Buffered request write.  Copy as much of the payload as
> > will // fit into the buffer curl gave us for it, and return the
> > number @@ -242,7 +243,7 @@ case "POST": ch.Setopt(curl.OPT_POST,
> > true) case "PUT": -        ch.Setopt(curl.OPT_CUSTOMREQUEST,
> > "PUT") +        ch.Setopt(curl.OPT_UPLOAD, true)
>
> Out of interest, where is PUT set now?  Does OPT_UPLOAD imply PUT?
> (Sorry, I know bugger all about curl)

Yeah, I just bumbled my way to
http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTUPLOAD

...
> > === modified file 'x509dispatcher_test.go' ---
...
> > inspection. +        requestBody, err := ioutil.ReadAll(r.Body)
>
> Doesn't this need the NopCloser trick?  Or is r.Body still readable later?

r.Body isn't readable in the test; it seems that it gets sucked dry
well before; I suspect that it's something that the ServeMux sorts
out.

=== modified file 'example/management/run.go'
--- example/management/run.go	2013-07-10 12:49:25 +0000
+++ example/management/run.go	2013-07-10 17:10:42 +0000
@@ -88,16 +88,6 @@
 
 func ExerciseHostedServicesAPI(api *gwacl.ManagementAPI) {
     var err error
-    networkConfig, err := api.GetNetworkConfiguration()
-    checkError(err)
-    if networkConfig == nil {
-        fmt.Println("No network configuration is set.")
-    } else {
-        xml, err := networkConfig.Serialize()
-        checkError(err)
-        fmt.Println(xml)
-    }
-
     location := "West US"
     release := "13.04"
 
@@ -110,11 +100,52 @@
     fmt.Printf("Created affinity group %s\n", affinityGroupName)
 
     defer func() {
-        fmt.Println("Deleting affinity group %s", affinityGroupName)
+        fmt.Printf("Deleting affinity group %s\n", affinityGroupName)
         api.DeleteAffinityGroup(&gwacl.DeleteAffinityGroupRequest{
             Name: affinityGroupName})
-        fmt.Println("Done deleting affinity group %s", affinityGroupName)
-    }()
+        fmt.Printf("Done deleting affinity group %s\n", affinityGroupName)
+    }()
+
+    virtualNetworkName := gwacl.MakeRandomVirtualNetworkName("virtual-net-")
+    fmt.Printf("Creating virtual network %s...\n", virtualNetworkName)
+    // FIXME: This clobbers *all* networking configuration instead of just
+    // adding the specific virtual network.
+    vnetRequest := &gwacl.NetworkConfiguration{
+        XMLNS: gwacl.XMLNS_NC,
+        VirtualNetworkSites: &[]gwacl.VirtualNetworkSite{
+            {
+                Name:          virtualNetworkName,
+                AffinityGroup: affinityGroupName,
+                AddressSpacePrefixes: []string{
+                    "10.0.0.0/8",
+                },
+            },
+        },
+    }
+    err = api.SetNetworkConfiguration(vnetRequest)
+    checkError(err)
+    fmt.Println("Done creating virtual network")
+
+    defer func() {
+        fmt.Println("Deleting virtual network...")
+        // FIXME: This destroys *all* networking configuration instead of just
+        // removing the specific network we created.
+        api.SetNetworkConfiguration(&gwacl.NetworkConfiguration{
+            XMLNS:               gwacl.XMLNS_NC,
+            VirtualNetworkSites: &[]gwacl.VirtualNetworkSite{},
+        })
+        fmt.Println("Done deleting virtual network")
+    }()
+
+    networkConfig, err := api.GetNetworkConfiguration()
+    checkError(err)
+    if networkConfig == nil {
+        fmt.Println("No network configuration is set")
+    } else {
+        xml, err := networkConfig.Serialize()
+        checkError(err)
+        fmt.Println(xml)
+    }
 
     fmt.Printf("Getting OS Image for release '%s' and location '%s'...\n", release, location)
     images, err := api.ListOSImages()

=== modified file 'management_base.go'
--- management_base.go	2013-07-10 09:12:01 +0000
+++ management_base.go	2013-07-10 17:10:42 +0000
@@ -131,7 +131,7 @@
     if err != nil {
         return err
     }
-    response, err := api.session.put(URI, []byte(body))
+    response, err := api.session.put(URI, []byte(body), "application/xml")
     if err != nil {
         return err
     }
@@ -388,7 +388,7 @@
     if err != nil {
         return err
     }
-    response, err := api.session.put(url, []byte(body))
+    response, err := api.session.put(url, []byte(body), "application/xml")
     if err != nil {
         return err
     }
@@ -442,7 +442,7 @@
     if err != nil {
         return err
     }
-    response, err := api.session.put("services/networking/media", []byte(body))
+    response, err := api.session.put("services/networking/media", []byte(body), "application/octet-stream")
     if err != nil {
         return err
     }

=== modified file 'management_base_test.go'
--- management_base_test.go	2013-07-10 10:08:25 +0000
+++ management_base_test.go	2013-07-10 17:10:42 +0000
@@ -929,7 +929,6 @@
             {
                 Name:          "virtual-network-name",
                 AffinityGroup: "affinity-group-name",
-                Label:         "label-for-the-site",
                 AddressSpacePrefixes: []string{
                     "CIDR-identifier",
                 },
@@ -944,7 +943,7 @@
                         Name: "primary-DNS-name",
                     },
                 },
-                Gateway: Gateway{
+                Gateway: &Gateway{
                     Profile: "Small",
                     VPNClientAddressPoolPrefixes: []string{
                         "CIDR-identifier",

=== modified file 'names.go'
--- names.go	2013-07-10 12:49:25 +0000
+++ names.go	2013-07-10 17:10:42 +0000
@@ -18,6 +18,7 @@
 // consisting of only ASCII digits and lower-case ASCII letters.
 // The identifier will start with the given prefix.  The prefix must be no
 // longer than the specified length, or there'll be trouble.
+
 func makeRandomIdentifier(prefix string, length int) string {
     // Only digits and lower-case ASCII letters are accepted.
     const (
@@ -30,6 +31,12 @@
         panic(fmt.Errorf("prefix '%s' is more than the requested %d characters long", prefix, length))
     }
 
+    if len(prefix)+5 > length {
+        panic(fmt.Errorf(
+            "prefix '%s' is too long; space is needed for at least 5 random characters, only %d given",
+            prefix, length-len(prefix)))
+    }
+
     if len(prefix) == 0 {
         // No prefix.  Still have to start with a letter, so pick one.
         prefix = pickOne(letters)
@@ -102,3 +109,16 @@
     // is.  Testing indicate that 50 works.  
     return makeRandomIdentifier(prefix, 50)
 }
+
+// MakeRandomVirtualNetworkName generates a pseudo-random name for a virtual
+// network with the given prefix.
+//
+// The prefix must be as short as possible, be entirely in ASCII, start with
+// a lower-case letter, and contain only lower-case letters and digits after
+// that.
+//
+// Be sure your random generator is initialized, or this will always produce
+// the same sequence!
+func MakeRandomVirtualNetworkName(prefix string) string {
+    return makeRandomIdentifier(prefix, 20)
+}

=== modified file 'names_test.go'
--- names_test.go	2013-07-10 12:58:52 +0000
+++ names_test.go	2013-07-10 17:10:42 +0000
@@ -17,10 +17,19 @@
 }
 
 func (*namesSuite) TestMakeRandomIdentifierObeysLength(c *C) {
-    length := 1 + rand.Intn(50)
+    length := 6 + rand.Intn(50)
     c.Check(len(makeRandomIdentifier("x", length)), Equals, length)
 }
 
+// makeRandomIdentifier ensures that there are at least 5 random characters in
+// an identifier.
+func (*namesSuite) TestMakeRandomIdentifierEnsuresSomeRandomness(c *C) {
+    c.Check(makeRandomIdentifier("1234-", 10), Matches, "1234-[a-z0-9]{5}")
+    c.Check(
+        func() { makeRandomIdentifier("12345-", 10) }, PanicMatches,
+        "prefix '12345-' is too long; space is needed for at least 5 random characters, only 4 given")
+}
+
 func (*namesSuite) TestMakeRandomIdentifierRandomizes(c *C) {
     // There is a minute chance that this will start failing just because
     // the randomizer repeats a pattern of results.  If so, seed it.
@@ -41,7 +50,7 @@
 }
 
 func (*namesSuite) TestMakeRandomIdentifierUsesPrefix(c *C) {
-    c.Check(makeRandomIdentifier("prefix", 10), Matches, "prefix.*")
+    c.Check(makeRandomIdentifier("prefix", 11), Matches, "prefix.*")
 }
 
 func (*namesSuite) TestMakeRandomIdentifierUsesOnlyAcceptedCharacters(c *C) {
@@ -50,7 +59,7 @@
 
 func (*namesSuite) TestMakeRandomIdentifierAcceptsEmptyPrefix(c *C) {
     // In particular, the first character must still be a letter.
-    c.Check(makeRandomIdentifier("", 1), Matches, "[a-z]")
+    c.Check(makeRandomIdentifier("", 5), Matches, "[a-z].*")
 }
 
 func (*namesSuite) TestMakeRandomDiskName(c *C) {
@@ -60,3 +69,7 @@
 func (*namesSuite) TestMakeRandomRoleName(c *C) {
     c.Check(MakeRandomRoleName(""), Not(HasLen), 0)
 }
+
+func (*namesSuite) TestMakeRandomVirtualNetworkName(c *C) {
+    c.Check(MakeRandomVirtualNetworkName(""), Not(HasLen), 0)
+}

=== modified file 'x509dispatcher.go'
--- x509dispatcher.go	2013-07-01 13:04:17 +0000
+++ x509dispatcher.go	2013-07-10 17:10:42 +0000
@@ -61,12 +61,13 @@
 
 // newX509RequestPUT initializes an X509Request for a PUT.  You may still
 // need to set further values.
-func newX509RequestPUT(url string, payload []byte) *X509Request {
+func newX509RequestPUT(url string, payload []byte, contentType string) *X509Request {
     return &X509Request{
-        Method:     "PUT",
-        URL:        url,
-        APIVersion: baseAPIVersion,
-        Payload:    payload,
+        Method:      "PUT",
+        URL:         url,
+        APIVersion:  baseAPIVersion,
+        Payload:     payload,
+        ContentType: contentType,
     }
 }
 
@@ -201,7 +202,7 @@
     if len(request.Payload) != 0 {
         headers = append(headers, "Content-Type: "+request.ContentType)
         // Arrange for the request body to be written.
-        ch.Setopt(curl.OPT_POSTFIELDSIZE, len(request.Payload))
+        headers = append(headers, "Transfer-Encoding: chunked")
         ch.Setopt(curl.OPT_READFUNCTION, func(buf []byte, _ interface{}) int {
             // Buffered request write.  Copy as much of the payload as will
             // fit into the buffer curl gave us for it, and return the number
@@ -242,7 +243,7 @@
     case "POST":
         ch.Setopt(curl.OPT_POST, true)
     case "PUT":
-        ch.Setopt(curl.OPT_CUSTOMREQUEST, "PUT")
+        ch.Setopt(curl.OPT_UPLOAD, true)
     case "DELETE":
         ch.Setopt(curl.OPT_CUSTOMREQUEST, "DELETE")
     default:

=== modified file 'x509dispatcher_test.go'
--- x509dispatcher_test.go	2013-07-02 07:15:53 +0000
+++ x509dispatcher_test.go	2013-07-10 17:10:42 +0000
@@ -1,6 +1,7 @@
 package gwacl
 
 import (
+    "io/ioutil"
     . "launchpad.net/gocheck"
     "net/http"
     "net/http/httptest"
@@ -10,13 +11,24 @@
 
 var _ = Suite(&x509DispatcherSuite{})
 
+type Request struct {
+    *http.Request
+    BodyContent []byte
+}
+
 // makeRecordingHTTPServer creates an http server (don't forget to Close() it when done)
 // that serves at the given base URL, copies incoming requests into the given
 // channel, and finally returns the given status code.  If body is not nil, it
 // will be returned as the request body.
-func makeRecordingHTTPServer(requests chan *http.Request, status int, body []byte, headers http.Header) *httptest.Server {
+func makeRecordingHTTPServer(requests chan *Request, status int, body []byte, headers http.Header) *httptest.Server {
     returnRequest := func(w http.ResponseWriter, r *http.Request) {
-        requests <- r
+        // Capture all the request body content for later inspection.
+        requestBody, err := ioutil.ReadAll(r.Body)
+        if err != nil {
+            panic(err)
+        }
+        requests <- &Request{r, requestBody}
+
         for header, values := range headers {
             for _, value := range values {
                 w.Header().Set(header, value)
@@ -59,7 +71,7 @@
 }
 
 func (*x509DispatcherSuite) TestGetRequestDoesHTTPGET(c *C) {
-    httpRequests := make(chan *http.Request, 1)
+    httpRequests := make(chan *Request, 1)
     server := makeRecordingHTTPServer(httpRequests, http.StatusOK, nil, nil)
     defer server.Close()
     // No real certificate needed since we're testing on http, not https.
@@ -75,11 +87,12 @@
     httpRequest := <-httpRequests
     c.Check(httpRequest.Method, Equals, "GET")
     c.Check(httpRequest.URL.String(), Equals, path)
+    c.Check(httpRequest.BodyContent, HasLen, 0)
 }
 
 func (*x509DispatcherSuite) TestGetFollowsRedirects(c *C) {
     redirectPath := "/redirect/path"
-    httpRequests := make(chan *http.Request, _CURL_MAX_REDIRECTS+1)
+    httpRequests := make(chan *Request, _CURL_MAX_REDIRECTS+1)
     locationHeaders := http.Header{}
     locationHeaders.Add("Location", redirectPath)
     server := makeRecordingHTTPServer(httpRequests, http.StatusTemporaryRedirect, nil, locationHeaders)
@@ -93,7 +106,7 @@
     _, err = performX509CurlRequest(session, request)
     c.Check(err, ErrorMatches, ".*Number of redirects hit maximum amount.*")
 
-    var httpRequest *http.Request
+    var httpRequest *Request
     // The original GET request has been performed.
     select {
     case httpRequest = <-httpRequests:
@@ -116,7 +129,7 @@
 }
 
 func (*x509DispatcherSuite) TestPostRequestDoesHTTPPOST(c *C) {
-    httpRequests := make(chan *http.Request, 1)
+    httpRequests := make(chan *Request, 1)
     requestBody := []byte{1, 2, 3}
     responseBody := []byte{4, 5, 6}
     requestContentType := "bogusContentType"
@@ -131,17 +144,18 @@
     response, err := performX509CurlRequest(session, request)
     c.Assert(err, IsNil)
     c.Assert(response.StatusCode, Equals, http.StatusOK)
+    c.Check(response.Body, DeepEquals, responseBody)
 
     httpRequest := <-httpRequests
     c.Check(httpRequest.Header[http.CanonicalHeaderKey("Content-Type")], DeepEquals, []string{requestContentType})
     c.Check(httpRequest.Header[http.CanonicalHeaderKey("X-Ms-Version")], DeepEquals, []string{request.APIVersion})
     c.Check(httpRequest.Method, Equals, "POST")
     c.Check(httpRequest.URL.String(), Equals, path)
-    c.Check(response.Body, DeepEquals, responseBody)
+    c.Check(httpRequest.BodyContent, DeepEquals, requestBody)
 }
 
 func (*x509DispatcherSuite) TestDeleteRequestDoesHTTPDELETE(c *C) {
-    httpRequests := make(chan *http.Request, 1)
+    httpRequests := make(chan *Request, 1)
     server := makeRecordingHTTPServer(httpRequests, http.StatusOK, nil, nil)
     defer server.Close()
     // No real certificate needed since we're testing on http, not https.
@@ -157,10 +171,11 @@
     httpRequest := <-httpRequests
     c.Check(httpRequest.Method, Equals, "DELETE")
     c.Check(httpRequest.URL.String(), Equals, path)
+    c.Check(httpRequest.BodyContent, HasLen, 0)
 }
 
 func (*x509DispatcherSuite) TestPutRequestDoesHTTPPUT(c *C) {
-    httpRequests := make(chan *http.Request, 1)
+    httpRequests := make(chan *Request, 1)
     requestBody := []byte{1, 2, 3}
     responseBody := []byte{4, 5, 6}
     server := makeRecordingHTTPServer(httpRequests, http.StatusOK, responseBody, nil)
@@ -169,16 +184,17 @@
     session, err := newX509Session("subscriptionid", "cert.pem")
     c.Assert(err, IsNil)
     path := "/foo/bar"
-    request := newX509RequestPUT(server.URL+path, requestBody)
+    request := newX509RequestPUT(server.URL+path, requestBody, "application/octet-stream")
 
     response, err := performX509CurlRequest(session, request)
     c.Assert(err, IsNil)
     c.Assert(response.StatusCode, Equals, http.StatusOK)
+    c.Check(response.Body, DeepEquals, responseBody)
 
     httpRequest := <-httpRequests
     c.Check(httpRequest.Method, Equals, "PUT")
     c.Check(httpRequest.URL.String(), Equals, path)
-    c.Check(response.Body, DeepEquals, responseBody)
+    c.Check(httpRequest.BodyContent, DeepEquals, requestBody)
 }
 
 func (*x509DispatcherSuite) TestRequestRegistersHeader(c *C) {

=== modified file 'x509session.go'
--- x509session.go	2013-06-27 11:53:50 +0000
+++ x509session.go	2013-07-10 17:10:42 +0000
@@ -102,12 +102,12 @@
 // put performs a PUT request to the Azure management API.
 // Be aware that Azure may perform PUT operations asynchronously.  If you are
 // not sure, call blockUntilCompleted() on the response.
-func (session *x509Session) put(path string, body []byte) (*x509Response, error) {
-    request := newX509RequestPUT(session.composeURL(path), body)
+func (session *x509Session) put(path string, body []byte, contentType string) (*x509Response, error) {
+    request := newX509RequestPUT(session.composeURL(path), body, contentType)
     response, err := _X509Dispatcher(session, request)
     if err != nil {
         return nil, err
     }
-    err = session.getServerError(response.StatusCode, response.Body, "POST request failed")
+    err = session.getServerError(response.StatusCode, response.Body, "PUT request failed")
     return response, err
 }

=== modified file 'x509session_test.go'
--- x509session_test.go	2013-06-27 10:55:35 +0000
+++ x509session_test.go	2013-07-10 17:10:42 +0000
@@ -321,7 +321,7 @@
     recordedRequests := make([]*X509Request, 0)
     rigRecordingDispatcher(&recordedRequests)
 
-    _, err = session.put(uri, requestBody)
+    _, err = session.put(uri, requestBody, "text/plain")
     c.Assert(err, IsNil)
 
     c.Assert(len(recordedRequests), Equals, 1)

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-07-10 15:37:52 +0000
+++ xmlobjects.go	2013-07-10 17:10:42 +0000
@@ -629,11 +629,10 @@
     XMLName              string          `xml:"VirtualNetworkSite"`
     Name                 string          `xml:"name,attr"`
     AffinityGroup        string          `xml:"AffinityGroup,attr"`
-    Label                string          `xml:"Label"`
     AddressSpacePrefixes []string        `xml:"AddressSpace>AddressPrefix"`
     Subnets              *[]Subnet       `xml:"Subnets>Subnet",omitempty`
     DnsServersRef        *[]DnsServerRef `xml:"DnsServersRef>DnsServerRef",omitempty`
-    Gateway              Gateway         `xml:"Gateway"`
+    Gateway              *Gateway        `xml:"Gateway",omitempty`
 }
 
 type NetworkConfiguration struct {

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-07-10 15:44:14 +0000
+++ xmlobjects_test.go	2013-07-10 17:10:42 +0000
@@ -279,7 +279,6 @@
             </LocalNetworkSites>
             <VirtualNetworkSites>
               <VirtualNetworkSite name="virtual-network-name" AffinityGroup="affinity-group-name">
-                <Label>label-for-the-site</Label>
                 <AddressSpace>
                   <AddressPrefix>CIDR-identifier</AddressPrefix>
                 </AddressSpace>
@@ -327,7 +326,6 @@
             {
                 Name:          "virtual-network-name",
                 AffinityGroup: "affinity-group-name",
-                Label:         "label-for-the-site",
                 AddressSpacePrefixes: []string{
                     "CIDR-identifier",
                 },
@@ -342,7 +340,7 @@
                         Name: "primary-DNS-name",
                     },
                 },
-                Gateway: Gateway{
+                Gateway: &Gateway{
                     Profile: "Small",
                     VPNClientAddressPoolPrefixes: []string{
                         "CIDR-identifier",
@@ -363,6 +361,46 @@
     c.Assert(observed, Equals, expected)
 }
 
+func (suite *xmlSuite) TestNetworkConfigurationSerializeMinimal(c *C) {
+    expected := fmt.Sprintf(
+        "\n<NetworkConfiguration xmlns=\"%s\"></NetworkConfiguration>",
+        XMLNS_NC)
+    input := NetworkConfiguration{XMLNS: XMLNS_NC}
+    observed, err := input.Serialize()
+    c.Assert(err, IsNil)
+    c.Assert(observed, Equals, expected)
+}
+
+func (suite *xmlSuite) TestNetworkConfigurationSerializeSimpleVirtualNetworkSite(c *C) {
+    expected := dedent.Dedent(`
+        <NetworkConfiguration xmlns="http://schemas.microsoft.com/ServiceHosting/2011/07/NetworkConfiguration">
+          <VirtualNetworkConfiguration>
+            <VirtualNetworkSites>
+              <VirtualNetworkSite name="virtual-network-name" AffinityGroup="affinity-group-name">
+                <AddressSpace>
+                  <AddressPrefix>CIDR-identifier</AddressPrefix>
+                </AddressSpace>
+              </VirtualNetworkSite>
+            </VirtualNetworkSites>
+          </VirtualNetworkConfiguration>
+        </NetworkConfiguration>`)
+    input := NetworkConfiguration{
+        XMLNS: XMLNS_NC,
+        VirtualNetworkSites: &[]VirtualNetworkSite{
+            {
+                Name:          "virtual-network-name",
+                AffinityGroup: "affinity-group-name",
+                AddressSpacePrefixes: []string{
+                    "CIDR-identifier",
+                },
+            },
+        },
+    }
+    observed, err := input.Serialize()
+    c.Assert(err, IsNil)
+    c.Assert(observed, Equals, expected)
+}
+
 func (suite *xmlSuite) TestCreateAffinityGroup(c *C) {
     expected := dedent.Dedent(`
         <CreateAffinityGroup xmlns="http://schemas.microsoft.com/windowsazure">
@@ -492,7 +530,6 @@
             {
                 Name:          "virtual-network-name",
                 AffinityGroup: "affinity-group-name",
-                Label:         "label-for-the-site",
                 AddressSpacePrefixes: []string{
                     "CIDR-identifier",
                 },
@@ -507,7 +544,7 @@
                         Name: "primary-DNS-name",
                     },
                 },
-                Gateway: Gateway{
+                Gateway: &Gateway{
                     Profile: "Small",
                     VPNClientAddressPoolPrefixes: []string{
                         "CIDR-identifier",