master oss management server can start now

client/tomcatconf/components.xml.in

@@ -49,15 +49,10 @@
         <dao name="IP Addresses" class="com.cloud.network.dao.IPAddressDaoImpl"/>
         <dao name="vlan" class="com.cloud.dc.dao.VlanDaoImpl">
         </dao>
-		<dao name="PodVlanMap" class="com.cloud.dc.dao.PodVlanMapDaoImpl"/>
+        <dao name="PodVlanMap" class="com.cloud.dc.dao.PodVlanMapDaoImpl"/>
         <dao name="AccountVlanMap" class="com.cloud.dc.dao.AccountVlanMapDaoImpl"/>
         <dao name="Volume" class="com.cloud.storage.dao.VolumeDaoImpl"/>
         <dao name="Events" class="com.cloud.event.dao.EventDaoImpl"/>
-        <dao name="VM Template" class="com.cloud.storage.dao.VMTemplateDaoImpl">
-            <param name="cache.size">50</param>
-            <param name="cache.time.to.live">-1</param>
-	        <param name="routing.uniquename">routing</param>
-        </dao>
         <dao name="User" class="com.cloud.user.dao.UserDaoImpl">
             <param name="cache.size">5000</param>
             <param name="cache.time.to.live">300</param>
@@ -73,7 +68,7 @@
         <dao name="Network Rule Config" class="com.cloud.network.dao.NetworkRuleConfigDaoImpl"/>
         <dao name="Security Group Mapping" class="com.cloud.network.dao.SecurityGroupVMMapDaoImpl"/>
         <dao name="Load Balancer Mapping" class="com.cloud.network.dao.LoadBalancerVMMapDaoImpl"/>
-		<dao name="Datacenter IP Addresses" class="com.cloud.dc.dao.DataCenterIpAddressDaoImpl"/>
+        <dao name="Datacenter IP Addresses" class="com.cloud.dc.dao.DataCenterIpAddressDaoImpl"/>
         <dao name="Network Security Group" class="com.cloud.network.security.dao.NetworkGroupDaoImpl"/>
         <dao name="Ingress Rules" class="com.cloud.network.security.dao.IngressRuleDaoImpl"/>
         <dao name="Network Group Mapping" class="com.cloud.network.security.dao.NetworkGroupVMMapDaoImpl"/>
@@ -85,90 +80,105 @@
         <dao name="Domain" class="com.cloud.domain.dao.DomainDaoImpl"/>
         <dao name="Account" class="com.cloud.user.dao.AccountDaoImpl"/>
         <dao name="ResourceLimit" class="com.cloud.configuration.dao.ResourceLimitDaoImpl"/>
-	<dao name="ResourceCount" class="com.cloud.configuration.dao.ResourceCountDaoImpl"/>
+        <dao name="ResourceCount" class="com.cloud.configuration.dao.ResourceCountDaoImpl"/>
         <dao name="UserAccount" class="com.cloud.user.dao.UserAccountDaoImpl"/>
         <dao name="VM Template Host" class="com.cloud.storage.dao.VMTemplateHostDaoImpl"/>
         <dao name="Upload" class="com.cloud.storage.dao.UploadDaoImpl"/>
-        <dao name="Certificate" class="com.cloud.certificate.dao.CertificateDaoImpl"/>
         <dao name="VM Template Pool" class="com.cloud.storage.dao.VMTemplatePoolDaoImpl"/>
-        <dao name="VM Template Zone" class="com.cloud.storage.dao.VMTemplateZoneDaoImpl"/>
         <dao name="Launch Permission" class="com.cloud.storage.dao.LaunchPermissionDaoImpl"/>
         <dao name="Configuration" class="com.cloud.configuration.dao.ConfigurationDaoImpl"/>
-        <dao name="HostDetails" class="com.cloud.host.dao.DetailsDaoImpl"/>
+        <dao name="VM Template" class="com.cloud.storage.dao.VMTemplateDaoImpl">
+            <param name="cache.size">50</param>
+            <param name="cache.time.to.live">-1</param>
+            <param name="routing.uniquename">routing</param>
+        </dao>
         <dao name="HA" class="com.cloud.ha.dao.HighAvailabilityDaoImpl"/>
         <dao name="Console Proxy" class="com.cloud.vm.dao.ConsoleProxyDaoImpl"/>
         <dao name="Secondary Storage VM" class="com.cloud.vm.dao.SecondaryStorageVmDaoImpl"/>
         <dao name="Upgrade" class="com.cloud.maint.dao.AgentUpgradeDaoImpl"/>
         <dao name="Management Server Host" class="com.cloud.cluster.dao.ManagementServerHostDaoImpl"/>
         <dao name="Snapshot" class="com.cloud.storage.dao.SnapshotDaoImpl"/>
-        <dao name="SnapshotPolicyDao" class="com.cloud.storage.dao.SnapshotPolicyDaoImpl"/>
-        <dao name="SnapshotScheduleDao" class="com.cloud.storage.dao.SnapshotScheduleDaoImpl"/>
         <dao name="AsyncJobDao" class="com.cloud.async.dao.AsyncJobDaoImpl"/>
         <dao name="SyncQueueDao" class="com.cloud.async.dao.SyncQueueDaoImpl"/>
         <dao name="SyncQueueItemDao" class="com.cloud.async.dao.SyncQueueItemDaoImpl"/>
-        <dao name="StoragePoolDao" class="com.cloud.storage.dao.StoragePoolDaoImpl"/>
-        <dao name="StoragePoolHostDao" class="com.cloud.storage.dao.StoragePoolHostDaoImpl"/>
         <dao name="GuestOSDao" class="com.cloud.storage.dao.GuestOSDaoImpl"/>
         <dao name="GuestOSCategoryDao" class="com.cloud.storage.dao.GuestOSCategoryDaoImpl"/>
+        <dao name="StoragePoolDao" class="com.cloud.storage.dao.StoragePoolDaoImpl"/>
+        <dao name="StoragePoolHostDao" class="com.cloud.storage.dao.StoragePoolHostDaoImpl"/>
+        <dao name="HostDetails" class="com.cloud.host.dao.DetailsDaoImpl"/>
+        <dao name="SnapshotPolicyDao" class="com.cloud.storage.dao.SnapshotPolicyDaoImpl"/>
+        <dao name="SnapshotScheduleDao" class="com.cloud.storage.dao.SnapshotScheduleDaoImpl"/>
+        <dao name="PreallocatedLunDao" class="com.cloud.storage.preallocatedlun.dao.PreallocatedLunDaoImpl"/>
         <dao name="ClusterDao" class="com.cloud.dc.dao.ClusterDaoImpl"/>
+        <dao name="Certificate" class="com.cloud.certificate.dao.CertificateDaoImpl"/>
         <dao name="NetworkConfigurationDao" class="com.cloud.network.dao.NetworkConfigurationDaoImpl"/>
         <dao name="NetworkOfferingDao" class="com.cloud.offerings.dao.NetworkOfferingDaoImpl"/>
         <dao name="NicDao" class="com.cloud.vm.dao.NicDaoImpl"/>
         <dao name="InstanceGroupDao" class="com.cloud.vm.dao.InstanceGroupDaoImpl"/>
         <dao name="Instance Group to VM Mapping" class="com.cloud.vm.dao.InstanceGroupVMMapDaoImpl"/>
-
+        
         <adapters key="com.cloud.agent.manager.allocator.HostAllocator">
-            <adapter name="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator"/>
+            <adapter name="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.RecreateHostAllocator"/>
-            <adapter name="FirstFit" class="com.cloud.agent.manager.allocator.impl.FirstFitAllocator"/>
+            <!--adapter name="FirstFit" class="com.cloud.agent.manager.allocator.impl.FirstFitAllocator"/-->
         </adapters>
         <adapters key="com.cloud.storage.allocator.StoragePoolAllocator">
             <adapter name="LocalStorage" class="com.cloud.storage.allocator.LocalStoragePoolAllocator"/>
-            <adapter name="Storage" class="com.cloud.storage.allocator.FirstFitStoragePoolAllocator"/>
+            <!-- adapter name="Storage" class="com.cloud.storage.allocator.FirstFitStoragePoolAllocator"/ -->
-            <adapter name="Storage" class="com.cloud.storage.allocator.RandomStoragePoolAllocator"/>
+            <!--adapter name="Storage" class="com.cloud.storage.allocator.RandomStoragePoolAllocator"/-->
             <adapter name="GarbageCollecting" class="com.cloud.storage.allocator.GarbageCollectingStoragePoolAllocator"/>
         </adapters>
         <adapters key="com.cloud.agent.manager.allocator.PodAllocator">
             <adapter name="User First" class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator"/>
         </adapters>
-
+        <!--
+        <adapters key="com.cloud.network.VirtualNetworkAllocator">
+            <adapter name="Basic" class="com.cloud.network.BasicVirtualNetworkAllocator"/>
+        </adapters>
+        -->
         <adapters key="com.cloud.consoleproxy.ConsoleProxyAllocator">
             <adapter name="Balance" class="com.cloud.consoleproxy.ConsoleProxyBalanceAllocator"/>
         </adapters>
+        <adapters key="com.cloud.network.configuration.NetworkGuru">
+            <adapter name="GuestNetworkGuru" class="com.cloud.network.configuration.GuestNetworkGuru"/>
+            <adapter name="PublicNetworkGuru" class="com.cloud.network.configuration.PublicNetworkGuru"/>
+            <adapter name="PodBasedNetworkGuru" class="com.cloud.network.configuration.PodBasedNetworkGuru"/>
+            <adapter name="ControlNetworkGuru" class="com.cloud.network.configuration.ControlNetworkGuru"/>
+        </adapters>
+        <adapters key="com.cloud.storage.secondary.SecondaryStorageVmAllocator">
+            <adapter name="Balance" class="com.cloud.storage.secondary.SecondaryStorageVmDefaultAllocator"/>
+        </adapters>
+        <adapters key="com.cloud.network.IpAddrAllocator">
+            <adapter name="Basic" class="com.cloud.network.ExteralIpAddressAllocator"/>
+        </adapters>
+        
+        <manager name="StackMaidManager" class="com.cloud.maid.StackMaidManagerImpl">
+        </manager>
 
         <adapters key="com.cloud.server.auth.UserAuthenticator">
             <adapter name="MD5" class="com.cloud.server.auth.MD5UserAuthenticator"/>
         </adapters>
         <adapters key="com.cloud.ha.Investigator">
             <adapter name="SimpleInvestigator" class="com.cloud.ha.CheckOnAgentInvestigator"/>
+            <adapter name="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator"/>
             <adapter name="PingInvestigator" class="com.cloud.ha.InvestigatorImpl"/>
         </adapters>
         <adapters key="com.cloud.ha.FenceBuilder">
             <adapter name="StorageFenceBuilder" class="com.cloud.ha.StorageFence"/>
         </adapters>
-
-		<adapters key="com.cloud.network.IpAddrAllocator">
-            <adapter name="Basic" class="com.cloud.network.ExteralIpAddressAllocator"/>
-        </adapters>
-
         <adapters key="com.cloud.resource.Discoverer">
-            <adapter name="SecondaryStorage" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer"/>
             <adapter name="XCP Agent" class="com.cloud.hypervisor.xen.discoverer.XcpServerDiscoverer"/>
+            <adapter name="SecondaryStorage" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer"/>
             <adapter name="KVM Agent" class="com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer"/>
         </adapters>
-
+        <adapters key="com.cloud.deploy.DeploymentPlanner">
-        <manager name="Cluster Manager" class="com.cloud.cluster.DummyClusterManagerImpl">
+            <adapter name="Simple" class="com.cloud.deploy.SimplePlanner"/>
-        </manager>
+        </adapters>
-        <manager name="StackMaidManager" class="com.cloud.maid.StackMaidManagerImpl">
-        </manager>
-        
-		<manager name="account manager" class="com.cloud.user.AccountManagerImpl">
-        </manager>
         <manager name="agent manager" class="com.cloud.agent.manager.AgentManagerImpl">
         </manager>
-
+        <manager name="account manager" class="com.cloud.user.AccountManagerImpl">
-		<manager name="configuration manager" class="com.cloud.configuration.ConfigurationManagerImpl">
+        </manager>
-			<param name="premium">false</param>
+        <manager name="configuration manager" class="com.cloud.configuration.ConfigurationManagerImpl">
-		</manager>
+        </manager>
         <manager name="network manager" class="com.cloud.network.NetworkManagerImpl">
         </manager>
         <manager name="download manager" class="com.cloud.storage.download.DownloadMonitorImpl">
@@ -177,65 +187,50 @@
         </manager>
         <manager name="console proxy manager" class="com.cloud.consoleproxy.AgentBasedStandaloneConsoleProxyManager">
         </manager>
+        <manager name="secondary storage vm manager" class="com.cloud.storage.secondary.SecondaryStorageManagerImpl">
+        </manager>
         <manager name="vm manager" class="com.cloud.vm.UserVmManagerImpl"/>
         <manager name="upgrade manager" class="com.cloud.maint.UpgradeManagerImpl">
         </manager>
         <manager name="StorageManager" class="com.cloud.storage.StorageManagerImpl">
         </manager>
-        <manager name="SnapshotManager" class="com.cloud.storage.snapshot.SnapshotManagerImpl">
+        <manager name="Cluster Manager" class="com.cloud.cluster.DummyClusterManagerImpl">
-        </manager>
-        <manager name="SnapshotScheduler" class="com.cloud.storage.snapshot.SnapshotSchedulerImpl">
         </manager>
         <manager name="SyncQueueManager" class="com.cloud.async.SyncQueueManagerImpl">
         </manager>
         <manager name="AsyncJobManager" class="com.cloud.async.AsyncJobManagerImpl">
         </manager>
         <manager name="AsyncJobExecutorContext" class="com.cloud.async.AsyncJobExecutorContextImpl">
-        </manager>  
+        </manager>
         <manager name="HA Manager" class="com.cloud.ha.HighAvailabilityManagerImpl">
         </manager>
         <manager name="Alert Manager" class="com.cloud.alert.AlertManagerImpl">
         </manager>
         <manager name="Template Manager" class="com.cloud.template.TemplateManagerImpl">
         </manager>
+        <manager name="Snapshot Manager" class="com.cloud.storage.snapshot.SnapshotManagerImpl">
+        </manager>
+        <manager name="SnapshotScheduler" class="com.cloud.storage.snapshot.SnapshotSchedulerImpl">
+        </manager>
         <manager name="NetworkGroupManager" class="com.cloud.network.security.NetworkGroupManagerImpl">
         </manager>
-<!--        
+        <manager name="VmManager" class="com.cloud.vm.MauriceMoss"/>
-        <adapters key="com.cloud.alert.AlertAdapter">
+        <manager name="DomainRouterManager" class="com.cloud.network.router.DomainRouterManagerImpl"/>
-            <adapter name="ConsoleProxyAlert" class="com.cloud.alert.ConsoleProxyAlertAdapter"/>
+        
-        </adapters>
--->        
     </management-server>
 
     <configuration-server class="com.cloud.server.ConfigurationServerImpl">
-		<dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl"/>
+        <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl">
-		<manager name="configuration manager configuration server" class="com.cloud.configuration.ConfigurationManagerImpl">
+             <param name="premium">false</param>
-			<param name="premium">false</param>
-		</manager>
-		<dao name="User configuration server" class="com.cloud.user.dao.UserDaoImpl">
-        </dao>
-        <dao name="Account configuration server" class="com.cloud.user.dao.AccountDaoImpl"/>
-        <dao name="IP Addresses configuration server" class="com.cloud.network.dao.IPAddressDaoImpl"/>
-		<dao name="Datacenter IP Addresses configuration server" class="com.cloud.dc.dao.DataCenterIpAddressDaoImpl"/>
-		<dao name="domain router" class="com.cloud.vm.dao.DomainRouterDaoImpl"/>
-		<dao name="host zone configuration server" class="com.cloud.dc.dao.DataCenterDaoImpl"/>
-        <dao name="Console Proxy" class="com.cloud.vm.dao.ConsoleProxyDaoImpl"/>
-        <dao name="Secondary Storage VM" class="com.cloud.vm.dao.SecondaryStorageVmDaoImpl"/>
-        <dao name="host pod configuration server" class="com.cloud.dc.dao.HostPodDaoImpl">
-        </dao>
-		<dao name="PodVlanMap configuration server" class="com.cloud.dc.dao.PodVlanMapDaoImpl"/>
-        <dao name="AccountVlanMap configurations erver" class="com.cloud.dc.dao.AccountVlanMapDaoImpl"/>
-        <dao name="vlan configuration server" class="com.cloud.dc.dao.VlanDaoImpl">
-        </dao>
-        <dao name="VM Instance configuration server" class="com.cloud.vm.dao.VMInstanceDaoImpl">
         </dao>
+        <dao name="Snapshot policy defaults" class="com.cloud.storage.dao.SnapshotPolicyDaoImpl"/>
+        <dao name="DiskOffering configuration server" class="com.cloud.storage.dao.DiskOfferingDaoImpl"/>         
         <dao name="ServiceOffering configuration server" class="com.cloud.service.dao.ServiceOfferingDaoImpl">
             <param name="cache.size">50</param>
             <param name="cache.time.to.live">-1</param>
         </dao>
-        <dao name="DiskOffering configuration server" class="com.cloud.storage.dao.DiskOfferingDaoImpl"/>
+        <dao name="host zone configuration server" class="com.cloud.dc.dao.DataCenterDaoImpl"/>
-        <dao name="Snapshot policy defaults" class="com.cloud.storage.dao.SnapshotPolicyDaoImpl"/>
+        <dao name="host pod configuration server" class="com.cloud.dc.dao.HostPodDaoImpl"/>
-        <dao name="Events configuration server" class="com.cloud.event.dao.EventDaoImpl"/>
     </configuration-server>
     
 </components.xml>

server/src/com/cloud/configuration/ConfigurationManager.java

@@ -300,12 +300,6 @@ public interface ConfigurationManager extends Manager {
 	 */
 	String listToCsvTags(List<String> tags);
 	
-	/**
-	 * Returns a flag that describes whether the manager is being used in a Premium context or not.
-	 * @return true for Premium, false for not
-	 */
-	boolean isPremium();
-
 	/**
 	 * Persists a config value via the API call
 	 * @param cmd - the command that wraps instance, component, category, name, value, description parameters

server/src/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -131,16 +131,12 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
 	@Inject SecondaryStorageVmDao _secStorageDao;
     @Inject AccountManager _accountMgr;
     @Inject NetworkManager _networkMgr;
-	public boolean _premium;
 
-	private int _maxVolumeSizeInGb;
+    private int _maxVolumeSizeInGb;
 
     @Override
     public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
     	_name = name;
-        
-        Object premium = params.get("premium");
-        _premium = (premium != null) && ((String) premium).equals("true");
 
         String maxVolumeSizeInGbString = _configDao.getValue("max.volume.size.gb");
         int maxVolumeSizeGb = NumbersUtil.parseInt(maxVolumeSizeInGbString, 2000);
@@ -155,11 +151,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
         return _name;
     }
     
-    @Override
-    public boolean isPremium() {
-    	return _premium;
-    }
-    
     @Override
     public boolean start() {
         return true;