You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/01/22 07:52:27 UTC
[4/4] git commit: updated refs/heads/marvin to 6a2cc9f
CLOUDSTACK-5925: Moved test data from testsuites to marvin/config
Also merged redundant testdata as they were found.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a2cc9fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a2cc9fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a2cc9fb
Branch: refs/heads/marvin
Commit: 6a2cc9fbd0e2943132d3c8b8f729d8470331dc20
Parents: 9393275
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Wed Jan 22 05:45:19 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Wed Jan 22 12:21:07 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_affinity_groups.py | 42 +-
test/integration/smoke/test_deploy_vm.py | 37 +-
.../smoke/test_deploy_vm_with_userdata.py | 41 +-
...deploy_vms_with_varied_deploymentplanners.py | 40 +-
test/integration/smoke/test_disk_offerings.py | 31 +-
test/integration/smoke/test_guest_vlan_range.py | 29 +-
test/integration/smoke/test_hosts.py | 68 +--
test/integration/smoke/test_internal_lb.py | 64 +--
test/integration/smoke/test_iso.py | 58 +-
test/integration/smoke/test_loadbalance.py | 82 +--
.../smoke/test_multipleips_per_nic.py | 36 +-
test/integration/smoke/test_network.py | 121 +----
test/integration/smoke/test_network_acl.py | 61 +--
test/integration/smoke/test_nic.py | 105 +---
.../integration/smoke/test_portable_publicip.py | 74 +--
test/integration/smoke/test_primary_storage.py | 21 +-
test/integration/smoke/test_public_ip_range.py | 26 -
test/integration/smoke/test_regions.py | 19 +-
.../smoke/test_reset_vm_on_reboot.py | 60 +--
test/integration/smoke/test_resource_detail.py | 73 +--
test/integration/smoke/test_routers.py | 47 +-
test/integration/smoke/test_scale_vm.py | 69 +--
.../integration/smoke/test_service_offerings.py | 104 +---
test/integration/smoke/test_snapshots.py | 108 +---
test/integration/smoke/test_ssvm.py | 10 -
test/integration/smoke/test_templates.py | 95 +---
test/integration/smoke/test_vm_life_cycle.py | 124 +----
test/integration/smoke/test_vm_snapshots.py | 72 +--
test/integration/smoke/test_volumes.py | 68 +--
test/integration/smoke/test_vpc_vpn.py | 95 +---
tools/marvin/marvin/config/config.cfg | 28 +-
tools/marvin/marvin/config/test_data.cfg | 540 ++++++++++++++-----
32 files changed, 632 insertions(+), 1816 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_affinity_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_affinity_groups.py b/test/integration/smoke/test_affinity_groups.py
index 0f8bdc4..346a4a4 100644
--- a/test/integration/smoke/test_affinity_groups.py
+++ b/test/integration/smoke/test_affinity_groups.py
@@ -24,44 +24,6 @@ from marvin.integration.lib.common import *
from marvin.sshClient import SshClient
from nose.plugins.attrib import attr
-class Services:
- """Test Account Services
- """
-
- def __init__(self):
- self.services = {
- "domain": {
- "name": "Domain",
- },
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended for unique
- # username
- "password": "password",
- },
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- # in MHz
- "memory": 128,
- # In MBs
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- "virtual_machine" : {
- "affinity": {
- "name": "webvms",
- "type": "host anti-affinity",
- },
- "hypervisor" : "XenServer",
- }
- }
-
-
class TestDeployVmWithAffinityGroup(cloudstackTestCase):
"""
This test deploys a virtual machine into a user account
@@ -73,7 +35,7 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
cls.test_client = super(TestDeployVmWithAffinityGroup, cls).getClsTestClient()
zone_name = cls.test_client.getZoneForTests()
cls.api_client = cls.test_client.getApiClient()
- cls.services = Services().services
+ cls.services = cls.test_client.getConfigParser().parsedDict
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
@@ -97,7 +59,7 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
cls.service_offering = ServiceOffering.create(
cls.api_client,
- cls.services["service_offering"]
+ cls.services["service_offerings"]
)
cls.ag = AffinityGroup.create(cls.api_client, cls.services["virtual_machine"]["affinity"],
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_deploy_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm.py b/test/integration/smoke/test_deploy_vm.py
index 4104386..a09be35 100644
--- a/test/integration/smoke/test_deploy_vm.py
+++ b/test/integration/smoke/test_deploy_vm.py
@@ -33,46 +33,15 @@ from marvin.integration.lib.common import get_zone, get_domain, get_template
from nose.plugins.attrib import attr
-class TestData(object):
- """Test data object that is required to create resources
- """
- def __init__(self):
- self.testdata = {
- #data to create an account
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- "password": "password",
- },
- #data reqd for virtual machine creation
- "virtual_machine" : {
- "name" : "testvm",
- "displayname" : "Test VM",
- },
- #small service offering
- "service_offering": {
- "small": {
- "name": "Small Instance",
- "displaytext": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 256,
- },
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- }
-
-
class TestDeployVM(cloudstackTestCase):
"""Test deploy a VM into a user account
"""
def setUp(self):
- self.testdata = TestData().testdata
self.apiclient = self.testClient.getApiClient()
+ self.testdata = self.testClient.getConfigParser().parsedDict
+
# Get Zone, Domain and Default Built-in template
self.domain = get_domain(self.apiclient, self.testdata)
self.zone = get_zone(self.apiclient, self.testdata)
@@ -88,7 +57,7 @@ class TestDeployVM(cloudstackTestCase):
#create a service offering
self.service_offering = ServiceOffering.create(
self.apiclient,
- self.testdata["service_offering"]["small"]
+ self.testdata["service_offerings"]["small"]
)
#build cleanup list
self.cleanup = [
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_deploy_vm_with_userdata.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm_with_userdata.py b/test/integration/smoke/test_deploy_vm_with_userdata.py
index 85e768e..7bb72b3 100644
--- a/test/integration/smoke/test_deploy_vm_with_userdata.py
+++ b/test/integration/smoke/test_deploy_vm_with_userdata.py
@@ -26,52 +26,23 @@ from nose.plugins.attrib import attr
import random
import string
-class Services:
- def __init__(self):
- self.services = {
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- "password": "password",
- },
- "virtual_machine": {
- "displayname": "Test VM",
- "username": "root",
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 256,
- },
- }
-
-
class TestDeployVmWithUserData(cloudstackTestCase):
"""Tests for UserData
"""
@classmethod
def setUpClass(cls):
- cls.apiClient = super(TestDeployVmWithUserData, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestDeployVmWithUserData, cls).getClsTestClient()
+ cls.apiClient = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
cls.zone = get_zone(cls.apiClient, cls.services)
if cls.zone.localstorageenabled:
#For devcloud since localstroage is enabled
- cls.services["service_offering"]["storagetype"] = "local"
+ cls.services["service_offerings"]["storagetype"] = "local"
cls.service_offering = ServiceOffering.create(
cls.apiClient,
- cls.services["service_offering"]
+ cls.services["service_offerings"]
)
cls.account = Account.create(cls.apiClient, services=cls.services["account"])
cls.cleanup = [cls.account]
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
index b4d35e0..565228a 100644
--- a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
+++ b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
@@ -21,34 +21,6 @@ from marvin.integration.lib.common import get_zone, get_domain, get_template
from marvin.integration.lib.utils import cleanup_resources
from nose.plugins.attrib import attr
-class Services:
- def __init__(self):
- self.services = {
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended for unique
- # username
- "password": "password",
- },
- "service_offering": {
- "name": "Planner Service Offering",
- "displaytext": "Planner Service Offering",
- "cpunumber": 1,
- "cpuspeed": 100,
- # in MHz
- "memory": 128,
- # In MBs
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- "virtual_machine": {
- "hypervisor": "XenServer",
- }
- }
-
-
class TestDeployVmWithVariedPlanners(cloudstackTestCase):
""" Test to create services offerings for deployment planners
- firstfit, userdispersing
@@ -56,8 +28,10 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.apiclient = super(TestDeployVmWithVariedPlanners, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestDeployVmWithVariedPlanners, cls).getClsTestClient()
+ cls.apiclient = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
# Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient, cls.services)
cls.zone = get_zone(cls.apiclient, cls.services)
@@ -89,7 +63,7 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
#FIXME: How do we know that first fit actually happened?
self.service_offering_firstfit = ServiceOffering.create(
self.apiclient,
- self.services["service_offering"],
+ self.services["service_offerings"],
deploymentplanner='FirstFitPlanner'
)
@@ -132,7 +106,7 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
"""
self.service_offering_userdispersing = ServiceOffering.create(
self.apiclient,
- self.services["service_offering"],
+ self.services["service_offerings"],
deploymentplanner='UserDispersingPlanner'
)
@@ -191,7 +165,7 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
"""
self.service_offering_userconcentrated = ServiceOffering.create(
self.apiclient,
- self.services["service_offering"],
+ self.services["service_offerings"],
deploymentplanner='UserConcentratedPodPlanner'
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_disk_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_disk_offerings.py b/test/integration/smoke/test_disk_offerings.py
index 4588a26..b104ca8 100644
--- a/test/integration/smoke/test_disk_offerings.py
+++ b/test/integration/smoke/test_disk_offerings.py
@@ -27,23 +27,10 @@ from nose.plugins.attrib import attr
_multiprocess_shared_ = True
-class Services:
- """Test Disk offerings Services
- """
-
- def __init__(self):
- self.services = {
- "off": {
- "name": "Disk offering",
- "displaytext": "Disk offering",
- "disksize": 1 # in GB
- },
- }
-
class TestCreateDiskOffering(cloudstackTestCase):
def setUp(self):
- self.services = Services().services
+ self.services = self.testClient.getConfigParser().parsedDict
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
self.cleanup = []
@@ -68,7 +55,7 @@ class TestCreateDiskOffering(cloudstackTestCase):
disk_offering = DiskOffering.create(
self.apiclient,
- self.services["off"]
+ self.services["disk_offering"]
)
self.cleanup.append(disk_offering)
@@ -92,12 +79,12 @@ class TestCreateDiskOffering(cloudstackTestCase):
self.assertEqual(
disk_response.displaytext,
- self.services["off"]["displaytext"],
+ self.services["disk_offering"]["displaytext"],
"Check server id in createServiceOffering"
)
self.assertEqual(
disk_response.name,
- self.services["off"]["name"],
+ self.services["disk_offering"]["name"],
"Check name in createServiceOffering"
)
return
@@ -122,15 +109,17 @@ class TestDiskOfferings(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(TestDiskOfferings, cls).getClsTestClient().getApiClient()
+ cloudstackTestClient = super(TestDiskOfferings, cls).getClsTestClient()
+ self.api_client = self.cloudstackTestClient.getApiClient()
+ self.services = self.cloudstackTestClient.getConfigParser().parsedDict
+
cls.disk_offering_1 = DiskOffering.create(
cls.api_client,
- cls.services["off"]
+ cls.services["disk_offering"]
)
cls.disk_offering_2 = DiskOffering.create(
cls.api_client,
- cls.services["off"]
+ cls.services["disk_offering"]
)
cls._cleanup = [cls.disk_offering_1]
return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_guest_vlan_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py
index 07e141d..4e2de50 100644
--- a/test/integration/smoke/test_guest_vlan_range.py
+++ b/test/integration/smoke/test_guest_vlan_range.py
@@ -26,35 +26,14 @@ from marvin.integration.lib.base import *
from marvin.integration.lib.common import *
import datetime
-
-class Services:
- """Test Dedicating Guest Vlan Ranges
- """
-
- def __init__(self):
- self.services = {
- "domain": {
- "name": "Domain",
- },
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- "password": "password",
- },
- "name": "testphysicalnetwork",
-
- "vlan": "2118-2120",
- }
-
-
class TestDedicateGuestVlanRange(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.apiclient = super(TestDedicateGuestVlanRange, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestDedicateGuestVlanRange, cls).getClsTestClient()
+ cls.apiclient = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
# Get Zone, Domain
cls.domain = get_domain(cls.apiclient, cls.services)
cls.zone = get_zone(cls.apiclient, cls.services)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_hosts.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_hosts.py b/test/integration/smoke/test_hosts.py
index 6f7d400..4c58b9b 100644
--- a/test/integration/smoke/test_hosts.py
+++ b/test/integration/smoke/test_hosts.py
@@ -30,79 +30,13 @@ import time
_multiprocess_shared_ = True
-class Services:
- """Test Hosts & Clusters Services
- """
-
- def __init__(self):
- self.services = {
- "clusters": {
- 0: {
- "clustername": "Xen Cluster",
- "clustertype": "CloudManaged",
- # CloudManaged or ExternalManaged"
- "hypervisor": "XenServer",
- # Hypervisor type
- },
- 1: {
- "clustername": "KVM Cluster",
- "clustertype": "CloudManaged",
- # CloudManaged or ExternalManaged"
- "hypervisor": "KVM",
- # Hypervisor type
- },
- 2: {
- "hypervisor": 'VMware',
- # Hypervisor type
- "clustertype": 'ExternalManaged',
- # CloudManaged or ExternalManaged"
- "username": 'administrator',
- "password": 'fr3sca',
- "url": 'http://192.168.100.17/CloudStack-Clogeny-Pune/Pune-1',
- # Format:http://vCenter Host/Datacenter/Cluster
- "clustername": 'VMWare Cluster',
- },
- },
- "hosts": {
- "xenserver": {
- # Must be name of corresponding Hypervisor type
- # in cluster in small letters
- "hypervisor": 'XenServer',
- # Hypervisor type
- "clustertype": 'CloudManaged',
- # CloudManaged or ExternalManaged"
- "url": 'http://192.168.100.211',
- "username": "root",
- "password": "fr3sca",
- },
- "kvm": {
- "hypervisor": 'KVM',
- # Hypervisor type
- "clustertype": 'CloudManaged',
- # CloudManaged or ExternalManaged"
- "url": 'http://192.168.100.212',
- "username": "root",
- "password": "fr3sca",
- },
- "vmware": {
- "hypervisor": 'VMware',
- # Hypervisor type
- "clustertype": 'ExternalManaged',
- # CloudManaged or ExternalManaged"
- "url": 'http://192.168.100.203',
- "username": "administrator",
- "password": "fr3sca",
- },
- },
- }
-
class TestHosts(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
- self.services = Services().services
+ self.services = self.testClient.getConfigParser().parsedDict
self.zone = get_zone(self.apiclient, self.services)
self.pod = get_pod(self.apiclient, self.zone.id, self.services)
self.cleanup = []
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_internal_lb.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_internal_lb.py b/test/integration/smoke/test_internal_lb.py
index 7510169..d997ae0 100644
--- a/test/integration/smoke/test_internal_lb.py
+++ b/test/integration/smoke/test_internal_lb.py
@@ -24,73 +24,21 @@ from marvin.integration.lib.base import *
from marvin.integration.lib.common import *
from nose.plugins.attrib import attr
-
-class Services:
- def __init__(self):
- self.services = {
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- "password": "password",
- },
- "virtual_machine": {
- "displayname": "Test VM",
- "username": "root",
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 256,
- },
- "network_offering": {
- "name": "Network offering for internal lb service",
- "displaytext": "Network offering for internal lb service",
- "guestiptype": "Isolated",
- "traffictype": "Guest",
- "supportedservices": "Vpn,Dhcp,Dns,Lb,UserData,SourceNat,StaticNat,PortForwarding,NetworkACL",
- "serviceProviderList": {
- "Dhcp": "VpcVirtualRouter",
- "Dns": "VpcVirtualRouter",
- "Vpn": "VpcVirtualRouter",
- "UserData": "VpcVirtualRouter",
- "Lb": "InternalLbVM",
- "SourceNat": "VpcVirtualRouter",
- "StaticNat": "VpcVirtualRouter",
- "PortForwarding": "VpcVirtualRouter",
- "NetworkACL": "VpcVirtualRouter",
- },
- "serviceCapabilityList": {
- "SourceNat": {"SupportedSourceNatTypes": "peraccount"},
- "Lb": {"lbSchemes": "internal", "SupportedLbIsolation": "dedicated"}
- }
- }
- }
-
-
class TestInternalLb(cloudstackTestCase):
"""Test Internal LB
"""
@classmethod
def setUpClass(cls):
- cls.apiclient = super(TestInternalLb, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestInternalLb, cls).getClsTestClient()
+ cls.apiclient = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
cls.zone = get_zone(cls.apiclient, cls.services)
cls.domain = get_domain(cls.apiclient)
cls.service_offering = ServiceOffering.create(
cls.apiclient,
- cls.services["service_offering"]
+ cls.services["service_offerings"]
)
cls.account = Account.create(cls.apiclient, services=cls.services["account"])
cls.template = get_template(
@@ -109,7 +57,7 @@ class TestInternalLb(cloudstackTestCase):
"""
#1) Create and enable network offering with Internal Lb vm service
- self.networkOffering = NetworkOffering.create(self.apiclient, self.services["network_offering"], conservemode=False)
+ self.networkOffering = NetworkOffering.create(self.apiclient, self.services["network_offering_internal_lb"], conservemode=False)
self.networkOffering.update(self.apiclient, state="Enabled")
#2) Create VPC and network in it
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_iso.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
index 75289b8..50042ba 100644
--- a/test/integration/smoke/test_iso.py
+++ b/test/integration/smoke/test_iso.py
@@ -31,61 +31,10 @@ import time
_multiprocess_shared_ = True
-class Services:
- """Test ISO Services
- """
-
- def __init__(self):
- self.services = {
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended in create account to
- # ensure unique username generated each time
- "password": "password",
- },
- "iso_1":
- {
- "displaytext": "Test ISO 1",
- "name": "ISO 1",
- "url": "http://people.apache.org/~tsp/dummy.iso",
- # Source URL where ISO is located
- "isextractable": True,
- "isfeatured": True,
- "ispublic": True,
- "ostype": "CentOS 5.3 (64-bit)",
- },
- "iso_2":
- {
- "displaytext": "Test ISO 2",
- "name": "ISO 2",
- "url": "http://people.apache.org/~tsp/dummy.iso",
- # Source URL where ISO is located
- "isextractable": True,
- "isfeatured": True,
- "ispublic": True,
- "ostype": "CentOS 5.3 (64-bit)",
- "mode": 'HTTP_DOWNLOAD',
- # Used in Extract template, value must be HTTP_DOWNLOAD
- },
- "isfeatured": True,
- "ispublic": True,
- "isextractable": True,
- "bootable": True, # For edit template
- "passwordenabled": True,
- "sleep": 60,
- "timeout": 10,
- "ostype": "CentOS 5.3 (64-bit)",
- # CentOS 5.3 (64 bit)
- }
-
-
class TestCreateIso(cloudstackTestCase):
def setUp(self):
- self.services = Services().services
+ self.services = self.testClient.getConfigParser().parsedDict
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
# Get Zone, Domain and templates
@@ -189,8 +138,9 @@ class TestISO(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(TestISO, cls).getClsTestClient().getApiClient()
+ cloudstackTestClient = super(TestISO, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_loadbalance.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_loadbalance.py b/test/integration/smoke/test_loadbalance.py
index 5f80c38..db8f46e 100644
--- a/test/integration/smoke/test_loadbalance.py
+++ b/test/integration/smoke/test_loadbalance.py
@@ -27,87 +27,15 @@ import time
_multiprocess_shared_ = True
-class Services:
- """Test Network Services
- """
-
- def __init__(self):
- self.services = {
- "ostype": "CentOS 5.3 (64-bit)",
- # Cent OS 5.3 (64 bit)
- "lb_switch_wait": 10,
- # Time interval after which LB switches the requests
- "sleep": 60,
- "timeout":10,
- "network_offering": {
- "name": 'Test Network offering',
- "displaytext": 'Test Network offering',
- "guestiptype": 'Isolated',
- "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding',
- "traffictype": 'GUEST',
- "availability": 'Optional',
- "serviceProviderList" : {
- "Dhcp": 'VirtualRouter',
- "Dns": 'VirtualRouter',
- "SourceNat": 'VirtualRouter',
- "PortForwarding": 'VirtualRouter',
- },
- },
- "network": {
- "name": "Test Network",
- "displaytext": "Test Network",
- },
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- # in MHz
- "memory": 256,
- # In MBs
- },
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- "password": "password",
- },
- "server":
- {
- "displayname": "Small Instance",
- "username": "root",
- "password": "password",
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "ssh_port": 22,
- "protocol": 'TCP',
- },
- "natrule":
- {
- "privateport": 22,
- "publicport": 2222,
- "protocol": "TCP"
- },
- "lbrule":
- {
- "name": "SSH",
- "alg": "roundrobin",
- # Algorithm used for load balancing
- "privateport": 22,
- "publicport": 2222,
- "protocol": 'TCP'
- }
- }
-
class TestLoadBalance(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestLoadBalance, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestLoadBalance, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
@@ -127,7 +55,7 @@ class TestLoadBalance(cloudstackTestCase):
)
cls.service_offering = ServiceOffering.create(
cls.api_client,
- cls.services["service_offering"]
+ cls.services["service_offerings"]
)
cls.vm_1 = VirtualMachine.create(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_multipleips_per_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_multipleips_per_nic.py b/test/integration/smoke/test_multipleips_per_nic.py
index 7d18064..9e04b53 100644
--- a/test/integration/smoke/test_multipleips_per_nic.py
+++ b/test/integration/smoke/test_multipleips_per_nic.py
@@ -38,44 +38,12 @@ from marvin.cloudstackAPI.listNics import listNicsCmd
from nose.plugins.attrib import attr
-class TestData(object):
- """Test data object that is required to create resources
- """
- def __init__(self):
- self.testdata = {
- #data to create an account
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- "password": "password",
- },
- #data reqd for virtual machine creation
- "virtual_machine" : {
- "name" : "testvm",
- "displayname" : "Test VM",
- },
- #small service offering
- "service_offering": {
- "small": {
- "name": "Small Instance",
- "displaytext": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 256,
- },
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- }
-
-
class TestDeployVM(cloudstackTestCase):
"""Test deploy a VM into a user account
"""
def setUp(self):
- self.testdata = TestData().testdata
+ self.testdata = self.testClient.getConfigParser().parsedDict
self.apiclient = self.testClient.getApiClient()
# Get Zone, Domain and Default Built-in template
@@ -93,7 +61,7 @@ class TestDeployVM(cloudstackTestCase):
#create a service offering
self.service_offering = ServiceOffering.create(
self.apiclient,
- self.testdata["service_offering"]["small"]
+ self.testdata["service_offerings"]["small"]
)
#build cleanup list
self.cleanup = [
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 732fe15..f0cdcfd 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -31,80 +31,6 @@ import time
_multiprocess_shared_ = True
-class Services:
- """Test Network Services
- """
-
- def __init__(self):
- self.services = {
- "ostype": "CentOS 5.3 (64-bit)",
- # Cent OS 5.3 (64 bit)
- "lb_switch_wait": 10,
- # Time interval after which LB switches the requests
- "sleep": 60,
- "timeout":10,
- "network_offering": {
- "name": 'Test Network offering',
- "displaytext": 'Test Network offering',
- "guestiptype": 'Isolated',
- "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding',
- "traffictype": 'GUEST',
- "availability": 'Optional',
- "serviceProviderList" : {
- "Dhcp": 'VirtualRouter',
- "Dns": 'VirtualRouter',
- "SourceNat": 'VirtualRouter',
- "PortForwarding": 'VirtualRouter',
- },
- },
- "network": {
- "name": "Test Network",
- "displaytext": "Test Network",
- },
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- # in MHz
- "memory": 256,
- # In MBs
- },
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- "password": "password",
- },
- "server":
- {
- "displayname": "Small Instance",
- "username": "root",
- "password": "password",
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "ssh_port": 22,
- "protocol": 'TCP',
- },
- "natrule":
- {
- "privateport": 22,
- "publicport": 22,
- "protocol": "TCP"
- },
- "lbrule":
- {
- "name": "SSH",
- "alg": "roundrobin",
- # Algorithm used for load balancing
- "privateport": 22,
- "publicport": 2222,
- "protocol": 'TCP'
- }
- }
-
class TestPublicIP(cloudstackTestCase):
@@ -114,8 +40,10 @@ class TestPublicIP(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestPublicIP, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestPublicIP, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
@@ -293,9 +221,10 @@ class TestPortForwarding(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestPortForwarding, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
-
+ cloudstackTestClient = super(TestPortForwarding, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
@@ -311,14 +240,14 @@ class TestPortForwarding(cloudstackTestCase):
admin=True,
domainid=cls.domain.id
)
- cls.services["server"]["zoneid"] = cls.zone.id
+ cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.service_offering = ServiceOffering.create(
cls.api_client,
- cls.services["service_offering"]
+ cls.services["service_offerings"]
)
cls.virtual_machine = VirtualMachine.create(
cls.api_client,
- cls.services["server"],
+ cls.services["virtual_machine"],
templateid=template.id,
accountid=cls.account.name,
domainid=cls.account.domainid,
@@ -483,7 +412,7 @@ class TestPortForwarding(cloudstackTestCase):
self.account.name,
self.zone.id,
self.account.domainid,
- self.services["server"]
+ self.services["virtual_machine"]
)
self.cleanup.append(ip_address)
@@ -596,7 +525,7 @@ class TestRebootRouter(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
- self.services = Services().services
+ self.services = self.testClient.cloudstackTestClient.getConfigParser().parsedDict
# Get Zone, Domain and templates
self.domain = get_domain(self.apiclient, self.services)
@@ -606,7 +535,7 @@ class TestRebootRouter(cloudstackTestCase):
self.zone.id,
self.services["ostype"]
)
- self.services["server"]["zoneid"] = self.zone.id
+ self.services["virtual_machine"]["zoneid"] = self.zone.id
#Create an account, network, VM and IP addresses
self.account = Account.create(
@@ -617,11 +546,11 @@ class TestRebootRouter(cloudstackTestCase):
)
self.service_offering = ServiceOffering.create(
self.apiclient,
- self.services["service_offering"]
+ self.services["service_offerings"]
)
self.vm_1 = VirtualMachine.create(
self.apiclient,
- self.services["server"],
+ self.services["virtual_machine"],
templateid=template.id,
accountid=self.account.name,
domainid=self.account.domainid,
@@ -646,7 +575,7 @@ class TestRebootRouter(cloudstackTestCase):
self.vm_1.account,
self.vm_1.zoneid,
self.vm_1.domainid,
- self.services["server"]
+ self.services["virtual_machine"]
)
#Open up firewall port for SSH
fw_rule = FireWallRule.create(
@@ -762,7 +691,7 @@ class TestReleaseIP(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
- self.services = Services().services
+ self.services = self.testClient.getConfigParser().parsedDict
# Get Zone, Domain and templates
self.domain = get_domain(self.apiclient, self.services)
@@ -772,7 +701,7 @@ class TestReleaseIP(cloudstackTestCase):
self.zone.id,
self.services["ostype"]
)
- self.services["server"]["zoneid"] = self.zone.id
+ self.services["virtual_machine"]["zoneid"] = self.zone.id
#Create an account, network, VM, Port forwarding rule, LB rules
self.account = Account.create(
@@ -784,12 +713,12 @@ class TestReleaseIP(cloudstackTestCase):
self.service_offering = ServiceOffering.create(
self.apiclient,
- self.services["service_offering"]
+ self.services["service_offerings"]
)
self.virtual_machine = VirtualMachine.create(
self.apiclient,
- self.services["server"],
+ self.services["virtual_machine"],
templateid=template.id,
accountid=self.account.name,
domainid=self.account.domainid,
@@ -899,7 +828,7 @@ class TestDeleteAccount(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
- self.services = Services().services
+ self.services = self.testClient.getConfigParser().parsedDict
# Get Zone, Domain and templates
self.domain = get_domain(self.apiclient, self.services)
@@ -909,7 +838,7 @@ class TestDeleteAccount(cloudstackTestCase):
self.zone.id,
self.services["ostype"]
)
- self.services["server"]["zoneid"] = self.zone.id
+ self.services["virtual_machine"]["zoneid"] = self.zone.id
#Create an account, network, VM and IP addresses
self.account = Account.create(
@@ -920,11 +849,11 @@ class TestDeleteAccount(cloudstackTestCase):
)
self.service_offering = ServiceOffering.create(
self.apiclient,
- self.services["service_offering"]
+ self.services["service_offerings"]
)
self.vm_1 = VirtualMachine.create(
self.apiclient,
- self.services["server"],
+ self.services["virtual_machine"],
templateid=template.id,
accountid=self.account.name,
domainid=self.account.domainid,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_network_acl.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py
index 3363e46..9e8df15 100644
--- a/test/integration/smoke/test_network_acl.py
+++ b/test/integration/smoke/test_network_acl.py
@@ -24,70 +24,19 @@ from marvin.integration.lib.base import *
from marvin.integration.lib.common import *
from nose.plugins.attrib import attr
-class Services:
- def __init__(self):
- self.services = {
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- "password": "password",
- },
- "virtual_machine": {
- "displayname": "Test VM",
- "username": "root",
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 256,
- },
- "network_offering": {
- "name": "Network offering for internal lb service",
- "displaytext": "Network offering for internal lb service",
- "guestiptype": "Isolated",
- "traffictype": "Guest",
- "supportedservices": "Vpn,Dhcp,Dns,Lb,UserData,SourceNat,StaticNat,PortForwarding,NetworkACL",
- "serviceProviderList": {
- "Dhcp": "VpcVirtualRouter",
- "Dns": "VpcVirtualRouter",
- "Vpn": "VpcVirtualRouter",
- "UserData": "VpcVirtualRouter",
- "Lb": "InternalLbVM",
- "SourceNat": "VpcVirtualRouter",
- "StaticNat": "VpcVirtualRouter",
- "PortForwarding": "VpcVirtualRouter",
- "NetworkACL": "VpcVirtualRouter",
- },
- "serviceCapabilityList": {
- "SourceNat": {"SupportedSourceNatTypes": "peraccount"},
- "Lb": {"lbSchemes": "internal", "SupportedLbIsolation": "dedicated"}
- }
- }
- }
-
-
class TestNetworkACL(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.apiclient = super(TestNetworkACL, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestNetworkACL, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
cls.zone = get_zone(cls.apiclient, cls.services)
cls.domain = get_domain(cls.apiclient)
cls.service_offering = ServiceOffering.create(
cls.apiclient,
- cls.services["service_offering"]
+ cls.services["service_offerings"]
)
cls.account = Account.create(cls.apiclient, services=cls.services["account"])
cls.template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py
index ac95685..0f87de1 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -28,107 +28,6 @@ import signal
import sys
import time
-class Services:
- def __init__(self):
- self.services = {
- "disk_offering":{
- "displaytext": "Small",
- "name": "Small",
- "disksize": 1
- },
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended in create account to
- # ensure unique username generated each time
- "password": "password",
- },
- # Create a small virtual machine instance with disk offering
- "small": {
- "displayname": "testserver",
- "username": "root", # VM creds for SSH
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "service_offerings": {
- "tiny": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100, # in MHz
- "memory": 128, # In MBs
- },
- },
- "network_offering": {
- "name": 'Test Network offering',
- "displaytext": 'Test Network offering',
- "guestiptype": 'Isolated',
- "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding',
- "traffictype": 'GUEST',
- "availability": 'Optional',
- "serviceProviderList" : {
- "Dhcp": 'VirtualRouter',
- "Dns": 'VirtualRouter',
- "SourceNat": 'VirtualRouter',
- "PortForwarding": 'VirtualRouter',
- },
- },
- "network_offering_shared": {
- "name": 'Test Network offering shared',
- "displaytext": 'Test Network offering Shared',
- "guestiptype": 'Shared',
- "supportedservices": 'Dhcp,Dns,UserData',
- "traffictype": 'GUEST',
- "specifyVlan" : "True",
- "specifyIpRanges" : "True",
- "serviceProviderList" : {
- "Dhcp": 'VirtualRouter',
- "Dns": 'VirtualRouter',
- "UserData": 'VirtualRouter',
- },
- },
- "network": {
- "name": "Test Network",
- "displaytext": "Test Network",
- "acltype": "Account",
- },
- "network2": {
- "name": "Test Network Shared",
- "displaytext": "Test Network Shared",
- "vlan" :1201,
- "gateway" :"172.16.15.1",
- "netmask" :"255.255.255.0",
- "startip" :"172.16.15.21",
- "endip" :"172.16.15.41",
- "acltype": "Account",
- },
- # ISO settings for Attach/Detach ISO tests
- "iso": {
- "displaytext": "Test ISO",
- "name": "testISO",
- "url": "http://people.apache.org/~tsp/dummy.iso",
- # Source URL where ISO is located
- "ostype": 'CentOS 5.3 (64-bit)',
- "mode": 'HTTP_DOWNLOAD', # Downloading existing ISO
- },
- "template": {
- "displaytext": "Cent OS Template",
- "name": "Cent OS Template",
- "passwordenabled": True,
- },
- "sleep": 60,
- "timeout": 10,
- #Migrate VM to hostid
- "ostype": 'CentOS 5.3 (64-bit)',
- # CentOS 5.3 (64-bit)
- }
-
class TestNic(cloudstackTestCase):
def setUp(self):
@@ -145,7 +44,7 @@ class TestNic(cloudstackTestCase):
try:
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
- self.services = Services().services
+ self.services = self.testClient.getConfigParser().parsedDict
# Get Zone, Domain and templates
domain = get_domain(self.apiclient, self.services)
@@ -169,7 +68,7 @@ class TestNic(cloudstackTestCase):
self.services["small"]["zoneid"] = zone.id
self.services["small"]["template"] = template.id
- self.services["iso"]["zoneid"] = zone.id
+ self.services["iso_1"]["zoneid"] = zone.id
self.services["network"]["zoneid"] = zone.id
# Create Account, VMs, NAT Rules etc
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_portable_publicip.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_portable_publicip.py b/test/integration/smoke/test_portable_publicip.py
index 0faed71..7eda7da 100644
--- a/test/integration/smoke/test_portable_publicip.py
+++ b/test/integration/smoke/test_portable_publicip.py
@@ -23,68 +23,6 @@ from marvin.integration.lib.base import *
from marvin.integration.lib.common import *
from nose.plugins.attrib import attr
-class Services:
- """Test Data
- """
-
- def __init__(self):
- self.services = {
- "domain": {
- "name": "Domain",
- },
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended for unique
- # username
- "password": "password",
- },
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- # in MHz
- "memory": 128,
- # In MBs
- },
- "network_offering": {
- "name": 'Test Network offering',
- "displaytext": 'Test Network offering',
- "guestiptype": 'Isolated',
- "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding',
- "traffictype": 'GUEST',
- "availability": 'Optional',
- "serviceProviderList" : {
- "Dhcp": 'VirtualRouter',
- "Dns": 'VirtualRouter',
- "SourceNat": 'VirtualRouter',
- "PortForwarding": 'VirtualRouter',
- },
- },
- "network": {
- "name": "Test Network",
- "displaytext": "Test Network",
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- "gateway" : "172.1.1.1",
- "netmask" : "255.255.255.0",
- "startip" : "172.1.1.10",
- "endip" : "172.1.1.20",
- "regionid" : "1",
- "vlan" :"10",
- "isportable" : "true",
- "virtual_machine" : {
- "affinity": {
- "name": "webvms",
- "type": "host anti-affinity",
- },
- "hypervisor" : "XenServer",
- }
- }
-
class TestPortablePublicIPRange(cloudstackTestCase):
"""
@@ -95,8 +33,10 @@ class TestPortablePublicIPRange(cloudstackTestCase):
"""
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestPortablePublicIPRange, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestPortablePublicIPRange, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
# Get Zone, Domain
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
@@ -161,8 +101,10 @@ class TestPortablePublicIPAcquire(cloudstackTestCase):
"""
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestPortablePublicIPAcquire, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestPortablePublicIPAcquire, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
# Get Zone, Domain
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_primary_storage.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_primary_storage.py b/test/integration/smoke/test_primary_storage.py
index 5cf31b1..a142a27 100644
--- a/test/integration/smoke/test_primary_storage.py
+++ b/test/integration/smoke/test_primary_storage.py
@@ -29,31 +29,12 @@ from nose.plugins.attrib import attr
import time
_multiprocess_shared_ = True
-class Services:
- """Test Primary storage Services
- """
-
- def __init__(self):
- self.services = {
- "nfs":
- {
- "url": "nfs://10.147.28.7/export/home/talluri/testprimary",
- # Format: File_System_Type/Location/Path
- "name": "Primary XEN"
- },
- "iscsi": {
- "url": "iscsi://192.168.100.21/iqn.2012-01.localdomain.clo-cstack-cos6:iser/1",
- # Format : iscsi://IP Address/IQN number/LUN#
- "name": "Primary iSCSI"
- }
- }
-
class TestPrimaryStorageServices(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
- self.services = Services().services
+ self.services = self.testClient.getConfigParser().parsedDict
self.cleanup = []
# Get Zone and pod
self.zone = get_zone(self.apiclient, self.services)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_public_ip_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_public_ip_range.py b/test/integration/smoke/test_public_ip_range.py
index e1d78d9..f2cb2df 100644
--- a/test/integration/smoke/test_public_ip_range.py
+++ b/test/integration/smoke/test_public_ip_range.py
@@ -26,32 +26,6 @@ from marvin.integration.lib.base import *
from marvin.integration.lib.common import *
import datetime
-class Services:
- """Test Dedicating Public IP addresses
- """
-
- def __init__(self):
- self.services = {
- "domain": {
- "name": "Domain",
- },
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- "password": "password",
- },
- "gateway": "10.102.197.1",
- "netmask": "255.255.255.0",
- "forvirtualnetwork": "true",
- "startip": "10.102.197.70",
- "endip": "10.102.197.73",
- "zoneid": "1",
- "podid": "",
- "vlan": "4444",
- }
-
class TestDedicatePublicIPRange(cloudstackTestCase):
@classmethod
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_regions.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_regions.py b/test/integration/smoke/test_regions.py
index 5d12e74..288c3e6 100644
--- a/test/integration/smoke/test_regions.py
+++ b/test/integration/smoke/test_regions.py
@@ -22,25 +22,16 @@ from marvin.integration.lib.base import *
from marvin.integration.lib.common import *
from nose.plugins.attrib import attr
-class Services:
- def __init__(self):
- self.services = {
- "region": {
- "regionid": "2",
- "regionname": "Region2",
- "regionendpoint": "http://region2:8080/client"
- }
- }
-
-
class TestRegions(cloudstackTestCase):
"""Test Regions - basic region creation
"""
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestRegions, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestRegions, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
cls.domain = get_domain(cls.api_client, cls.services)
cls.cleanup = []
@@ -90,4 +81,4 @@ class TestRegions(cloudstackTestCase):
list_region = Region.list(cls.api_client, id=cls.services["region"]["regionid"])
assert list_region is None, "Region deletion fails"
except Exception as e:
- raise Exception("Warning: Region cleanup/delete fails with : %s" % e)
\ No newline at end of file
+ raise Exception("Warning: Region cleanup/delete fails with : %s" % e)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_reset_vm_on_reboot.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_reset_vm_on_reboot.py b/test/integration/smoke/test_reset_vm_on_reboot.py
index 4e52f0f..61e5178 100644
--- a/test/integration/smoke/test_reset_vm_on_reboot.py
+++ b/test/integration/smoke/test_reset_vm_on_reboot.py
@@ -27,66 +27,12 @@ from nose.plugins.attrib import attr
_multiprocess_shared_ = True
-class Services:
- """Test VM Life Cycle Services
- """
-
- def __init__(self):
- self.services = {
-
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended in create account to
- # ensure unique username generated each time
- "password": "password",
- },
- "small":
- # Create a small virtual machine instance with disk offering
- {
- "displayname": "testserver",
- "username": "root", # VM creds for SSH
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "service_offerings":
- {
- "small":
- {
- # Small service offering ID to for change VM
- # service offering from medium to small
- "name": "SmallInstance_volatile",
- "displaytext": "SmallInstance_volatile",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 256,
- },
- },
- #Change this
- "template": {
- "displaytext": "xs",
- "name": "xs",
- "passwordenabled": False,
- },
- "sleep": 60,
- "timeout": 10,
- #Migrate VM to hostid
- "ostype": 'CentOS 5.3 (64-bit)',
- # CentOS 5.3 (64-bit)
- }
-
-
class TestResetVmOnReboot(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestResetVmOnReboot, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestResetVmOnReboot, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
# Get Zone, Domain and templates
domain = get_domain(cls.api_client, cls.services)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_resource_detail.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_resource_detail.py b/test/integration/smoke/test_resource_detail.py
index 00a7b5c..054ee42 100644
--- a/test/integration/smoke/test_resource_detail.py
+++ b/test/integration/smoke/test_resource_detail.py
@@ -29,81 +29,14 @@ from nose.plugins.attrib import attr
import time
_multiprocess_shared_ = True
-class Services:
- """Test VM Life Cycle Services
- """
-
- def __init__(self):
- self.services = {
-
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended in create account to
- # ensure unique username generated each time
- "password": "password",
- },
- "small":
- # Create a small virtual machine instance with disk offering
- {
- "displayname": "testserver",
- "username": "root", # VM creds for SSH
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "disk_offering": {
- "displaytext": "Small",
- "name": "Small",
- "storagetype": "shared",
- "disksize": 1
- },
- "service_offerings":
- {
- "small":
- {
- # Small service offering ID to for change VM
- # service offering from medium to small
- "name": "SmallInstance",
- "displaytext": "SmallInstance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 256,
- },
- "big":
- {
- # Big service offering ID to for change VM
- "name": "BigInstance",
- "displaytext": "BigInstance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 512,
- }
- },
- #Change this
- "template": {
- "displaytext": "xs",
- "name": "xs",
- "passwordenabled": False,
- },
- "sleep": 60,
- "timeout": 10,
- #Migrate VM to hostid
- "ostype": 'CentOS 5.6 (64-bit)',
- # CentOS 5.3 (64-bit)
- }
class TestResourceDetail(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestResourceDetail, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestResourceDetail, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
# Get Zone, Domain and templates
domain = get_domain(cls.api_client, cls.services)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index 7d32413..3f1ea92 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -30,53 +30,16 @@ import time
_multiprocess_shared_ = True
-class Services:
- """Test router Services
- """
-
- def __init__(self):
- self.services = {
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100, # in MHz
- "memory": 128, # In MBs
- },
- "virtual_machine":
- {
- "displayname": "Test VM",
- "username": "root",
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "testuser",
- "password": "password",
- },
- "ostype": "CentOS 5.3 (64-bit)",
- "sleep": 60,
- "timeout": 10,
- }
-
class TestRouterServices(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestRouterServices,
- cls
- ).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestRouterServices, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
@@ -96,7 +59,7 @@ class TestRouterServices(cloudstackTestCase):
)
cls.service_offering = ServiceOffering.create(
cls.api_client,
- cls.services["service_offering"]
+ cls.services["service_offerings"]
)
cls.vm_1 = VirtualMachine.create(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_scale_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py
index 1d1726d..d7138bf 100644
--- a/test/integration/smoke/test_scale_vm.py
+++ b/test/integration/smoke/test_scale_vm.py
@@ -27,75 +27,12 @@ from nose.plugins.attrib import attr
_multiprocess_shared_ = True
-class Services:
- """Test VM Life Cycle Services
- """
-
- def __init__(self):
- self.services = {
-
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended in create account to
- # ensure unique username generated each time
- "password": "password",
- },
- "small":
- # Create a small virtual machine instance with disk offering
- {
- "displayname": "testserver",
- "username": "root", # VM creds for SSH
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "service_offerings":
- {
- "small":
- {
- # Small service offering ID to for change VM
- # service offering from medium to small
- "name": "SmallInstance",
- "displaytext": "SmallInstance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 256,
- },
- "big":
- {
- # Big service offering ID to for change VM
- "name": "BigInstance",
- "displaytext": "BigInstance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 512,
- }
- },
- #Change this
- "template": {
- "displaytext": "xs",
- "name": "xs",
- "passwordenabled": False,
- },
- "sleep": 60,
- "timeout": 10,
- #Migrate VM to hostid
- "ostype": 'CentOS 5.3 (64-bit)',
- # CentOS 5.3 (64-bit)
- }
-
-
class TestScaleVm(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestScaleVm, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestScaleVm, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
# Get Zone, Domain and templates
domain = get_domain(cls.api_client, cls.services)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a2cc9fb/test/integration/smoke/test_service_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py
index 968dc56..095bbfd 100644
--- a/test/integration/smoke/test_service_offerings.py
+++ b/test/integration/smoke/test_service_offerings.py
@@ -35,93 +35,13 @@ from nose.plugins.attrib import attr
_multiprocess_shared_ = True
-class Services:
- """Test Service offerings Services
- """
-
- def __init__(self):
- self.services = {
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended in create account to
- # ensure unique username generated each time
- "password": "password",
- },
- "off":
- {
- "name": "Service Offering",
- "displaytext": "Service Offering",
- "cpunumber": 1,
- "cpuspeed": 100, # MHz
- "memory": 128, # in MBs
- },
- "small":
- # Create a small virtual machine instance with disk offering
- {
- "displayname": "testserver",
- "username": "root", # VM creds for SSH
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "medium": # Create a medium virtual machine instance
- {
- "displayname": "testserver",
- "username": "root",
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "service_offerings":
- {
- "tiny":
- {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100, # in MHz
- "memory": 128, # In MBs
- },
- "small":
- {
- # Small service offering ID to for change VM
- # service offering from medium to small
- "name": "Small Instance",
- "displaytext": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 128,
- },
- "medium":
- {
- # Medium service offering ID to for
- # change VM service offering from small to medium
- "name": "Medium Instance",
- "displaytext": "Medium Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 256,
- }
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- }
-
class TestCreateServiceOffering(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
self.cleanup = []
- self.services = Services().services
+ self.services = self.testClient.getConfigParser().parsedDict
def tearDown(self):
try:
@@ -143,7 +63,7 @@ class TestCreateServiceOffering(cloudstackTestCase):
service_offering = ServiceOffering.create(
self.apiclient,
- self.services["off"]
+ self.services["service_offerings"]
)
self.cleanup.append(service_offering)
@@ -168,27 +88,27 @@ class TestCreateServiceOffering(cloudstackTestCase):
self.assertEqual(
list_service_response[0].cpunumber,
- self.services["off"]["cpunumber"],
+ self.services["service_offerings"]["cpunumber"],
"Check server id in createServiceOffering"
)
self.assertEqual(
list_service_response[0].cpuspeed,
- self.services["off"]["cpuspeed"],
+ self.services["service_offerings"]["cpuspeed"],
"Check cpuspeed in createServiceOffering"
)
self.assertEqual(
list_service_response[0].displaytext,
- self.services["off"]["displaytext"],
+ self.services["service_offerings"]["displaytext"],
"Check server displaytext in createServiceOfferings"
)
self.assertEqual(
list_service_response[0].memory,
- self.services["off"]["memory"],
+ self.services["service_offerings"]["memory"],
"Check memory in createServiceOffering"
)
self.assertEqual(
list_service_response[0].name,
- self.services["off"]["name"],
+ self.services["service_offerings"]["name"],
"Check name in createServiceOffering"
)
return
@@ -212,19 +132,21 @@ class TestServiceOfferings(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestServiceOfferings, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cloudstackTestClient = super(TestServiceOfferings, cls).getClsTestClient()
+ cls.api_client = cloudstackTestClient.getApiClient()
+ cls.services = cloudstackTestClient.getConfigParser().parsedDict
+
domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype
cls.service_offering_1 = ServiceOffering.create(
cls.api_client,
- cls.services["off"]
+ cls.services["service_offerings"]
)
cls.service_offering_2 = ServiceOffering.create(
cls.api_client,
- cls.services["off"]
+ cls.services["service_offerings"]
)
template = get_template(
cls.api_client,