explicit import of unittest

test/integration/component/cpu_limits/__init__.py

@@ -13,4 +13,4 @@
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
-# under the License.
+# under the License.

test/integration/component/find_hosts_for_migration.py

@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (migrateVirtualMachine,
                                   prepareHostForMaintenance,
                                   cancelHostMaintenance,
@@ -270,4 +271,4 @@ class TestHostsForMigration(cloudstackTestCase):
 
         self.assertTrue(notSuitableHost is not None, "notsuitablehost should not be None")
         self.debug("Suitable Hosts: %s" % suitableHost)
-        self.debug("Not suitable Hosts: %s" % notSuitableHost)
+        self.debug("Not suitable Hosts: %s" % notSuitableHost)

test/integration/component/maint/__init__.py

@@ -18,4 +18,4 @@
 """
 Tests that put hosts, zones, resources in to maintenance mode are here.
 These will have to be run sequentiall when resources are available so as not disrupt other tests
-"""
+"""

test/integration/component/maint/test_bugs.py

@@ -16,7 +16,8 @@
 # under the License.
 
 # Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (updateStoragePool,
                                   resizeVolume,
                                   listCapacity,

test/integration/component/maint/test_capacity_host_delete.py

@@ -18,7 +18,8 @@
 # Test from the Marvin - Testing in Python wiki
 
 # All tests inherit from cloudstackTestCase
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 
 # Import Integration Libraries
 

test/integration/component/maint/test_dedicate_guest_vlan_ranges.py

@@ -24,7 +24,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (validateList,
                               cleanup_resources,
                               random_gen,

test/integration/component/maint/test_dedicate_public_ip_range.py

@@ -26,7 +26,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (validateList,
                               cleanup_resources,
                               random_gen)

test/integration/component/maint/test_escalation_templates.py

@@ -15,7 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (Account,
                              Domain, Template, Configurations,VirtualMachine,Snapshot,ServiceOffering
                              )

test/integration/component/maint/test_escalations_hosts.py

@@ -18,7 +18,8 @@
 # Test from the Marvin - Testing in Python wiki
 
 # All tests inherit from cloudstackTestCase
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 
 # Import Integration Libraries
 

test/integration/component/maint/test_high_availability.py

@@ -20,7 +20,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (prepareHostForMaintenance,
                                   cancelHostMaintenance)
 from marvin.lib.utils import cleanup_resources

test/integration/component/maint/test_host_high_availability.py

@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (migrateVirtualMachine,
                                   prepareHostForMaintenance,
                                   cancelHostMaintenance)

test/integration/component/maint/test_ip_resource_count_for_vpc.py

@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (VirtualMachine,
                              NetworkOffering,
                              VpcOffering,

test/integration/component/maint/test_multiple_ip_ranges.py

@@ -16,7 +16,8 @@
 # under the License.
 """ Tests for Multiple IP Ranges feature
 """
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import cleanup_resources, get_process_status
 from marvin.lib.base import (Account,
                              DiskOffering,

test/integration/component/maint/test_vpc_host_maintenance.py

@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import migrateSystemVm
 from marvin.lib.utils import cleanup_resources
 from marvin.lib.base import (Host,

test/integration/component/maint/test_vpc_on_host_maintenance.py

@@ -16,7 +16,8 @@
 # under the License.
 
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import cleanup_resources
 from marvin.lib.base import (Account,
                              Host,

test/integration/component/maint/testpath_disablestoragepool.py

@@ -19,7 +19,8 @@
 # All tests inherit from cloudstack TestCase
 
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.codes import FAILED, PASS
 from marvin.lib.base import (Account,
                              VirtualMachine,

test/integration/component/maint/testpath_vMotion_vmware.py

@@ -17,7 +17,8 @@
 """ Test cases for Test Paths Storage Migration
 """
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (cleanup_resources,
                               validateList,
                               is_server_ssh_ready

test/integration/component/test_acquire_specified_public_ip.py

@@ -21,7 +21,8 @@ Tests of acquiring a specified public IP for isolated network or vpc
 
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import createVlanIpRange
 from marvin.lib.utils import (validateList,
                               cleanup_resources)

test/integration/component/test_add_remove_network.py

@@ -27,7 +27,8 @@
 
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from ddt import ddt, data
 from marvin.lib.base import (
                                         Account,

test/integration/component/test_advancedsg_networks.py

@@ -17,7 +17,8 @@
 
 """ P1 tests for networks in advanced zone with security groups
 """
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from ddt import ddt, data
 from marvin.lib.base import (Zone,
                                          ServiceOffering,

test/integration/component/test_affinity_groups.py

@@ -15,7 +15,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import deleteAffinityGroup
 from marvin.lib.utils import (cleanup_resources,
                               random_gen)

test/integration/component/test_affinity_groups_projects.py

@@ -15,7 +15,8 @@
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import deleteAffinityGroup
 from marvin.lib.utils import (cleanup_resources,
                         random_gen)

test/integration/component/test_base_image_updation.py

@@ -28,7 +28,8 @@
 from marvin.codes import (PASS,
                           RECURRING)
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 
 from marvin.lib.base import (ServiceOffering,
                                          Account,

test/integration/component/test_blocker_bugs.py

@@ -36,7 +36,8 @@ from marvin.lib.common import (get_zone,
                                get_builtin_template_info)
 
 #Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import restartNetwork
 from marvin.codes import PASS
 import time

test/integration/component/test_brocade_vcs.py

@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (listPhysicalNetworks,
                                   listNetworkServiceProviders,
                                   addNetworkServiceProvider,

test/integration/component/test_browse_templates.py

@@ -20,7 +20,8 @@
 
 import marvin
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import *
 from marvin.lib.utils import *
 from marvin.lib.base import *

test/integration/component/test_browse_templates2.py

@@ -19,7 +19,8 @@
 
 import marvin
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import *
 from marvin.lib.utils import *
 from marvin.lib.base import *

test/integration/component/test_browse_volumes.py

@@ -20,7 +20,8 @@
 
 import marvin
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import *
 from marvin.lib.utils import *
 from marvin.lib.base import *

test/integration/component/test_concurrent_snapshots_limit.py

@@ -309,4 +309,4 @@ class TestConcurrentSnapshotLimit(cloudstackTestCase):
              "concurrent.snapshots.threshold.perhost",
              "String"
            )
-        return
+        return

test/integration/component/test_cpu_project_limits.py

@@ -19,7 +19,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,

test/integration/component/test_custom_hostname.py

@@ -19,7 +19,8 @@
 # Import Local Modules
 
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (cleanup_resources,
                               random_gen,
                               get_hypervisor_type)

test/integration/component/test_deploy_vgpu_vm.py

@@ -18,7 +18,8 @@
 # Test from the Marvin - Testing in Python wiki
 
 # All tests inherit from cloudstackTestCase
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import changeServiceForVirtualMachine, startVirtualMachine
 
 # Import Integration Libraries

test/integration/component/test_dhcp_dns_offload.py

@@ -16,7 +16,8 @@
 # under the License.
 """ Tests for DHCP DNS offload feature
 """
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (random_gen, validateList, cleanup_resources, get_hypervisor_type)
 from marvin.lib.base import (Account,
                              NIC,

test/integration/component/test_dynamic_compute_offering.py

@@ -25,7 +25,8 @@
     Feature Specifications: https://cwiki.apache.org/confluence/display/
     CLOUDSTACK/Dynamic+Compute+Offering+FS
 """
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (cleanup_resources,
                               validateList,
                               random_gen,

test/integration/component/test_egress_fw_rules.py

@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib           import attr
-from marvin.cloudstackTestCase     import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase     import cloudstackTestCase
+import unittest
 from marvin.lib.base   import (Account,
                                            Domain,
                                            Router,

test/integration/component/test_eip_elb.py

@@ -19,7 +19,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (authorizeSecurityGroupIngress,
                                   disassociateIpAddress,
                                   deleteLoadBalancerRule)

test/integration/component/test_escalation_listTemplateDomainAdmin.py

@@ -164,4 +164,4 @@ class TestlistTemplatesDomainAdmin(cloudstackTestCase):
 
             else:
                 retries = retries - 1
-        raise Exception("Template download failed exception.")
+        raise Exception("Template download failed exception.")

test/integration/component/test_escalations_instances.py

@@ -16,7 +16,8 @@
 # under the License.
 
 # Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import cleanup_resources, validateList
 from marvin.lib.base import (Account,
                              ServiceOffering,

test/integration/component/test_escalations_ipaddresses.py

@@ -16,7 +16,8 @@
 # under the License.
 
 # Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (PublicIPAddress,
                              NetworkOffering,
                              Autoscale,

test/integration/component/test_escalations_snapshots.py

@@ -16,7 +16,8 @@
 # under the License.
 
 # Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (VmSnapshot,
                              Snapshot,
                              DiskOffering,

test/integration/component/test_escalations_templates.py

@@ -16,7 +16,8 @@
 # under the License.
 
 # Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (cleanup_resources,
                               validateList)
 from marvin.lib.base import (Account,

test/integration/component/test_escalations_volumes.py

@@ -16,7 +16,8 @@
 # under the License.
 
 # Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import createVolume, createTemplate
 from marvin.lib.utils import (cleanup_resources,
                               random_gen, validateList)

test/integration/component/test_ip_reservation.py

@@ -22,7 +22,8 @@
 
     Feature Specifications: https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+-+IP+Range+Reservation+within+a+Network
 """
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import validateList, cleanup_resources, verifyRouterState
 from marvin.lib.base import (Account,
                              Network,

test/integration/component/test_lb_secondary_ip.py

@@ -30,7 +30,8 @@
 
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (
     Account,
     ServiceOffering,

test/integration/component/test_list_nics.py

@@ -147,4 +147,4 @@ class TestDeployVM(cloudstackTestCase):
             cleanup_resources(self.apiclient, self.cleanup)
         except Exception as e:
             self.debug("Warning! Exception in tearDown: %s" % e)
-        return
+        return

test/integration/component/test_list_pod.py

@@ -19,7 +19,8 @@
 """
 
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (cleanup_resources)
 from marvin.lib.base import (Pod, Cluster, Capacities)
 from marvin.cloudstackAPI import (updateConfiguration)

test/integration/component/test_memory_limits.py

@@ -18,7 +18,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,

test/integration/component/test_mm_domain_limits.py

@@ -18,7 +18,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,

test/integration/component/test_mm_max_limits.py

@@ -18,7 +18,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,

test/integration/component/test_mm_project_limits.py

@@ -18,7 +18,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,

test/integration/component/test_multiple_nic_support.py

@@ -19,7 +19,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.sshClient import SshClient
 from marvin.lib.utils import (validateList,
                               cleanup_resources,

test/integration/component/test_multiple_subnets_in_isolated_network.py

@@ -21,7 +21,8 @@ Tests of acquiring IPs in multiple subnets for isolated network or vpc
 
 from nose.plugins.attrib import attr
 from marvin.cloudstackAPI import rebootRouter
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (validateList,
                               get_host_credentials,
                               get_process_status,

test/integration/component/test_multiple_subnets_in_isolated_network_rvr.py

@@ -21,7 +21,8 @@ Tests of acquiring IPs in multiple subnets for isolated network or vpc
 
 from nose.plugins.attrib import attr
 from marvin.cloudstackAPI import rebootRouter
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (validateList,
                               get_host_credentials,
                               get_process_status,

test/integration/component/test_multiple_subnets_in_vpc.py

@@ -21,7 +21,8 @@ Tests of acquiring IPs in multiple subnets for isolated network or vpc
 
 from nose.plugins.attrib import attr
 from marvin.cloudstackAPI import rebootRouter
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (validateList,
                               get_host_credentials,
                               get_process_status,

test/integration/component/test_multiple_subnets_in_vpc_rvr.py

@@ -21,7 +21,8 @@ Tests of acquiring IPs in multiple subnets for isolated network or vpc
 
 from nose.plugins.attrib import attr
 from marvin.cloudstackAPI import rebootRouter
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (validateList,
                               get_host_credentials,
                               get_process_status,

test/integration/component/test_persistent_networks.py

@@ -44,7 +44,8 @@ from marvin.lib.common import (get_domain,
 from nose.plugins.attrib import attr
 from marvin.codes import PASS, FAIL, FAILED
 from marvin.sshClient import SshClient
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from ddt import ddt, data
 import time
 

test/integration/component/test_project_limits.py

@@ -18,7 +18,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 #from marvin.cloudstackAPI import *
 from marvin.lib.utils import (cleanup_resources,
                               validateList)

test/integration/component/test_project_resources.py

@@ -18,7 +18,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (VirtualMachine,
                                          Account,
                                          Project,

test/integration/component/test_project_usage.py

@@ -18,7 +18,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import deleteVolume
 from marvin.lib.utils import (cleanup_resources, validateList)
 from marvin.lib.base import (Project,
@@ -2026,4 +2027,4 @@ class TestVMSnapshotUsage(cloudstackTestCase):
                             1,
                             "Check VM.SNAPSHOT.DELETE in events table"
                         )
-        return
+        return

test/integration/component/test_protocol_number_security_group.py

@@ -21,7 +21,8 @@ Tests protocol number support for security groups
 
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import authorizeSecurityGroupIngress, revokeSecurityGroupIngress, authorizeSecurityGroupEgress, revokeSecurityGroupEgress
 from marvin.sshClient import SshClient
 from marvin.lib.utils import (validateList,

test/integration/component/test_ps_domain_limits.py

@@ -25,7 +25,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (Account,
                              ServiceOffering,
                              VirtualMachine,

test/integration/component/test_ps_limits.py

@@ -25,7 +25,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (
                              Account,
                              ServiceOffering,

test/integration/component/test_ps_max_limits.py

@@ -25,7 +25,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (Account,
                              ServiceOffering,
                              VirtualMachine,

test/integration/component/test_ps_project_limits.py

@@ -25,7 +25,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (Account,
                              ServiceOffering,
                              VirtualMachine,

test/integration/component/test_ps_resize_volume.py

@@ -28,7 +28,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (Account,
                              ServiceOffering,
                              VirtualMachine,

test/integration/component/test_reset_ssh_keypair.py

@@ -32,7 +32,8 @@ from marvin.lib.common import (get_domain,
 from marvin.lib.utils import (cleanup_resources,
                                           random_gen,
                                           validateList)
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.codes import PASS, RUNNING
 
 #Import System modules

test/integration/component/test_rootvolume_resize.py

@@ -24,7 +24,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (Account,
                              ServiceOffering,
                              VirtualMachine,
@@ -1140,4 +1141,4 @@ class TestResizeVolume(cloudstackTestCase):
                             " storage capacity after root "
                             "volume resize  : %s" % e)
 
-        return
+        return

test/integration/component/test_shared_networks.py

@@ -18,7 +18,8 @@
 """ P1 tests for shared networks
 """
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import rebootRouter, stopRouter, startRouter
 from marvin.lib.base import (Account,
                              Network,

test/integration/component/test_simultaneous_volume_attach.py

@@ -17,7 +17,8 @@
 
 #Import Local Modules
 from marvin.cloudstackAPI import *
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (cleanup_resources,
                               validateList)
 from marvin.lib.base import (ServiceOffering,
@@ -252,4 +253,4 @@ class TestMultipleVolumeAttach(cloudstackTestCase):
                             "All 4 data disks are not attached to VM Successfully"
                             )
 
-        return
+        return

test/integration/component/test_snapshot_gc.py

@@ -16,7 +16,8 @@
 # under the License.
 
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 #from marvin.cloudstackAPI import *
 from marvin.lib.utils import (
                               is_snapshot_on_nfs,

test/integration/component/test_snapshot_limits.py

@@ -16,7 +16,8 @@
 # under the License.
 
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import cleanup_resources
 from marvin.lib.base import (Account,
                              VirtualMachine,

test/integration/component/test_ss_limits.py

@@ -25,7 +25,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (Account,
                              ServiceOffering,
                              VirtualMachine,

test/integration/component/test_ss_project_limits.py

@@ -25,7 +25,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (Account,
                              ServiceOffering,
                              VirtualMachine,

test/integration/component/test_template_from_snapshot_with_template_details.py

@@ -18,7 +18,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import listZones
 from marvin.lib.utils import (cleanup_resources)
 from marvin.lib.base import (Account,

test/integration/component/test_templates.py

@@ -18,7 +18,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import listZones
 from marvin.lib.utils import (cleanup_resources)
 from marvin.lib.base import (Account,

test/integration/component/test_updateResourceCount.py

@@ -232,4 +232,4 @@ class TestUpdateResourceCount(cloudstackTestCase):
             1024,
             "The memory amount does not seem to be right."
         )
-        return
+        return

test/integration/component/test_vm_passwdenabled.py

@@ -14,7 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import cleanup_resources
 from marvin.lib.base import (Account,
                              ServiceOffering,

test/integration/component/test_vmware_drs.py

@@ -21,7 +21,8 @@
 import marvin
 from nose.plugins.attrib import attr
 
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 
 from marvin.lib.base import (Account,
                                          AffinityGroup,

test/integration/component/test_vpc_network.py

@@ -19,7 +19,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import startVirtualMachine, stopVirtualMachine
 from marvin.lib.utils import cleanup_resources, validateList
 from marvin.lib.base import (VirtualMachine,

test/integration/component/test_vpc_network_lbrules.py

@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (stopRouter,
                                         startRouter,
                                         Account,

test/integration/component/test_vpc_network_staticnatrule.py

@@ -18,7 +18,8 @@
 """ Component tests for VPC network functionality - Port Forwarding Rules.
 """
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (Account,
                                          VpcOffering,
                                          VPC,

test/integration/component/test_vpc_vm_life_cycle.py

@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import cleanup_resources, validateList
 from marvin.lib.base import (VirtualMachine,
                                          NATRule,

test/integration/component/test_vpc_vms_deployment.py

@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (VirtualMachine,
                                          NetworkOffering,
                                          VpcOffering,

test/integration/plugins/ldap/ldap_test_data.py

@@ -186,4 +186,4 @@ class LdapTestData:
                     LdapTestData.group : LdapTestData.seniors
                 }
             ],
-        }
+        }

test/integration/smoke/test_create_network.py

@@ -17,7 +17,8 @@
 
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.sshClient import SshClient
 from marvin.lib.utils import (cleanup_resources,
                               random_gen)

test/integration/smoke/test_iso.py

@@ -18,7 +18,8 @@
 """
 # Import Local Modules
 from marvin.cloudstackException import GetDetailExceptionInfo
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import listZones, updateIso, extractIso, updateIsoPermissions, copyIso, deleteIso,\
     registerIso,listOsTypes
 from marvin.lib.utils import cleanup_resources, random_gen, get_hypervisor_type,validateList
@@ -775,4 +776,4 @@ class TestCreateISOWithChecksum(cloudstackTestCase):
 
             else:
                 retries = retries - 1
-        raise Exception("Template download failed exception.")
+        raise Exception("Template download failed exception.")

test/integration/smoke/test_kubernetes_clusters.py

@@ -17,7 +17,8 @@
 """ Tests for Kubernetes supported version """
 
 #Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (listInfrastructure,
                                   listTemplates,
                                   listKubernetesSupportedVersions,

test/integration/smoke/test_kubernetes_supported_versions.py

@@ -17,7 +17,8 @@
 """ Tests for Kubernetes supported version """
 
 #Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (listInfrastructure,
                                   listKubernetesSupportedVersions,
                                   addKubernetesSupportedVersion,

test/integration/smoke/test_migration.py

@@ -18,7 +18,8 @@
 """ Network migration test
 """
 # Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (
     Account,
     ServiceOffering,

test/integration/smoke/test_nic_adapter_type.py

@@ -22,7 +22,8 @@
 
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (
                              Account,
                              ServiceOffering,

test/integration/smoke/test_scale_vm.py

@@ -209,4 +209,4 @@ class TestScaleVm(cloudstackTestCase):
             'Running',
             "Check the state of VM"
         )
-        return
+        return

test/integration/smoke/test_templates.py

@@ -20,7 +20,8 @@
 from marvin.cloudstackException import *
 from marvin.cloudstackAPI import *
 from marvin.codes import FAILED
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import listZones
 from marvin.lib.utils import random_gen, cleanup_resources
 from marvin.lib.base import (Account,

test/integration/smoke/test_update_security_group.py

@@ -21,7 +21,8 @@ Tests for updating security group name
 
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import updateSecurityGroup, createSecurityGroup
 from marvin.sshClient import SshClient
 from marvin.lib.utils import (validateList,

test/integration/smoke/test_usage.py

@@ -19,7 +19,8 @@
 # Import Local Modules
 from marvin.codes import FAILED
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import deleteVolume
 from marvin.lib.utils import (cleanup_resources,get_hypervisor_type)
 from marvin.lib.base import (Account,

test/integration/smoke/test_volumes.py

@@ -17,7 +17,8 @@
 """ BVT tests for Volumes
 """
 #Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 #from marvin.cloudstackException import *
 from marvin.cloudstackAPI import (deleteVolume,
                                   extractVolume,

test/integration/testpaths/testpath_snapshot_hadrning.py

@@ -18,7 +18,8 @@
 """
 
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (cleanup_resources,
                               is_snapshot_on_nfs,
                               validateList)

test/integration/testpaths/testpath_storage_migration.py

@@ -17,7 +17,8 @@
 """ Test cases for Test Paths Storage Migration
 """
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (cleanup_resources)
 from marvin.lib.base import (Account,
                              ServiceOffering,

test/integration/testpaths/testpath_volume_cuncurrent_snapshots.py

@@ -19,7 +19,8 @@
 """
 
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (cleanup_resources, is_snapshot_on_nfs,
                               validateList)
 from marvin.lib.base import (Account,

test/integration/testpaths/testpath_volume_recurring_snap.py

@@ -17,7 +17,8 @@
 """ Test cases for VM/Volume recurring snapshot Test Path
 """
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (cleanup_resources,
                               is_snapshot_on_nfs,
                               validateList

test/integration/testpaths/testpath_volume_snapshot.py

@@ -17,7 +17,8 @@
 """ Test cases for VM/Volume snapshot Test Path
 """
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (cleanup_resources,
                               is_snapshot_on_nfs,
                               validateList)