SrikanteswaraRao Talluri
0e223d6787
Merge branch 'master' into marvin
...
Conflicts:
test/integration/component/test_base_image_updation.py
test/integration/component/test_cpu_domain_limits.py
test/integration/component/test_cpu_limits.py
test/integration/component/test_cpu_project_limits.py
test/integration/component/test_ip_reservation.py
test/integration/component/test_memory_limits.py
test/integration/component/test_mm_domain_limits.py
test/integration/component/test_mm_project_limits.py
test/integration/component/test_persistent_networks.py
test/integration/component/test_portable_ip.py
test/integration/component/test_routers.py
test/integration/smoke/test_deploy_vm.py
test/integration/smoke/test_deploy_vm_with_userdata.py
test/integration/smoke/test_internal_lb.py
test/integration/smoke/test_vm_life_cycle.py
test/integration/smoke/test_volumes.py
tools/marvin/marvin/codes.py
tools/marvin/marvin/configGenerator.py
tools/marvin/marvin/lib/base.py
tools/marvin/marvin/lib/common.py
tools/marvin/marvin/lib/utils.py
2014-04-08 17:53:37 +05:30
SrikanteswaraRao Talluri
91a5e3bb66
CLOUDSTACK-6125: adding 'selfservice','provisioning' tags to segregate the tests
...
that can be run on simulator only and that needs hardware.
2014-03-28 15:34:57 +05:30
Santhosh Edukulla
bf72441d13
CLOUDSTACK-6006: Remove integration folder and lib
2014-02-04 12:01:58 +05:30
SrikanteswaraRao Talluri
c2b5addaed
CLOUDSTACK-5625: removed unnecessary global setting 'ldap.realname.attribute'
2014-01-06 14:52:26 +05:30
Ian Duffy
eaa4143371
Merge LDAPPlugin
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-25 17:54:52 +05:30
suresh sadhu
56a001d1c4
CLOUDSTACK-3023: added tags for all the test cases
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 10:03:51 +05:30
Prasanna Santhanam
54ac779b8f
Fix all occurrences of account.account
...
Fixes the dereference of account objects with account.account. This is
to conform to recent library changes in Marvin
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-20 22:59:52 +05:30
Prasanna Santhanam
32e7ba23a3
LDAP moved to regression suite.
...
LDAP requires a Directory server which isn't available by default in
most environments. Moving this to the regression suite so it can be run
on demand.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-20 17:59:19 +05:30