Updated Branches: refs/heads/vmwaresdk-to-vijava 02ae858d6 -> 9ae656423
Convert VmwareHelper.java and VmwareContext.javafrom Vmware SDK to vijava Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ae65642 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ae65642 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ae65642 Branch: refs/heads/vmwaresdk-to-vijava Commit: 9ae65642334b4a92d53c26b95ad20224a4bcd06f Parents: 02ae858 Author: Hugo Trippaers <[email protected]> Authored: Sun Sep 22 20:49:49 2013 +0800 Committer: Hugo Trippaers <[email protected]> Committed: Sun Sep 22 20:49:49 2013 +0800 ---------------------------------------------------------------------- .../hypervisor/vmware/util/VmwareContext.java | 24 ++++++++++---------- .../hypervisor/vmware/util/VmwareHelper.java | 22 +++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ae65642/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java ---------------------------------------------------------------------- diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java index 6c3dab7..04939a7 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java @@ -193,14 +193,14 @@ public class VmwareContext { ManagedObjectReference mor = getRootFolder(); for(int i=0; i < tokens.length;i++) { String token = tokens[i]; - List<ObjectContent> ocs; + ObjectContent[] ocs; PropertySpec pSpec = null; ObjectSpec oSpec = null; if(mor.getType().equalsIgnoreCase("Datacenter")) { pSpec = new PropertySpec(); pSpec.setAll(false); pSpec.setType("ManagedEntity"); - pSpec.getPathSet().add("name"); + pSpec.setPathSet(new String[] {"name"}); TraversalSpec dcHostFolderTraversal = new TraversalSpec(); dcHostFolderTraversal.setType("Datacenter"); @@ -210,13 +210,13 @@ public class VmwareContext { oSpec = new ObjectSpec(); oSpec.setObj(mor); oSpec.setSkip(Boolean.TRUE); - oSpec.getSelectSet().add(dcHostFolderTraversal); + oSpec.setSelectSet(new TraversalSpec[] { dcHostFolderTraversal }); } else if(mor.getType().equalsIgnoreCase("Folder")) { pSpec = new PropertySpec(); pSpec.setAll(false); pSpec.setType("ManagedEntity"); - pSpec.getPathSet().add("name"); + pSpec.setPathSet(new String[] {"name"}); TraversalSpec folderChildrenTraversal = new TraversalSpec(); folderChildrenTraversal.setType("Folder"); @@ -226,13 +226,13 @@ public class VmwareContext { oSpec = new ObjectSpec(); oSpec.setObj(mor); oSpec.setSkip(Boolean.TRUE); - oSpec.getSelectSet().add(folderChildrenTraversal); + oSpec.setSelectSet(new TraversalSpec[] { folderChildrenTraversal }); } else if(mor.getType().equalsIgnoreCase("ClusterComputeResource")) { pSpec = new PropertySpec(); pSpec.setType("ManagedEntity"); - pSpec.getPathSet().add("name"); + pSpec.setPathSet(new String[] {"name"}); TraversalSpec clusterHostTraversal = new TraversalSpec(); clusterHostTraversal.setType("ClusterComputeResource"); @@ -242,7 +242,7 @@ public class VmwareContext { oSpec = new ObjectSpec(); oSpec.setObj(mor); oSpec.setSkip(Boolean.TRUE); - oSpec.getSelectSet().add(clusterHostTraversal); + oSpec.setSelectSet(new TraversalSpec[] { clusterHostTraversal }); } else { s_logger.error("Invalid inventory path, path element can only be datacenter and folder"); @@ -250,16 +250,16 @@ public class VmwareContext { } PropertyFilterSpec pfSpec = new PropertyFilterSpec(); - pfSpec.getPropSet().add(pSpec); - pfSpec.getObjectSet().add(oSpec); + pfSpec.setPropSet(new PropertySpec[] { pSpec }); + pfSpec.setObjectSet(new ObjectSpec[] { oSpec }); List<PropertyFilterSpec> pfSpecArr = new ArrayList<PropertyFilterSpec>(); pfSpecArr.add(pfSpec); - ocs = getService().retrieveProperties(getPropertyCollector(), pfSpecArr); + ocs = getService().retrieveProperties(getPropertyCollector(), pfSpecArr.toArray(new PropertyFilterSpec[0])); - if(ocs != null && ocs.size() > 0) { + if(ocs != null && ocs.length > 0) { boolean found = false; for(ObjectContent oc : ocs) { - String name = oc.getPropSet().get(0).getVal().toString(); + String name = oc.getPropSet()[0].getVal().toString(); if(name.equalsIgnoreCase(token) || name.equalsIgnoreCase("host")) { mor = oc.getObj(); found = true; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ae65642/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java ---------------------------------------------------------------------- diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java index bcf9f14..df85058 100644 --- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java @@ -147,7 +147,7 @@ public class VmwareHelper { final VirtualDeviceConnectInfo connectInfo = new VirtualDeviceConnectInfo(); dvPortConnection.setSwitchUuid(dvSwitchUuid); - dvPortConnection.setPortgroupKey(morNetwork.getValue()); + dvPortConnection.setPortgroupKey(morNetwork.getVal()); dvPortBacking.setPort(dvPortConnection); nic.setBacking(dvPortBacking); nic.setKey(30); @@ -171,7 +171,7 @@ public class VmwareHelper { VirtualDisk disk = new VirtualDisk(); VirtualDiskFlatVer2BackingInfo backingInfo = new VirtualDiskFlatVer2BackingInfo(); - backingInfo.setDiskMode(VirtualDiskMode.PERSISTENT.value()); + backingInfo.setDiskMode(VirtualDiskMode.persistent.toString()); backingInfo.setThinProvisioned(true); backingInfo.setEagerlyScrub(false); backingInfo.setDatastore(morDs); @@ -279,7 +279,7 @@ public class VmwareHelper { disk = new VirtualDisk(); backingInfo = new VirtualDiskFlatVer2BackingInfo(); backingInfo.setDatastore(morDs); - backingInfo.setDiskMode(VirtualDiskMode.PERSISTENT.value()); + backingInfo.setDiskMode(VirtualDiskMode.persistent.toString()); disk.setBacking(backingInfo); if(controllerKey < 0) @@ -321,7 +321,7 @@ public class VmwareHelper { VirtualDiskFlatVer2BackingInfo backingInfo = new VirtualDiskFlatVer2BackingInfo(); backingInfo.setDatastore(vmdkDatastorePathChain[0].second()); backingInfo.setFileName(vmdkDatastorePathChain[0].first()); - backingInfo.setDiskMode(VirtualDiskMode.PERSISTENT.value()); + backingInfo.setDiskMode(VirtualDiskMode.persistent.toString()); if(vmdkDatastorePathChain.length > 1) { Pair<String, ManagedObjectReference>[] parentDisks = new Pair[vmdkDatastorePathChain.length - 1]; for(int i = 0; i < vmdkDatastorePathChain.length - 1; i++) @@ -354,7 +354,7 @@ public class VmwareHelper { VirtualDiskFlatVer2BackingInfo parentBacking = new VirtualDiskFlatVer2BackingInfo(); parentBacking.setDatastore(morDs); - parentBacking.setDiskMode(VirtualDiskMode.PERSISTENT.value()); + parentBacking.setDiskMode(VirtualDiskMode.persistent.toString()); if(parentDatastorePathList.length > 1) { String[] nextDatastorePathList = new String[parentDatastorePathList.length -1]; @@ -372,7 +372,7 @@ public class VmwareHelper { VirtualDiskFlatVer2BackingInfo parentBacking = new VirtualDiskFlatVer2BackingInfo(); parentBacking.setDatastore(parentDatastorePathList[0].second()); - parentBacking.setDiskMode(VirtualDiskMode.PERSISTENT.value()); + parentBacking.setDiskMode(VirtualDiskMode.persistent.toString()); if(parentDatastorePathList.length > 1) { Pair<String, ManagedObjectReference>[] nextDatastorePathList = new Pair[parentDatastorePathList.length -1]; @@ -430,20 +430,20 @@ public class VmwareHelper { return disks[0]; } - public static ManagedObjectReference findSnapshotInTree(List<VirtualMachineSnapshotTree> snapTree, String findName) { + public static ManagedObjectReference findSnapshotInTree(VirtualMachineSnapshotTree[] snapTree, String findName) { assert(findName != null); ManagedObjectReference snapMor = null; if (snapTree == null) return snapMor; - for (int i = 0; i < snapTree.size() && snapMor == null; i++) { - VirtualMachineSnapshotTree node = snapTree.get(i); + for (int i = 0; i < snapTree.length && snapMor == null; i++) { + VirtualMachineSnapshotTree node = snapTree[i]; if (node.getName().equals(findName)) { snapMor = node.getSnapshot(); } else { - List<VirtualMachineSnapshotTree> childTree = node.getChildSnapshotList(); + VirtualMachineSnapshotTree[] childTree = node.getChildSnapshotList(); snapMor = findSnapshotInTree(childTree, findName); } } @@ -593,7 +593,7 @@ public class VmwareHelper { } public static Object getPropValue(ObjectContent oc, String name) { - List<DynamicProperty> props = oc.getPropSet(); + DynamicProperty[] props = oc.getPropSet(); for(DynamicProperty prop : props) { if(prop.getName().equalsIgnoreCase(name))
