etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #979 from borisroman/CLOUDSTACK-8989 

[4.6] CLOUDSTACK-8989 test_ps_limits.py tests can also be run on a "basic" setup.The tests in the test_ps_limits.py file can all be run on a "basic" setup. This PR adds that functionality.

```
nosetests --with-marvin --marvin-config=/data/shared/marvin/mct-zone1-kvm1-basic.cfg -s -a tags=basic,required_hardware=false smoke/test_vm_life_cycle.py
```
```
==== Marvin Init Started ====

=== Marvin Parse Config Successful ===

=== Marvin Setting TestData Successful===

==== Log Folder Path: /tmp//MarvinLogs//Oct_26_2015_09_55_20_4UDZRZ. All logs will be available here ====

=== Marvin Init Logging Successful===

==== Marvin Init Successful ====
=== TestName: test_deploy_vm | Status : SUCCESS ===

=== TestName: test_deploy_vm_multiple | Status : SUCCESS ===

=== TestName: test_01_stop_vm | Status : SUCCESS ===

=== TestName: test_02_start_vm | Status : SUCCESS ===

=== TestName: test_03_reboot_vm | Status : SUCCESS ===

=== TestName: test_06_destroy_vm | Status : SUCCESS ===

=== TestName: test_07_restore_vm | Status : SUCCESS ===

=== TestName: test_09_expunge_vm | Status : SUCCESS ===

===final results are now copied to: /tmp//MarvinLogs/test_vm_life_cycle_2GU6K4===
```
```
nosetests --with-marvin --marvin-config=/data/shared/marvin/mct-zone1-kvm1-basic.cfg -s -a tags=basic,required_hardware=false component/test_ps_limits.py
```
```
==== Marvin Init Started ====

=== Marvin Parse Config Successful ===

=== Marvin Setting TestData Successful===

==== Log Folder Path: /tmp//MarvinLogs//Oct_26_2015_10_19_51_ZY3KD5. All logs will be available here ====

=== Marvin Init Logging Successful===

==== Marvin Init Successful ====
=== TestName: test_assign_vm_different_account_1_root_domain_admin | Status : SUCCESS ===

=== TestName: test_assign_vm_different_account_2_child_domain_admin | Status : SUCCESS ===

=== TestName: test_attach_detach_volume_1_root_domain_admin | Status : SUCCESS ===

=== TestName: test_attach_detach_volume_2_child_domain_admin | Status : SUCCESS ===

=== TestName: test_create_multiple_volumes_1_root_domain_admin | Status : SUCCESS ===

=== TestName: test_create_multiple_volumes_2_child_domain_admin | Status : SUCCESS ===

=== TestName: test_deploy_multiple_vm_1_root_domain_admin | Status : SUCCESS ===

=== TestName: test_deploy_multiple_vm_2_child_domain_admin | Status : SUCCESS ===

=== TestName: test_stop_start_vm_1_root_domain_admin | Status : SUCCESS ===

=== TestName: test_stop_start_vm_2_child_domain_admin | Status : SUCCESS ===

===final results are now copied to: /tmp//MarvinLogs/test_ps_limits_0E1HFP===
```

* pr/979:
  CLOUDSTACK-8989 test_ps_limits.py tests can also be run on a basic setup.

Signed-off-by: Remi Bergsma <github@remi.nl>
This commit is contained in:
Remi Bergsma 2015-10-28 11:49:41 +01:00
parent 39c825c2c5 a24cbafb15
commit bde75b49c3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/integration/component/test_ps_limits.py
View File

@ -156,7 +156,7 @@ class TestVolumeLimits(cloudstackTestCase):
return [PASS, None]
@data(ROOT_DOMAIN_ADMIN, CHILD_DOMAIN_ADMIN)
@attr(tags=["advanced"], required_hardware="false")
@attr(tags=["advanced","basic"], required_hardware="false")
def test_stop_start_vm(self, value):
"""Test Deploy VM with 5 GB volume & verify the usage
@ -195,7 +195,7 @@ class TestVolumeLimits(cloudstackTestCase):
@unittest.skip("skip")
@data(ROOT_DOMAIN_ADMIN, CHILD_DOMAIN_ADMIN)
@attr(tags=["advanced"], required_hardware="false")
@attr(tags=["advanced","basic"], required_hardware="false")
def test_destroy_recover_vm(self, value):
"""Test delete and recover instance
@ -233,7 +233,7 @@ class TestVolumeLimits(cloudstackTestCase):
return
@data(ROOT_DOMAIN_ADMIN, CHILD_DOMAIN_ADMIN)
@attr(tags=["advanced"], required_hardware="false")
@attr(tags=["advanced","basic"], required_hardware="false")
def test_attach_detach_volume(self, value):
"""Stop attach and detach volume from VM
@ -302,7 +302,7 @@ class TestVolumeLimits(cloudstackTestCase):
return
@data(ROOT_DOMAIN_ADMIN, CHILD_DOMAIN_ADMIN)
@attr(tags=["advanced"], required_hardware="false")
@attr(tags=["advanced","basic"], required_hardware="false")
def test_create_multiple_volumes(self, value):
"""Test create multiple volumes
@ -396,7 +396,7 @@ class TestVolumeLimits(cloudstackTestCase):
return
@data(ROOT_DOMAIN_ADMIN, CHILD_DOMAIN_ADMIN)
@attr(tags=["advanced"], required_hardware="false")
@attr(tags=["advanced","basic"], required_hardware="false")
def test_deploy_multiple_vm(self, value):
"""Test Deploy multiple VMs with & verify the usage
# Validate the following
@ -452,7 +452,7 @@ class TestVolumeLimits(cloudstackTestCase):
return
@data(ROOT_DOMAIN_ADMIN, CHILD_DOMAIN_ADMIN)
@attr(tags=["advanced","selfservice"])
@attr(tags=["advanced","basic","selfservice"])
def test_assign_vm_different_account(self, value):
"""Test assign Vm to different account
# Validate the following
@ -505,7 +505,7 @@ class TestVolumeLimits(cloudstackTestCase):
return
@data(ROOT_DOMAIN_ADMIN, CHILD_DOMAIN_ADMIN)
@attr(tags=["advanced"], required_hardware="true")
@attr(tags=["advanced","basic"], required_hardware="true")
def test_create_template_snapshot(self, value):
"""Test create snapshot and templates from volume