From 99e9f5d308f8deb80f346ed47b09594fe60bf9db Mon Sep 17 00:00:00 2001 From: Sateesh Chodapuneedi Date: Thu, 23 May 2013 12:23:06 +0530 Subject: [PATCH] CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter Support for custom field "cloud.zone" for datacenter object in vCenter. Signed-off-by: Sateesh Chodapuneedi --- .../com/cloud/hypervisor/vmware/mo/CustomFieldConstants.java | 1 + .../src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/CustomFieldConstants.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/CustomFieldConstants.java index 4cd5f9b844b..11bc1576c35 100644 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/CustomFieldConstants.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/CustomFieldConstants.java @@ -21,4 +21,5 @@ public interface CustomFieldConstants { public final static String CLOUD_GC = "cloud.gc"; public final static String CLOUD_GC_DVP = "cloud.gc.dvp"; public final static String CLOUD_NIC_MASK = "cloud.nic.mask"; + public final static String CLOUD_ZONE = "cloud.zone"; } diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java index 0a3e20ba8aa..cabb60abc5d 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java @@ -488,4 +488,9 @@ public class DatacenterMO extends BaseMO { dvSwitchMor = _context.getVimClient().getDecendentMoRef(networkFolderMor, "VmwareDistributedVirtualSwitch", dvSwitchName); return dvSwitchMor; } + + public boolean ensureCustomFieldDef(String fieldName) throws Exception { + CustomFieldsManagerMO cfmMo = new CustomFieldsManagerMO(_context, _context.getServiceContent().getCustomFieldsManager()); + return cfmMo.ensureCustomFieldDef("Datacenter", fieldName) > 0; + } }