Alex Huang
c6ba4a23e8
Deadlock resolved
2013-06-27 14:00:31 -07:00
Alex Huang
3c2aa18500
Fixed the problem with buildapidocs. There are now too many jars but with 1.6 JRE, you can just specify the directory rather than each jar individually.
2013-06-27 13:57:37 -07:00
Alex Huang
262352a1c6
Another merge from master to bring over fixes to bugs that broke the bvt
2013-06-27 11:16:32 -07:00
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
Hiroaki KAWAI
29c39e8f4e
Add check for some cli programs
...
Add check for faketime and vhd-util for xen export.
2013-06-27 13:04:12 +09:00
Hiroaki KAWAI
c484d8aaba
Add notes about systemvm build script
2013-06-26 15:16:29 +09:00
Alex Huang
7b7db0560c
merge is complete
2013-06-24 16:50:31 -07:00
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
4591f94a0b
Debian 7.0.0 in archives
...
Debian released 7.1 and moved the old image to archives. Updated with
the archives link to the -netinst image.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-22 16:25:22 +05:30
Sheng Yang
759269fcd8
Baremetal: Fix API's packages and categories
2013-06-21 09:48:30 -07: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
Prasanna Santhanam
6b34943622
Add listCacheStores to Image Store category
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-21 11:56:05 +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
Edison Su
5456d0d85e
CLOUDSTACK-2481: add vhd-util in system vm template
2013-06-20 17:51:38 -07:00
Min Chen
09f50ca506
Update marvin config to work for deployDataCenter.py.
2013-06-20 17:43:20 -07:00
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
Alex Huang
e2edae1711
Merge from master
2013-06-17 19:00:44 -07:00
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
Rohit Yadav
10f9516015
cloumonkey: Remove junk from requester.py
...
This fix removes junk from 6e22843acb which was
supposed to just improve error messages and not messup the whole async block
logic and go into an infinite recursion or fail with some key error.
Signed-off-by: Rohit Yadav <rohit.yadav@wingify.com>
2013-06-16 18:34:32 +05:30
Rohit Yadav
1a058d7793
cloudmonkey: Bump up version of cloudmonkey to 4.2.xx
...
Signed-off-by: Rohit Yadav <rohit.yadav@wingify.com>
2013-06-16 18:33:34 +05:30
Edison Su
f41c800d88
merge to master
2013-06-14 19:06:33 -07:00
David Nalley
ef4c342d5c
updating copyright year and mark text
2013-06-13 14:22:01 -04:00
David Nalley
3707f70812
removing unsused logos
2013-06-13 14:04:42 -04:00
David Nalley
5ee38b79ae
Branding - moving the CloudStack logo in the apidocs to a properly apache-ified logo with TM symbol
2013-06-13 14:04:28 -04:00
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
Prasanna Santhanam
1c6e1012dc
Fix the build system VM job
...
When both systemvmtemplate64 and systemvmtemplate are present the grep
match fails and returns (non-deterministically) the 64bit appliance
instead of the 32bit one. Fix this by matching the path separater as
well.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-12 20:25:20 +05:30
Alex Huang
aaa16af211
Merged from master
2013-06-09 17:53:27 -07:00
Chiradeep Vittal
cb80ae2440
Debian repository (backports) now has latest haproxy, re-introduce into systemvm
2013-06-07 17:29:14 -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