Updated Branches: refs/heads/master 9ca34f14a -> 6ad27d903
CLOUDSTACK-5640: Correcting imports in test cases Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6ad27d90 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6ad27d90 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6ad27d90 Branch: refs/heads/master Commit: 6ad27d903b1ccfd0aac6cb1f304aabe7af1275e1 Parents: 9ca34f1 Author: Gaurav Aradhye <[email protected]> Authored: Sun Dec 29 19:38:57 2013 +0530 Committer: Girish Shilamkar <[email protected]> Committed: Sun Dec 29 19:38:57 2013 +0530 ---------------------------------------------------------------------- .../component/test_egress_fw_rules.py | 2 +- test/integration/component/test_haproxy.py | 6 +++--- .../smoke/test_deploy_vm_with_userdata.py | 7 +++++-- ..._deploy_vms_with_varied_deploymentplanners.py | 4 ++-- test/integration/smoke/test_service_offerings.py | 19 +++++++++++++------ 5 files changed, 24 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ad27d90/test/integration/component/test_egress_fw_rules.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_egress_fw_rules.py b/test/integration/component/test_egress_fw_rules.py index 919725f..87bf5df 100644 --- a/test/integration/component/test_egress_fw_rules.py +++ b/test/integration/component/test_egress_fw_rules.py @@ -32,11 +32,11 @@ from marvin.integration.lib.common import (get_domain, get_zone, get_template, list_hosts, - rebootRouter, list_routers, wait_for_cleanup, list_virtual_machines) from marvin.integration.lib.utils import cleanup_resources +from marvin.cloudstackAPI import rebootRouter from marvin.cloudstackAPI.createEgressFirewallRule import createEgressFirewallRuleCmd from marvin.cloudstackAPI.deleteEgressFirewallRule import deleteEgressFirewallRuleCmd http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ad27d90/test/integration/component/test_haproxy.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_haproxy.py b/test/integration/component/test_haproxy.py index 1c8dc63..f77e4ec 100644 --- a/test/integration/component/test_haproxy.py +++ b/test/integration/component/test_haproxy.py @@ -33,10 +33,10 @@ from marvin.integration.lib.base import ( ) from marvin.integration.lib.common import (get_domain, get_zone, - get_template, - random_gen + get_template ) -from marvin.integration.lib.utils import cleanup_resources +from marvin.integration.lib.utils import (cleanup_resources, + random_gen) from marvin.cloudstackAPI import createLBStickinessPolicy from marvin.sshClient import SshClient http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ad27d90/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 8910b2e..e3788cf 100644 --- a/test/integration/smoke/test_deploy_vm_with_userdata.py +++ b/test/integration/smoke/test_deploy_vm_with_userdata.py @@ -16,8 +16,11 @@ # under the License. from marvin.cloudstackTestCase import cloudstackTestCase -from marvin.integration.lib.base import * -from marvin.integration.lib.common import get_template, get_zone, list_virtual_machines, cleanup_resources +from marvin.integration.lib.base import (ServiceOffering, + VirtualMachine, + Account) +from marvin.integration.lib.common import get_template, get_zone, list_virtual_machines +from marvin.integration.lib.utils import cleanup_resources from nose.plugins.attrib import attr import random http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ad27d90/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 a08537e..b4d35e0 100644 --- a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py +++ b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py @@ -17,8 +17,8 @@ from marvin.cloudstackTestCase import cloudstackTestCase from marvin.integration.lib.base import Account, VirtualMachine, ServiceOffering, Host, Cluster -from marvin.integration.lib.common import get_zone, get_domain, get_template, cleanup_resources - +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: http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ad27d90/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 22273d7..968dc56 100644 --- a/test/integration/smoke/test_service_offerings.py +++ b/test/integration/smoke/test_service_offerings.py @@ -17,12 +17,19 @@ """ BVT tests for Service offerings""" #Import Local Modules -import marvin -from marvin.cloudstackTestCase import * -from marvin.cloudstackAPI import * -from marvin.integration.lib.utils import isAlmostEqual -from marvin.integration.lib.base import * -from marvin.integration.lib.common import * +from marvin.cloudstackTestCase import cloudstackTestCase +from marvin.cloudstackAPI import changeServiceForVirtualMachine,updateServiceOffering +from marvin.integration.lib.utils import (isAlmostEqual, + cleanup_resources, + random_gen) +from marvin.integration.lib.base import (ServiceOffering, + Account, + VirtualMachine) +from marvin.integration.lib.common import (list_service_offering, + list_virtual_machines, + get_domain, + get_zone, + get_template) from nose.plugins.attrib import attr
