[WIP] vSphere provider support for SDRS with storage pods

builtin/providers/vsphere/resource_vsphere_file.go

@@ -17,8 +17,10 @@ type file struct {
 	datastore       string
 	sourceFile      string
 	destinationFile string
+	// use_sdrs        bool // TODO
 }
 
+// TODO add DRS
 func resourceVSphereFile() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceVSphereFileCreate,
@@ -55,6 +57,7 @@ func resourceVSphereFile() *schema.Resource {
 
 func resourceVSphereFileCreate(d *schema.ResourceData, meta interface{}) error {
 
+	log.SetFlags(log.Lshortfile)
 	log.Printf("[DEBUG] creating file: %#v", d)
 	client := meta.(*govmomi.Client)
 
@@ -123,6 +126,7 @@ func createFile(client *govmomi.Client, f *file) error {
 
 func resourceVSphereFileRead(d *schema.ResourceData, meta interface{}) error {
 
+	log.SetFlags(log.Lshortfile)
 	log.Printf("[DEBUG] reading file: %#v", d)
 	f := file{}
 
@@ -173,6 +177,7 @@ func resourceVSphereFileRead(d *schema.ResourceData, meta interface{}) error {
 
 func resourceVSphereFileUpdate(d *schema.ResourceData, meta interface{}) error {
 
+	log.SetFlags(log.Lshortfile)
 	log.Printf("[DEBUG] updating file: %#v", d)
 	if d.HasChange("destination_file") {
 		oldDestinationFile, newDestinationFile := d.GetChange("destination_file")
@@ -232,6 +237,7 @@ func resourceVSphereFileUpdate(d *schema.ResourceData, meta interface{}) error {
 
 func resourceVSphereFileDelete(d *schema.ResourceData, meta interface{}) error {
 
+	log.SetFlags(log.Lshortfile)
 	log.Printf("[DEBUG] deleting file: %#v", d)
 	f := file{}
 
@@ -297,6 +303,7 @@ func deleteFile(client *govmomi.Client, f *file) error {
 }
 
 // getDatastore gets datastore object
+// TODO add DRS functionality
 func getDatastore(f *find.Finder, ds string) (*object.Datastore, error) {
 
 	if ds != "" {

builtin/providers/vsphere/resource_vsphere_file_test.go

@@ -17,6 +17,7 @@ import (
 // Basic file creation
 func TestAccVSphereFile_basic(t *testing.T) {
 	testVmdkFileData := []byte("# Disk DescriptorFile\n")
+	// TODO make this OS TMP dir ... run on windows
 	testVmdkFile := "/tmp/tf_test.vmdk"
 	err := ioutil.WriteFile(testVmdkFile, testVmdkFileData, 0644)
 	if err != nil {

builtin/providers/vsphere/resource_vsphere_folder.go

@@ -48,6 +48,8 @@ func resourceVSphereFolder() *schema.Resource {
 
 func resourceVSphereFolderCreate(d *schema.ResourceData, meta interface{}) error {
 
+	log.SetFlags(log.Lshortfile)
+
 	client := meta.(*govmomi.Client)
 
 	f := folder{
@@ -117,6 +119,7 @@ func createFolder(client *govmomi.Client, f *folder) error {
 
 func resourceVSphereFolderRead(d *schema.ResourceData, meta interface{}) error {
 
+	log.SetFlags(log.Lshortfile)
 	log.Printf("[DEBUG] reading folder: %#v", d)
 	client := meta.(*govmomi.Client)
 
@@ -145,6 +148,7 @@ func resourceVSphereFolderRead(d *schema.ResourceData, meta interface{}) error {
 
 func resourceVSphereFolderDelete(d *schema.ResourceData, meta interface{}) error {
 
+	log.SetFlags(log.Lshortfile)
 	f := folder{
 		path:         strings.TrimRight(d.Get("path").(string), "/"),
 		existingPath: d.Get("existing_path").(string),

builtin/providers/vsphere/resource_vsphere_virtual_disk.go

@@ -19,6 +19,7 @@ type virtualDisk struct {
 	adapterType string
 	datacenter  string
 	datastore   string
+	// use_sdrs    bool // TODO implement sdrs
 }
 
 // Define VirtualDisk args
@@ -88,6 +89,8 @@ func resourceVSphereVirtualDisk() *schema.Resource {
 }
 
 func resourceVSphereVirtualDiskCreate(d *schema.ResourceData, meta interface{}) error {
+
+	log.SetFlags(log.Lshortfile)
 	log.Printf("[INFO] Creating Virtual Disk")
 	client := meta.(*govmomi.Client)
 
@@ -129,6 +132,8 @@ func resourceVSphereVirtualDiskCreate(d *schema.ResourceData, meta interface{})
 }
 
 func resourceVSphereVirtualDiskRead(d *schema.ResourceData, meta interface{}) error {
+
+	log.SetFlags(log.Lshortfile)
 	log.Printf("[DEBUG] Reading virtual disk.")
 	client := meta.(*govmomi.Client)
 
@@ -192,6 +197,8 @@ func resourceVSphereVirtualDiskRead(d *schema.ResourceData, meta interface{}) er
 }
 
 func resourceVSphereVirtualDiskDelete(d *schema.ResourceData, meta interface{}) error {
+
+	log.SetFlags(log.Lshortfile)
 	client := meta.(*govmomi.Client)
 
 	vDisk := virtualDisk{}

builtin/providers/vsphere/resource_vsphere_virtual_disk_test.go

@@ -13,6 +13,16 @@ import (
 	"golang.org/x/net/context"
 )
 
+func testVirtualDiskPreCheck(t *testing.T) {
+	if v := os.Getenv("VSPHERE_INIT_TYPE"); v == "" {
+		t.Fatal("VSPHERE_INIT_TYPE must be set to test")
+	}
+	if v := os.Getenv("VSPHERE_ADAPTER_TYPE"); v == "" {
+		t.Fatal("VSPHERE_ADAPTER_TYPE must be set to test")
+	}
+	testAccPreCheck(t)
+}
+
 func TestAccVSphereVirtualDisk_basic(t *testing.T) {
 	var datacenterOpt string
 	var datastoreOpt string
@@ -32,19 +42,24 @@ func TestAccVSphereVirtualDisk_basic(t *testing.T) {
 		adapterTypeOpt += fmt.Sprintf("    adapter_type = \"%s\"\n", v)
 	}
 
+	config := fmt.Sprintf(
+		testAccCheckVSphereVirtuaDiskConfig_basic,
+		initTypeOpt,
+		adapterTypeOpt,
+		datacenterOpt,
+		datastoreOpt,
+	)
+
+	log.Printf("[DEBUG] template= %s", testAccCheckVSphereVirtuaDiskConfig_basic)
+	log.Printf("[DEBUG] template config= %s", config)
+
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testVirtualDiskPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckVSphereVirtualDiskDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: fmt.Sprintf(
-					testAccCheckVSphereVirtuaDiskConfig_basic,
-					initTypeOpt,
-					adapterTypeOpt,
-					datacenterOpt,
-					datastoreOpt,
-				),
+				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					testAccVSphereVirtualDiskExists("vsphere_virtual_disk.foo"),
 				),