Only compare bus number if different

[dhekimian]

Description

#1032 didn't take all cases into account. This change does.

Acceptance tests

• Have you added an acceptance test for the functionality being added?
• Have you run the acceptance tests on this branch? (If so, please include the test log in a gist)

References

[dhekimian]

@bill-rich In further testing with the change from #1032, we ran into another issue with the sort:

00023.290 ERR [DEBUG] DiskPostCloneOperation: Disk devices located: disk-1000-0,disk-1000-1,disk-1000-2,disk-1000-3,disk-1000-4,disk-1000-5,disk-1000-6,disk-1000-8,disk-1000-9,disk-1000-10,disk-1000-11,disk-1000-12,disk-1000-13,disk-1000-14,disk-1000-15,disk-1001-0
00023.290 ERR [DEBUG] DiskPostCloneOperation: Disk devices order after sort: disk-1000-0,disk-1000-1,disk-1000-2,disk-1000-3,disk-1000-4,disk-1000-5,disk-1000-6,disk-1000-8,disk-1000-10,disk-1000-11,disk-1000-12,disk-1000-13,disk-1000-14,disk-1000-15,disk-1001-0,disk-1000-9

disk-1000-9 was getting sorted to the end. Ended up adding a bunch of debug statements to figure out where the logic was going wrong. Realized the logic need to look at the bus id to properly address the sub-sorting.

Instead of doing:

if liCtlr.(types.BaseVirtualController).GetVirtualController().BusNumber < ljCtlr.(types.BaseVirtualController).GetVirtualController().BusNumber {
	return true
}
if liCtlr.(types.BaseVirtualController).GetVirtualController().BusNumber > ljCtlr.(types.BaseVirtualController).GetVirtualController().BusNumber {
	return false
}

Went with the following to keep from doubling the look up:

liCtlrBus := liCtlr.(types.BaseVirtualController).GetVirtualController().BusNumber
ljCtlrBus := ljCtlr.(types.BaseVirtualController).GetVirtualController().BusNumber
if liCtlrBus != ljCtlrBus {
  return liCtlrBus < ljCtlrBus
}

Tested with the VMware VCSA-7.0.0.10100-15952498 (GA).

[dhekimian]

@bill-rich MR #1032 didn't fix all the use cases and I believe this MR fixes it for good. Please merge to replace the changes from #1032

[bill-rich]

Thanks for keeping pushing through on this issue. Looks good!

[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 feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 hashibot-feedback@hashicorp.com. Thanks!