Commit Graph

577 Commits

Author SHA1 Message Date
Prachi Damle 4a1eaf45bd Merge branch 'master' into affinity_groups
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-04-10 11:34:30 -07:00
Rohit Yadav ed79b8bf14 CLOUDSTACK-1867: Comment vmware-tools installation, use open-vm-tools
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-10 23:14:50 +05:30
Rohit Yadav 9fca393f01 appliance: Install open-vm-tools, vmwaretools alternative
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-10 18:10:03 +05:30
Rohit Yadav 11042121b2 appliance: only build-essential needed to build vmtools
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-10 18:04:54 +05:30
Rohit Yadav 26695151f6 appliance: Permute again, give some more megas to /usr for systemvm
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-10 18:01:49 +05:30
Rohit Yadav bdc82627fe appliance: Permute partition space such as it succeeds during partitioning
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-10 17:04:51 +05:30
Rohit Yadav dc3c834a22 appliance: Feed more disk space to /usr
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-10 16:47:33 +05:30
Rohit Yadav b50201e69c appliance: Make more room in /usr, installing vmwaretools takes 'em all
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-10 16:27:56 +05:30
Prasanna Santhanam f8bbd88a42 maven+marvin: Fix up the activation property
activation property marvin.config will attempt to deploy a zone again on
running the marvin.test profile. This is unnecessary as marvin.setup
already finishes deploying a zone.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-10 16:16:41 +05:30
Rohit Yadav 26d772f740 CLOUDSTACK-1867: Install vmwaretools while buildling systemvms
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-10 16:06:54 +05:30
Rohit Yadav 9eaef0e7c7 appliance: Fix systemvm's preseed to give more space for /usr
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-10 16:06:54 +05:30
Rohit Yadav 643ee1d15e CLOUDSTACK-1867: Export both ova and vmdk systemvm appliances for VMWare
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-10 13:05:54 +05:30
Prachi Damle 90172c38f8 Merge branch 'master' into affinity_groups 2013-04-09 15:05:39 -07:00
Chiradeep Vittal bf56403d82 QuickCloud: default to enabled if not specified in datacenter config 2013-04-09 14:45:27 -07:00
Chiradeep Vittal 271d232d62 QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package
QuickCloud: fix license issue
QuickCloud: use a different activation for deploying quickcloud
Otherwise marvin gets invoked during mvn install -Dquickcloud
2013-04-09 14:45:27 -07:00
Chiradeep Vittal 5ff8bcaa2e QuickCloud: when using SSVM, pass in the new name of the SS class (com.cloud -> org.apache.cloudstack)
QuickCloud : configuration moved to applicationContext.xml from componentContext.xml
QuickCloud: default to enabled state for devcloud zone
QuickCloud: environment.properties helps customize location of pid file
2013-04-09 14:45:26 -07:00
Chiradeep Vittal c5b11df6b7 QuickCloud: option to build with componentContext tailored for quickcloud
For now it replaces ConsoleProxyManagerImpl with StaticConsoleProxyManager
Usage: mvn install -Dquickcloud

QuickCloud: rename deploy profile

QuickCloud: remove cyclic dependency introduced in nonoss build by moving SecondaryStorageDiscoverer into services
However with this fix, developers will be unable to run 'PremiumSecondaryStorageResource' (for VMWare installations) using mvn exec:java.
Instead they will have to use the exploded archive from systemvm.zip
2013-04-09 14:45:26 -07:00
Chiradeep Vittal a806ce43d3 QuickCloud: allow specification of network offering name in datacenter config. The deployDatacenter python script will use this to pick the network offering during creation of the default network in a basic zone 2013-04-09 14:45:26 -07:00
Chiradeep Vittal e7983b25cc QuickCloud: Enable secondary storage daemon to run outside the system vm 2013-04-09 14:45:25 -07:00
Chiradeep Vittal 1c33a3ee80 Make apidoc generation less verbose -- makes it hard to figure out what is going on with the rest of the build
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-04-09 10:54:44 -07:00
Prasanna Santhanam 8e9650d28e affinitygroup bvt: changes to the bvt for affinity groups
Added tags for the test, base.py extensions for list, craete, delete and
fixes to the test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-09 16:31:18 +05:30
Jessica Wang 98bc240d2a Revert "Dedicate Public IP range"
This reverts commit d6ed8d7cb5.

Conflicts:

	server/test/com/cloud/configuration/ConfigurationManagerTest.java
2013-04-08 17:15:51 -07:00
Likitha Shetty d6ed8d7cb5 Dedicate Public IP range 2013-04-08 14:46:21 -07:00
Prasanna Santhanam 4b33493a4b 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-08 23:18:00 +05:30
Prasanna Santhanam 0346fd8ab0 affinity group tests moved into the test folder
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-08 11:18:28 +05:30
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
Rohit Yadav ff74cbbeea cli: Remove tabularize, fix display types, make code pep8 compliant
- Remove tabularize field
- Now display types are: default, json and table
- Make requester pep8 compliant
- Remove unnecessary comments, if we want them we should put them on each method

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-05 23:06:44 +05:30
Rohit Yadav 9fbae85799 cli: Make cloudmonkey.py pep8 compliant
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-05 22:56:07 +05:30
Justin Grudzien c75b11d13a CLOUDSTACK-1875: add JSON output to cloudmonkey
Added
1. display = [default|json|tabularize] has been added in the config to replace tabularize = [true|false]
2. tabularize is deprecated but we will still set it as "false" once the user removes it out of their config to avoid throwing an error. This will be removed in the next major version.
3. display = "default" is added to the [ui] section of the config if it is not present.
4. You can now output JSON formatted text by setting the config display = json
5. You can now filter text in JSON output mode. (i.e. list users account=grudzien filter=account,id,email). Filtered output returns a properly formatted JSON document.

Removed
1. Removed the printing of attr keys in read_config().

Deprecated
1. tabularize = [true|false] is now messaged as deprecated.

Signed-off-by: Justin Grudzien <grudzien@gmail.com>
2013-04-05 22:48:15 +05:30
Rohit Yadav 63fa086fcc cli: Handle URLError, variable refactor used passed variable
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-05 22:42:55 +05:30
Funs Kessen 6e22843acb Cloudmonkey requester.py change to return clearer errors and implement a logic change for async calls.
Applied from review request:
https://reviews.apache.org/r/10151/

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-05 22:42:55 +05:30
Chip Childers 348afc8aaf Removing waf legal docs
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-05 16:44:08 +01:00
Hugo Trippaers 085846af94 Cleanup: Found some waf remnants 2013-04-05 13:28:15 +02: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