Skip to content

Commit 5610749

Browse files
author
Prasanna Santhanam
committed
simulator context : finalize the simulator spring context
This context is similar to the componentContext.xml.in but loads simulator components for the marvin tests.
1 parent b1c9a34 commit 5610749

1 file changed

Lines changed: 87 additions & 102 deletions

File tree

‎client/tomcatconf/simulatorComponentContext.xml.in‎

Lines changed: 87 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11

22
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one
4-
or more contributor license agreements. See the NOTICE file
5-
distributed with this work for additional information
6-
regarding copyright ownership. The ASF licenses this file
7-
to you under the Apache License, Version 2.0 (the
8-
"License"); you may not use this file except in compliance
9-
with the License. You may obtain a copy of the License at
10-
11-
http://www.apache.org/licenses/LICENSE-2.0
12-
13-
Unless required by applicable law or agreed to in writing,
14-
software distributed under the License is distributed on an
15-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
KIND, either express or implied. See the License for the
17-
specific language governing permissions and limitations
18-
under the License.
19-
-->
3+
~ Licensed to the Apache Software Foundation (ASF) under one
4+
~ or more contributor license agreements. See the NOTICE file
5+
~ distributed with this work for additional information
6+
~ regarding copyright ownership. The ASF licenses this file
7+
~ to you under the Apache License, Version 2.0 (the
8+
~ "License"); you may not use this file except in compliance
9+
~ with the License. You may obtain a copy of the License at
10+
~
11+
~ http://www.apache.org/licenses/LICENSE-2.0
12+
~
13+
~ Unless required by applicable law or agreed to in writing,
14+
~ software distributed under the License is distributed on an
15+
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
~ KIND, either express or implied. See the License for the
17+
~ specific language governing permissions and limitations
18+
~ under the License.
19+
-->
2020
<beans xmlns="http://www.springframework.org/schema/beans"
2121
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2222
xmlns:context="http://www.springframework.org/schema/context"
@@ -51,96 +51,65 @@
5151
<!--
5252
Managers & pluggable adapters configuration under OSS deployment
5353
-->
54-
<bean id="accountManagerImpl" class="com.cloud.user.AccountManagerImpl" >
55-
<property name="UserAuthenticators">
54+
<bean id="userAuthenticators" class="com.cloud.utils.component.AdapterList">
55+
<property name="Adapters">
5656
<list>
57+
<ref bean="SHA256SaltedUserAuthenticator"/>
5758
<ref bean="MD5UserAuthenticator"/>
5859
<ref bean="LDAPUserAuthenticator"/>
59-
</list>
60-
</property>
61-
<property name="SecurityCheckers">
62-
<list>
63-
<ref bean="domainChecker"/>
60+
<ref bean="PlainTextUserAuthenticator"/>
6461
</list>
6562
</property>
6663
</bean>
67-
68-
<bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl">
69-
<property name="UserAuthenticators">
64+
<bean id="userPasswordEncoders" class="com.cloud.utils.component.AdapterList">
65+
<property name="Adapters">
7066
<list>
67+
<ref bean="SHA256SaltedUserAuthenticator"/>
7168
<ref bean="MD5UserAuthenticator"/>
7269
<ref bean="LDAPUserAuthenticator"/>
73-
</list>
74-
</property>
75-
<property name="HostAllocators">
76-
<list>
77-
<ref bean="FirstFitRouting"/>
70+
<ref bean="PlainTextUserAuthenticator"/>
7871
</list>
7972
</property>
8073
</bean>
8174

82-
<bean id="storageManagerImpl" class="com.cloud.storage.StorageManagerImpl">
83-
<property name="StoragePoolAllocators">
84-
<list>
85-
<ref bean="LocalStoragePoolAllocator"/>
86-
<ref bean="clusterScopeStoragePoolAllocator"/>
87-
<ref bean="zoneWideStoragePoolAllocator"/>
88-
<ref bean="garbageCollectingStoragePoolAllocator"/>
89-
</list>
90-
</property>
91-
</bean>
9275

93-
<bean id="FirstFitPlanner" class="com.cloud.deploy.FirstFitPlanner">
94-
<property name="name" value="First Fit"/>
95-
<property name="StoragePoolAllocators">
96-
<list>
97-
<ref bean="LocalStoragePoolAllocator"/>
98-
<ref bean="clusterScopeStoragePoolAllocator"/>
99-
<ref bean="zoneWideStoragePoolAllocator"/>
100-
<ref bean="garbageCollectingStoragePoolAllocator"/>
101-
</list>
102-
</property>
103-
<property name="HostAllocators">
76+
<bean id="securityCheckers" class="com.cloud.utils.component.AdapterList">
77+
<property name="Adapters">
10478
<list>
105-
<ref bean="FirstFitRouting"/>
79+
<ref bean="domainChecker"/>
10680
</list>
10781
</property>
10882
</bean>
10983

110-
<bean id="resourceManagerImpl" class="com.cloud.resource.ResourceManagerImpl" >
111-
<property name="PodAllocators">
112-
<list>
113-
<ref bean="UserConcentratedAllocator"/>
114-
</list>
115-
</property>
116-
<property name="Discoverers">
84+
<!-- Resource discoverers -->
85+
<bean id="resourceDiscoverers" class="com.cloud.utils.component.AdapterList">
86+
<property name="Adapters">
11787
<list>
11888
<ref bean="SimulatorDiscoverer"/>
119-
<ref bean="XcpServerDiscoverer"/>
12089
<ref bean="SimulatorSecondaryDiscoverer"/>
90+
<ref bean="XcpServerDiscoverer"/>
12191
<ref bean="SecondaryStorageDiscoverer"/>
12292
<ref bean="KvmServerDiscoverer"/>
12393
<ref bean="LxcServerDiscoverer"/>
124-
125-
<!--
126-
<ref bean="BareMetalDiscoverer"/>
127-
-->
128-
12994
<ref bean="OvmDiscoverer"/>
13095
</list>
13196
</property>
13297
</bean>
13398

134-
<bean id="highAvailabilityManagerExtImpl" class="com.cloud.ha.HighAvailabilityManagerExtImpl" >
135-
<property name="Investigators">
99+
<!-- HA adapters -->
100+
<bean id="haInvestigators" class="com.cloud.utils.component.AdapterList">
101+
<property name="Adapters">
136102
<list>
137103
<ref bean="CheckOnAgentInvestigator"/>
138104
<ref bean="XenServerInvestigator"/>
139105
<ref bean="UserVmDomRInvestigator"/>
140106
<ref bean="ManagementIPSystemVMInvestigator"/>
141107
</list>
142108
</property>
143-
<property name="FenceBuilders">
109+
</bean>
110+
111+
<bean id="haFenceBuilders" class="com.cloud.utils.component.AdapterList">
112+
<property name="Adapters">
144113
<list>
145114
<ref bean="XenServerFencer"/>
146115
<ref bean="KVMFencer"/>
@@ -149,13 +118,9 @@
149118
</property>
150119
</bean>
151120

152-
<bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" >
153-
<property name="HostAllocators">
154-
<list>
155-
<ref bean="FirstFitRouting"/>
156-
</list>
157-
</property>
158-
<property name="Planners">
121+
<!-- Deployment/allocation adapters -->
122+
<bean id="deploymentPlanners" class="com.cloud.utils.component.AdapterList">
123+
<property name="Adapters">
159124
<list>
160125
<ref bean="FirstFitPlanner" />
161126
<ref bean="UserDispersingPlanner" />
@@ -164,46 +129,50 @@
164129
<!--
165130
<ref bean="BareMetalPlanner" />
166131
-->
132+
</list>
133+
</property>
134+
</bean>
167135

136+
<bean id="podAllocators" class="com.cloud.utils.component.AdapterList">
137+
<property name="Adapters">
138+
<list>
139+
<ref bean="UserConcentratedAllocator"/>
168140
</list>
169141
</property>
170142
</bean>
171143

172-
<bean id="networkManagerImpl" class="com.cloud.network.NetworkManagerImpl" >
173-
<property name="NetworkGurus">
144+
<bean id="hostAllocators" class="com.cloud.utils.component.AdapterList">
145+
<property name="Adapters">
174146
<list>
175-
<ref bean="StorageNetworkGuru"/>
176-
<ref bean="ExternalGuestNetworkGuru"/>
177-
<ref bean="PublicNetworkGuru"/>
178-
<ref bean="PodBasedNetworkGuru"/>
179-
<ref bean="DirectPodBasedNetworkGuru"/>
180-
<ref bean="ControlNetworkGuru"/>
181-
<ref bean="DirectNetworkGuru"/>
182-
<ref bean="OvsGuestNetworkGuru"/>
183-
<ref bean="PrivateNetworkGuru"/>
147+
<ref bean="FirstFitRouting"/>
184148
</list>
185149
</property>
186-
<property name="NetworkElements">
150+
</bean>
151+
152+
<bean id="storagePoolAllocators" class="com.cloud.utils.component.AdapterList">
153+
<property name="Adapters">
187154
<list>
188-
<ref bean="VirtualRouter"/>
189-
<ref bean="Ovs"/>
190-
<ref bean="SecurityGroupProvider"/>
191-
<ref bean="VpcVirtualRouter"/>
192-
<!--
193-
<ref bean="BareMetalDhcp"/>
194-
<ref bean="BareMetalPxe"/>
195-
<ref bean="BareMetalUserdata"/>
196-
-->
155+
<ref bean="LocalStoragePoolAllocator"/>
156+
<ref bean="clusterScopeStoragePoolAllocator"/>
157+
<ref bean="zoneWideStoragePoolAllocator"/>
158+
<ref bean="garbageCollectingStoragePoolAllocator"/>
197159
</list>
198160
</property>
199-
<property name="IpDeployers">
161+
</bean>
162+
163+
<!-- Networking adapters -->
164+
<bean id="ipDeployers" class="com.cloud.utils.component.AdapterList">
165+
<property name="Adapters">
200166
<list>
201167
<ref bean="elasticLoadBalancerElement"/>
202168
<ref bean="VirtualRouter"/>
203169
<ref bean="VpcVirtualRouter"/>
204170
</list>
205171
</property>
206-
<property name="DhcpProviders">
172+
</bean>
173+
174+
<bean id="dhcpProviders" class="com.cloud.utils.component.AdapterList">
175+
<property name="Adapters">
207176
<list>
208177
<ref bean="VirtualRouter"/>
209178
<ref bean="VpcVirtualRouter"/>
@@ -214,8 +183,24 @@
214183
</property>
215184
</bean>
216185

217-
<bean id="networkModelImpl" class="com.cloud.network.NetworkModelImpl">
218-
<property name="NetworkElements">
186+
<bean id="networkGurus" class="com.cloud.utils.component.AdapterList">
187+
<property name="Adapters">
188+
<list>
189+
<ref bean="StorageNetworkGuru"/>
190+
<ref bean="ExternalGuestNetworkGuru"/>
191+
<ref bean="PublicNetworkGuru"/>
192+
<ref bean="PodBasedNetworkGuru"/>
193+
<ref bean="DirectPodBasedNetworkGuru"/>
194+
<ref bean="ControlNetworkGuru"/>
195+
<ref bean="DirectNetworkGuru"/>
196+
<ref bean="OvsGuestNetworkGuru"/>
197+
<ref bean="PrivateNetworkGuru"/>
198+
</list>
199+
</property>
200+
</bean>
201+
202+
<bean id="networkElements" class="com.cloud.utils.component.AdapterList">
203+
<property name="Adapters">
219204
<list>
220205
<ref bean="VirtualRouter"/>
221206
<ref bean="Ovs"/>

0 commit comments

Comments
 (0)