Commit Graph

545 Commits

Author SHA1 Message Date
Prachi Damle ca1a7948f1 Merge branch 'master' into affinity_groups
Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-04-05 13:49:20 -07:00
Prachi Damle 08d8257f50 Integration testcase and the config file needed, that runs with marvin. 2013-04-03 16:22:58 -07:00
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 82fd9382b7 marvin+sync: apidiscovery sync and regenerate for marvin
Use codegenerator to sync marvin cloudstackAPIs from a given cloudstack
endpoint. Sometimes you want to synchronize marvin with the new APIs
that you have introduced locally or any alterations you may have made
the API. In such cases you can sync marvin's libraries as follows.

$sudo mvn -Pdeveloper,marvin.sync -Dendpoint=localhost -pl :cloud-marvin

This needs sudo privileges since it will call on pip to upgrade the existing
marvin installation on your machine. The endpoint is where your management
server is running and is exposing the API discovery plugin. A listApis call is
made and the resulting json deserialized back into marvin's library entities.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 19:56:28 +05:30
Prasanna Santhanam 5d67c98e5b marvin+apidiscovery: Extend API discovery plugin
API discovery plugin will return embedded entities for marvin to
discovery and generate it's API classes.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:30 +05:30
Prasanna Santhanam d4dc264917 simulator+marvin: include a router test
Added a test that will ensure the advanced router comes up in the
account belonging to the deployed VM. It should come up with the
publicip, guestip and linklocalip.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:30 +05:30
Prasanna Santhanam 9c755e11e5 marvin-nose: include the plugin as part of marvin install
No need to register the plugin seperately now. The installer will
register with nose's entry_point automatically.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:29 +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
Prasanna Santhanam fe48bbebda moving out the vmpasswd into its own suite
vm passwords are extended features that don't need to be part of the
smoke suite.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:29 +05:30
Prasanna Santhanam 3075d0cf56 marvin: argparse enhancement and unit-test-xml-reporting dependency removed
1. deployAndRun will use the more modern argparse module
2. improving logging within the remoteSSHClient, moving to debug and
default logging to INFO
3. removing dependance on the xmlrunner. use nose --with-xunit instead

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:29 +05:30
Rohit Yadav b3a3ad74c6 appliance: While building systemvms fetch src tarball from new git repo
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-26 11:26:50 +05:30
Rohit Yadav ccba1c728c cli: Make cloudmonkey use new url and dev ml
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-26 11:25:26 +05:30
Rohit Yadav 87500f9796 appliance: veewee definition to build devcloud, work in progress
forked from systemvmtemplate

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-25 14:52:36 +05:30
Edison Su 3ed6200ef8 move default primary storage plugin into its own pom 2013-03-20 17:21:40 -07:00
Rohit Yadav 0d62549d61 cli: Run onecmd if any arg is passed
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-20 13:14:09 +05:30
Rohit Yadav 4ad5d1a4f5 cli: Fix nonetype issue with cachemaker and exit after printing version
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-20 12:42:29 +05:30
Prasanna Santhanam 323c3211c8 run the test lifecycle only when config is specified 2013-03-20 11:07:49 +05:30
Prasanna Santhanam 02b3cd7de9 marvin logging: write to tmp to adjust for mac-osx
/var/log is not available on OSX. This breaks the simulator run.
2013-03-20 10:47:15 +05:30
Prasanna Santhanam 792db8b5cc 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>
2013-03-20 10:36:43 +05:30
Rohit Yadav 0b7a4e04aa cli: Check args from optparser and not sys.argv
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-19 18:04:52 +05:30
Rohit Yadav 19a290500e cli: Import project info from config in setup.py, fix debug msgs
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>

lsdfjk

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-19 16:05:11 +05:30
Rohit Yadav 4421f2bb60 CLOUDSTACK-1708: Let cloudmonkey accept cfg passed in cmd line
The patch adds feature in cloudmonkey to have multiple profiles by passing
custom cfg file to set custom profile in both interactive shell and cmd line tool
use cases.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-19 16:05:11 +05:30
Rohit Yadav e28aa09f01 cli: cachemaker should import config and not the field
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-19 16:05:11 +05:30
Rohit Yadav 93bc669a0e cli: Pass config file by value in cloudmonkey's config
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-19 16:05:10 +05:30
Rohit Yadav 99ed891804 appliance: Fix readme and zerodisk /home
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-18 11:00:39 +05:30
Alex Huang 164d3a1a39 Added a shell script to set the maven profiles in eclipse 2013-03-13 20:21:58 -07:00
Rohit Yadav 9af338c651 appliance: While building don't just check empty arg, check if it was passed
The fix makes systemvmtemplate as the default veewee vbox appliance if not
other appliance is provided to be built

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-12 17:58:15 +05:30
Rohit Yadav 7e7ceba83b appliance: Fix hardcoded appliance name while checking and removing shared folders
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-11 14:56:20 +05:30
Rohit Yadav 72c1a888eb appliance: Fix build.sh to build 64bit systemvm appliance as well
TODO: Make it general like boxer.sh in tools/devcloud/src

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-11 14:19:30 +05:30
Rohit Yadav 9f4444c9e4 appliance: Add veewee definition for 64bit systemvm template
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-11 14:10:44 +05:30
Rohit Yadav 602ca7fe6d appliance: during cleanup remove veewee and vbox txt files
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-07 16:50:37 +05:30
Rohit Yadav c2fbac4166 appliance: Use Debian Wheezy rc1 for building systemvm
We switch from Debian beta-4 i386 to rc1 i386.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-07 15:01:01 +05:30
Rohit Yadav cc9b7d4c20 cloudmonkey: print sync stats, asks users to use sync
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-06 17:21:32 +05:30
Rohit Yadav bb2c7dc728 CLOUDSTACK-1340: Fix grub2 cfg to boot without waiting, fix locale
Thanks to Marcus for testing and helping on KVM template, adding locale fix as
per Marcus's suggestion. Tested with latest build on my local vbox.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-06 14:21:06 +05:30
Rohit Yadav 34b37ef8ed CLOUDSTACK-1340: Compress QCOW2 for KVM
As suggested by Marcus, by compression qcow2, we end up having smaller disk image.
I'm still archiving the qcow2 as bz2 because our installation manual still ask
users to cloud-install-sys-tmplt which expects a *.qcow2.bz2

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-05 18:35:09 +05:30
Alena Prokharchyk 7a54458e17 CLOUDSTACK-1502 Fixed the api-doc build component caused by new API commands:
addIpToNic
removeIpFromNic
listNics

1) Removed trailing whitespaces from commands.properties file for the commands above
2) Created a new category "Nic" in gen_toc.py for the new commands
2013-03-04 16:19:08 -08:00
Chiradeep Vittal 6a1ecae552 Ensure RAT does not report marvin generated files as noncompliant in developer environment
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-02 16:49:02 +05:30
Rohit Yadav b55f5898d5 CLOUDSTACK-1340: Exit script if exporting fails for any disk format
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-01 21:02:04 +05:30
Rohit Yadav 26edb3c0aa CLOUDSTACK-1340: Just take the first of results, query and remove shared folders
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-01 20:39:52 +05:30
Rohit Yadav 0f30c1e6b0 CLOUDSTACK-1340: Fix typo in variable in build.sh
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-01 20:04:03 +05:30
Rohit Yadav 512c16f483 CLOUDSTACK-1340: Do two rounds of vhd export, from raw to fixed to dynamic
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-01 16:59:02 +05:30
Rohit Yadav 0b07bc974a CLOUDSTACK-1340: Remove any shared folders, don't install legacy grub
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-01 15:08:19 +05:30
Rohit Yadav e80ccea517 CLOUDSTACK-1340: Jenkins fails for changing directories, rvm sourcing fails
http://jenkins.cloudstack.org/job/build-systemvm-master/64/console

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 17:37:02 +05:30
Rohit Yadav 44f345e4c6 CLOUDSTACK-1340: Fix destination path issue, vbox's internalcommands issue
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:55:41 +05:30
Rohit Yadav 80a6aaf7e1 CLOUDSTACK-1340: Fix locale, cmd, disk size and remove multiple apt-get installs
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:15:09 +05:30
Rohit Yadav 6380e2004c CLOUDSTACK-1340: apt-get autoclean and then clean to remove cached debs
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:02:44 +05:30
Rohit Yadav 673700a1a2 CLOUDSTACK-1340: Fix raw disk export using vbox internalcommand
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 15:58:50 +05:30
Rohit Yadav 644a73bb2f CLOUDSTACK-1340: Don't remove all scripts in /root, rm only those copied by veewee
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 13:19:59 +05:30
Rohit Yadav a5ab63602d CLOUDSTACK-1340: Fix typos, paths, create user cloud and make 'em invincible
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-27 18:40:51 +05:30
Rohit Yadav 9c6ced96c1 CLOUDSTACK-1340: Fix path issues in postinstall.sh, zerodisk on all partitions
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-27 17:56:55 +05:30