Tidy up code.

Author: tintoy

client.go

@@ -71,6 +71,36 @@ func (driver *Driver) getNetworkDomain() (*compute.NetworkDomain, error) {
 	return client.GetNetworkDomain(driver.ServerID)
 }
 
+// Resolve (find) the target network domain by name and data centre Id.
+func (driver *Driver) resolveNetworkDomain() error {
+	driver.NetworkDomainID = ""
+
+	if driver.NetworkDomainName == "" {
+		return errors.New("Network domain name has not been configured")
+	}
+
+	if driver.DataCenterID == "" {
+		return errors.New("Data centre Id has not been configured")
+	}
+
+	client, err := driver.getCloudControlClient()
+	if err != nil {
+		return err
+	}
+
+	networkDomain, err := client.GetNetworkDomainByName(driver.NetworkDomainName, driver.DataCenterID)
+	if err != nil {
+		return err
+	}
+	if networkDomain == nil {
+		return fmt.Errorf("No network domain named '%s' was found in data centre '%s'", driver.NetworkDomainName, driver.DataCenterID)
+	}
+
+	driver.NetworkDomainID = networkDomain.ID
+
+	return nil
+}
+
 // Retrieve the target VLAN.
 func (driver *Driver) getVLAN() (*compute.VLAN, error) {
 	if driver.VLANID == "" {
@@ -87,9 +117,7 @@ func (driver *Driver) getVLAN() (*compute.VLAN, error) {
 
 // Resolve (find) the target OS image.
 func (driver *Driver) resolveOSImage() error {
-	if driver.ImageID != "" {
-		return nil
-	}
+	driver.ImageID = ""
 
 	networkDomain, err := driver.getNetworkDomain()
 	if err != nil {
@@ -155,16 +183,15 @@ func (driver *Driver) deployServer() (*compute.Server, error) {
 
 	log.Debug("Deploying server '%s' ('%s')...", driver.ServerID, driver.MachineName)
 
-	log.Info("Server '%s' is being provisioned...")
 	resource, err := client.WaitForDeploy(compute.ResourceTypeServer, driver.ServerID, 15*time.Minute)
 	if err != nil {
 		return nil, err
 	}
 	server := resource.(*compute.Server)
+
 	log.Debug("Server '%s' ('%s') has been successfully provisioned...", driver.ServerID, server.Name)
 
 	driver.IPAddress = *server.Network.PrimaryAdapter.PrivateIPv4Address
-	log.Info("Server '%s' has private IP '%s'.", server.Name, driver.IPAddress)
 
 	return server, nil
 }

driver.go

@@ -27,6 +27,12 @@ type Driver struct {
 	// The CloudControl region code
 	CloudControlRegion string
 
+	// The name of the target network domain.
+	NetworkDomainName string
+
+	// The Id of the data centre in which the target network domain is located.
+	DataCenterID string
+
 	// The Id of the target network domain.
 	NetworkDomainID string
 
@@ -72,12 +78,17 @@ func (driver *Driver) GetCreateFlags() []mcnflag.Flag {
 			Value:  "",
 		},
 		mcnflag.StringFlag{
-			Name:  "network-domain-id",
-			Usage: "The Id of the target CloudControl network domain",
+			Name:  "networkdomain",
+			Usage: "The name of the target CloudControl network domain",
+			Value: "",
+		},
+		mcnflag.StringFlag{
+			Name:  "datacenter",
+			Usage: "The Id of the data centre in which the the target CloudControl network domain is located",
 			Value: "",
 		},
 		mcnflag.StringFlag{
-			Name:  "vlan-id",
+			Name:  "vlan",
 			Usage: "The Id of the target CloudControl VLAN",
 			Value: "",
 		},
@@ -113,8 +124,9 @@ func (driver *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 	driver.CloudControlPassword = flags.String("cloudcontrol-password")
 	driver.CloudControlRegion = flags.String("cloudcontrol-region")
 
-	driver.NetworkDomainID = flags.String("network-domain-id")
-	driver.VLANID = flags.String("vlan-id")
+	driver.NetworkDomainName = flags.String("networkdomain")
+	driver.DataCenterID = flags.String("datacenter")
+	driver.VLANID = flags.String("vlan")
 	driver.ImageName = DefaultImageName
 
 	driver.SSHUser = flags.String("ssh-user")
@@ -126,47 +138,31 @@ func (driver *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 
 // PreCreateCheck validates the configuration before making any changes.
 func (driver *Driver) PreCreateCheck() error {
-	client, err := driver.getCloudControlClient()
-	if err != nil {
-		return err
-	}
-
 	log.Info("Examining target network domain (Id = '%s', region = '%s')...", driver.NetworkDomainID, driver.CloudControlRegion)
 
-	networkDomain, err := client.GetNetworkDomain(driver.NetworkDomainID)
+	err := driver.resolveNetworkDomain()
 	if err != nil {
-		log.Errorf("Failed to retrieve network domain '%s': %s", driver.NetworkDomainID, err.Error())
-
 		return err
 	}
-	if networkDomain == nil {
-		log.Errorf("Network domain '%s' was not found in region '%s'.", driver.NetworkDomainID, driver.CloudControlRegion)
-
-		return fmt.Errorf("Network domain '%s' was not found", driver.NetworkDomainID)
-	}
 
 	log.Info("Will create machine '%s' in network domain '%s' (data centre '%s').",
 		driver.MachineName,
-		networkDomain.Name,
-		networkDomain.DatacenterID,
+		driver.NetworkDomainName,
+		driver.DataCenterID,
 	)
 
 	log.Info("Examining target VLAN (Id = '%s')...", driver.VLANID)
-	vlan, err := client.GetVLAN(driver.VLANID)
+	vlan, err := driver.getVLAN()
 	if err != nil {
-		log.Errorf("Failed to retrieve VLAN '%s': %s", driver.VLANID, err.Error())
-
 		return err
 	}
-	if networkDomain == nil {
+	if vlan == nil {
 		log.Errorf("VLAN '%s' was not found in network domain '%s'.", driver.VLANID, driver.NetworkDomainID)
 
 		return fmt.Errorf("VLAN '%s' was not found", driver.VLANID)
 	}
 
-	if vlan.NetworkDomain.ID != networkDomain.ID {
-		log.Errorf("Cannot use VLAN '%s' because it belongs to network domain '%s' (not '%s').", driver.VLANID, vlan.NetworkDomain.ID, networkDomain.ID)
-
+	if vlan.NetworkDomain.ID != driver.NetworkDomainID {
 		return fmt.Errorf("Cannot use VLAN '%s' because it belongs to a different network domain ('%s')", driver.VLANID, vlan.NetworkDomain.ID)
 	}
 
@@ -179,14 +175,16 @@ func (driver *Driver) Create() error {
 	if err != nil {
 		return err
 	}
-
 	log.Info("Local machine's public IP address is '%s'.", localPublicIP)
 
+	log.Info("Deploying server '%s'...", driver.MachineName)
 	server, err := driver.deployServer()
 	if err != nil {
 		return err
 	}
 
+	log.Info("Server '%s' has private IP '%s'.", driver.MachineName, driver.IPAddress)
+
 	// TODO: Create NAT and firewall rules, if required.
 
 	log.Info("Configuring SSH key for server '%s'...")