From 6e85ae219b53a1350eff3914922fac4b8d3e5a40 Mon Sep 17 00:00:00 2001 From: Vijayendra Bhamidipati Date: Mon, 15 Jul 2013 10:26:43 +0200 Subject: [PATCH] CLOUDSTACK-3425 Ignore network interfaces without a uuid when passing them on as extra configs to ESX for nicira NVP controller. Signed-off-by: Hugo Trippaers --- .../hypervisor/vmware/resource/VmwareResource.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 2d18dc83c8d..8b8f706c000 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -2826,10 +2826,12 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa */ int nicNum = 0; for (NicTO nicTo : sortNicsByDeviceId(nics)) { - newVal = new OptionValue(); - newVal.setKey("nvp.iface-id." + nicNum); - newVal.setValue(nicTo.getUuid()); - extraOptions.add(newVal); + if (nicTo.getUuid() != null) { + newVal = new OptionValue(); + newVal.setKey("nvp.iface-id." + nicNum); + newVal.setValue(nicTo.getUuid()); + extraOptions.add(newVal); + } nicNum++; }