You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 17:41:31 UTC
[14/18] Marvin + test changes from master Signed-off-by:
SrikanteswaraRao Talluri
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/test/integration/component/test_netscaler_lb_algo.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb_algo.py b/test/integration/component/test_netscaler_lb_algo.py
index 3c18fcd..6eda9a3 100644
--- a/test/integration/component/test_netscaler_lb_algo.py
+++ b/test/integration/component/test_netscaler_lb_algo.py
@@ -22,11 +22,10 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
-from marvin.integration.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
from marvin.sshClient import SshClient
-import datetime
class Services:
@@ -117,14 +116,13 @@ class TestLbWithRoundRobin(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbWithRoundRobin,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbWithRoundRobin, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -330,14 +328,13 @@ class TestLbWithLeastConn(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbWithLeastConn,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbWithLeastConn, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -552,14 +549,13 @@ class TestLbWithSourceIp(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestLbWithSourceIp,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbWithSourceIp, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -768,14 +764,13 @@ class TestLbAlgoRrLc(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoRrLc,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoRrLc, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -973,14 +968,13 @@ class TestLbAlgoLcRr(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoLcRr,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoLcRr, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -1175,14 +1169,13 @@ class TestLbAlgoRrSb(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoRrSb,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoRrSb, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -1380,14 +1373,13 @@ class TestLbAlgoSbRr(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoSbRr,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoSbRr, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -1588,14 +1580,13 @@ class TestLbAlgoSbLc(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoSbLc,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoSbLc, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -1795,14 +1786,13 @@ class TestLbAlgoLcSb(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoLcSb,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoLcSb, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/test/integration/component/test_netscaler_lb_sticky.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb_sticky.py b/test/integration/component/test_netscaler_lb_sticky.py
index 6c27a08..c333f60 100644
--- a/test/integration/component/test_netscaler_lb_sticky.py
+++ b/test/integration/component/test_netscaler_lb_sticky.py
@@ -22,9 +22,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
-from marvin.integration.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
from marvin.sshClient import SshClient
import datetime
@@ -117,14 +117,13 @@ class TestLbStickyPolicy(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbStickyPolicy,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbStickyPolicy, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/test/integration/component/test_netscaler_nw_off.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py
index a94f01d..d3f1f9e 100644
--- a/test/integration/component/test_netscaler_nw_off.py
+++ b/test/integration/component/test_netscaler_nw_off.py
@@ -22,9 +22,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
-from marvin.integration.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
from marvin.sshClient import SshClient
import datetime
@@ -191,14 +191,13 @@ class TestAddMultipleNetScaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestAddMultipleNetScaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAddMultipleNetScaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls._cleanup = []
return
@@ -506,14 +505,13 @@ class TestNetScalerSharedMode(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNetScalerSharedMode,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNetScalerSharedMode, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -1051,14 +1049,13 @@ class TestNwOffDedicatedNetscaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNwOffDedicatedNetscaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNwOffDedicatedNetscaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -1217,14 +1214,13 @@ class TestNwOffNetscaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNwOffNetscaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNwOffNetscaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -1525,14 +1521,13 @@ class TestNwOffSToDUpgrade(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNwOffSToDUpgrade,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNwOffSToDUpgrade, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -1940,14 +1935,13 @@ class TestNwOffDToSUpgrade(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNwOffDToSUpgrade,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNwOffDToSUpgrade, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -2341,15 +2335,13 @@ class TestNOWithNetscaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNOWithNetscaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNOWithNetscaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/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 7040722..b0b6906 100644
--- a/test/integration/component/test_network_offering.py
+++ b/test/integration/component/test_network_offering.py
@@ -22,9 +22,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
-from marvin.integration.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
import datetime
@@ -160,14 +160,13 @@ class TestNOVirtualRouter(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNOVirtualRouter,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNOVirtualRouter, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -733,14 +732,13 @@ class TestNetworkUpgrade(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNetworkUpgrade,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNetworkUpgrade, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -1181,14 +1179,13 @@ class TestNetworkUpgrade(cloudstackTestCase):
class TestNOWithOnlySourceNAT(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.apiclient = super(
- TestNOWithOnlySourceNAT,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNOWithOnlySourceNAT, cls).getClsTestClient()
+ cls.apiclient = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.apiclient, cls.services)
- cls.zone = get_zone(cls.apiclient, cls.services)
+ cls.domain = get_domain(cls.apiclient)
+ cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.apiclient,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/test/integration/component/test_non_contiguous_vlan.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_non_contiguous_vlan.py b/test/integration/component/test_non_contiguous_vlan.py
index 3ebaf3a..4609af9 100644
--- a/test/integration/component/test_non_contiguous_vlan.py
+++ b/test/integration/component/test_non_contiguous_vlan.py
@@ -28,17 +28,17 @@
from marvin.cloudstackTestCase import (cloudstackTestCase,unittest)
-from marvin.integration.lib.base import (Account,
+from marvin.lib.base import (Account,
ServiceOffering,
PhysicalNetwork,
VirtualMachine,
)
-from marvin.integration.lib.common import (get_zone,
+from marvin.lib.common import (get_zone,
get_pod,
get_domain,
get_template,
setNonContiguousVlanIds)
-from marvin.integration.lib.utils import (cleanup_resources,
+from marvin.lib.utils import (cleanup_resources,
xsplit)
from nose.plugins.attrib import attr
@@ -47,7 +47,7 @@ class Services():
def __init__(self):
self.services = {
- "vlan": {
+ "vlan_nc": {
"partial_range": ["",""],
"full_range": "",
},
@@ -89,12 +89,14 @@ class TestNonContiguousVLANRanges(cloudstackTestCase):
"""
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestNonContiguousVLANRanges, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNonContiguousVLANRanges, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, pod, domain
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
+ # Get Zone, Domain and templates
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
+ cls.domain = get_domain(cls.api_client)
cls.service_offering = ServiceOffering.create(
cls.api_client,
@@ -123,7 +125,7 @@ class TestNonContiguousVLANRanges(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
- self.vlan = self.services["vlan"]
+ self.vlan = self.services["vlan_nc"]
self.apiClient = self.testClient.getApiClient()
self.physicalnetwork, self.vlan = setNonContiguousVlanIds(self.apiclient, self.zone.id)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/test/integration/component/test_persistent_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py
index 134b9b5..4c1798f 100644
--- a/test/integration/component/test_persistent_networks.py
+++ b/test/integration/component/test_persistent_networks.py
@@ -14,64 +14,35 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-""" Tests for Persistent Networks without running VMs feature
-
- Test Plan: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Persistent+Networks+without+a+running+VM
-
- Issue Link: https://issues.apache.org/jira/browse/CLOUDSTACK-2232
-
- Feature Specifications: https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+-+Persistent+Networks
-"""
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.utils import (cleanup_resources,
- validateList,
- get_hypervisor_type)
-from marvin.integration.lib.base import (Account,
- ServiceOffering,
- NetworkOffering,
- Network,
- VirtualMachine,
- PublicIPAddress,
- FireWallRule,
- Router,
- Host,
- NATRule,
- Project,
- LoadBalancerRule,
- VpcOffering,
- VPC,
- Domain,
- StaticNATRule,
- NetworkACL)
-from marvin.integration.lib.common import (get_domain,
- get_zone,
- get_template,
- wait_for_cleanup,
- add_netscaler,
- verifyNetworkState)
-
+""" Tests for Persistent Networks without running VMs feature"""
+from marvin.cloudstackException import CloudstackAPIException
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
+import netaddr
from nose.plugins.attrib import attr
-from marvin.codes import PASS, FAIL
+from marvin.codes import PASS, FAIL, FAILED
from marvin.sshClient import SshClient
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
from ddt import ddt, data
import time
@ddt
class TestPersistentNetworks(cloudstackTestCase):
- """Test Persistent Networks without running VMs
- """
-
+ '''
+ Test Persistent Networks without running VMs
+ '''
@classmethod
def setUpClass(cls):
- cloudstackTestClient = super(TestPersistentNetworks,cls).getClsTestClient()
- cls.api_client = cloudstackTestClient.getApiClient()
+ cls.testClient = super(TestPersistentNetworks, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
- cls.services = cloudstackTestClient.getConfigParser().parsedDict
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -1005,20 +976,22 @@ class TestAssignVirtualMachine(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cloudstackTestClient = super(TestAssignVirtualMachine,cls).getClsTestClient()
- cls.api_client = cloudstackTestClient.getApiClient()
+ cls.testClient = super(TestAssignVirtualMachine, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
- cls.services = cloudstackTestClient.getConfigParser().parsedDict
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
cls.services["ostype"]
)
+ if cls.template == FAILED:
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
@@ -1165,20 +1138,22 @@ class TestProjectAccountOperations(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cloudstackTestClient = super(TestProjectAccountOperations,cls).getClsTestClient()
- cls.api_client = cloudstackTestClient.getApiClient()
+ cls.testClient = super(TestProjectAccountOperations, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
- cls.services = cloudstackTestClient.getConfigParser().parsedDict
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
cls.services["ostype"]
)
+ if cls.template == FAILED:
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
@@ -1338,20 +1313,22 @@ class TestRestartPersistentNetwork(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cloudstackTestClient = super(TestRestartPersistentNetwork,cls).getClsTestClient()
- cls.api_client = cloudstackTestClient.getApiClient()
+ cls.testClient = super(TestRestartPersistentNetwork, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
- cls.services = cloudstackTestClient.getConfigParser().parsedDict
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
cls.services["ostype"]
)
+ if cls.template == FAILED:
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
@@ -1618,25 +1595,28 @@ class TestVPCNetworkOperations(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cloudstackTestClient = super(TestVPCNetworkOperations,cls).getClsTestClient()
- cls.api_client = cloudstackTestClient.getApiClient()
+ cls.testClient = super(TestVPCNetworkOperations, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
- cls.services = cloudstackTestClient.getConfigParser().parsedDict
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
cls.services["ostype"]
)
+ if cls.template == FAILED:
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
+
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
cls.api_client,
- cls.services["service_offering"]
+ cls.services["service_offerings"]["small"]
)
cls.persistent_network_offering_NoLB = NetworkOffering.create(cls.api_client, cls.services["nw_off_persistent_VPCVR_NoLB"],
conservemode=False)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/test/integration/component/test_portable_ip.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_portable_ip.py b/test/integration/component/test_portable_ip.py
index e8bf4f5..61268eb 100644
--- a/test/integration/component/test_portable_ip.py
+++ b/test/integration/component/test_portable_ip.py
@@ -21,25 +21,11 @@
Feature Specifications: https://cwiki.apache.org/confluence/display/CLOUDSTACK/portable+public+IP
"""
from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.integration.lib.utils import cleanup_resources
-from marvin.integration.lib.base import (Account,
- NetworkOffering,
- ServiceOffering,
- Network,
- VirtualMachine,
- PublicIPAddress,
- FireWallRule,
- NATRule,
- PortablePublicIpRange,
- StaticNATRule)
-from marvin.integration.lib.common import (get_zone,
- get_pod,
- get_domain,
- get_region,
- get_template,
- get_portable_ip_range_services,
- is_public_ip_in_correct_state)
-from netaddr import IPAddress
+from marvin.cloudstackException import CloudstackAPIException
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
+from netaddr import *
from marvin.sshClient import SshClient
from nose.plugins.attrib import attr
@@ -144,6 +130,14 @@ class Services:
"protocol": 'TCP',
},
"ostype": 'CentOS 5.3 (64-bit)',
+ "portableIpRange": {
+ "gateway" : "10.223.252.195",
+ "netmask" : "255.255.255.192",
+ "startip" : "10.223.252.196",
+ "endip" : "10.223.252.197",
+ "vlan" : "1001"
+ }
+
}
class TestCreatePortablePublicIpRanges(cloudstackTestCase):
@@ -153,13 +147,15 @@ class TestCreatePortablePublicIpRanges(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestCreatePortablePublicIpRanges, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCreatePortablePublicIpRanges, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.region = get_region(cls.api_client)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -199,7 +195,7 @@ class TestCreatePortablePublicIpRanges(cloudstackTestCase):
# 1. Create new portable ip range with root admin api
# 2. Portable ip range should be created successfully
- portable_ip_range_services = get_portable_ip_range_services(self.config)
+ portable_ip_range_services = self.services["portableIpRange"]
self.debug(portable_ip_range_services)
@@ -238,12 +234,12 @@ class TestCreatePortablePublicIpRanges(cloudstackTestCase):
domainid=self.domain.id
)
- self.api_client_user = self.testClient.createUserApiClient(
+ self.api_client_user = self.testClient.getUserApiClient(
UserName=self.account.name,
DomainName=self.account.domain
)
- portable_ip_range_services = get_portable_ip_range_services(self.config)
+ portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@@ -265,7 +261,7 @@ class TestCreatePortablePublicIpRanges(cloudstackTestCase):
# 1. Try to create new portable ip range with invalid region id
# 2. Portable ip range creation should fail
- portable_ip_range_services = get_portable_ip_range_services(self.config)
+ portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@@ -289,13 +285,15 @@ class TestDeletePortablePublicIpRanges(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDeletePortablePublicIpRanges, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeletePortablePublicIpRanges, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.region = get_region(cls.api_client)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -317,7 +315,7 @@ class TestDeletePortablePublicIpRanges(cloudstackTestCase):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
- portable_ip_range_services = get_portable_ip_range_services(self.config)
+ portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@@ -378,7 +376,7 @@ class TestDeletePortablePublicIpRanges(cloudstackTestCase):
self.cleanup.append(self.account)
- self.api_client_user = self.testClient.createUserApiClient(
+ self.api_client_user = self.testClient.getUserApiClient(
UserName=self.account.name,
DomainName=self.account.domain
)
@@ -461,13 +459,15 @@ class TestListPortablePublicIpRanges(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestListPortablePublicIpRanges, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestListPortablePublicIpRanges, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.region = get_region(cls.api_client)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -490,7 +490,7 @@ class TestListPortablePublicIpRanges(cloudstackTestCase):
self.dbclient = self.testClient.getDbConnection()
#create new portable ip range
- self.portable_ip_range_services = get_portable_ip_range_services(self.config)
+ self.portable_ip_range_services = self.services["portableIpRange"]
if self.portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@@ -569,7 +569,7 @@ class TestListPortablePublicIpRanges(cloudstackTestCase):
self.cleanup.append(self.account)
- self.api_client_user = self.testClient.createUserApiClient(
+ self.api_client_user = self.testClient.getUserApiClient(
UserName=self.account.name,
DomainName=self.account.domain
)
@@ -585,13 +585,15 @@ class TestAssociatePublicIp(cloudstackTestCase):
"""
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestAssociatePublicIp, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAssociatePublicIp, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.region = get_region(cls.api_client)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -651,7 +653,7 @@ class TestAssociatePublicIp(cloudstackTestCase):
self.cleanup = []
- portable_ip_range_services = get_portable_ip_range_services(self.config)
+ portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@@ -909,13 +911,15 @@ class TestDisassociatePublicIp(cloudstackTestCase):
"""
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDisassociatePublicIp, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDisassociatePublicIp, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.region = get_region(cls.api_client)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -993,7 +997,7 @@ class TestDisassociatePublicIp(cloudstackTestCase):
self.dbclient = self.testClient.getDbConnection()
self.cleanup = []
- portable_ip_range_services = get_portable_ip_range_services(self.config)
+ portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@@ -1144,7 +1148,7 @@ class TestDisassociatePublicIp(cloudstackTestCase):
domainid=self.domain.id
)
- self.api_client_user = self.testClient.createUserApiClient(
+ self.api_client_user = self.testClient.getUserApiClient(
UserName=self.user_account.name,
DomainName=self.user_account.domain
)
@@ -1168,14 +1172,16 @@ class TestDeleteAccount(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDeleteAccount, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeleteAccount, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.region = get_region(cls.api_client)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -1213,7 +1219,7 @@ class TestDeleteAccount(cloudstackTestCase):
)
self.cleanup = []
- portable_ip_range_services = get_portable_ip_range_services(self.config)
+ portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
@@ -1393,13 +1399,15 @@ class TestPortableIpTransferAcrossNetworks(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestPortableIpTransferAcrossNetworks, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestPortableIpTransferAcrossNetworks, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.region = get_region(cls.api_client)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -1488,7 +1496,7 @@ class TestPortableIpTransferAcrossNetworks(cloudstackTestCase):
self.dbclient = self.testClient.getDbConnection()
#create new portable ip range
- self.portable_ip_range_services = get_portable_ip_range_services(self.config)
+ self.portable_ip_range_services = self.services["portableIpRange"]
if self.portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/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 4d878f7..4b777fe 100644
--- a/test/integration/component/test_project_configs.py
+++ b/test/integration/component/test_project_configs.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
-from marvin.integration.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
from marvin.sshClient import SshClient
import datetime
@@ -109,13 +109,11 @@ class TestUserProjectCreation(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestUserProjectCreation,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestUserProjectCreation, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
configs = Configurations.list(
@@ -275,13 +273,11 @@ class TestProjectCreationNegative(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectCreationNegative,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectCreationNegative, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Checking for prereqisits - global configs
@@ -420,17 +416,15 @@ class TestProjectInviteRequired(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectInviteRequired,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectInviteRequired, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Create domains, account etc.
- cls.domain = get_domain(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
# Verify 'project.invite.required' is set to false
configs = Configurations.list(
@@ -572,17 +566,15 @@ class TestProjectInviteRequiredTrue(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectInviteRequiredTrue,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectInviteRequiredTrue, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Create domains, account etc.
- cls.domain = get_domain(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
# Verify 'project.invite.required' is set to true
configs = Configurations.list(
@@ -725,17 +717,15 @@ class TestProjectInviteTimeout(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectInviteTimeout,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectInviteTimeout, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Create domains, account etc.
- cls.domain = get_domain(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
# Verify 'project.invite.required' is set to true
configs = Configurations.list(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/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 7d93876..7941313 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
-from marvin.integration.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
from marvin.codes import PASS
import datetime
@@ -124,13 +124,11 @@ class TestProjectLimits(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectLimits,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectLimits, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Create domains, account etc.
@@ -502,10 +500,11 @@ class TestResourceLimitsProject(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestResourceLimitsProject, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestResourceLimitsProject, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -945,14 +944,12 @@ class TestMaxProjectNetworks(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestMaxProjectNetworks,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMaxProjectNetworks, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/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 7fb23a4..8f81cf9 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -19,7 +19,7 @@
#Import Local Modules
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (VirtualMachine,
+from marvin.lib.base import (VirtualMachine,
Account,
Project,
NATRule,
@@ -35,7 +35,7 @@ from marvin.integration.lib.base import (VirtualMachine,
DiskOffering,
LoadBalancerRule)
-from marvin.integration.lib.common import (get_zone,
+from marvin.lib.common import (get_zone,
get_template,
get_domain,
list_volumes,
@@ -44,7 +44,7 @@ from marvin.integration.lib.common import (get_zone,
get_free_vlan,
wait_for_cleanup)
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
import random
@@ -161,13 +161,11 @@ class TestOfferings(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestOfferings,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestOfferings, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone and template
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -342,13 +340,11 @@ class TestNetwork(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNetwork,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNetwork, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone and template
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -550,13 +546,11 @@ class TestTemplates(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestTemplates,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestTemplates, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -780,13 +774,11 @@ class TestSnapshots(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestSnapshots,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestSnapshots, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -928,13 +920,11 @@ class TestPublicIpAddress(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestPublicIpAddress,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestPublicIpAddress, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -1213,15 +1203,12 @@ class TestSecurityGroup(cloudstackTestCase):
@classmethod
def setUpClass(cls):
+ cls.testClient = super(TestSecurityGroup, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- cls.api_client = super(
- TestSecurityGroup,
- cls
- ).getClsTestClient().getApiClient()
-
- # Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/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 10f48a6..16ca8c1 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
-from marvin.integration.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
from marvin.sshClient import SshClient
import datetime
@@ -116,14 +116,13 @@ class TestVmUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVmUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVmUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -311,14 +310,13 @@ class TestPublicIPUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestPublicIPUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestPublicIPUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -483,14 +481,13 @@ class TestVolumeUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVolumeUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVolumeUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -668,14 +665,13 @@ class TestTemplateUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestTemplateUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestTemplateUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id
template = get_template(
@@ -844,11 +840,13 @@ class TestISOUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestISOUsage, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestISOUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id
cls.services["iso"]["zoneid"] = cls.zone.id
@@ -990,14 +988,13 @@ class TestLBRuleUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestLBRuleUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLBRuleUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
@@ -1173,14 +1170,13 @@ class TestSnapshotUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestSnapshotUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestSnapshotUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -1351,14 +1347,13 @@ class TestNatRuleUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNatRuleUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNatRuleUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
@@ -1534,14 +1529,13 @@ class TestVpnUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVpnUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVpnUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py
index 1a00f58..c593fb6 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
-from marvin.integration.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
from marvin.sshClient import SshClient
import datetime
@@ -103,21 +103,15 @@ class TestMultipleProjectCreation(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestMultipleProjectCreation,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMultipleProjectCreation, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
- # Create domains, account etc.
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
-
configs = Configurations.list(
cls.api_client,
name='project.invite.required'
@@ -320,18 +314,14 @@ class TestCrossDomainAccountAdd(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestCrossDomainAccountAdd,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCrossDomainAccountAdd, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
configs = Configurations.list(
cls.api_client,
@@ -454,18 +444,14 @@ class TestDeleteAccountWithProject(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDeleteAccountWithProject,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeleteAccountWithProject, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
configs = Configurations.list(
cls.api_client,
@@ -567,13 +553,12 @@ class TestDeleteDomainWithProject(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDeleteDomainWithProject,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeleteDomainWithProject, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
configs = Configurations.list(
@@ -708,17 +693,13 @@ class TestProjectOwners(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectOwners,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectOwners, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
configs = Configurations.list(
@@ -1136,18 +1117,14 @@ class TestProjectResources(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectResources,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectResources, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
configs = Configurations.list(
cls.api_client,
@@ -1440,18 +1417,14 @@ class TestProjectSuspendActivate(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectSuspendActivate,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectSuspendActivate, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, domain, template etc
- cls.zone = get_zone(cls.api_client, cls.services)
+ # Get Zone
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
cls.template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/test/integration/component/test_recurring_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_recurring_snapshots.py b/test/integration/component/test_recurring_snapshots.py
index fd1b57d..2ef2bc3 100644
--- a/test/integration/component/test_recurring_snapshots.py
+++ b/test/integration/component/test_recurring_snapshots.py
@@ -18,9 +18,9 @@
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
-from marvin.integration.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
class Services:
"""Test Snapshots Services
@@ -126,11 +126,13 @@ class TestRecurringSnapshots(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestRecurringSnapshots, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRecurringSnapshots, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -402,4 +404,4 @@ class TestRecurringSnapshots(cloudstackTestCase):
self.services["recurring_snapshot"]["maxsnaps"],
"Check maximum number of recurring snapshots retained"
)
- return
\ No newline at end of file
+ return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/test/integration/component/test_redundant_router_cleanups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_redundant_router_cleanups.py b/test/integration/component/test_redundant_router_cleanups.py
index 84cbc6f..2220d51 100644
--- a/test/integration/component/test_redundant_router_cleanups.py
+++ b/test/integration/component/test_redundant_router_cleanups.py
@@ -16,9 +16,9 @@
# under the License.
from nose.plugins.attrib import attr
-from marvin.integration.lib.base import *
-from marvin.integration.lib.utils import *
-from marvin.integration.lib.common import *
+from marvin.lib.base import *
+from marvin.lib.utils import *
+from marvin.lib.common import *
#Import Local Modules
from marvin.cloudstackTestCase import cloudstackTestCase
@@ -137,14 +137,13 @@ class TestRedundantRouterNetworkCleanups(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestRedundantRouterNetworkCleanups,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRedundantRouterNetworkCleanups, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/798a6aa2/test/integration/component/test_redundant_router_services.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_redundant_router_services.py b/test/integration/component/test_redundant_router_services.py
index 5204d6f..707b673 100644
--- a/test/integration/component/test_redundant_router_services.py
+++ b/test/integration/component/test_redundant_router_services.py
@@ -17,9 +17,9 @@
from nose.plugins.attrib import attr
-from marvin.integration.lib.base import *
-from marvin.integration.lib.utils import *
-from marvin.integration.lib.common import *
+from marvin.lib.base import *
+from marvin.lib.utils import *
+from marvin.lib.common import *
#Import Local Modules
from marvin.cloudstackTestCase import cloudstackTestCase
@@ -138,14 +138,13 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestEnableVPNOverRvR,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestEnableVPNOverRvR, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
cls.zone.id,