Merge lp:~rvb/gwacl/get-deployment into lp:gwacl

[Raphaël Badin]

Add GetDeployment method. Add Deployment.GetFQDN() method.

This branch does two things:
- add a new GetDeployment() to fetch a unique deployment. That will be used in the Azure provider and also in the (upcoming) GetDeployments method when one will filter using only one deployment name.
- add a new GetFQDN() method on a deployment to fetch the hostname (derived from the URL field).

The changes in storage.go and vhd_footer.go are due to "make format".

[lp:~rvb/gwacl/get-deployment]

137. By Raphaël Badin on 2013-06-26

Fix variable name.

[Gavin Panella (allenap)]

Looks good :)

[1]

+    path := "services/hostedservices/" + request.ServiceName + "/deployments/" + request.DeploymentName

request.ServiceName and request.DeploymentName need to be query
escaped.

[2]

-    Size           int       // How many bytes from the Filesystem data to
-                             // upload.  *Must* be a multiple of 512.
+    Size           int       // How many bytes from the Filesystem data to upload.  *Must* be a multiple of 512.

Is this something that gofmt did?

[3]

-    if req.Size % 512 != 0 {
+    if req.Size%512 != 0 {

One problem with using a code formatter is that, when its decision is
on crack, it's difficult to argue. This change makes the condition
noticably less readable. A workaround is to use braces:

    if (req.Size % 512) != 0 {

gofmt will leave this alone.

Here and elsewhere.

[4]

+func (suite *xmlSuite) TestDeploymentGetFQDNErrorsIfURLCannotBeParsed(c *C) {
+    deployment := &Deployment{}
+    err := deployment.Deserialize([]byte(deploymentXMLFaultyURL))
+    c.Assert(err, IsNil)
+    _, err = deployment.GetFQDN()
+    c.Assert(err, NotNil)
+}

Perhaps verify that err is related to parsing, so that this test
doesn't mask another error later on.

[5]

<Configuration>PFNlcnZpY2VDb25maWd1cmF0aW9uIHhtbG5zOnhzZD0iaHR0cD...

Newlines can be added to base64-encoded content without altering its
meaning. Please can you reformat this line so that it's a little
shorter?

review: Approve

[lp:~rvb/gwacl/get-deployment]

138. By Raphaël Badin on 2013-06-26

Review fixes.

139. By Raphaël Badin on 2013-06-26

Use url.QueryEscape().

140. By Raphaël Badin on 2013-06-26

Do not use url.QueryEscape().

[Raphaël Badin (rvb)]

Thanks for the review.

> [1]
>
> +    path := "services/hostedservices/" + request.ServiceName +
> "/deployments/" + request.DeploymentName
>
> request.ServiceName and request.DeploymentName need to be query
> escaped.

Right. I'm afraid we need to fix some other methods in this file as well.

> [2]
>
> -    Size           int       // How many bytes from the Filesystem data to
> -                             // upload.  *Must* be a multiple of 512.
> +    Size           int       // How many bytes from the Filesystem data to
> upload.  *Must* be a multiple of 512.
>
> Is this something that gofmt did?

Not exactly, but gofmt wanted to put the second line of comment at the beginning of the line.

> [3]
>
> -    if req.Size % 512 != 0 {
> +    if req.Size%512 != 0 {
>
> One problem with using a code formatter is that, when its decision is
> on crack, it's difficult to argue. This change makes the condition
> noticably less readable. A workaround is to use braces:
>
>    if (req.Size % 512) != 0 {
>
> gofmt will leave this alone.
>
> Here and elsewhere.

All right.

> [4]
>
> +func (suite *xmlSuite) TestDeploymentGetFQDNErrorsIfURLCannotBeParsed(c *C) {
> +    deployment := &Deployment{}
> +    err := deployment.Deserialize([]byte(deploymentXMLFaultyURL))
> +    c.Assert(err, IsNil)
> +    _, err = deployment.GetFQDN()
> +    c.Assert(err, NotNil)
> +}
>
> Perhaps verify that err is related to parsing, so that this test
> doesn't mask another error later on.

Good point.

> [5]
>
> <Configuration>PFNlcnZpY2VDb25maWd1cmF0aW9uIHhtbG5zOnhzZD0iaHR0cD...
>
> Newlines can be added to base64-encoded content without altering its
> meaning. Please can you reformat this line so that it's a little
> shorter?

Okay (but I'm not sure it's that important to be honest, it's not like if someone has to read that line ;)).

=== modified file 'management_base.go'
--- management_base.go	2013-06-24 08:21:50 +0000
+++ management_base.go	2013-06-26 10:55:30 +0000
@@ -190,6 +190,27 @@
     return api.blockUntilCompleted(response)
 }
 
+type GetDeploymentRequest struct {
+    ServiceName    string
+    DeploymentName string
+}
+
+func (api *ManagementAPI) GetDeployment(request *GetDeploymentRequest) (*Deployment, error) {
+    checkPathComponents(request.ServiceName)
+    checkPathComponents(request.DeploymentName)
+    path := "services/hostedservices/" + request.ServiceName + "/deployments/" + request.DeploymentName
+    response, err := api.session.get(path)
+    if err != nil {
+        return nil, err
+    }
+    deployment := Deployment{}
+    err = deployment.Deserialize(response.Body)
+    if err != nil {
+        return nil, err
+    }
+    return &deployment, nil
+}
+
 // AddStorageAccount starts the creation of a storage account.  This is
 // called a storage service in the Azure API, but nomenclature seems to
 // have changed.

=== modified file 'management_base_test.go'
--- management_base_test.go	2013-06-21 13:33:48 +0000
+++ management_base_test.go	2013-06-26 10:55:30 +0000
@@ -520,6 +520,104 @@
     checkOneRequest(c, recordedRequests, expectedURL, []byte{}, "DELETE")
 }
 
+var getDeploymentResponse = `
+<?xml version="1.0"?>
+<Deployment xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <Name>gwaclmachinekjn8minr</Name>
+  <DeploymentSlot>Staging</DeploymentSlot>
+  <PrivateID>53b117c3126a4f1b8b23bc36c2c94dd1</PrivateID>
+  <Status>Running</Status>
+  <Label>WjNkaFkyeHRZV05vYVc1bGEycHVPRzFwYm5JPQ==</Label>
+  <Url>http://53b117c3126a4f1b8b23bc36c2c94dd1.cloudapp.net/</Url>
+  <Configuration>PFNlcnZpY2VDb25maWd1cmF0aW9uIHhtbG5zOnhzZD0iaHR0cDovL3d3dy53
+My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTU
+xTY2hlbWEtaW5zdGFuY2UiIHhtbG5zPSJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL1NlcnZp
+Y2VIb3N0aW5nLzIwMDgvMTAvU2VydmljZUNvbmZpZ3VyYXRpb24iPg0KICA8Um9sZSBuYW1lPSJnd2
+FjbHJvbGVoYXVxODFyIj4NCiAgICA8SW5zdGFuY2VzIGNvdW50PSIxIiAvPg0KICA8L1JvbGU+DQo8
+L1NlcnZpY2VDb25maWd1cmF0aW9uPg==</Configuration>
+  <RoleInstanceList>
+    <RoleInstance>
+      <RoleName>gwaclrolehauq81r</RoleName>
+      <InstanceName>gwaclrolehauq81r</InstanceName>
+      <InstanceStatus>ReadyRole</InstanceStatus>
+      <InstanceUpgradeDomain>0</InstanceUpgradeDomain>
+      <InstanceFaultDomain>0</InstanceFaultDomain>
+      <InstanceSize>ExtraSmall</InstanceSize>
+      <InstanceStateDetails/>
+      <IpAddress>10.241.158.13</IpAddress>
+      <PowerState>Started</PowerState>
+      <HostName>gwaclhostsnx7m1co57n</HostName>
+      <RemoteAccessCertificateThumbprint>68db67cd8a6047a6cf6da0f92a7ee67d</RemoteAccessCertificateThumbprint>
+    </RoleInstance>
+  </RoleInstanceList>
+  <UpgradeDomainCount>1</UpgradeDomainCount>
+  <RoleList>
+    <Role i:type="PersistentVMRole">
+      <RoleName>gwaclrolehauq81r</RoleName>
+      <OsVersion/>
+      <RoleType>PersistentVMRole</RoleType>
+      <ConfigurationSets>
+        <ConfigurationSet i:type="NetworkConfigurationSet">
+          <ConfigurationSetType>NetworkConfiguration</ConfigurationSetType>
+          <SubnetNames/>
+        </ConfigurationSet>
+      </ConfigurationSets>
+      <DataVirtualHardDisks/>
+      <OSVirtualHardDisk>
+        <HostCaching>ReadWrite</HostCaching>
+        <DiskLabel>gwaclauonntmontirrz9rgltt8d5f4evtjeagbcx7kf8umqhs3t421m21t798ebw</DiskLabel>
+        <DiskName>gwacldiskdvmvahc</DiskName>
+        <MediaLink>http://gwacl3133mh3fs9jck6yk0dh.blob.core.windows.net/vhds/gwacldisk79vobmh.vhd</MediaLink>
+        <SourceImageName>b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu_DAILY_BUILD-precise-12_04_2-LTS-amd64-server-20130624-en-us-30GB</SourceImageName>
+        <OS>Linux</OS>
+      </OSVirtualHardDisk>
+      <RoleSize>ExtraSmall</RoleSize>
+    </Role>
+  </RoleList>
+  <SdkVersion/>
+  <Locked>false</Locked>
+  <RollbackAllowed>false</RollbackAllowed>
+  <CreatedTime>2013-06-25T14:35:22Z</CreatedTime>
+  <LastModifiedTime>2013-06-25T14:48:54Z</LastModifiedTime>
+  <ExtendedProperties/>
+  <PersistentVMDowntime>
+    <StartTime>2013-05-08T22:00:00Z</StartTime>
+    <EndTime>2013-05-10T06:00:00Z</EndTime>
+    <Status>PersistentVMUpdateCompleted</Status>
+  </PersistentVMDowntime>
+  <VirtualIPs>
+    <VirtualIP>
+      <Address>137.117.72.69</Address>
+      <IsDnsProgrammed>true</IsDnsProgrammed>
+      <Name>__PseudoBackEndContractVip</Name>
+    </VirtualIP>
+  </VirtualIPs>
+</Deployment>
+`
+
+func (suite *managementBaseAPISuite) TestGetDeployment(c *C) {
+    api := makeAPI(c)
+    fixedResponse := x509Response{
+        StatusCode: http.StatusOK,
+        Body:       []byte(getDeploymentResponse),
+    }
+    rigFixedResponseDispatcher(&fixedResponse)
+    recordedRequests := make([]*x509Request, 0)
+    rigRecordingDispatcher(&recordedRequests)
+
+    serviceName := "serviceName"
+    deploymentName := "gwaclmachinekjn8minr"
+
+    request := &GetDeploymentRequest{ServiceName: serviceName, DeploymentName: deploymentName}
+    deployment, err := api.GetDeployment(request)
+    c.Assert(err, IsNil)
+
+    expectedURL := AZURE_URL + api.session.subscriptionId + "/services/hostedservices/" + serviceName + "/deployments/" + deploymentName
+    checkOneRequest(c, &recordedRequests, expectedURL, []byte{}, "GET")
+
+    c.Check(deployment.Name, Equals, deploymentName)
+}
+
 func (suite *managementBaseAPISuite) TestAddStorageAccount(c *C) {
     api := makeAPI(c)
     header := http.Header{}

=== modified file 'storage.go'
--- storage.go	2013-06-25 06:09:00 +0000
+++ storage.go	2013-06-26 10:55:30 +0000
@@ -121,8 +121,7 @@
     Container      string    // Container name in the storage account
     Filename       string    // Specify the filename in which to store the VHD
     FilesystemData io.Reader // A formatted filesystem, e.g. iso9660.
-    Size           int       // How many bytes from the Filesystem data to
-                             // upload.  *Must* be a multiple of 512.
+    Size           int       // How many bytes from the Filesystem data to upload.  *Must* be a multiple of 512.
 }
 
 // CreateInstanceDataVHD will take the supplied filesystem data and create an
@@ -139,7 +138,7 @@
 
     var err error
 
-    if req.Size % 512 != 0 {
+    if req.Size%512 != 0 {
         return fmt.Errorf("Size must be a multiple of 512")
     }
     if req.Size > VHD_SIZE-512 {
@@ -170,8 +169,8 @@
     err = context.PutPage(&PutPageRequest{
         Container:  req.Container,
         Filename:   req.Filename,
-        StartRange: VHD_SIZE-512,  // last page of the blob
-        EndRange:   VHD_SIZE-1,
+        StartRange: VHD_SIZE - 512, // last page of the blob
+        EndRange:   VHD_SIZE - 1,
         Data:       dataReader,
     })
 
@@ -184,7 +183,7 @@
         Container:  req.Container,
         Filename:   req.Filename,
         StartRange: 0,
-        EndRange:   req.Size-1,
+        EndRange:   req.Size - 1,
         Data:       req.FilesystemData,
     })
 

=== modified file 'storage_base.go'
--- storage_base.go	2013-06-25 00:51:32 +0000
+++ storage_base.go	2013-06-26 10:55:30 +0000
@@ -439,7 +439,7 @@
         if req.Size == 0 {
             return fmt.Errorf("Must supply a size for a page blob")
         }
-        if req.Size % 512 != 0 {
+        if req.Size%512 != 0 {
             return fmt.Errorf("Size must be a multiple of 512 bytes")
         }
     case "block":

=== modified file 'vhd_footer.go'
--- vhd_footer.go	2013-06-25 01:06:24 +0000
+++ vhd_footer.go	2013-06-26 10:55:30 +0000
@@ -20,7 +20,7 @@
 // example), the easiest way is to use VirtualBox to define a new one, and
 // then do 'tail -c 512 | base64' on that file.
 
-const VHD_SIZE = 20972032  // This is 20Mib + 512 bytes
+const VHD_SIZE = 20972032 // This is 20Mib + 512 bytes
 const VHD_FOOTER = `
 Y29uZWN0aXgAAAACAAEAAP//////////GVKuuHZib3gABAACV2kyawAAAAABQAAAAAAAAAFAAAAC
 WgQRAAAAAv//5y4OEjVapHY7QpuodZNf77j6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-06-21 15:14:41 +0000
+++ xmlobjects.go	2013-06-26 10:55:30 +0000
@@ -7,6 +7,7 @@
     "encoding/base64"
     "encoding/xml"
     "fmt"
+    "net/url"
     "regexp"
     "sort"
     "strings"
@@ -368,6 +369,17 @@
     ExtendedProperties []ExtendedProperty `xml:"ExtendedProperties>ExtendedProperty,omitempty"` // Only used for "Get Deployment."
 }
 
+func (deployment *Deployment) GetFQDN() (string, error) {
+    if deployment.URL == "" {
+        return "", fmt.Errorf("Deployment's URL field is empty")
+    }
+    parsedURL, err := url.Parse(deployment.URL)
+    if err != nil {
+        return "", err
+    }
+    return parsedURL.Host, nil
+}
+
 func (s *Deployment) Deserialize(data []byte) error {
     return xml.Unmarshal(data, s)
 }

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-06-21 11:54:19 +0000
+++ xmlobjects_test.go	2013-06-26 10:55:30 +0000
@@ -186,162 +186,163 @@
     c.Check(xml, Equals, expected)
 }
 
+// From http://msdn.microsoft.com/en-us/library/windowsazure/ee460804.aspx
+var deploymentXML = `
+<?xml version="1.0" encoding="utf-8"?>
+<Deployment xmlns="http://schemas.microsoft.com/windowsazure">
+  <Name>name-of-deployment</Name>
+  <DeploymentSlot>current-deployment-environment</DeploymentSlot>
+  <PrivateID>deployment-id</PrivateID>
+  <Status>status-of-deployment</Status>
+  <Label>base64-encoded-name-of-deployment</Label>
+  <Url>http://name-of-deployment.cloudapp.net</Url>
+  <Configuration>base-64-encoded-configuration-file</Configuration>
+  <RoleInstanceList>
+    <RoleInstance>
+      <RoleName>name-of-role</RoleName>
+      <InstanceName>name-of-role-instance</InstanceName>
+      <InstanceStatus>status-of-role-instance</InstanceStatus>
+      <InstanceUpgradeDomain>update-domain-of-role-instance</InstanceUpgradeDomain>
+      <InstanceFaultDomain>fault-domain-of-role-instance</InstanceFaultDomain>
+      <InstanceSize>size-of-role-instance</InstanceSize>
+      <InstanceStateDetails>state-of-role-instance</InstanceStateDetails>
+      <InstanceErrorCode>error-code-returned-for-role-instance</InstanceErrorCode>
+      <IpAddress>ip-address-of-role-instance</IpAddress>
+      <InstanceEndpoints>
+	<InstanceEndpoint>
+	  <Name>name-of-endpoint</Name>
+	  <Vip>virtual-ip-address-of-instance-endpoint</Vip>
+	  <PublicPort>1234</PublicPort>
+	  <LocalPort>5678</LocalPort>
+	  <Protocol>protocol-of-instance-endpoint</Protocol>
+	</InstanceEndpoint>
+      </InstanceEndpoints>
+      <PowerState>state-of-role-instance</PowerState>
+      <HostName>dns-name-of-service</HostName>
+      <RemoteAccessCertificateThumbprint>cert-thumbprint-for-remote-access</RemoteAccessCertificateThumbprint>
+    </RoleInstance>
+  </RoleInstanceList>
+  <UpgradeStatus>
+    <UpgradeType>auto|manual</UpgradeType>
+    <CurrentUpgradeDomainState>before|during</CurrentUpgradeDomainState>
+    <CurrentUpgradeDomain>n</CurrentUpgradeDomain>
+  </UpgradeStatus>
+  <UpgradeDomainCount>number-of-upgrade-domains-in-deployment</UpgradeDomainCount>
+  <RoleList>
+    <Role>
+      <RoleName>name-of-role</RoleName>
+      <OsVersion>operating-system-version</OsVersion>
+      <ConfigurationSets>
+	<ConfigurationSet>
+	  <ConfigurationSetType>NetworkConfiguration</ConfigurationSetType>
+	  <InputEndpoints>
+	    <InputEndpoint>
+	      <Port>port-number-of-input-endpoint-in-network</Port>
+	      <Protocol>protocol-of-input-endpoint-in-network</Protocol>
+	      <Vip>virtual-ip-address-of-input-endpoint-in-network</Vip>
+	    </InputEndpoint>
+	  </InputEndpoints>
+	</ConfigurationSet>
+      </ConfigurationSets>
+    </Role>
+    <Role>
+      <RoleName>name-of-role</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>internal-facing-port-of-input-endpoint</LocalPort>
+	      <Name>name-of-input-endpoint</Name>
+	      <Port>external-facing-port-of-input-endpoint</Port>
+	      <LoadBalancerProbe>
+		<Path>path-of-probe</Path>
+		<Port>port-assigned-to-probe</Port>
+		<Protocol>protocol-of-probe-port</Protocol>
+	      </LoadBalancerProbe>
+	      <Protocol>protocol-of-input-endpoint</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>name-of-data-disk</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>
+    </Role>
+  </RoleList>
+  <SdkVersion>sdk-version-used-to-create-package</SdkVersion>
+  <Locked>status-of-deployment-write-allowed</Locked>
+  <RollbackAllowed>rollback-operation-allowed</RollbackAllowed>
+  <VirtualNetworkName>name-of-virtual-network</VirtualNetworkName>
+  <Dns>
+    <DnsServers>
+      <DnsServer>
+	<Name>name-of-dns-server</Name>
+	<Address>address-of-dns-server</Address>
+      </DnsServer>
+    </DnsServers>
+  </Dns>
+  <ExtendedProperties>
+    <ExtendedProperty>
+      <Name>name-of-property</Name>
+      <Value>value-of-property</Value>
+    </ExtendedProperty>
+  </ExtendedProperties>
+  <PersistentVMDowntime>
+    <StartTime>start-of-downtime</StartTime>
+    <EndTime>end-of-downtime</EndTime>
+    <Status>status-of-downtime</Status>
+  </PersistentVMDowntime>
+  <VirtualIPs>
+    <VirtualIP>
+      <Address>virtual-ip-address-of-deployment</Address>
+    </VirtualIP>
+  </VirtualIPs>
+  <ExtensionConfiguration>
+    <AllRoles>
+      <Extension>
+	<Id>identifier-of-extension</Id>
+      </Extension>
+      ...
+    </AllRoles>
+    <NamedRoles>
+      <Role>
+	<RoleName>role_name1</RoleName>
+	<Extensions>
+	  <Extension>
+	    <Id>identifier-of-extension</Id>
+	  </Extension>
+	  ...
+	</Extensions>
+      </Role>
+    </NamedRoles>
+  </ExtensionConfiguration>
+</Deployment>
+`
+
 func (suite *xmlSuite) TestDeploymentWRTGetDeployment(c *C) {
-    // From http://msdn.microsoft.com/en-us/library/windowsazure/ee460804.aspx
-    input := `
-        <?xml version="1.0" encoding="utf-8"?>
-        <Deployment xmlns="http://schemas.microsoft.com/windowsazure">
-          <Name>name-of-deployment</Name>
-          <DeploymentSlot>current-deployment-environment</DeploymentSlot>
-          <PrivateID>deployment-id</PrivateID>
-          <Status>status-of-deployment</Status>
-          <Label>base64-encoded-name-of-deployment</Label>
-          <Url>deployment-url</Url>
-          <Configuration>base-64-encoded-configuration-file</Configuration>
-          <RoleInstanceList>
-            <RoleInstance>
-              <RoleName>name-of-role</RoleName>
-              <InstanceName>name-of-role-instance</InstanceName>
-              <InstanceStatus>status-of-role-instance</InstanceStatus>
-              <InstanceUpgradeDomain>update-domain-of-role-instance</InstanceUpgradeDomain>
-              <InstanceFaultDomain>fault-domain-of-role-instance</InstanceFaultDomain>
-              <InstanceSize>size-of-role-instance</InstanceSize>
-              <InstanceStateDetails>state-of-role-instance</InstanceStateDetails>
-              <InstanceErrorCode>error-code-returned-for-role-instance</InstanceErrorCode>
-              <IpAddress>ip-address-of-role-instance</IpAddress>
-              <InstanceEndpoints>
-                <InstanceEndpoint>
-                  <Name>name-of-endpoint</Name>
-                  <Vip>virtual-ip-address-of-instance-endpoint</Vip>
-                  <PublicPort>1234</PublicPort>
-                  <LocalPort>5678</LocalPort>
-                  <Protocol>protocol-of-instance-endpoint</Protocol>
-                </InstanceEndpoint>
-              </InstanceEndpoints>
-              <PowerState>state-of-role-instance</PowerState>
-              <HostName>dns-name-of-service</HostName>
-              <RemoteAccessCertificateThumbprint>cert-thumbprint-for-remote-access</RemoteAccessCertificateThumbprint>
-            </RoleInstance>
-          </RoleInstanceList>
-          <UpgradeStatus>
-            <UpgradeType>auto|manual</UpgradeType>
-            <CurrentUpgradeDomainState>before|during</CurrentUpgradeDomainState>
-            <CurrentUpgradeDomain>n</CurrentUpgradeDomain>
-          </UpgradeStatus>
-          <UpgradeDomainCount>number-of-upgrade-domains-in-deployment</UpgradeDomainCount>
-          <RoleList>
-            <Role>
-              <RoleName>name-of-role</RoleName>
-              <OsVersion>operating-system-version</OsVersion>
-              <ConfigurationSets>
-                <ConfigurationSet>
-                  <ConfigurationSetType>NetworkConfiguration</ConfigurationSetType>
-                  <InputEndpoints>
-                    <InputEndpoint>
-                      <Port>port-number-of-input-endpoint-in-network</Port>
-                      <Protocol>protocol-of-input-endpoint-in-network</Protocol>
-                      <Vip>virtual-ip-address-of-input-endpoint-in-network</Vip>
-                    </InputEndpoint>
-                  </InputEndpoints>
-                </ConfigurationSet>
-              </ConfigurationSets>
-            </Role>
-            <Role>
-              <RoleName>name-of-role</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>internal-facing-port-of-input-endpoint</LocalPort>
-                      <Name>name-of-input-endpoint</Name>
-                      <Port>external-facing-port-of-input-endpoint</Port>
-                      <LoadBalancerProbe>
-                        <Path>path-of-probe</Path>
-                        <Port>port-assigned-to-probe</Port>
-                        <Protocol>protocol-of-probe-port</Protocol>
-                      </LoadBalancerProbe>
-                      <Protocol>protocol-of-input-endpoint</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>name-of-data-disk</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>
-            </Role>
-          </RoleList>
-          <SdkVersion>sdk-version-used-to-create-package</SdkVersion>
-          <Locked>status-of-deployment-write-allowed</Locked>
-          <RollbackAllowed>rollback-operation-allowed</RollbackAllowed>
-          <VirtualNetworkName>name-of-virtual-network</VirtualNetworkName>
-          <Dns>
-            <DnsServers>
-              <DnsServer>
-                <Name>name-of-dns-server</Name>
-                <Address>address-of-dns-server</Address>
-              </DnsServer>
-            </DnsServers>
-          </Dns>
-          <ExtendedProperties>
-            <ExtendedProperty>
-              <Name>name-of-property</Name>
-              <Value>value-of-property</Value>
-            </ExtendedProperty>
-          </ExtendedProperties>
-          <PersistentVMDowntime>
-            <StartTime>start-of-downtime</StartTime>
-            <EndTime>end-of-downtime</EndTime>
-            <Status>status-of-downtime</Status>
-          </PersistentVMDowntime>
-          <VirtualIPs>
-            <VirtualIP>
-              <Address>virtual-ip-address-of-deployment</Address>
-            </VirtualIP>
-          </VirtualIPs>
-          <ExtensionConfiguration>
-            <AllRoles>
-              <Extension>
-                <Id>identifier-of-extension</Id>
-              </Extension>
-              ...
-            </AllRoles>
-            <NamedRoles>
-              <Role>
-                <RoleName>role_name1</RoleName>
-                <Extensions>
-                  <Extension>
-                    <Id>identifier-of-extension</Id>
-                  </Extension>
-                  ...
-                </Extensions>
-              </Role>
-            </NamedRoles>
-          </ExtensionConfiguration>
-        </Deployment>
-        `
     expected := &Deployment{
         XMLNS:          "http://schemas.microsoft.com/windowsazure",
         Name:           "name-of-deployment",
@@ -349,7 +350,7 @@
         PrivateID:      "deployment-id",
         Status:         "status-of-deployment",
         Label:          "base64-encoded-name-of-deployment",
-        URL:            "deployment-url",
+        URL:            "http://name-of-deployment.cloudapp.net",
         Configuration:  "base-64-encoded-configuration-file",
         RoleInstanceList: []RoleInstance{
             {
@@ -426,11 +427,54 @@
         },
     }
     observed := &Deployment{}
-    err := observed.Deserialize([]byte(input))
+    err := observed.Deserialize([]byte(deploymentXML))
     c.Assert(err, IsNil)
     c.Assert(observed, DeepEquals, expected)
 }
 
+func (suite *xmlSuite) TestDeploymentGetFQDNExtractsFQDN(c *C) {
+    deployment := &Deployment{}
+    err := deployment.Deserialize([]byte(deploymentXML))
+    c.Assert(err, IsNil)
+    fqdn, err := deployment.GetFQDN()
+    c.Assert(err, IsNil)
+    c.Assert(fqdn, Equals, "name-of-deployment.cloudapp.net")
+}
+
+var deploymentXMLEmptyURL = `
+<?xml version="1.0" encoding="utf-8"?>
+<Deployment xmlns="http://schemas.microsoft.com/windowsazure">
+  <Name>name-of-deployment</Name>
+  <Label>base64-encoded-name-of-deployment</Label>
+  <Url></Url>
+</Deployment>
+`
+
+func (suite *xmlSuite) TestDeploymentGetFQDNErrorsIfURLIsEmpty(c *C) {
+    deployment := &Deployment{}
+    err := deployment.Deserialize([]byte(deploymentXMLEmptyURL))
+    c.Assert(err, IsNil)
+    _, err = deployment.GetFQDN()
+    c.Check(err, ErrorMatches, ".*URL field is empty.*")
+}
+
+var deploymentXMLFaultyURL = `
+<?xml version="1.0" encoding="utf-8"?>
+<Deployment xmlns="http://schemas.microsoft.com/windowsazure">
+  <Name>name-of-deployment</Name>
+  <Label>base64-encoded-name-of-deployment</Label>
+  <Url>%z</Url>
+</Deployment>
+`
+
+func (suite *xmlSuite) TestDeploymentGetFQDNErrorsIfURLCannotBeParsed(c *C) {
+    deployment := &Deployment{}
+    err := deployment.Deserialize([]byte(deploymentXMLFaultyURL))
+    c.Assert(err, IsNil)
+    _, err = deployment.GetFQDN()
+    c.Check(err, ErrorMatches, ".*invalid URL.*")
+}
+
 func (suite *xmlSuite) TestNewDeploymentForCreateVMDeployment(c *C) {
     name := "deploymentName"
     deploymentSlot := "staging"