Updated Branches: refs/heads/master b1c9a340a -> 5610749e2
simulator context : finalize the simulator spring context This context is similar to the componentContext.xml.in but loads simulator components for the marvin tests. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5610749e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5610749e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5610749e Branch: refs/heads/master Commit: 5610749e2957b74a8ebbdfa2b3c4ba5074be29dc Parents: b1c9a34 Author: Prasanna Santhanam <t...@apache.org> Authored: Fri Apr 5 21:04:51 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Fri Apr 5 21:08:59 2013 +0530 ---------------------------------------------------------------------- client/tomcatconf/simulatorComponentContext.xml.in | 189 +++++++-------- 1 files changed, 87 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5610749e/client/tomcatconf/simulatorComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/simulatorComponentContext.xml.in b/client/tomcatconf/simulatorComponentContext.xml.in index 1cb9f6f..fc5cf54 100644 --- a/client/tomcatconf/simulatorComponentContext.xml.in +++ b/client/tomcatconf/simulatorComponentContext.xml.in @@ -1,22 +1,22 @@ <!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; @@ -51,88 +51,54 @@ <!-- Managers & pluggable adapters configuration under OSS deployment --> - <bean id="accountManagerImpl" class="com.cloud.user.AccountManagerImpl" > - <property name="UserAuthenticators"> + <bean id="userAuthenticators" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> + <ref bean="SHA256SaltedUserAuthenticator"/> <ref bean="MD5UserAuthenticator"/> <ref bean="LDAPUserAuthenticator"/> - </list> - </property> - <property name="SecurityCheckers"> - <list> - <ref bean="domainChecker"/> + <ref bean="PlainTextUserAuthenticator"/> </list> </property> </bean> - - <bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl"> - <property name="UserAuthenticators"> + <bean id="userPasswordEncoders" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> + <ref bean="SHA256SaltedUserAuthenticator"/> <ref bean="MD5UserAuthenticator"/> <ref bean="LDAPUserAuthenticator"/> - </list> - </property> - <property name="HostAllocators"> - <list> - <ref bean="FirstFitRouting"/> + <ref bean="PlainTextUserAuthenticator"/> </list> </property> </bean> - <bean id="storageManagerImpl" class="com.cloud.storage.StorageManagerImpl"> - <property name="StoragePoolAllocators"> - <list> - <ref bean="LocalStoragePoolAllocator"/> - <ref bean="clusterScopeStoragePoolAllocator"/> - <ref bean="zoneWideStoragePoolAllocator"/> - <ref bean="garbageCollectingStoragePoolAllocator"/> - </list> - </property> - </bean> - <bean id="FirstFitPlanner" class="com.cloud.deploy.FirstFitPlanner"> - <property name="name" value="First Fit"/> - <property name="StoragePoolAllocators"> - <list> - <ref bean="LocalStoragePoolAllocator"/> - <ref bean="clusterScopeStoragePoolAllocator"/> - <ref bean="zoneWideStoragePoolAllocator"/> - <ref bean="garbageCollectingStoragePoolAllocator"/> - </list> - </property> - <property name="HostAllocators"> + <bean id="securityCheckers" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> - <ref bean="FirstFitRouting"/> + <ref bean="domainChecker"/> </list> </property> </bean> - <bean id="resourceManagerImpl" class="com.cloud.resource.ResourceManagerImpl" > - <property name="PodAllocators"> - <list> - <ref bean="UserConcentratedAllocator"/> - </list> - </property> - <property name="Discoverers"> + <!-- Resource discoverers --> + <bean id="resourceDiscoverers" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> <ref bean="SimulatorDiscoverer"/> - <ref bean="XcpServerDiscoverer"/> <ref bean="SimulatorSecondaryDiscoverer"/> + <ref bean="XcpServerDiscoverer"/> <ref bean="SecondaryStorageDiscoverer"/> <ref bean="KvmServerDiscoverer"/> <ref bean="LxcServerDiscoverer"/> - - <!-- - <ref bean="BareMetalDiscoverer"/> - --> - <ref bean="OvmDiscoverer"/> </list> </property> </bean> - <bean id="highAvailabilityManagerExtImpl" class="com.cloud.ha.HighAvailabilityManagerExtImpl" > - <property name="Investigators"> + <!-- HA adapters --> + <bean id="haInvestigators" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> <ref bean="CheckOnAgentInvestigator"/> <ref bean="XenServerInvestigator"/> @@ -140,7 +106,10 @@ <ref bean="ManagementIPSystemVMInvestigator"/> </list> </property> - <property name="FenceBuilders"> + </bean> + + <bean id="haFenceBuilders" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> <ref bean="XenServerFencer"/> <ref bean="KVMFencer"/> @@ -149,13 +118,9 @@ </property> </bean> - <bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" > - <property name="HostAllocators"> - <list> - <ref bean="FirstFitRouting"/> - </list> - </property> - <property name="Planners"> + <!-- Deployment/allocation adapters --> + <bean id="deploymentPlanners" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> <ref bean="FirstFitPlanner" /> <ref bean="UserDispersingPlanner" /> @@ -164,46 +129,50 @@ <!-- <ref bean="BareMetalPlanner" /> --> + </list> + </property> + </bean> + <bean id="podAllocators" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> + <list> + <ref bean="UserConcentratedAllocator"/> </list> </property> </bean> - <bean id="networkManagerImpl" class="com.cloud.network.NetworkManagerImpl" > - <property name="NetworkGurus"> + <bean id="hostAllocators" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> - <ref bean="StorageNetworkGuru"/> - <ref bean="ExternalGuestNetworkGuru"/> - <ref bean="PublicNetworkGuru"/> - <ref bean="PodBasedNetworkGuru"/> - <ref bean="DirectPodBasedNetworkGuru"/> - <ref bean="ControlNetworkGuru"/> - <ref bean="DirectNetworkGuru"/> - <ref bean="OvsGuestNetworkGuru"/> - <ref bean="PrivateNetworkGuru"/> + <ref bean="FirstFitRouting"/> </list> </property> - <property name="NetworkElements"> + </bean> + + <bean id="storagePoolAllocators" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> - <ref bean="VirtualRouter"/> - <ref bean="Ovs"/> - <ref bean="SecurityGroupProvider"/> - <ref bean="VpcVirtualRouter"/> - <!-- - <ref bean="BareMetalDhcp"/> - <ref bean="BareMetalPxe"/> - <ref bean="BareMetalUserdata"/> - --> + <ref bean="LocalStoragePoolAllocator"/> + <ref bean="clusterScopeStoragePoolAllocator"/> + <ref bean="zoneWideStoragePoolAllocator"/> + <ref bean="garbageCollectingStoragePoolAllocator"/> </list> </property> - <property name="IpDeployers"> + </bean> + + <!-- Networking adapters --> + <bean id="ipDeployers" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> <ref bean="elasticLoadBalancerElement"/> <ref bean="VirtualRouter"/> <ref bean="VpcVirtualRouter"/> </list> </property> - <property name="DhcpProviders"> + </bean> + + <bean id="dhcpProviders" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> <ref bean="VirtualRouter"/> <ref bean="VpcVirtualRouter"/> @@ -214,8 +183,24 @@ </property> </bean> - <bean id="networkModelImpl" class="com.cloud.network.NetworkModelImpl"> - <property name="NetworkElements"> + <bean id="networkGurus" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> + <list> + <ref bean="StorageNetworkGuru"/> + <ref bean="ExternalGuestNetworkGuru"/> + <ref bean="PublicNetworkGuru"/> + <ref bean="PodBasedNetworkGuru"/> + <ref bean="DirectPodBasedNetworkGuru"/> + <ref bean="ControlNetworkGuru"/> + <ref bean="DirectNetworkGuru"/> + <ref bean="OvsGuestNetworkGuru"/> + <ref bean="PrivateNetworkGuru"/> + </list> + </property> + </bean> + + <bean id="networkElements" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> <list> <ref bean="VirtualRouter"/> <ref bean="Ovs"/>
