Skip to content

Commit 792db8b

Browse files
author
Prasanna Santhanam
committed
simulator: removing cyclic dependency from simulator
The database creator caused a cyclic dependecny in the simulator which is removed with this commit. Additionally the simulator profile is now merged with developer profile and a test for server health is included Steps to run: $ mvn -Pdeveloper clean install $ mvn -Pdeveloper -pl developer -Ddeploydb $ mvn -Pdeveloper -pl developer -Ddeploydb-simulator $ mvn -pl client jetty:run To deploy an adv. zone and test the server health: $ mvn -Pdeveloper,marvin -Dmarvin.config=`find . -name simulator.cfg` -pl :cloud-marvin test Conflicts: pom.xml Signed-off-by: Prasanna Santhanam <tsp@apache.org>
1 parent 4faad73 commit 792db8b

6 files changed

Lines changed: 259 additions & 339 deletions

File tree

‎client/pom.xml‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,11 @@
219219
<artifactId>cloud-engine-storage-volume</artifactId>
220220
<version>${project.version}</version>
221221
</dependency>
222+
<dependency>
223+
<groupId>org.apache.cloudstack</groupId>
224+
<artifactId>cloud-plugin-hypervisor-simulator</artifactId>
225+
<version>${project.version}</version>
226+
</dependency>
222227
</dependencies>
223228
<build>
224229
<defaultGoal>install</defaultGoal>
@@ -481,21 +486,6 @@
481486
</pluginManagement>
482487
</build>
483488
<profiles>
484-
<profile>
485-
<id>simulator</id>
486-
<activation>
487-
<property>
488-
<name>simulator</name>
489-
</property>
490-
</activation>
491-
<dependencies>
492-
<dependency>
493-
<groupId>org.apache.cloudstack</groupId>
494-
<artifactId>cloud-plugin-hypervisor-simulator</artifactId>
495-
<version>${project.version}</version>
496-
</dependency>
497-
</dependencies>
498-
</profile>
499489
<profile>
500490
<id>netapp</id>
501491
<activation>

‎client/tomcatconf/componentContext.xml.in‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,9 @@
215215
<property name="name" value="KVM Agent"/>
216216
</bean>
217217

218-
<!--
219218
<bean id="SimulatorDiscoverer" class="com.cloud.resource.SimulatorDiscoverer">
220-
<property name="name" value="KVM Agent"/>
219+
<property name="name" value="Simulator Agent"/>
221220
</bean>
222-
-->
223221

224222

225223
<bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer">
@@ -318,11 +316,9 @@
318316
<property name="name" value="OvmGuru"/>
319317
</bean>
320318

321-
<!--
322319
<bean id="SimulatorGuru" class="com.cloud.simulator.SimulatorGuru">
323320
<property name="name" value="SimulatorGuru"/>
324321
</bean>
325-
-->
326322

327323
<bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru">
328324
<property name="name" value="BaremetalGuru"/>

‎developer/pom.xml‎

Lines changed: 139 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
language governing permissions and limitations under the License. -->
1111
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1212

13-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
13+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1414
<modelVersion>4.0.0</modelVersion>
1515
<artifactId>cloud-developer</artifactId>
1616
<name>Apache CloudStack Developer Tools</name>
@@ -21,25 +21,98 @@
2121
<version>4.2.0-SNAPSHOT</version>
2222
</parent>
2323
<dependencies>
24+
<!-- specify the dependent jdbc driver here -->
2425
<dependency>
2526
<groupId>mysql</groupId>
2627
<artifactId>mysql-connector-java</artifactId>
27-
<version>5.1.21</version>
28-
<scope>runtime</scope>
28+
<version>${cs.mysql.version}</version>
29+
</dependency>
30+
<dependency>
31+
<groupId>commons-dbcp</groupId>
32+
<artifactId>commons-dbcp</artifactId>
33+
<version>${cs.dbcp.version}</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>commons-pool</groupId>
37+
<artifactId>commons-pool</artifactId>
38+
<version>${cs.pool.version}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.jasypt</groupId>
42+
<artifactId>jasypt</artifactId>
43+
<version>${cs.jasypt.version}</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.apache.cloudstack</groupId>
47+
<artifactId>cloud-utils</artifactId>
48+
<version>${project.version}</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.cloudstack</groupId>
52+
<artifactId>cloud-server</artifactId>
53+
<version>${project.version}</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.apache.cloudstack</groupId>
57+
<artifactId>cloud-plugin-hypervisor-simulator</artifactId>
58+
<version>${project.version}</version>
59+
<scope>compile</scope>
2960
</dependency>
30-
<dependency>
31-
<groupId>org.apache.cloudstack</groupId>
32-
<artifactId>cloud-plugin-hypervisor-simulator</artifactId>
33-
<version>${project.version}</version>
34-
<scope>compile</scope>
35-
</dependency>
3661
</dependencies>
3762
<build>
3863
<defaultGoal>install</defaultGoal>
64+
<plugins>
65+
<plugin>
66+
<groupId>org.codehaus.mojo</groupId>
67+
<artifactId>properties-maven-plugin</artifactId>
68+
<version>1.0-alpha-2</version>
69+
<executions>
70+
<execution>
71+
<phase>initialize</phase>
72+
<goals>
73+
<goal>read-project-properties</goal>
74+
</goals>
75+
<configuration>
76+
<files>
77+
<file>${basedir}/../utils/conf/db.properties</file>
78+
<file>${basedir}/../utils/conf/db.properties.override</file>
79+
</files>
80+
<quiet>true</quiet>
81+
</configuration>
82+
</execution>
83+
</executions>
84+
</plugin>
85+
<plugin>
86+
<artifactId>maven-antrun-plugin</artifactId>
87+
<version>1.7</version>
88+
<executions>
89+
<execution>
90+
<phase>generate-resources</phase>
91+
<goals>
92+
<goal>run</goal>
93+
</goals>
94+
<configuration>
95+
<target>
96+
<filter token="VERSION" value="${project.version}"/>
97+
<copy todir="${basedir}/target/db" filtering="true">
98+
<fileset dir="${basedir}/../setup/db/"/>
99+
</copy>
100+
<copy todir="${basedir}/target/db" filtering="true">
101+
<fileset
102+
dir="${basedir}/../awsapi-setup/db/mysql/">
103+
<include name="**/*.sql"/>
104+
</fileset>
105+
</copy>
106+
</target>
107+
</configuration>
108+
</execution>
109+
</executions>
110+
</plugin>
111+
</plugins>
39112
</build>
40-
41113
<profiles>
42114
<profile>
115+
<!-- default deploydb property -->
43116
<id>deploydb</id>
44117
<activation>
45118
<property>
@@ -48,91 +121,10 @@
48121
</activation>
49122
<build>
50123
<plugins>
51-
<plugin>
52-
<groupId>org.codehaus.mojo</groupId>
53-
<artifactId>properties-maven-plugin</artifactId>
54-
<version>1.0-alpha-2</version>
55-
<executions>
56-
<execution>
57-
<phase>initialize</phase>
58-
<goals>
59-
<goal>read-project-properties</goal>
60-
</goals>
61-
<configuration>
62-
<files>
63-
<file>${project.parent.basedir}/utils/conf/db.properties</file>
64-
<file>${project.parent.basedir}/utils/conf/db.properties.override</file>
65-
</files>
66-
<quiet>true</quiet>
67-
</configuration>
68-
</execution>
69-
</executions>
70-
</plugin>
71-
<plugin>
72-
<artifactId>maven-antrun-plugin</artifactId>
73-
<version>1.7</version>
74-
<executions>
75-
<execution>
76-
<phase>generate-resources</phase>
77-
<goals>
78-
<goal>run</goal>
79-
</goals>
80-
<configuration>
81-
<target>
82-
<filter token="VERSION" value="${project.version}" />
83-
<copy todir="${basedir}/target/db" filtering="true">
84-
<fileset dir="${project.basedir}/../setup/db/" />
85-
</copy>
86-
<copy todir="${basedir}/target/db" filtering="true">
87-
<fileset
88-
dir="${project.basedir}/../awsapi-setup/db/mysql/">
89-
<include name="**/*.sql" />
90-
</fileset>
91-
</copy>
92-
</target>
93-
</configuration>
94-
</execution>
95-
</executions>
96-
</plugin>
97-
98-
<!-- DatabaseCreator driver here -->
99124
<plugin>
100125
<groupId>org.codehaus.mojo</groupId>
101126
<artifactId>exec-maven-plugin</artifactId>
102127
<version>1.2.1</version>
103-
<dependencies>
104-
<!-- specify the dependent jdbc driver here -->
105-
<dependency>
106-
<groupId>mysql</groupId>
107-
<artifactId>mysql-connector-java</artifactId>
108-
<version>${cs.mysql.version}</version>
109-
</dependency>
110-
<dependency>
111-
<groupId>commons-dbcp</groupId>
112-
<artifactId>commons-dbcp</artifactId>
113-
<version>${cs.dbcp.version}</version>
114-
</dependency>
115-
<dependency>
116-
<groupId>commons-pool</groupId>
117-
<artifactId>commons-pool</artifactId>
118-
<version>${cs.pool.version}</version>
119-
</dependency>
120-
<dependency>
121-
<groupId>org.jasypt</groupId>
122-
<artifactId>jasypt</artifactId>
123-
<version>${cs.jasypt.version}</version>
124-
</dependency>
125-
<dependency>
126-
<groupId>org.apache.cloudstack</groupId>
127-
<artifactId>cloud-utils</artifactId>
128-
<version>${project.version}</version>
129-
</dependency>
130-
<dependency>
131-
<groupId>org.apache.cloudstack</groupId>
132-
<artifactId>cloud-server</artifactId>
133-
<version>${project.version}</version>
134-
</dependency>
135-
</dependencies>
136128
<executions>
137129
<execution>
138130
<phase>process-resources</phase>
@@ -143,17 +135,11 @@
143135
</execution>
144136
</executions>
145137
<configuration>
146-
<includeProjectDependencies>false</includeProjectDependencies>
147-
<includePluginDependencies>true</includePluginDependencies>
148-
<executableDependency>
149-
<groupId>org.apache.cloudstack</groupId>
150-
<artifactId>cloud-server</artifactId>
151-
</executableDependency>
152138
<mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
153139
<arguments>
154140
<!-- db properties file -->
155-
<argument>${project.parent.basedir}/utils/conf/db.properties</argument>
156-
<argument>${project.parent.basedir}/utils/conf/db.properties.override</argument>
141+
<argument>${basedir}/../utils/conf/db.properties</argument>
142+
<argument>${basedir}/../utils/conf/db.properties.override</argument>
157143
<!-- Create default schema and db table views -->
158144
<argument>${basedir}/target/db/create-schema.sql</argument>
159145
<argument>${basedir}/target/db/create-schema-premium.sql</argument>
@@ -181,7 +167,59 @@
181167
<systemProperties>
182168
<systemProperty>
183169
<key>catalina.home</key>
184-
<value>${project.parent.basedir}/utils</value>
170+
<value>${basedir}/../utils</value>
171+
</systemProperty>
172+
<systemProperty>
173+
<key>paths.script</key>
174+
<value>${basedir}/target/db</value>
175+
</systemProperty>
176+
</systemProperties>
177+
</configuration>
178+
</plugin>
179+
</plugins>
180+
</build>
181+
</profile>
182+
<profile>
183+
<!-- simulator deploydb property -->
184+
<id>deploydb-simulator</id>
185+
<activation>
186+
<property>
187+
<name>deploydb-simulator</name>
188+
</property>
189+
</activation>
190+
<build>
191+
<plugins>
192+
<plugin>
193+
<groupId>org.codehaus.mojo</groupId>
194+
<artifactId>exec-maven-plugin</artifactId>
195+
<version>1.2.1</version>
196+
<executions>
197+
<execution>
198+
<phase>process-resources</phase>
199+
<id>create-schema-simulator</id>
200+
<goals>
201+
<goal>java</goal>
202+
</goals>
203+
</execution>
204+
</executions>
205+
<configuration>
206+
<mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
207+
<arguments>
208+
<!-- db properties file -->
209+
<argument>${basedir}/../utils/conf/db.properties</argument>
210+
<argument>${basedir}/../utils/conf/db.properties.override</argument>
211+
<!-- simulator sql files -->
212+
<argument>${basedir}/target/db/create-schema-simulator.sql</argument>
213+
<argument>${basedir}/target/db/templates.simulator.sql</argument>
214+
<!-- upgrade -->
215+
<argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument>
216+
<argument>--database=simulator</argument>
217+
<argument>--rootpassword=${db.root.password}</argument>
218+
</arguments>
219+
<systemProperties>
220+
<systemProperty>
221+
<key>catalina.home</key>
222+
<value>${basedir}/../utils</value>
185223
</systemProperty>
186224
<systemProperty>
187225
<key>paths.script</key>
@@ -194,4 +232,4 @@
194232
</build>
195233
</profile>
196234
</profiles>
197-
</project>
235+
</project>

0 commit comments

Comments
 (0)