cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject git commit: updated refs/heads/4.2 to 6e85ae2
Date Mon, 15 Jul 2013 08:28:30 GMT
Updated Branches:
  refs/heads/4.2 8065a5570 -> 6e85ae219


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 <htrippaers@schubergphilis.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6e85ae21
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6e85ae21
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6e85ae21

Branch: refs/heads/4.2
Commit: 6e85ae219b53a1350eff3914922fac4b8d3e5a40
Parents: 8065a55
Author: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
Authored: Mon Jul 15 10:26:43 2013 +0200
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Mon Jul 15 10:26:43 2013 +0200

----------------------------------------------------------------------
 .../cloud/hypervisor/vmware/resource/VmwareResource.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e85ae21/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
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 2d18dc8..8b8f706 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++;
             }
 


Mime
View raw message