Commit Graph

200 Commits

Author SHA1 Message Date
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
Murali Reddy d6452be861 CLOUDSTACK-652: meging 'portable public ip' feature
Squashed commit of the following:

commit f244f9ce7982db16984dd87c31545f1c0240c704
Merge: 993cbb0 f5c8e38
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:54:05 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java

commit 993cbb0df9fa6e64b96b18ed775b73cdf4a8f5d7
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:49:54 2013 +0530

    introduce 'transferPortableIP' interface method in network manger. This
    method will transfer association of portable ip from one network to
    another network.

commit 0c1c2652c1b39e9a81ca35464360e11ed9ef23f1
Merge: a718d35 a29e393
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Fri May 17 02:48:54 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	utils/src/com/cloud/utils/net/NetUtils.java

commit a718d353f7
Merge: ecca117 c211818
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 21:22:19 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/src/com/cloud/network/addr/PublicIp.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/com/cloud/network/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit ecca117e34
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 20:05:29 2013 +0530

    added integration tests for testing portable ip ranges

commit 895a27c277
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 15:12:19 2013 +0530

    - establish model for transferring portable IP association from a network
      with which it is associated to another network.

    - enabling static nat api, extended to transfer potrtable IP across the
      networks if the VM/network is different from the current associate
      network of the portable ip

commit 51509751b2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 12:05:33 2013 +0530

    seperate out associate/disassociate with guest network operations from
    alloc and release of portable ip

commit bd058f58c2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 21:14:48 2013 +0530

    enhance disasociateIPAddr API to release protable IP associated with a
    guest network or VPC

commit 27504d9098
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 16:53:45 2013 +0530

    enhance asociateIPAddr API to acquire a protable IP and associate with a
    guest network or VPC

commit f82c6a8431
Merge: 3dbfb44 0749013
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 23:32:13 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/com/cloud/network/IpAddress.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	client/tomcatconf/commands.properties.in
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
    	setup/db/db/schema-410to420.sql

commit 3dbfb44eb5
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 20:33:19 2013 +0530

    - add 'portable' boolean as property of IpAddress, persist the property in
    IPAddressVO, return the property in IpAddressResponse

    - add ability to request portable IP in associateIpAddress api

commit bf3cb274cf
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 16:08:40 2013 +0530

    add the status of each portable IP (its state, details of associated data
    center/VPC/guest network etc) in the PortableIpRangeResponse returned by
    listPortableIpRanges API

commit e7b2fb2255
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 14:36:01 2013 +0530

    Introdcues notion of 'portable IP' pool at region level.

    Introduces root admin only API's to provision portable ip to a region
       - createPortableIpRange
       - deletePortableIpRange
       - listPortableIpRanges
2013-05-20 20:05:47 +05:30
SrikanteswaraRao Talluri 28c5fbcb05 CLOUDSTACK-2483: Fix base.py migrate volume method
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-17 14:24:47 +05:30
Girish Shilamkar 4d0cea6626 CLOUDSTACK-2513: VPN tests refer to invalid connection.user in cloudConnection
cloudConnection object should always have "user" and "passwd" attributes.
And they are "None" while creating userAPIClient. As we already
have "user" and "password" for mgmt server.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-17 14:05:04 +05:30
Devdeep Singh adbebc1892 Changes for implicitly dedicating a resource. It includes a following:
1. A new implicit planner which extends the functionality provided by FirstFitPlanner.
2. Implicit planner can be used in either strict or preferred mode. In strict mode it tries to deploy a vm of a given account on a host on which vms of the account are already running. If no such host is found it'll search for an empty host to service the request. Otherwise the deploy vm request fails.
3. In preferred mode, if a host which is running vms of the account or an empty host isn't found, the planner then tries to deploy on any other host provided it isn't running implicitly dedicated strict vms of any other account.
4. Updated the createServiceOffering api to configure the details for the planner that the service offering is using.
5. Made db changes to store the service offering details for the planner.
6. Unit tests for testing the implicit planner functionality.
7. Marvin test for validating the functionality.
2013-05-17 11:40:31 +05:30
Prasanna Santhanam 50eeae81da don't let requests logs
requests logs to the logger making it hard to distinguish marvin logs
from http logs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-15 19:41:48 -07:00
Prasanna Santhanam b17be94cf5 don't let requests logs
requests logs to the logger making it hard to distinguish marvin logs
from http logs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-15 14:52:33 +05:30
Edison Su a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Prasanna Santhanam 894413e362 Marvin IP cleared tests for various cloudstack components
One big blob of all the tests that were posted for IP clearance several
months ago. IP clearance VOTE has passed on general@

Ref: http://markmail.org/thread/xareczan2kx4hhom

RAT check passed.
2013-05-14 10:24:27 +05:30
Edison Su 1694c1a502 fix download timeout 2013-05-13 14:40:49 -07:00