Add datacenter import support

vsphere/internal/helper/datacenter/datacenter_helper.go

@@ -0,0 +1,19 @@
+package datacenter
+
+import (
+	"context"
+
+	"github.com/terraform-providers/terraform-provider-vsphere/vsphere/internal/helper/provider"
+	"github.com/vmware/govmomi"
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/object"
+)
+
+// FromPath returns a Datacenter via its supplied path.
+func FromPath(client *govmomi.Client, path string) (*object.Datacenter, error) {
+	finder := find.NewFinder(client.Client, false)
+
+	ctx, cancel := context.WithTimeout(context.Background(), provider.DefaultAPITimeout)
+	defer cancel()
+	return finder.Datacenter(ctx, path)
+}

vsphere/resource_vsphere_datacenter.go

@@ -1,14 +1,18 @@
 package vsphere
 
 import (
+	"errors"
 	"fmt"
 	"log"
+	"strings"
 	"time"
 
 	"context"
+
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/terraform-providers/terraform-provider-vsphere/vsphere/internal/helper/customattribute"
+	"github.com/terraform-providers/terraform-provider-vsphere/vsphere/internal/helper/datacenter"
 	"github.com/vmware/govmomi/find"
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/methods"
@@ -21,6 +25,9 @@ func resourceVSphereDatacenter() *schema.Resource {
 		Read:   resourceVSphereDatacenterRead,
 		Update: resourceVSphereDatacenterUpdate,
 		Delete: resourceVSphereDatacenterDelete,
+		Importer: &schema.ResourceImporter{
+			State: resourceVSphereDatacenterImport,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"name": {
@@ -86,6 +93,8 @@ func resourceVSphereDatacenterCreate(d *schema.ResourceData, meta interface{}) e
 		return fmt.Errorf("ESX host does not belong to a vCenter")
 	}
 
+	d.SetId(name)
+
 	// Wait for the datacenter resource to be ready
 	stateConf := &resource.StateChangeConf{
 		Pending:    []string{"InProgress"},
@@ -115,8 +124,6 @@ func resourceVSphereDatacenterCreate(d *schema.ResourceData, meta interface{}) e
 		}
 	}
 
-	d.SetId(name)
-
 	return resourceVSphereDatacenterRead(d, meta)
 }
 
@@ -140,7 +147,7 @@ func resourceVSphereDatacenterStateRefreshFunc(d *schema.ResourceData, meta inte
 
 func datacenterExists(d *schema.ResourceData, meta interface{}) (*object.Datacenter, error) {
 	client := meta.(*VSphereClient).vimClient
-	name := d.Get("name").(string)
+	name := d.Id()
 
 	path := name
 	if v, ok := d.GetOk("folder"); ok {
@@ -164,6 +171,9 @@ func resourceVSphereDatacenterRead(d *schema.ResourceData, meta interface{}) err
 	if err = d.Set("moid", dc.Reference().Value); err != nil {
 		return err
 	}
+	if err = d.Set("name", dc.Name()); err != nil {
+		return err
+	}
 	// Read tags if we have the ability to do so
 	if tagsClient, _ := meta.(*VSphereClient).TagsClient(); tagsClient != nil {
 		if err := readTagsForResource(tagsClient, dc, d); err != nil {
@@ -263,3 +273,18 @@ func resourceVSphereDatacenterDelete(d *schema.ResourceData, meta interface{}) e
 
 	return nil
 }
+
+func resourceVSphereDatacenterImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	client := meta.(*VSphereClient).vimClient
+	p := d.Id()
+	if !strings.HasPrefix(p, "/") {
+		return nil, errors.New("path must start with a trailing slash")
+	}
+
+	dc, err := datacenter.FromPath(client, p)
+	if err != nil {
+		return nil, err
+	}
+	d.SetId(dc.Name())
+	return []*schema.ResourceData{d}, nil
+}

vsphere/resource_vsphere_datacenter_test.go

@@ -138,6 +138,29 @@ func TestAccResourceVSphereDatacenter_createOnRootFolder(t *testing.T) {
 	})
 }
 
+func TestAccResourceVSphereDatacenter_import(t *testing.T) {
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckVSphereDatacenterDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckVSphereDatacenterConfig,
+				Check:  resource.ComposeTestCheckFunc(testAccCheckVSphereDatacenterExists(testAccCheckVSphereDatacenterResourceName, true)),
+			},
+			{
+				ResourceName:      "vsphere_datacenter.testDC",
+				Config:            testAccCheckVSphereDatacenterConfig,
+				Check:             resource.ComposeTestCheckFunc(testAccCheckVSphereDatacenterExists(testAccCheckVSphereDatacenterResourceName, true)),
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateId:     "/testDC",
+			},
+		},
+	})
+}
+
 // Create a datacenter on a subfolder
 func TestAccResourceVSphereDatacenter_createOnSubfolder(t *testing.T) {
 	dcFolder := os.Getenv("VSPHERE_DC_FOLDER")

website/docs/r/datacenter.html.markdown

@@ -63,3 +63,16 @@ and require vCenter.
 * `moid` - [Managed object ID][docs-about-morefs] of this datacenter.
 
 [docs-about-morefs]: /docs/providers/vsphere/index.html#use-of-managed-object-references-by-the-vsphere-provider
+
+## Importing 
+
+An existing datacenter can be [imported][docs-import] into this resource
+via supplying the full path to the datacenter. An example is below:
+
+[docs-import]: /docs/import/index.html
+
+```
+terraform import vsphere_datacenter.dc /dc1
+```
+
+The above would import the datacenter named `dc1`.