14 Commits

Author SHA1 Message Date
Chiradeep Vittal
71af0db668 Fix simulator running
NOTE: need to use mvn -Dsimulator client jetty:run to run
2013-08-09 18:36:18 -07:00
Edison Su
5db3057b05 move simulator classes into simulatorcomponent.xm 2013-07-09 15:36:45 -07:00
Edison Su
94aa67eae0 fix simulator 2013-07-09 10:42:03 -07:00
Prasanna Santhanam
9f12a25191 Fix injection of datastoreproviders in nonoss context
the datastore provider references are not in application context anymore
and have been moved to respective componentCOntexts. Plug them in by
default for nonoss server to startup successfully.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 01debd59d3a21c4164e4ef7e6f4d9e279933e34f)
2013-07-01 13:52:53 +05:30
Prasanna Santhanam
1e0f833772 Add UCS daos for simulator context
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 15:09:57 +05:30
Prasanna Santhanam
f1134da8df Group storage subsystem components for spring
Breaking down storage components among oss, nonoss and simulator
contexts. The default components are loaded by

OSS - applicationContext + componentContext
NonOSS - applicationContext + nonossComponentContext
Simulator - applicationContext + simulatorComponentContext

provider beans are are selectively overridden for simpler configuration.
Where possible beans are loaded by local reference.

<list merge=true> does not unfortunately work perfectly for bean merging
the providers causing a bit of bloat. Explore for later.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:53:41 +05:30
Prasanna Santhanam
fd867d5afa DataStore - provider, lifecycle, driver implementations for simulator
mock implementation to manage secondary storage related operations for
the simulator.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:52:16 +05:30
Prasanna Santhanam
767ed065c5 CLOUDSTACK-2815: Include dedication in simulator context
SimulatoComponentContext need sto include the dedicated resource manager
to see the commands/apis exposed by it.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-03 21:51:18 +05:30
Nitin Mehta
c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Prasanna Santhanam
32c7e1d880 fix up the hostaffinity processors from loading
hostaffinity don't load by default anymore

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-16 13:54:53 +05:30
Prasanna Santhanam
79812c253f bvt: marvin test for the affinity groups feature
The test deploys two VMs in the simulator context and verifies that the
default host -antiaffinity processor placed the VMs on two distinct
hosts.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-11 13:23:32 -07:00
Prasanna Santhanam
5610749e29 simulator context : finalize the simulator spring context
This context is similar to the componentContext.xml.in but loads
simulator components for the marvin tests.
2013-04-05 21:08:59 +05:30
Prasanna Santhanam
b798c45114 maven+marvin+simulator: Changes to the lifecycle steps
integration test is now run as follows:

Build
$ mvn -Pdeveloper -Dsimulator clean install

DB:
$ mvn -Pdeveloper -pl developer -Ddeploydb
$ mvn -Pdeveloper -pl developer -Ddeploydb-simulator

Setup:
$ mvn -Pdeveloper,marvin.setup -Dmarvin.config=setup/dev/advanced.cfg -pl :cloud-marvin integration-test

Test:
$ mvn -Pdeveloper,marvin.test -Dmarvin.config=setup/dev/advanced.cfg -pl :cloud-marvin integration-test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 19:56:33 +05:30
Prasanna Santhanam
2e2046fe38 marvin changes to do an pre-integration and integration test
Introducing the simulator spring context -
simulatorComponentContext.xml.in. This separates the simulator beans so
that production deployments don't have the simulator in them. Context is
enabled with -Dsimulator as part of the developer profile.

Also adding config files - Simulator Config for advanced zone and basic
zone deployments under setup/dev.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:29 +05:30