CLOUDSTACK-5925: Removed incorrect import

test/integration/smoke/test_affinity_groups.py

@@ -16,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *

test/integration/smoke/test_deploy_vm.py

@@ -16,7 +16,6 @@
 # under the License.
 
 #Test from the Marvin - Testing in Python wiki
-from marvin.cloudstackTestClient import getZoneForTests
 
 #All tests inherit from cloudstackTestCase
 from marvin.cloudstackTestCase import cloudstackTestCase

test/integration/smoke/test_deploy_vm_with_userdata.py

@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import cloudstackTestCase
 from marvin.integration.lib.base import (ServiceOffering,
                                          VirtualMachine,

test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py

@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from marvin.cloudstackTestClient import getZoneForTests
 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

test/integration/smoke/test_guest_vlan_range.py

@@ -17,7 +17,6 @@
 """ P1 tests for Dedicating Guest Vlan Ranges
 """
 #Import Local Modules
-from marvin.cloudstackTestClient import getZoneForTests
 import marvin
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *

test/integration/smoke/test_hosts.py

@@ -18,7 +18,6 @@
 """
 #Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *

test/integration/smoke/test_internal_lb.py

@@ -17,7 +17,6 @@
 """ Tests for configuring Internal Load Balancing Rules.
 """
 #Import Local Modules
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *

test/integration/smoke/test_iso.py

@@ -18,7 +18,6 @@
 """
 #Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *

test/integration/smoke/test_loadbalance.py

@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient

test/integration/smoke/test_multipleips_per_nic.py

@@ -31,7 +31,6 @@ from marvin.integration.lib.utils import cleanup_resources
 #common - commonly used methods for all tests are listed here
 from marvin.integration.lib.common import get_zone, get_domain, get_template
 
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackAPI.addIpToNic import addIpToNicCmd
 from marvin.cloudstackAPI.removeIpFromNic import removeIpFromNicCmd
 from marvin.cloudstackAPI.listNics import listNicsCmd

test/integration/smoke/test_network.py

@@ -18,7 +18,6 @@
 """
 #Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackException import cloudstackAPIException
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *

test/integration/smoke/test_nic.py

@@ -16,7 +16,6 @@
 # under the License.
 """ NIC tests for VM """
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient

test/integration/smoke/test_non_contigiousvlan.py

@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin import cloudstackTestCase
 from marvin.cloudstackAPI import *
 from marvin.cloudstackTestCase import cloudstackTestCase

test/integration/smoke/test_portable_publicip.py

@@ -16,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *

test/integration/smoke/test_primary_storage.py

@@ -18,7 +18,6 @@
 """
 #Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *

test/integration/smoke/test_public_ip_range.py

@@ -17,7 +17,6 @@
 """ P1 tests for Dedicating Public IP addresses
 """
 #Import Local Modules
-from marvin.cloudstackTestClient import getZoneForTests
 import marvin
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *

test/integration/smoke/test_regions.py

@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *

test/integration/smoke/test_reset_vm_on_reboot.py

@@ -18,7 +18,6 @@
 """
 #Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *

test/integration/smoke/test_resource_detail.py

@@ -18,7 +18,6 @@
 """
 #Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient

test/integration/smoke/test_routers.py

@@ -18,7 +18,6 @@
 """
 #Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient

test/integration/smoke/test_scale_vm.py

@@ -18,7 +18,6 @@
 """
 #Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *

test/integration/smoke/test_service_offerings.py

@@ -17,7 +17,6 @@
 """ BVT tests for Service offerings"""
 
 #Import Local Modules
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import cloudstackTestCase
 from marvin.cloudstackAPI import changeServiceForVirtualMachine,updateServiceOffering
 from marvin.integration.lib.utils import (isAlmostEqual,

test/integration/smoke/test_snapshots.py

@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from marvin.cloudstackTestClient import getZoneForTests
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *

test/integration/smoke/test_ssvm.py

@@ -19,7 +19,6 @@
 #Import Local Modules
 import marvin
 from marvin.cloudstackTestCase import *
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *

test/integration/smoke/test_templates.py

@@ -18,7 +18,6 @@
 """
 #Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient

test/integration/smoke/test_vm_life_cycle.py

@@ -18,7 +18,6 @@
 """
 #Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *

test/integration/smoke/test_vm_snapshots.py

@@ -17,7 +17,6 @@
 
 # Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *

test/integration/smoke/test_volumes.py

@@ -18,7 +18,6 @@
 """
 #Import Local Modules
 import marvin
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackException import *
 from marvin.cloudstackAPI import *

test/integration/smoke/test_vpc_vpn.py

@@ -17,7 +17,6 @@
 """ Tests for VPN in VPC
 """
 #Import Local Modules
-from marvin.cloudstackTestClient import getZoneForTests
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *