cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [2/4] git commit: updated refs/heads/master to abbae2a
Date Tue, 27 Aug 2013 00:29:53 GMT
Removed getPod, getCluster from ConfigurationManager


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

Branch: refs/heads/master
Commit: 2d05fe40c0ec90f156bd853d8ee504c41a4f588d
Parents: ff6b3fd
Author: Alex Huang <alex.huang@citrix.com>
Authored: Mon Aug 26 15:06:36 2013 -0700
Committer: Alex Huang <alex.huang@citrix.com>
Committed: Mon Aug 26 17:31:09 2013 -0700

----------------------------------------------------------------------
 .../com/cloud/vm/VirtualMachineManagerImpl.java   |  5 +++--
 .../cloud/configuration/ConfigurationManager.java |  4 ----
 .../configuration/ConfigurationManagerImpl.java   | 10 ----------
 .../cloud/vpc/MockConfigurationManagerImpl.java   | 18 ------------------
 4 files changed, 3 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d05fe40/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 26bcfa4..28df9a6 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -89,6 +89,7 @@ import com.cloud.dc.ClusterDetailsVO;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.HostPodVO;
+import com.cloud.dc.Pod;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.dc.dao.HostPodDao;
@@ -1906,9 +1907,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
         Host host = _hostDao.findById(vm.getHostId());
         Cluster cluster = null;
         if (host != null) {
-            cluster = _configMgr.getCluster(host.getClusterId());
+            cluster = _entityMgr.findById(Cluster.class, host.getClusterId());
         }
-        HostPodVO pod = _configMgr.getPod(host.getPodId());
+        Pod pod = _entityMgr.findById(Pod.class, host.getPodId());
         DeployDestination dest = new DeployDestination(dc, pod, cluster, host);
 
         try {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d05fe40/server/src/com/cloud/configuration/ConfigurationManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManager.java b/server/src/com/cloud/configuration/ConfigurationManager.java
index 775601a..72253fe 100755
--- a/server/src/com/cloud/configuration/ConfigurationManager.java
+++ b/server/src/com/cloud/configuration/ConfigurationManager.java
@@ -225,10 +225,6 @@ public interface ConfigurationManager extends ConfigurationService, Manager
{
 
     void createDefaultSystemNetworks(long zoneId) throws ConcurrentOperationException;
 
-    HostPodVO getPod(long id);
-
-    ClusterVO getCluster(long id);
-
     boolean releaseAccountSpecificVirtualRanges(long accountId);
 
     /**

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d05fe40/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index b31dfe3..5ef574d 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -4864,16 +4864,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements
Configurati
     }
 
     @Override
-    public HostPodVO getPod(long id) {
-        return _podDao.findById(id);
-    }
-
-    @Override
-    public ClusterVO getCluster(long id) {
-        return _clusterDao.findById(id);
-    }
-
-    @Override
     public AllocationState findClusterAllocationState(ClusterVO cluster) {
 
         if (cluster.getAllocationState() == AllocationState.Disabled) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d05fe40/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
index 3f75625..c1a9808 100755
--- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
@@ -541,24 +541,6 @@ public class MockConfigurationManagerImpl extends ManagerBase implements
Configu
     }
 
     /* (non-Javadoc)
-     * @see com.cloud.configuration.ConfigurationManager#getPod(long)
-     */
-    @Override
-    public HostPodVO getPod(long id) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see com.cloud.configuration.ConfigurationManager#getCluster(long)
-     */
-    @Override
-    public ClusterVO getCluster(long id) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
      * @see com.cloud.configuration.ConfigurationManager#deleteAccountSpecificVirtualRanges(long)
      */
     @Override


Mime
View raw message