You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/09/12 15:24:10 UTC
[20/37] git commit: migrating tags to attr decorators for nose attrib
classification
migrating tags to attr decorators for nose attrib classification
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9043e495
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9043e495
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9043e495
Branch: refs/heads/master
Commit: 9043e495225d0b05e34ec0c6c2ceb4e9a2f47aaa
Parents: bb8016e
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Sat Aug 18 13:37:12 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Sep 12 18:48:32 2012 +0530
----------------------------------------------------------------------
.../integration/component/test_network_offering.py | 12 +++---
test/integration/component/test_project_configs.py | 6 +-
test/integration/component/test_project_limits.py | 16 +-----
.../component/test_project_resources.py | 35 +++-----------
test/integration/component/test_project_usage.py | 30 ++++---------
test/integration/component/test_projects.py | 20 ++++----
test/integration/component/test_resource_limits.py | 32 +++++++-------
test/integration/component/test_routers.py | 12 +++---
test/integration/component/test_security_groups.py | 24 +++++-----
test/integration/component/test_snapshots.py | 10 ++--
test/integration/component/test_templates.py | 10 ++--
test/integration/component/test_usage.py | 22 ++++-----
test/integration/component/test_volumes.py | 14 +++---
13 files changed, 99 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_network_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py
index cc24d46..7cd2dcb 100644
--- a/test/integration/component/test_network_offering.py
+++ b/test/integration/component/test_network_offering.py
@@ -209,11 +209,11 @@ class TestNOVirtualRouter(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced"])
def test_01_network_off_without_conserve_mode(self):
"""Test Network offering with Conserve mode off and VR - All services
"""
- tags = ["advanced"]
# Validate the following
# 1. Create a Network from the above network offering and deploy a VM.
@@ -454,11 +454,11 @@ class TestNOVirtualRouter(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced"])
def test_02_network_off_with_conserve_mode(self):
"""Test Network offering with Conserve mode ON and VR - All services
"""
- tags = ["advanced"]
# Validate the following
# 1. Create a Network from the above network offering and deploy a VM.
@@ -787,11 +787,11 @@ class TestNOWithNetscaler(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advancedns"])
def test_01_network_off_without_conserve_mode(self):
"""Test Nw off with Conserve mode off, VR-All services, LB-netscaler
"""
- tags = ["advancedns"]
# Validate the following
# 1. Create a Network from the above network offering and deploy a VM.
@@ -1056,11 +1056,11 @@ class TestNOWithNetscaler(cloudstackTestCase):
)
return
+ @attr(tags = ["advancedns"])
def test_02_network_off_with_conserve_mode_netscaler(self):
"""Test NW off with Conserve mode ON, LB-Netscaler and VR-All services
"""
- tags = ["advancedns"]
# Validate the following
# 1. Create a Network from the above network offering and deploy a VM.
@@ -1431,11 +1431,11 @@ class TestNetworkUpgrade(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advancedns"])
def test_01_nwupgrade_netscaler_conserve_on(self):
"""Test Nw upgrade to netscaler lb service and conserve mode ON
"""
- tags = ["advancedns"]
# Validate the following
# 1. Upgrade a network with VR and conserve mode ON TO
@@ -1630,11 +1630,11 @@ class TestNetworkUpgrade(cloudstackTestCase):
)
return
+ @attr(tags = ["advancedns"])
def test_02_nwupgrade_netscaler_conserve_off(self):
"""Test Nw upgrade to netscaler lb service and conserve mode OFF
"""
- tags = ["advancedns"]
# Validate the following
# 1. Upgrade a network with VR and conserve mode ON TO
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_project_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_configs.py b/test/integration/component/test_project_configs.py
index 4384efb..6134ecc 100644
--- a/test/integration/component/test_project_configs.py
+++ b/test/integration/component/test_project_configs.py
@@ -173,10 +173,10 @@ class TestUserProjectCreation(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_admin_project_creation(self):
"""Test create project as a domain admin and domain user
"""
- tags = ["advanced", "basic", "sg", "eip", "advancedns"]
# Validate the following
# 1. Check if 'allow.user.create.projects' configuration is true
# 2. Create a Project as domain admin
@@ -338,11 +338,11 @@ class TestProjectCreationNegative(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
@unittest.skip("Known bug-able to create project as a domain user")
def test_user_project_creation(self):
"""Test create project as a domain admin and domain user
"""
-
# Validate the following
# 1. Check if 'allow.user.create.projects' configuration is false
# 2. Create a Project as domain admin. Project creation should be
@@ -479,10 +479,10 @@ class TestProjectInviteRequired(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_add_user_to_project(self):
"""Add user to project when 'project.invite.required' is false"""
- tags = ["advanced", "basic", "sg", "eip", "advancedns"]
# Validate the following:
# 1. Create a Project
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index 3817c76..e2bf2e2 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -155,10 +155,10 @@ class TestProjectLimits(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_project_limits(self):
""" Test project limits
"""
-
# Validate the following
# 1. Create a Project. Verify once projects are created, they inherit
# a default set of resource limits as configured by the Cloud Stack
@@ -302,11 +302,11 @@ class TestProjectLimits(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
@unittest.skip("No provision for updating resource limits from account through API")
def test_02_project_limits_normal_user(self):
""" Test project limits
"""
-
# Validate the following
# 1. Create a Project
# 2. Reduce the projects limits as a domain admin. Verify resource
@@ -526,10 +526,10 @@ class TestResourceLimitsProject(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_03_vm_per_project(self):
"""Test VM limit per project
"""
-
# Validate the following
# 1. Set max VM per project to 2
# 2. Create account and start 2 VMs. Verify VM state is Up and Running
@@ -591,11 +591,7 @@ class TestResourceLimitsProject(cloudstackTestCase):
def test_04_publicip_per_project(self):
"""Test Public IP limit per project
"""
-<<<<<<< HEAD
-
-=======
tags = ["advanced", "eip", "advancedns"]
->>>>>>> 6d17e21... This commit has following fixes:
# Validate the following
# 1. set max no of IPs per project to 2.
# 2. Create an account in this domain
@@ -806,13 +802,7 @@ class TestResourceLimitsProject(cloudstackTestCase):
def test_07_templates_per_project(self):
"""Test Templates limit per project
"""
-<<<<<<< HEAD
-
- # Validate the following
-=======
tags = ["advanced", "basic", "sg", "eip", "advancedns"]
- # Validate the following
->>>>>>> 6d17e21... This commit has following fixes:
# 1. set max no of templates per project to 1.
# 2. Create a template in this project. Both template should be in
# ready state
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_project_resources.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py
index a8c9d85..dce3432 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -206,10 +206,10 @@ class TestOfferings(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_service_offerings(self):
""" Test service offerings in a project
"""
-
# Validate the following
# 1. Create a project.
# 2. List service offerings for the project. All SO available in the
@@ -248,6 +248,7 @@ class TestOfferings(cloudstackTestCase):
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_02_project_disk_offerings(self):
""" Test project disk offerings
"""
@@ -380,14 +381,10 @@ class TestNetwork(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_03_network_create(self):
""" Test create network in project
"""
-<<<<<<< HEAD
-
-=======
- tags = ["advanced", "advancedns"]
->>>>>>> 6d17e21... This commit has following fixes:
# Validate the following
# 1. Create a project.
# 2. Add virtual/direct network resource to the project. User shared
@@ -588,16 +585,10 @@ class TestTemplates(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_04_public_template_use_in_project(self):
"""Test Templates creation in projects
"""
-<<<<<<< HEAD
-
- # Validate the following
-=======
- tags = ["advanced", "basic", "sg", "eip", "advancedns"]
- # Validate the following
->>>>>>> 6d17e21... This commit has following fixes:
# 1. Create a project
# 2. Verify Public templates can be used without any restriction
# 3. Verify that template created in project can be used in project
@@ -652,16 +643,10 @@ class TestTemplates(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_05_use_private_template_in_project(self):
"""Test use of private template in a project
"""
-<<<<<<< HEAD
-
- # Validate the following
-=======
- tags = ["advanced", "basic", "sg", "eip", "advancedns"]
- # Validate the following
->>>>>>> 6d17e21... This commit has following fixes:
# 1. Create a project
# 2. Verify that in order to use somebody’s Private template for vm
# creation in the project, permission to use the template has to
@@ -823,10 +808,10 @@ class TestSnapshots(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_06_create_snapshots_in_project(self):
"""Test create snapshots in project
"""
-
# Validate the following
# 1. Create a project
# 2. Add some snapshots to the project
@@ -976,14 +961,10 @@ class TestPublicIpAddress(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_07_associate_public_ip(self):
"""Test associate public IP within the project
"""
-<<<<<<< HEAD
-
-=======
- tags = ["advanced", "eip", "advancedns"]
->>>>>>> 6d17e21... This commit has following fixes:
# Validate the following
# 1. Create a project
# 2. Add some public Ips to the project
@@ -1256,10 +1237,10 @@ class TestSecurityGroup(cloudstackTestCase):
return
+ @attr(tags = ["sg", "eip"])
def test_08_security_group(self):
"""Test security groups in project
"""
-
# Validate the following:
# 1. Create a project
# 2. Assign some security groups to that project
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index 7c33773..a2731e3 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -191,10 +191,10 @@ class TestVmUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_vm_usage(self):
"""Test Create/Destroy VM and verify usage calculation
"""
-
# Validate the following
# 1. Create a VM. Verify usage_events table contains VM .create,
# VM.start , Network.offering.assign , Volume.create events
@@ -402,10 +402,10 @@ class TestPublicIPUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "eip", "advancedns"])
def test_01_public_ip_usage(self):
"""Test Assign new IP and verify usage calculation
"""
-
# Validate the following
# 1. Acquire a IP for the network of this account. Verify usage_event
# table has Acquire IP event for the IP for this account
@@ -560,10 +560,10 @@ class TestVolumeUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_volume_usage(self):
"""Test Create/delete a volume and verify correct usage is recorded
"""
-
# Validate the following
# 1. Volume.create event for both root and data disk is there for the
# created account in cloud.usage_event table
@@ -751,11 +751,11 @@ class TestTemplateUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_template_usage(self):
"""Test Upload/ delete a template and verify correct usage is generated
for the template uploaded
"""
-
# Validate the following
# 1. Create a account
# 2. Upload a template from this account. template.create event is
@@ -903,10 +903,10 @@ class TestISOUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_ISO_usage(self):
"""Test Create/Delete a ISO and verify its usage is generated correctly
"""
-
# Validate the following
# 1. Create a account
# 2. Upload a ISO from this account. ISO.create event is recorded in
@@ -1075,14 +1075,10 @@ class TestLBRuleUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "eip", "advancedns"])
def test_01_lb_usage(self):
"""Test Create/Delete a LB rule and verify correct usage is recorded
"""
-<<<<<<< HEAD
-
-=======
- tags = ["advanced", "eip", "advancedns"]
->>>>>>> 6d17e21... This commit has following fixes:
# Validate the following
# 1. Acquire a IP for this account. lb.rule.create event is registered
# for this account in cloud.usage_event table
@@ -1245,11 +1241,11 @@ class TestSnapshotUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_snapshot_usage(self):
"""Test Create/Delete a manual snap shot and verify
correct usage is recorded
"""
-
# Validate the following
# 1. Create snapshot of the root disk for this account.Snapshot.create
# event is there for the created account in cloud.usage_event table
@@ -1437,14 +1433,10 @@ class TestNatRuleUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_nat_usage(self):
"""Test Create/Delete a PF rule and verify correct usage is recorded
"""
-<<<<<<< HEAD
-
-=======
- tags = ["advanced", "advancedns"]
->>>>>>> 6d17e21... This commit has following fixes:
# Validate the following
# 1. Acquire a IP for this account
# 2. Create a PF rule on the IP associated with this account.
@@ -1624,14 +1616,10 @@ class TestVpnUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_vpn_usage(self):
"""Test Create/Delete a VPN and verify correct usage is recorded
"""
-<<<<<<< HEAD
-
-=======
- tags = ["advanced", "advancedns"]
->>>>>>> 6d17e21... This commit has following fixes:
# Validate the following
# 1. Enable VPN for this IP. vpn.add.user event is registered for this
# account in cloud.usage_event table
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py
index e7dca88..201ee4a 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -167,11 +167,11 @@ class TestMultipleProjectCreation(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_create_multiple_projects_by_account(self):
""" Verify an account can own multiple projects and can belong to
multiple projects
"""
-
# Validate the following
# 1. Create multiple project. Verify at step 1 An account is allowed
# to create multiple projects
@@ -383,10 +383,10 @@ class TestCrossDomainAccountAdd(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_02_cross_domain_account_add(self):
""" Verify No cross domain projects
"""
-
# Validate the following
# 1. Create a project in a domain.
# 2. Add different domain account to the project. Add account should
@@ -503,10 +503,10 @@ class TestDeleteAccountWithProject(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_03_delete_account_with_project(self):
""" Test As long as the project exists, its owner can't be removed
"""
-
# Validate the following
# 1. Create a project.
# 2. Delete account who is owner of the project. Delete account should
@@ -617,11 +617,11 @@ class TestDeleteDomainWithProject(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_04_delete_domain_with_project(self):
""" Test Verify delete domain with cleanup=true should delete projects
belonging to the domain
"""
-
# Validate the following
# 1. Create a project in a domain
# 2. Delete domain forcefully. Verify that project is also deleted as
@@ -762,11 +762,11 @@ class TestProjectOwners(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_05_user_project_owner_promotion(self):
""" Test Verify a project user can be later promoted to become a
owner
"""
-
# Validate the following
# 1. Create a project.
# 2. Add account to the project. Edit account to make it a project
@@ -904,10 +904,10 @@ class TestProjectOwners(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_06_max_one_project_owner(self):
""" Test Verify there can only be one owner of a project at a time
"""
-
# Validate the following
# 1. Create a project.
# 2. Add account to the project. Edit account to make it a project
@@ -1194,11 +1194,11 @@ class TestProjectResources(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_07_project_resources_account_delete(self):
""" Test Verify after an account is removed from the project, all his
resources stay with the project.
"""
-
# Validate the following
# 1. Create a project.
# 2. Add some accounts to project. Add resources to the project
@@ -1310,10 +1310,10 @@ class TestProjectResources(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_08_cleanup_after_project_delete(self):
""" Test accounts are unassigned from project after project deletion
"""
-
# Validate the following
# 1. Create a project.
# 2. Add some accounts to project. Add resources to the project
@@ -1524,11 +1524,11 @@ class TestProjectSuspendActivate(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_09_project_suspend(self):
""" Test Verify after an account is removed from the project, all his
resources stay with the project.
"""
-
# Validate the following
# 1. Create a project.
# 2. Add some accounts to project. Add resources to the project
@@ -1661,10 +1661,10 @@ class TestProjectSuspendActivate(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_10_project_activation(self):
""" Test project activation after suspension
"""
-
# Validate the following
# 1. Activate the project
# 2. Verify project is activated and we are able to add resources
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_resource_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py
index 8eb5568..e0679a0 100644
--- a/test/integration/component/test_resource_limits.py
+++ b/test/integration/component/test_resource_limits.py
@@ -152,10 +152,10 @@ class TestResourceLimitsAccount(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_vm_per_account(self):
"""Test VM limit per account
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Set user_vm=1 limit for account 1.
@@ -245,10 +245,10 @@ class TestResourceLimitsAccount(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_02_publicip_per_account(self):
"""Test Public IP limit per account
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Set Public_IP= 2 limit for account 1.
@@ -388,10 +388,10 @@ class TestResourceLimitsAccount(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_03_snapshots_per_account(self):
"""Test Snapshot limit per account
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Set snapshot= 2 limit for account 1.
@@ -544,10 +544,10 @@ class TestResourceLimitsAccount(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_04_volumes_per_account(self):
"""Test Volumes limit per account
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Set volumes=2 limit for account 1.
@@ -686,10 +686,10 @@ class TestResourceLimitsAccount(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_05_templates_per_account(self):
"""Test Templates limit per account
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Set templates=1 limit for account 1.
@@ -916,10 +916,10 @@ class TestResourceLimitsDomain(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_vm_per_domain(self):
"""Test VM limit per domain
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Set max VM per domain to 2
@@ -982,10 +982,10 @@ class TestResourceLimitsDomain(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_publicip_per_domain(self):
"""Test Public IP limit per domain
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. set max no of IPs per domain to 2.
@@ -1052,10 +1052,10 @@ class TestResourceLimitsDomain(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_03_snapshots_per_domain(self):
"""Test Snapshot limit per domain
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. set max no of snapshots per domain to 1.
@@ -1135,10 +1135,10 @@ class TestResourceLimitsDomain(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_04_volumes_per_domain(self):
"""Test Volumes limit per domain
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. set max no of volume per domain to 1.
@@ -1188,10 +1188,10 @@ class TestResourceLimitsDomain(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_05_templates_per_domain(self):
"""Test Templates limit per domain
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. set max no of templates per domain to 2.
@@ -1335,9 +1335,9 @@ class TestResources(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_zones(self):
"""Check the status of zones"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. List zones
@@ -1361,9 +1361,9 @@ class TestResources(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"]
def test_02_pods(self):
"""Check the status of pods"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. List pods
@@ -1387,9 +1387,9 @@ class TestResources(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_03_clusters(self):
"""Check the status of clusters"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. List clusters
@@ -1413,9 +1413,9 @@ class TestResources(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_04_hosts(self):
"""Check the status of hosts"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. List hosts with type=Routing
@@ -1440,9 +1440,9 @@ class TestResources(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_05_storage_pools(self):
"""Check the status of Storage pools"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. List storage pools for the zone
@@ -1466,9 +1466,9 @@ class TestResources(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_06_secondary_storage(self):
"""Check the status of secondary storage"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. List secondary storage
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index f826001..e42792c 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -167,10 +167,10 @@ class TestRouterServices(cloudstackTestCase):
self._cleanup = []
return
+ @attr(tags = ["advanced"])
def test_01_AdvancedZoneRouterServices(self):
"""Test advanced zone router services
"""
- tags = ["advanced"]
# Validate the following:
# 1. Verify that list of services provided by this network are running
# a. DNS
@@ -313,10 +313,10 @@ class TestRouterServices(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced"])
def test_02_NetworkGarbageCollection(self):
"""Test network garbage collection
"""
- tags = ["advanced"]
# Validate the following
# 1. wait for router to start and guest network to be created
# a.listRouters account=user, domainid=1 (router state=Running)
@@ -471,10 +471,10 @@ class TestRouterServices(cloudstackTestCase):
self._cleanup.append(self.vm_2)
return
+ @attr(tags = ["advanced"])
def test_03_RouterStartOnVmDeploy(self):
"""Test router start on VM deploy
"""
- tags = ["advanced"]
# Validate the following
# 1. deployVirtualMachine in the account
# 2. listVirtualMachines account=user, domainid=1
@@ -646,10 +646,10 @@ class TestRouterStopCreatePF(cloudstackTestCase):
self._cleanup = []
return
+ @attr(tags = ["advanced"])
def test_01_RouterStopCreatePF(self):
"""Test router stop create port forwarding
"""
- tags = ["advanced"]
# validate the following
# 1. wait for router to start, guest network to be implemented and
# VM to report Running
@@ -856,10 +856,10 @@ class TestRouterStopCreateLB(cloudstackTestCase):
self._cleanup = []
return
+ @attr(tags = ["advanced"])
def test_01_RouterStopCreateLB(self):
"""Test router stop create Load balancing
"""
- tags = ["advanced"]
# validate the following
# 1. listLoadBalancerRules (publicipid=ipaddressid of source NAT)
# 2. rule should be for port 2222 as applied and
@@ -1066,10 +1066,10 @@ class TestRouterStopCreateFW(cloudstackTestCase):
self._cleanup = []
return
+ @attr(tags = ["advanced"])
def test_01_RouterStopCreateFW(self):
"""Test router stop create Firewall rule
"""
- tags = ["advanced"]
# validate the following
# 1. 1. listFirewallRules (filter by ipaddressid of sourcenat)
# 2. rule should be for ports 1-600 and in state=Active
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index 85c96d3..f68b3a7 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -165,11 +165,11 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
return
+ @attr(tags = ["sg", "eip"])
def test_01_deployVM_InDefaultSecurityGroup(self):
"""Test deploy VM in default security group
"""
- tags = ["sg", "eip"]
# Validate the following:
# 1. deploy Virtual machine using admin user
@@ -244,11 +244,11 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
)
return
+ @attr(tags = ["sg", "eip"])
def test_02_listSecurityGroups(self):
"""Test list security groups for admin account
"""
- tags = ["sg", "eip"]
# Validate the following:
# 1. listSecurityGroups in admin account
@@ -279,11 +279,11 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
)
return
+ @attr(tags = ["sg", "eip"])
def test_03_accessInDefaultSecurityGroup(self):
"""Test access in default security group
"""
- tags = ["sg", "eip"]
# Validate the following:
# 1. deploy Virtual machine using admin user
@@ -436,11 +436,11 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
return
+ @attr(tags = ["sg", "eip"])
def test_01_authorizeIngressRule(self):
"""Test authorize ingress rule
"""
- tags = ["sg", "eip"]
# Validate the following:
#1. Create Security group for the account.
@@ -572,11 +572,11 @@ class TestRevokeIngressRule(cloudstackTestCase):
return
+ @attr(tags = ["sg", "eip"])
def test_01_revokeIngressRule(self):
"""Test revoke ingress rule
"""
- tags = ["sg", "eip"]
# Validate the following:
#1. Create Security group for the account.
@@ -739,11 +739,11 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
return
+ @attr(tags = ["sg", "eip", "basic"])
def test_01_dhcpOnlyRouter(self):
"""Test router services for user account
"""
- tags = ["sg", "eip", "basic"]
# Validate the following
#1. List routers for any user account
@@ -869,10 +869,10 @@ class TestdeployVMWithUserData(cloudstackTestCase):
return
+ @attr(tags = ["sg", "eip"])
def test_01_deployVMWithUserData(self):
"""Test Deploy VM with User data"""
- tags = ["sg", "eip"]
# Validate the following
# 1. CreateAccount of type user
@@ -1045,10 +1045,10 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
return
+ @attr(tags = ["sg", "eip"])
def test_01_delete_security_grp_running_vm(self):
"""Test delete security group with running VM"""
- tags = ["sg", "eip"]
# Validate the following
# 1. createsecuritygroup (ssh-incoming) for this account
@@ -1129,10 +1129,10 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
)
return
+ @attr(tags = ["sg", "eip"])
def test_02_delete_security_grp_withoout_running_vm(self):
"""Test delete security group without running VM"""
- tags = ["sg", "eip"]
# Validate the following
# 1. createsecuritygroup (ssh-incoming) for this account
@@ -1291,10 +1291,10 @@ class TestIngressRule(cloudstackTestCase):
return
+ @attr(tags = ["sg", "eip"])
def test_01_authorizeIngressRule_AfterDeployVM(self):
"""Test delete security group with running VM"""
- tags = ["sg", "eip"]
# Validate the following
# 1. createsecuritygroup (ssh-incoming, 22via22) for this account
@@ -1403,10 +1403,10 @@ class TestIngressRule(cloudstackTestCase):
% (ingress_rule_2["id"], e))
return
+ @attr(tags = ["sg", "eip"])
def test_02_revokeIngressRule_AfterDeployVM(self):
"""Test Revoke ingress rule after deploy VM"""
- tags = ["sg", "eip"]
# Validate the following
# 1. createsecuritygroup (ssh-incoming, 22via22) for this account
@@ -1557,10 +1557,10 @@ class TestIngressRule(cloudstackTestCase):
% (icmp_rule["ruleid"], e))
return
+ @attr(tags = ["sg", "eip"])
def test_03_stopStartVM_verifyIngressAccess(self):
"""Test Start/Stop VM and Verify ingress rule"""
- tags = ["sg", "eip"]
# Validate the following
# 1. createsecuritygroup (ssh-incoming, 22via22) for this account
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py
index 76185da..717e9d9 100644
--- a/test/integration/component/test_snapshots.py
+++ b/test/integration/component/test_snapshots.py
@@ -163,10 +163,10 @@ class TestCreateVMsnapshotTemplate(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_createVM_snapshotTemplate(self):
"""Test create VM, Snapshot and Template
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Deploy VM using default template, small service offering
# and small data disk offering.
@@ -476,10 +476,10 @@ class TestAccountSnapshotClean(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_02_accountSnapshotClean(self):
"""Test snapshot cleanup after account deletion
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. listAccounts API should list out the newly created account
# 2. listVirtualMachines() command should return the deployed VM.
@@ -819,10 +819,10 @@ class TestSnapshotDetachedDisk(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_03_snapshot_detachedDisk(self):
"""Test snapshot from detached disk
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. login in VM and write some data on data disk(use fdisk to
# partition datadisk,fdisk /dev/sdb, and make filesystem using
@@ -1098,10 +1098,10 @@ class TestSnapshotLimit(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_04_snapshot_limit(self):
"""Test snapshot limit in snapshot policies
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Perform hourly recurring snapshot on the root disk of VM and keep
# the maxsnapshots as 1
@@ -1356,10 +1356,10 @@ class TestSnapshotEvents(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_05_snapshot_events(self):
"""Test snapshot events
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Perform snapshot on the root disk of this VM and check the events/alerts.
# 2. delete the snapshots and check the events/alerts
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py
index 4d74e0c..ced8732 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -159,10 +159,10 @@ class TestCreateTemplate(cloudstackTestCase):
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_create_template(self):
"""Test create public & private template
"""
- tags = ["advanced", "advancedns"]
# Validate the following:
# 1. Upload a templates in raw img format. Create a Vm instances from
# raw img template.
@@ -375,10 +375,10 @@ class TestTemplates(cloudstackTestCase):
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_create_template_volume(self):
"""Test Create template from volume
"""
- tags = ["advanced", "advancedns"]
# Validate the following:
# 1. Deploy new VM using the template created from Volume
@@ -415,9 +415,9 @@ class TestTemplates(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_02_copy_template(self):
"""Test for copy template from one zone to another"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. copy template should be successful and
@@ -473,10 +473,10 @@ class TestTemplates(cloudstackTestCase):
self.apiclient.deleteTemplate(cmd)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_03_delete_template(self):
"""Test Delete template
"""
- tags = ["advanced", "advancedns"]
# Validate the following:
# 1. Create a template and verify it is shown in list templates response
@@ -528,10 +528,10 @@ class TestTemplates(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_04_template_from_snapshot(self):
"""Create Template from snapshot
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 2. Snapshot the Root disk
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index 355fa44..6172e1e 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -177,10 +177,10 @@ class TestVmUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_vm_usage(self):
"""Test Create/Destroy VM and verify usage calculation
"""
-
# Validate the following
# 1. Create a VM. Verify usage_events table contains VM .create,
# VM.start , Network.offering.assign , Volume.create events
@@ -368,10 +368,10 @@ class TestPublicIPUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "eip", "advancedns"])
def test_01_public_ip_usage(self):
"""Test Assign new IP and verify usage calculation
"""
-
# Validate the following
# 1. Aquire a IP for the network of this account. Verify usage_event
# table has Acquire IP event for the IP for this account
@@ -515,10 +515,10 @@ class TestVolumeUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_volume_usage(self):
"""Test Create/delete a volume and verify correct usage is recorded
"""
-
# Validate the following
# 1. Volume.create event for both root and data disk is there for the
# created account in cloud.usage_event table
@@ -697,10 +697,10 @@ class TestTemplateUsage(cloudstackTestCase):
return
def test_01_template_usage(self):
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
"""Test Upload/ delete a template and verify correct usage is generated
for the template uploaded
"""
-
# Validate the following
# 1. Create a account
# 2. Upload a template from this account. template.create event is
@@ -839,10 +839,10 @@ class TestISOUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_ISO_usage(self):
"""Test Create/Delete a ISO and verify its usage is generated correctly
"""
-
# Validate the following
# 1. Create a account
# 2. Upload a ISO from this account. ISO.create event is recorded in
@@ -990,10 +990,10 @@ class TestLBRuleUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "eip", "advancedns"])
def test_01_lb_usage(self):
"""Test Create/Delete a LB rule and verify correct usage is recorded
"""
-
# Validate the following
# 1. Acquire a IP for this account. lb.rule.create event is registered
# for this account in cloud.usage_event table
@@ -1145,11 +1145,11 @@ class TestSnapshotUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
def test_01_snapshot_usage(self):
"""Test Create/Delete a manual snap shot and verify
correct usage is recorded
"""
-
# Validate the following
# 1. Create snapshot of the root disk for this account.Snapshot.create
# event is there for the created account in cloud.usage_event table
@@ -1316,14 +1316,10 @@ class TestNatRuleUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_nat_usage(self):
"""Test Create/Delete a PF rule and verify correct usage is recorded
"""
-<<<<<<< HEAD
-
-=======
- tags = ["advanced", "advancedns"]
->>>>>>> 6d17e21... This commit has following fixes:
# Validate the following
# 1. Acquire a IP for this account
# 2. Create a PF rule on the IP associated with this account.
@@ -1482,10 +1478,10 @@ class TestVpnUsage(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_vpn_usage(self):
"""Test Create/Delete a VPN and verify correct usage is recorded
"""
-
# Validate the following
# 1. Enable VPN for this IP. vpn.add.user event is registered for this
# account in cloud.usage_event table
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9043e495/test/integration/component/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py
index 697b945..1eccf09 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -140,10 +140,10 @@ class TestAttachVolume(cloudstackTestCase):
self.dbclient = self.testClient.getDbConnection()
self.cleanup = []
+ @attr(tags = ["advanced", "advancedns"])
def test_01_volume_attach(self):
"""Test Attach volumes (max capacity)
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Deploy a vm and create 5 data disk
# 2. Attach all the created Volume to the vm.
@@ -292,10 +292,10 @@ class TestAttachVolume(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_02_volume_attach_max(self):
"""Test attach volumes (more than max) to an instance
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Attach one more data volume to VM (Already 5 attached)
@@ -423,10 +423,10 @@ class TestAttachDetachVolume(cloudstackTestCase):
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
+ @attr(tags = ["advanced", "advancedns"])
def test_01_volume_attach_detach(self):
"""Test Volume attach/detach to VM (5 data volumes)
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Deploy a vm and create 5 data disk
@@ -671,10 +671,10 @@ class TestAttachVolumeISO(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_volume_iso_attach(self):
"""Test Volumes and ISO attach
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Create and attach 5 data volumes to VM
@@ -867,10 +867,10 @@ class TestVolumes(cloudstackTestCase):
cleanup_resources(self.apiclient, self.cleanup)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_01_attach_volume(self):
"""Attach a created Volume to a Running VM
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Create a data volume.
# 2. List Volumes should not have vmname and virtualmachineid fields in
@@ -951,10 +951,10 @@ class TestVolumes(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_02_detach_volume(self):
"""Detach a Volume attached to a VM
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. Data disk should be detached from instance
@@ -999,10 +999,10 @@ class TestVolumes(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns"])
def test_03_delete_detached_volume(self):
"""Delete a Volume unattached to an VM
"""
- tags = ["advanced", "advancedns"]
# Validate the following
# 1. volume should be deleted successfully and listVolume should not
# contain the deleted volume details.