Updated Branches: refs/heads/javelin 497dcd504 -> cbb7ff1c3
added missing files Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cbb7ff1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cbb7ff1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cbb7ff1c Branch: refs/heads/javelin Commit: cbb7ff1c3275f9ec9dbf722966d34a9e3fa69a60 Parents: b751b69 Author: Alex Huang <[email protected]> Authored: Thu Jan 17 06:50:59 2013 -0800 Committer: Alex Huang <[email protected]> Committed: Thu Jan 17 06:50:59 2013 -0800 ---------------------------------------------------------------------- .../SecurityGroupManagerTestConfiguration.java | 76 ++++++++++++ server/test/resources/db.properties | 70 +++++++++++ server/test/resources/testContext.xml | 94 +++++++++++++++ utils/test/resources/testContext.xml | 54 ++++++++ 4 files changed, 294 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cbb7ff1c/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java b/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java new file mode 100644 index 0000000..ecf3ad1 --- /dev/null +++ b/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java @@ -0,0 +1,76 @@ +// 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 +// 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. + +package com.cloud.network.security; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.cloud.agent.AgentManager; +import com.cloud.agent.MockAgentManagerImpl; +import com.cloud.network.NetworkManager; +import com.cloud.projects.MockProjectManagerImpl; +import com.cloud.projects.ProjectManager; +import com.cloud.user.AccountManager; +import com.cloud.user.DomainManager; +import com.cloud.user.MockAccountManagerImpl; +import com.cloud.user.MockDomainManagerImpl; +import com.cloud.utils.component.ComponentContext; +import com.cloud.vm.MockUserVmManagerImpl; +import com.cloud.vm.MockVirtualMachineManagerImpl; +import com.cloud.vm.UserVmManager; +import com.cloud.vm.VirtualMachineManager; +import com.cloud.vpc.MockNetworkManagerImpl; + +@Configuration +public class SecurityGroupManagerTestConfiguration { + + @Bean + public AgentManager agentManager() { + return ComponentContext.inject(MockAgentManagerImpl.class); + } + + @Bean + public VirtualMachineManager virtualMachineManager(){ + return ComponentContext.inject(MockVirtualMachineManagerImpl.class); + } + + @Bean + public UserVmManager userVmManager() { + return ComponentContext.inject(MockUserVmManagerImpl.class); + } + + @Bean + public NetworkManager networkManager(){ + return ComponentContext.inject(MockNetworkManagerImpl.class); + } + + @Bean + public AccountManager accountManager() { + return ComponentContext.inject(MockAccountManagerImpl.class); + } + + @Bean + public DomainManager domainManager() { + return ComponentContext.inject(MockDomainManagerImpl.class); + } + + @Bean + public ProjectManager projectManager() { + return ComponentContext.inject(MockProjectManagerImpl.class); + } +} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cbb7ff1c/server/test/resources/db.properties ---------------------------------------------------------------------- diff --git a/server/test/resources/db.properties b/server/test/resources/db.properties new file mode 100644 index 0000000..79a3c1b --- /dev/null +++ b/server/test/resources/db.properties @@ -0,0 +1,70 @@ +# 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. + + +# management server clustering parameters, change cluster.node.IP to the machine IP address +# in which the management server(Tomcat) is running +cluster.node.IP=127.0.0.1 +cluster.servlet.port=9090 + +# CloudStack database settings +db.cloud.username=cloud +db.cloud.password=cloud +db.root.password= +db.cloud.host=localhost +db.cloud.port=3306 +db.cloud.name=cloud + +# CloudStack database tuning parameters +db.cloud.maxActive=250 +db.cloud.maxIdle=30 +db.cloud.maxWait=10000 +db.cloud.autoReconnect=true +db.cloud.validationQuery=SELECT 1 +db.cloud.testOnBorrow=true +db.cloud.testWhileIdle=true +db.cloud.timeBetweenEvictionRunsMillis=40000 +db.cloud.minEvictableIdleTimeMillis=240000 +db.cloud.poolPreparedStatements=false +db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&prepStmtCacheSqlLimit=4096 + +# usage database settings +db.usage.username=cloud +db.usage.password=cloud +db.usage.host=localhost +db.usage.port=3306 +db.usage.name=cloud_usage + +# usage database tuning parameters +db.usage.maxActive=100 +db.usage.maxIdle=30 +db.usage.maxWait=10000 +db.usage.autoReconnect=true + +# awsapi database settings +db.awsapi.name=cloudbridge + +# Simulator database settings +db.simulator.username=cloud +db.simulator.password=cloud +db.simulator.host=localhost +db.simulator.port=3306 +db.simulator.name=simulator +db.simulator.maxActive=250 +db.simulator.maxIdle=30 +db.simulator.maxWait=10000 +db.simulator.autoReconnect=true http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cbb7ff1c/server/test/resources/testContext.xml ---------------------------------------------------------------------- diff --git a/server/test/resources/testContext.xml b/server/test/resources/testContext.xml new file mode 100644 index 0000000..b260386 --- /dev/null +++ b/server/test/resources/testContext.xml @@ -0,0 +1,94 @@ +<!-- + 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"; + xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:aop="http://www.springframework.org/schema/aop"; + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx-3.0.xsd + http://www.springframework.org/schema/aop + http://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd";> + + <context:annotation-config /> + + <context:component-scan base-package="org.apache.cloudstack, com.cloud" /> + + <!-- + @DB support + --> + <aop:config proxy-target-class="true"> + <aop:aspect id="dbContextBuilder" ref="transactionContextBuilder"> + <aop:pointcut id="captureAnyMethod" + expression="execution(* *(..))" + /> + + <aop:around pointcut-ref="captureAnyMethod" method="AroundAnyMethod"/> + </aop:aspect> + + <aop:aspect id="actionEventInterceptorAspect" ref="actionEventInterceptor"> + <aop:pointcut id="captureEventMethod" + expression="execution(* *(..)) and @annotation(com.cloud.event.ActionEvent)" + /> + <aop:around pointcut-ref="captureEventMethod" method="AroundAnyMethod"/> + </aop:aspect> + + </aop:config> + + <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" /> + <bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" /> + <bean class="com.cloud.network.security.SecurityGroupManagerTestConfiguration" /> + + <!-- + RPC/Async/EventBus + --> + + <bean id="onwireRegistry" class="org.apache.cloudstack.framework.serializer.OnwireClassRegistry" + init-method="scan" > + <property name="packages"> + <list> + <value>org.apache.cloudstack.framework</value> + </list> + </property> + </bean> + + <bean id="messageSerializer" class="org.apache.cloudstack.framework.serializer.JsonMessageSerializer"> + <property name="onwireClassRegistry" ref="onwireRegistry" /> + </bean> + + <bean id="transportProvider" class="org.apache.cloudstack.framework.server.ServerTransportProvider" init-method="initialize"> + <property name="workerPoolSize" value="5" /> + <property name="nodeId" value="Node1" /> + <property name="messageSerializer" ref="messageSerializer" /> + </bean> + + <bean id="rpcProvider" class="org.apache.cloudstack.framework.rpc.RpcProviderImpl" init-method="initialize"> + <constructor-arg ref="transportProvider" /> + <property name="messageSerializer" ref="messageSerializer" /> + </bean> + + <bean id="eventBus" class = "org.apache.cloudstack.framework.eventbus.EventBusBase" /> + + <bean id="apiServlet" class = "com.cloud.api.ApiServlet" /> + +</beans> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cbb7ff1c/utils/test/resources/testContext.xml ---------------------------------------------------------------------- diff --git a/utils/test/resources/testContext.xml b/utils/test/resources/testContext.xml new file mode 100644 index 0000000..26cdaae --- /dev/null +++ b/utils/test/resources/testContext.xml @@ -0,0 +1,54 @@ +<!-- + 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"; + xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:aop="http://www.springframework.org/schema/aop"; + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx-3.0.xsd + http://www.springframework.org/schema/aop + http://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd";> + + <context:annotation-config /> + + <context:component-scan base-package="org.apache.cloudstack, com.cloud" /> + + <!-- + @DB support + --> + <aop:config proxy-target-class="true"> + <aop:aspect id="dbContextBuilder" ref="transactionContextBuilder"> + <aop:pointcut id="captureAnyMethod" + expression="execution(* *(..))" + /> + + <aop:around pointcut-ref="captureAnyMethod" method="AroundAnyMethod"/> + </aop:aspect> + + </aop:config> + + <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" /> + + +</beans>
