provider/vsphere: Improved SCSI controller handling

[dkalleg]

Govmomi tries to use the 7th slot in a scsi controller, which is not
allowed. This patch will appropriately select the slot to attach a disk
to as well as determine if a scsi controller is full.

[stack72]

Hi @dkalleg

How do the acceptance tests look on your side for this?

P.

[dkalleg]

@stack72 WIP :) Sort of an emergency fix on my end. I plan to add an unit test for this as well, one that proves 7 scsi disks can be added successfully.

You got back to me really quickly.. and I'm sure 0.7.0 is coming quickly.. should I be setting high prio on these tasks? ;)

[stack72]

We are currently in lock down for 0.7 release :) Only emergency fixes going in right now so if you think this fits, then let me know!

[dkalleg]

Gotcha. This is important for my org. I'll will have a new test and all tests passing some time tomorrow for sure. aaaaand I'm also working on one more PR to fix #7897 :) I'm pushing to have both in 0.7.0.

[dkalleg]

@stack72 Test added, passing on my end.

[stack72]

Hey @dkalleg

Any chance you can drop the test results run in the thread for history?

P.

[dkalleg]

$ make testacc TEST=./builtin/providers/vsphere/ TESTARGS="-run TestAccVSphereVirtualMachine_diskSCSICapacity"
==> Checking that code complies with gofmt requirements...
/home/dkalleg/goworkspace/bin/stringer
go generate $(go list ./... | grep -v /terraform/vendor/)
2016/08/02 13:57:22 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/vsphere/ -v -run TestAccVSphereVirtualMachine_diskSCSICapacity -timeout 120m
=== RUN   TestAccVSphereVirtualMachine_diskSCSICapacity
2016/08/02 13:57:50 [DEBUG] template=
resource "vsphere_virtual_machine" "scsiCapacity" {
    name = "terraform-test"

%s
    vcpu = 2
    memory = 1024
    network_interface {
        label = "%s"
        ipv4_address = "%s"
        ipv4_prefix_length = %s
        ipv4_gateway = "%s"
    }
     disk {
%s
        template = "%s"
        iops = 500
    }

    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "one"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "two"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "three"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "four"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "five"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "six"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "seven"
    }
}
2016/08/02 13:57:50 [DEBUG] template config=
resource "vsphere_virtual_machine" "scsiCapacity" {
    name = "terraform-test"

    datacenter = "FTC"
    resource_pool = "Cluster1"

    vcpu = 2
    memory = 1024
    network_interface {
        label = "VM Private"
        ipv4_address = ""
        ipv4_prefix_length = 24
        ipv4_gateway = ""
    }
     disk {
        datastore = "san1"

        template = "DansTfTest/danTestTemplate"
        iops = 500
    }

    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "one"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "two"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "three"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "four"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "five"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "six"
    }
    disk {
        size = 1
        controller_type = "scsi-paravirtual"
        name = "seven"
    }
}
2016/08/02 13:57:50 [WARN] Invalid log level: "all". Defaulting to level: TRACE. Valid levels are: [TRACE DEBUG INFO WARN ERROR]
--- PASS: TestAccVSphereVirtualMachine_diskSCSICapacity (189.97s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/vsphere    190.018s

[stack72]

This LGTM! Thanks @dkalleg :)

[dkalleg]

Thanks @stack72 !

[ghost]

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.