Commit Graph

54 Commits

Author SHA1 Message Date
Prasanna Santhanam 72a026cea2 Fix pep8 formatting to fix cloudstack-marvin build
(cherry picked from commit 5326833971)
2013-08-30 12:41:16 +05:30
Prasanna Santhanam dc071e963e CLOUDSTACK-4499: Wait until hosts are up before adding storage pools
This works around the delay caused in adding Xen 6.1/6.2 hosts where
host takes two attempts to transition to Up state. We will wait for one
minute per cluster before attempting to add storage pool in the cluster.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 22ee499c3571b2a6b6921abb36c679128893c415)
2013-08-29 12:38:19 +05:30
Prasanna Santhanam 28a0b0c588 Fix broken pep8 from 1305697eaa
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-29 15:33:44 +05:30
Min Chen 1305697eaa CLOUDSTACK-3818: NFS Cache Improperly Named. 2013-07-26 14:36:00 -07:00
Prasanna Santhanam 2be96cf0b7 Fix pep8 that broken marvin build 10 days ago :(
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 1f95493dfef7762625530f59c4b4de2b6c2165f0)
2013-07-25 23:00:31 +05:30
Edison Su 83c7b9ae57 fix localendpoint npe 2013-07-17 16:28:49 -07:00
Edison Su ba4c4400b5 be able to upload template into swift 2013-07-16 18:05:01 -07:00
rayeesn 9bc105f39a vmware - not reqiured to add host, host will be added as part of cluster
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit b3e2871e73)
2013-07-12 16:11:55 +05:30
Edison Su 19651ff5fd fix marvin when deploy vmware setup 2013-07-03 14:33:17 -07:00
Prasanna Santhanam 48a2c761b4 pep8 fix
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 3684bafd37)
2013-06-30 13:58:52 +05:30
Prasanna Santhanam f3e3048682 CLOUDSTACK-3074: include support for vmwaredc mapping to zone
vmware dc can be mapped to the zone after CLOUDSTACK-1963. include
support in marvin for adding the vmwaredc.

vmwaredc : {
    name:
    username:
    vcenter:
    password:
    zoneid:
}

Will be sent during pod creation before cluster creation.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 10:03:51 +05:30
Prasanna Santhanam 9e474d018b do not flout pep8
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-28 19:02:59 +05:30
Prasanna Santhanam 9e8cf60b34 upgrade marvin classes to new style python objects
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-28 19:01:31 +05:30
Prasanna Santhanam 064b570c82 Correcting typo in deployDataCenter.py
isFreeZone is actually a test for whether the zone is a pure advanced
zone or an advanced zone with security groups. Renaming the var and
fixing the typo introduced by a65d21.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-21 21:23:10 +05:30
Daan Hoogland a65d2153f1 pep8 deployDatacenter 2013-06-21 08:28:18 -04:00
Prasanna Santhanam 694391ad04 add required provider for NFS storage
Changing the sandbox scripts and the marvin-checkin-test configurations
to include the required 'provider' argument when adding an image store
(secondary storage)

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-20 16:44:49 +05:30
Min Chen 6e0757bbf5 Fix indentation error in deployDataCenter.py. 2013-06-12 15:52:43 -07:00
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3ce) into object_store.
2013-06-12 11:20:32 -07:00
Wei Zhou e6863c612b Integration test for advanced zone with security groups
Description:
This patch includes three parts for advancedsg:
(1) Marvin support.
(2) devcloud support.
(3) integration test scripts

Testing Done:
devcloud testing ok.

Signed-off-by: Anthony Xu <anthony.xu@citrix.com>
2013-05-22 15:39:22 -07:00
Edison Su a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Edison Su 1694c1a502 fix download timeout 2013-05-13 14:40:49 -07:00
Min Chen 0d580ccb26 Fix NPE in adding host and also put back lost change in deployDataCenter
due to rebase with master.
2013-05-11 22:00:40 -07:00
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Prasanna Santhanam 808b49b216 Adding isolation method to the zone creation of marvin
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 15:29:10 +05:30
Ashutosh Kelkar 2f40a90c53 Multiple fixes to marvin framework
1. adding hypervisor information to configs
    TODO: support for multi-hypervisor zones?
2. CLOUDSTACK-601: Marvin unicode decode errors when running mysql
queries via dbClient
3. adding keypair support for remotessh client

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-26 12:16:08 +05:30
Prasanna Santhanam 167781ec01 refactor marvin to use requests instead of urllib2
Use python-requests [1] for Marvin. Requests enables graceful handling
of http connections. Marvin's cloudstackConnection has been refactored,
cleaned up to act as a single module for all kinds of cloudstack API
requesting.

TODO:
1. session based login mechanism of the UI should work from
cloudstackConnection
2. cloudmonkey can also reuse /import marvin.cloudstackConnection
3. More graceful handling of POST requests

[1] http://docs.python-requests.org/en/latest/

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-17 19:11:47 +05:30
Chiradeep Vittal bf56403d82 QuickCloud: default to enabled if not specified in datacenter config 2013-04-09 14:45:27 -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
Prasanna Santhanam 05437d0e97 maven pom: put apache cloudstack tools together in umbrella pom
minor pom refactor to put all the tools under one placeholder pom.
Also adds a profile for marvin to run deployDataCenter via mvn options.

$mvn -Pdeveloper,marvin -pl :cloud-marvin -Dmarvin.config=<path/to/config>

OR
$cd tools/marvin
$mvn -Pmarvin -pl :cloud-marvin -Dmarvin.config=path/to/config

will deploy the datacenter using the marvin.config property's value

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-15 20:53:41 +05:30
Prasanna Santhanam bfd02c5db3 traffic_type not traffictype
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-15 19:36:30 +05:30
Prasanna Santhanam 04b14ab03f Marvin: physical network label not carried through in the API
The label associated with the hypervisor nic to isolate traffic types by
Guest/Mgmt/Public/Storage was not passed in the marvin.traffictype
object and sent through to mgmt server resulting in traffic types not
being applied.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-15 19:29:27 +05:30
Prasanna Santhanam 8d3cbc82d8 marvin: fixes for handling multiple phy. networks
zones do not qualify for vlans but phy networks should carry the
underlying vlan information. moving the vlan down to physical_network
in configGenerator.py.

also the sandbox example has been corrected to reflect this change
and includes an illustration of using traffic types with labels.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
Reported-By: Marcus Sorenson <mlsorenson@apache.org>
2013-01-13 13:42:02 +05:30
John Burwell e4583ced2e S3-backed Secondary Storage 2013-01-02 10:28:47 -08:00
John Burwell 264a0670a8 - [CLOUDSTACK-509] S3-backed Secondary Storage - Adds S3 configuration support to Marvin - Moves configuration of global options to occur creation of zones since the values of global options impact the configuration and zone enablement processes 2012-12-19 16:09:25 -08:00
John Burwell 14f589702a CLOUDSTACK-660: Fixes traffic label configuration in Marvin
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-12-18 13:25:24 -05:00
Edison Su b70c1a5a84 Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
Prasanna Santhanam 802ddd43ca Summary: Moving the test integration libraries into marvin for CLI work
Detail: Integration tests use these libraries (base,utils,common) for
simplifying the usage of the API. These define the verbs of each
entity's usage (create, delete, add etc). For the CLI to present the
simplified API we'll leverage the integration libraries.

+ Fixes to setup-test-data.sh - kvm and xen each use a different version
of the built-in Cent OS template, 5.5 and 5.3 namely.

At a later point the setup-test-data script needs to be obsoleted.
ostypeids in tests should directly be determined from listOsTypes API
calls

Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1351520707 +0530
2012-10-29 20:23:02 +05:30
Prasanna Santhanam 7460b01893 Summary: provide deployment config access to marvin's testcase
Detail:
Sometimes tests need ssh access to the management server to perform
verification such as:

1. Pings from mgmt_server to agents
2. snapshots exist on secondary storage - mountable from mgmt server

For these the tests will need access to the config of the deployment and
the ip address of the mgmt server.

Egs: integration/component/test_egress.py and integration/component/test_snapshots.py

BUG-ID : CLOUDSTACK-377
Reported-by: Prasanna Santhanam
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1350624903 +0530
2012-10-19 11:06:53 +05:30
Prasanna Santhanam 02d33344bd elasticIp added as virtual network in basic zone 2012-09-12 18:48:34 +05:30
Prasanna Santhanam 9d2cf01717 Changes to accomadate the localstorage setting at zone level 2012-09-12 18:48:33 +05:30
Prasanna Santhanam 8ee8fdcc17 In basic zones enable the sg provider 2012-09-12 18:48:33 +05:30
Prasanna Santhanam cc6dae1eb4 There can be only one physical network in basic zone 2012-09-12 18:48:33 +05:30
Prasanna Santhanam 038608b54f Ignore comments in config files during loading 2012-08-09 17:37:43 +05:30
Prasanna Santhanam 614131a9de support for traffic type and external devices configuration
* traffictypes = 'Guest', 'Management', 'Public', 'Storage'
    - corresponding nic labels are given in the labeldict
* External device providers JuniperSrx, NetScaler and F5 load balancing
can now be configured

* examples are shown in the configGenerator.py script for basic,
advanced and EIP/ELB based zones

Conflicts:

	tools/marvin/marvin/configGenerator.py
	tools/marvin/marvin/deployDataCenter.py
2012-08-09 15:31:28 +05:30
Prasanna Santhanam 8a2135e3fa VpcVirtualRouter is not enabled always. 2012-07-30 15:32:38 +05:30
Prasanna Santhanam ed7f72b629 Enable VpcVirtualRouter when deploying advanced zone 2012-07-30 15:32:35 +05:30
David Nalley 54d7a10b99 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-04 18:45:34 -04:00
David Nalley ecf2cd57f9 fixing license headers in marvin 2012-07-04 18:45:08 -04:00
Edison Su 217fdd2497 From: jason.bausewein@tier3.com
Fixed deployDataCenter.py to select the correct network offering based on if security groups are enabled.  Also added default value to configGenerator.py for basic setup.
2012-07-03 12:56:42 -07:00