Commit Graph

209 Commits

Author SHA1 Message Date
Gaurav Aradhye bd80efc49a CLOUDSTACK-3452: Created security group for basic mode to allow SSH to vm
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 9c24c471bca83241a9ebf586567c0fd61231da19)
2013-07-19 17:44:52 +05:30
Prasanna Santhanam ae2ee95069 CLOUDSTACK-3655: RvR fails with unexpected state
The guestcidr is no longer specified directly. Use the netmask and
gateway combination to create custom cidr network

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit a4d902fc9b48e963d5987965207e3745e1728741)
2013-07-19 17:44:52 +05:30
Edison Su c618caf102 fix localendpoint npe 2013-07-17 16:29:52 -07:00
Girish Shilamkar 234db0561f CLOUDSTACK-3586: Fixed regression test cases for Affinity Groups
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-17 19:23:58 +05:30
Edison Su bf32776f9f be able to upload template into swift 2013-07-16 18:07:06 -07:00
rayeesn b3e2871e73 vmware - not reqiured to add host, host will be added as part of cluster
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-12 16:11:20 +05:30
Prasanna Santhanam f96b89f25e CLOUDSTACK-3273: ClassCastException when adding cache store via API
Filter the detail map sent over the wire into Map<String, String> before
processing underneath by  storage life cycle

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-05 15:32:41 +05:30
Prasanna Santhanam da9552b7f3 move isAlmostEqual to utils
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-04 20:14:54 +05:30
Edison Su 810c64e387 fix marvin when deploy vmware setup 2013-07-03 14:34:33 -07:00
Prasanna Santhanam 02f207f6c9 include account and domainid in affinity group creation
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-02 17:02:00 +05:30
Prasanna Santhanam 3684bafd37 pep8 fix
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-30 13:58:16 +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
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
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
Girish Shilamkar 3c0c6cb0b3 CLOUDSTACK-2254: Tests for Affinity and Anti Affinity rules
TestCreateAffinityGroup
TestListAffinityGroups
TestDeleteAffinityGroups
TestUpdateVMAffinityGroups
TestDeployVMAffinityGroups
TestAffinityGroupsAdminUser

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-27 09:51:29 +05:30
Daan Hoogland 3e430ccbf0 CLOUDSTACK-3096 format TestCaseExecuteEngine 2013-06-23 13:54:06 -04:00
Daan Hoogland d53f1c0946 CLOUDSTACK-3096 format cloudstackTestCase.py 2013-06-23 11:30:30 -04:00
Daan Hoogland 3f4204b8bc CLOUDSTACK-3096 format cloudstackException.py 2013-06-23 11:28:46 -04:00
Daan Hoogland 34fc209419 CLOUDSTACK-3096 format asyncJobMgr 2013-06-23 11:26:53 -04:00
Daan Hoogland 3fdcf1836c CLOUDSTACK-3096 format cloudsteackTestClient.py 2013-06-23 11:25:16 -04:00
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 1c50f1c756 CLOUDSTACK-3096: format codegenerator.py 2013-06-21 09:35:54 -04:00
Daan Hoogland f0ab05dc04 CLOUDSTACK-3096: format configGenerator.py 2013-06-21 08:55:08 -04:00
Daan Hoogland 3e5937e01d format dbConnection.py 2013-06-21 08:33:25 -04:00
Daan Hoogland 16e4f2ff72 format deployAndRun 2013-06-21 08:30:43 -04:00
Daan Hoogland a65d2153f1 pep8 deployDatacenter 2013-06-21 08:28:18 -04:00
Prasanna Santhanam a7ef5c343b pep8 - long line complaint.
.. and inline comment complaint.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-21 12:12:29 +05:30
Daan Hoogland c03ba0c8e6 CLOUDSTACK-3096: jsonHelper cleanup
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-21 11:46:37 +05:30
Daan Hoogland cd221fc33e marvinPlugin.py cleansed 2013-06-20 12:57:58 -04:00
Daan Hoogland fa58080807 remoteSSHClient cleansed 2013-06-20 12:56:18 -04:00
Daan Hoogland 30c6e2707a settings.py pep8 compliant 2013-06-20 12:32:39 -04:00
Daan Hoogland 4ca3f5c5e9 init without trailing whitespace 2013-06-20 12:29:06 -04:00
Daan Hoogland e8f0b2a48b pep8'ed the file 2013-06-20 12:24:28 -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
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Girish Shilamkar 6e63bb7822 CLOUDSTACK-1758: Update ssh key location for vmware
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-19 12:15:10 +05:30
Prasanna Santhanam 746af2bb6f CLOUDSTACK-3049: marvin-nose causes other plugins to fail when not enabled
enabled by default. Running regular nosetests with plugins other than
marvin will fail because of this. Failure manifests itself as nose
looking for the config file when using the marivn-nose plugin

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-18 15:20:58 +05:30
Prasanna Santhanam 28b598b4ac Fix VPC tests related to user roles
Many vpc tests fail because of incorrect apiClient passed in to create
the VPC, network etc. The exact method used is getUserApiClient to fetch
the apiclient for a specific user.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-17 17:32:05 +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
Shane Witbeck 5fa1ad518f fix for incorrect secondary dns 2013-06-05 17:21:44 -04:00
Prasanna Santhanam 1ddcd3e697 refactor network acl test to use marvin libraries
Refactor the network ACL test to use the integration libraries

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-05 20:32:34 +05:30
Prasanna Santhanam 0a9b9f7944 Internal LB test refactored to use integration lib
Refactoring the internal lb test to use the marvin libraries. Also added
reqd methods for the internal lb related APIs into integration.lib

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-05 17:00:47 +05:30
Ashutosh 85062a75ae Test cases for assignVirtualMachne feature.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-30 11:03:25 +05:30
Anthony Xu 19a1116df2 Merge branch '4-2-advanced-zone-security-group' 2013-05-28 11:03:56 -07:00
ashutoshkelkar 204bdac77f Fix for repeated log lines in test case logs.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-28 11:15:57 +05:30
Prasanna Santhanam ed2ce27371 CLOUDSTACK-2652: requests module differs on Python 2.6
On 2.6 response.json returns the JSOn in the response while on 2.7
response.json() is a method. Since Marvin installs on both platforms
fixing the error appropriately

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-24 19:22:49 +05:30
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -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