CLOUDSTACK-6006: Remove integration folder and lib

api/test/integration/api/test/account/testCreateAccount.py

@@ -18,8 +18,8 @@
 import factory
 import marvin
 from marvin import cloudstackTestCase
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib import utils
+from marvin.lib import utils
 
 class AccountFactory(factory.Factory):
     FACTORY_FOR = createAccount.createAccountCmd

test/integration/component/maint/test_egress_rules_host_maintenance.py

@@ -23,9 +23,9 @@ from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 #Import System modules
 import time

test/integration/component/maint/test_high_availability.py

@@ -23,9 +23,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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

test/integration/component/maint/test_host_high_availability.py

@@ -21,9 +21,9 @@
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 
 class Services:

test/integration/component/maint/test_multiple_ip_ranges.py

@@ -19,9 +19,9 @@
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.cloudstackException import cloudstackAPIException
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 # from netaddr import *
 import netaddr
 from nose.plugins.attrib import attr

test/integration/component/maint/test_redundant_router.py

@@ -16,9 +16,9 @@
 # under the License.
 
 from nose.plugins.attrib import attr
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 #Import Local Modules
 from marvin.cloudstackTestCase import cloudstackTestCase

test/integration/component/maint/test_redundant_router_deployment_planning.py

@@ -16,9 +16,9 @@
 # under the License.
 
 from nose.plugins.attrib import attr
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 #Import Local Modules
 from marvin.cloudstackTestCase import cloudstackTestCase

test/integration/component/maint/test_redundant_router_network_rules.py

@@ -16,9 +16,9 @@
 # under the License.
 
 from nose.plugins.attrib import attr
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 #Import Local Modules
 from marvin.cloudstackTestCase import cloudstackTestCase

test/integration/component/maint/test_vpc_host_maintenance.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

test/integration/component/maint/test_vpc_on_host_maintenance.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 
 class Services:

test/integration/component/test_accounts.py

@@ -19,9 +19,9 @@
 #Import Local Modules
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 from nose.plugins.attrib import attr
 from marvin.cloudstackException import cloudstackAPIException

test/integration/component/test_add_remove_network.py

@@ -29,7 +29,7 @@
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 from ddt import ddt, data
-from marvin.integration.lib.base import (
+from marvin.lib.base import (
                                         Account,
                                         Domain,
                                         ServiceOffering,
@@ -39,7 +39,7 @@ from marvin.integration.lib.base import (
                                         VpcOffering,
                                         VPC
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template,
                                         list_virtual_machines,
@@ -49,7 +49,7 @@ from marvin.integration.lib.common import (get_domain,
                                         update_resource_limit
                                         )
 
-from marvin.integration.lib.utils import (validateList,
+from marvin.lib.utils import (validateList,
 					                      random_gen,
                                           get_hypervisor_type,
                                           cleanup_resources)

test/integration/component/test_advancedsg_networks.py

@@ -19,7 +19,7 @@
 """
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 from ddt import ddt, data
-from marvin.integration.lib.base import (Zone,
+from marvin.lib.base import (Zone,
                                          ServiceOffering,
                                          Account,
                                          NetworkOffering,
@@ -31,14 +31,14 @@ from marvin.integration.lib.base import (Zone,
                                          SecurityGroup,
                                          Host)
 
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                            get_zone,
                                            get_template,
                                            get_free_vlan,
                                            list_virtual_machines,
                                            wait_for_cleanup)
 
-from marvin.integration.lib.utils import (cleanup_resources,
+from marvin.lib.utils import (cleanup_resources,
                                           random_gen,
                                           validateList)
 from marvin.cloudstackAPI import (authorizeSecurityGroupIngress,

test/integration/component/test_affinity_groups.py

@@ -17,9 +17,9 @@
 # under the License.
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 from nose.plugins.attrib import attr
 

test/integration/component/test_allocation_states.py

@@ -19,9 +19,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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 import datetime
 

test/integration/component/test_asa1000v_fw.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

test/integration/component/test_assign_vm.py

@@ -20,7 +20,7 @@
 #Import Local Modules
 from nose.plugins.attrib           import attr
 from marvin.cloudstackTestCase     import cloudstackTestCase
-from marvin.integration.lib.base   import (Account,
+from marvin.lib.base   import (Account,
                                            Domain,
                                            User,
                                            Project,
@@ -29,7 +29,7 @@ from marvin.integration.lib.base   import (Account,
                                            DiskOffering,
                                            ServiceOffering,
                                            VirtualMachine)
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                            get_zone,
                                            get_template,
                                            list_volumes,
@@ -37,7 +37,7 @@ from marvin.integration.lib.common import (get_domain,
                                            list_networks,
                                            list_snapshots,
                                            list_virtual_machines)
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 def log_test_exceptions(func):
     def test_wrap_exception_log(self, *args, **kwargs):

test/integration/component/test_baremetal.py

@@ -21,9 +21,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 import telnetlib
 

test/integration/component/test_base_image_updation.py

@@ -31,7 +31,7 @@ from marvin.codes import (PASS,
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 
-from marvin.integration.lib.base import (ServiceOffering,
+from marvin.lib.base import (ServiceOffering,
                                          Account,
                                          VirtualMachine,
                                          Volume,
@@ -41,13 +41,13 @@ from marvin.integration.lib.base import (ServiceOffering,
                                          Template
                                          )
 
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                            get_zone,
                                            get_template,
                                            list_templates
                                            )
 
-from marvin.integration.lib.utils import (validateList,
+from marvin.lib.utils import (validateList,
                                           cleanup_resources)
 
 import time

test/integration/component/test_blocker_bugs.py

@@ -18,9 +18,9 @@
 """
 import marvin
 from nose.plugins.attrib import attr
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 #Import Local Modules
 from marvin.cloudstackTestCase import *

test/integration/component/test_cpu_domain_limits.py

@@ -20,20 +20,20 @@
 # Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (
+from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,
                                         VirtualMachine,
                                         Resources,
                                         Domain
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template,
                                         find_suitable_host,
                                         get_resource_type
                                         )
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 class Services:
     """Test resource limit services

test/integration/component/test_cpu_limits.py

@@ -20,20 +20,20 @@
 # Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (
+from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,
                                         VirtualMachine,
                                         Domain,
                                         Resources
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template,
                                         find_suitable_host,
                                         get_resource_type
                                         )
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 
 class Services:

test/integration/component/test_cpu_max_limits.py

@@ -20,7 +20,7 @@
 # Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (
+from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,
                                         VirtualMachine,
@@ -28,11 +28,11 @@ from marvin.integration.lib.base import (
                                         Domain,
                                         Project
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template
                                         )
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 class Services:
     """Test resource limit services

test/integration/component/test_cpu_project_limits.py

@@ -20,20 +20,20 @@
 # Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (
+from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,
                                         VirtualMachine,
                                         Domain,
                                         Project
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template,
                                         find_suitable_host,
                                         get_resource_type
                                         )
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 class Services:
     """Test resource limit services

test/integration/component/test_custom_hostname.py

@@ -20,9 +20,9 @@
 import marvin
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 
 class Services:

test/integration/component/test_deploy_vm_userdata_reg.py

@@ -19,9 +19,9 @@
 # this script will cover VMdeployment  with Userdata tests
 
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 from marvin.sshClient import SshClient
 import unittest

test/integration/component/test_egress_fw_rules.py

@@ -21,7 +21,7 @@
 import unittest
 from nose.plugins.attrib           import attr
 from marvin.cloudstackTestCase     import cloudstackTestCase
-from marvin.integration.lib.base   import (Account,
+from marvin.lib.base   import (Account,
                                            Domain,
                                            Router,
                                            Network,
@@ -31,14 +31,14 @@ from marvin.integration.lib.base   import (Account,
                                            FireWallRule,
                                            NATRule,
                                            PublicIPAddress)
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                            get_zone,
                                            get_template,
                                            list_routers,
                                            wait_for_cleanup,
                                            list_virtual_machines
                                            )
-from marvin.integration.lib.utils import cleanup_resources, validateList
+from marvin.lib.utils import cleanup_resources, validateList
 from marvin.cloudstackAPI import rebootRouter
 from marvin.cloudstackAPI.createEgressFirewallRule import createEgressFirewallRuleCmd
 from marvin.cloudstackAPI.deleteEgressFirewallRule import deleteEgressFirewallRuleCmd

test/integration/component/test_egress_rules.py

@@ -20,13 +20,13 @@
 #Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.integration.lib.utils import (random_gen,
+from marvin.lib.utils import (random_gen,
                                           cleanup_resources)
-from marvin.integration.lib.base import (SecurityGroup,
+from marvin.lib.base import (SecurityGroup,
                                          VirtualMachine,
                                          Account,
                                          ServiceOffering)
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                            get_zone,
                                            get_template,
                                            list_virtual_machines)

test/integration/component/test_eip_elb.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

test/integration/component/test_explicit_dedication.py

@@ -21,9 +21,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 #Import System modules
 import time

test/integration/component/test_haproxy.py

@@ -19,7 +19,7 @@
 # Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.integration.lib.base import (
+from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,
                                         VirtualMachine,
@@ -31,11 +31,11 @@ from marvin.integration.lib.base import (
                                         Vpn,
                                         NATRule
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template
                                         )
-from marvin.integration.lib.utils import (cleanup_resources,
+from marvin.lib.utils import (cleanup_resources,
                                           random_gen)
 from marvin.cloudstackAPI import createLBStickinessPolicy
 from marvin.sshClient import SshClient

test/integration/component/test_implicit_planner.py

@@ -21,9 +21,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 #Import System modules
 import time

test/integration/component/test_ip_reservation.py

@@ -20,9 +20,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.cloudstackException import cloudstackAPIException
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 import netaddr
 
 from nose.plugins.attrib import attr

test/integration/component/test_ldap.py

@@ -29,9 +29,9 @@ import hashlib
 import random
 from marvin.cloudstackAPI import *
 from marvin.cloudstackAPI import login
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 import urllib
 

test/integration/component/test_memory_limits.py

@@ -19,21 +19,21 @@
 # Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (
+from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,
                                         VirtualMachine,
                                         Resources,
                                         Domain
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template,
                                         wait_for_cleanup,
                                         find_suitable_host,
                                         get_resource_type
                                         )
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 class Services:
     """Test memory resource limit services

test/integration/component/test_mm_domain_limits.py

@@ -19,14 +19,14 @@
 # Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (
+from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,
                                         VirtualMachine,
                                         Resources,
                                         Domain
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template,
 					                    wait_for_cleanup,
@@ -34,7 +34,7 @@ from marvin.integration.lib.common import (get_domain,
                                         get_resource_type,
                                         update_resource_count
                                         )
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 class Services:
     """Test memory resource limit services

test/integration/component/test_mm_max_limits.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 (
+from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,
                                         VirtualMachine,
@@ -27,11 +27,11 @@ from marvin.integration.lib.base import (
                                         Domain,
                                         Project
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template
                                         )
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 class Services:
     """Test memory resource limit services

test/integration/component/test_mm_project_limits.py

@@ -19,21 +19,21 @@
 # Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (
+from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,
                                         VirtualMachine,
                                         Domain,
                                         Project
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template,
 					                    wait_for_cleanup,
                                         find_suitable_host,
                                         get_resource_type
                                         )
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 class Services:
     """Test memory resource limit services

test/integration/component/test_multiple_ip_ranges.py

@@ -19,9 +19,9 @@
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.cloudstackException import cloudstackAPIException
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from netaddr import *
 
 from nose.plugins.attrib import attr

test/integration/component/test_netscaler_configs.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

test/integration/component/test_netscaler_lb.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

test/integration/component/test_netscaler_lb_algo.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 import datetime
 
 

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

test/integration/component/test_persistent_networks.py

@@ -20,9 +20,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.cloudstackException import cloudstackAPIException
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 import netaddr
 
 from nose.plugins.attrib import attr

test/integration/component/test_portable_ip.py

@@ -19,9 +19,9 @@
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.cloudstackException import cloudstackAPIException
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from netaddr import *
 from marvin.sshClient import SshClient
 

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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.codes import PASS
 import datetime
 

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
 
 

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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 class Services:
     """Test Snapshots Services

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.lib.base import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 #Import Local Modules
 from marvin.cloudstackTestCase import cloudstackTestCase

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.lib.base import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 #Import Local Modules
 from marvin.cloudstackTestCase import cloudstackTestCase

test/integration/component/test_redundant_router_upgrades.py

@@ -17,9 +17,9 @@
 
 
 from nose.plugins.attrib import attr
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 #Import Local Modules
 from marvin.cloudstackTestCase import cloudstackTestCase

test/integration/component/test_regions.py

@@ -17,9 +17,9 @@
 
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 from random import choice
 

test/integration/component/test_regions_accounts.py

@@ -17,9 +17,9 @@
 
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 
 class Services:

test/integration/component/test_reset_ssh_keypair.py

@@ -19,18 +19,18 @@
 """
 
 #Import Local Modules
-from marvin.integration.lib.base import (VirtualMachine,
+from marvin.lib.base import (VirtualMachine,
                                          SSHKeyPair,
                                          Account,
                                          Template,
                                          ServiceOffering,
                                          EgressFireWallRule)
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                            get_zone,
                                            get_template,
                                            list_virtual_machines,
                                            list_volumes)
-from marvin.integration.lib.utils import (cleanup_resources,
+from marvin.lib.utils import (cleanup_resources,
                                           random_gen,
                                           validateList)
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest

test/integration/component/test_resource_limits.py

@@ -19,7 +19,7 @@
 #Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.integration.lib.base import (VirtualMachine,
+from marvin.lib.base import (VirtualMachine,
                                          Snapshot,
                                          Template,
                                          PublicIPAddress,
@@ -31,14 +31,14 @@ from marvin.integration.lib.base import (VirtualMachine,
                                          NetworkOffering,
                                          ServiceOffering,
                                          Configurations)
-from marvin.integration.lib.common import (list_volumes,
+from marvin.lib.common import (list_volumes,
                                            get_domain,
                                            get_zone,
                                            get_template,
                                            update_resource_limit,
                                            list_configurations,
                                            wait_for_cleanup)
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 import time
 
 

test/integration/component/test_routers.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 #Import System modules
 import time

test/integration/component/test_security_groups.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 
 #Import System modules

test/integration/component/test_shared_networks.py

@@ -20,7 +20,7 @@
 #Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (Account,
+from marvin.lib.base import (Account,
                                          Network,
                                          NetworkOffering,
                                          VirtualMachine,
@@ -31,9 +31,9 @@ from marvin.integration.lib.base import (Account,
                                          FireWallRule,
                                          ServiceOffering,
                                          PublicIPAddress)
-from marvin.integration.lib.utils import (cleanup_resources,
+from marvin.lib.utils import (cleanup_resources,
                                           xsplit)
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                            get_zone,
                                            get_template,
                                            wait_for_cleanup,

test/integration/component/test_snapshot_gc.py

@@ -18,10 +18,10 @@
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
-from marvin.integration.lib.utils import is_snapshot_on_nfs
+from marvin.lib.utils import is_snapshot_on_nfs
 
 
 class Services:

test/integration/component/test_snapshot_limits.py

@@ -18,10 +18,10 @@
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
-from marvin.integration.lib.utils import is_snapshot_on_nfs
+from marvin.lib.utils import is_snapshot_on_nfs
 import os
 
 

test/integration/component/test_snapshots.py

@@ -20,7 +20,7 @@
 from nose.plugins.attrib import             attr
 from marvin.cloudstackTestCase import       cloudstackTestCase, unittest
 
-from marvin.integration.lib.base import     (Snapshot,
+from marvin.lib.base import     (Snapshot,
                                              Template,
                                              VirtualMachine,
                                              Account,
@@ -28,7 +28,7 @@ from marvin.integration.lib.base import     (Snapshot,
                                              DiskOffering,
                                              Volume)
 
-from marvin.integration.lib.common import   (get_domain,
+from marvin.lib.common import   (get_domain,
                                              get_zone,
                                              get_template,
                                              list_events,
@@ -38,7 +38,7 @@ from marvin.integration.lib.common import   (get_domain,
                                              list_virtual_machines,
                                              )
 
-from marvin.integration.lib.utils import    (cleanup_resources,
+from marvin.lib.utils import    (cleanup_resources,
                                              format_volume_to_ext3,
                                              random_gen,
                                              is_snapshot_on_nfs,

test/integration/component/test_snapshots_improvement.py

@@ -20,10 +20,10 @@
 # Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.utils import (random_gen,
+from marvin.lib.utils import (random_gen,
                                           is_snapshot_on_nfs,
                                           cleanup_resources)
-from marvin.integration.lib.base import (
+from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,
                                         VirtualMachine,
@@ -32,7 +32,7 @@ from marvin.integration.lib.base import (
                                         Volume,
                                         DiskOffering
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template,
                                         list_snapshots

test/integration/component/test_stopped_vm.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 #Import System modules
 import time
 

test/integration/component/test_storage_motion.py

@@ -20,9 +20,9 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 #Import System modules
 import time

test/integration/component/test_tags.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 import datetime
 
 

test/integration/component/test_templates.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 import urllib
 from random import random
 #Import System modules

test/integration/component/test_update_vm.py

@@ -17,9 +17,9 @@
 
 
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.integration.lib.base import Account, VirtualMachine, ServiceOffering
+from marvin.lib.base import Account, VirtualMachine, ServiceOffering
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
-from marvin.integration.lib.common import get_zone, get_domain, get_template
+from marvin.lib.common import get_zone, get_domain, get_template
 from nose.plugins.attrib import attr
 
 class TestData(object):

test/integration/component/test_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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

test/integration/component/test_vm_passwdenabled.py

@@ -18,9 +18,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 
 

test/integration/component/test_vmware_drs.py

@@ -23,19 +23,19 @@ from nose.plugins.attrib import attr
 
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 
-from marvin.integration.lib.base import (Account,
+from marvin.lib.base import (Account,
                                          AffinityGroup,
                                          Host,
                                          VirtualMachine,
                                          ServiceOffering)
 
-from marvin.integration.lib.common import (get_zone,
+from marvin.lib.common import (get_zone,
                                            get_template,
                                            get_domain,
                                            get_pod
                                            )
 
-from marvin.integration.lib.utils import (validateList,
+from marvin.lib.utils import (validateList,
                                           cleanup_resources,
                                           random_gen)
 

test/integration/component/test_volumes.py

@@ -20,9 +20,9 @@
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 #Import System modules
 import time
 

test/integration/component/test_vpc.py

@@ -22,9 +22,9 @@ from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackException import cloudstackAPIException
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 
 
 class Services:

test/integration/component/test_vpc_network.py

@@ -21,8 +21,8 @@
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 from marvin.cloudstackAPI import startVirtualMachine, stopVirtualMachine
-from marvin.integration.lib.utils import cleanup_resources, validateList
+from marvin.lib.utils import cleanup_resources, validateList
-from marvin.integration.lib.base import (VirtualMachine,
+from marvin.lib.base import (VirtualMachine,
                                          ServiceOffering,
                                          Account,
                                          NATRule,
@@ -35,7 +35,7 @@ from marvin.integration.lib.base import (VirtualMachine,
                                          StaticNATRule,
                                          NetworkACL,
                                          PublicIPAddress)
-from marvin.integration.lib.common import (get_zone,
+from marvin.lib.common import (get_zone,
                                            get_domain,
                                            get_template,
                                            wait_for_cleanup,

test/integration/component/test_vpc_network_lbrules.py

@@ -20,7 +20,7 @@
 #Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (stopRouter,
+from marvin.lib.base import (stopRouter,
                                         startRouter,
                                         Account,
                                         VpcOffering,
@@ -34,11 +34,11 @@ from marvin.integration.lib.base import (stopRouter,
                                         VirtualMachine,
                                         LoadBalancerRule,
                                         StaticNATRule)
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template,
                                         list_routers)
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 import socket
 import time
 

test/integration/component/test_vpc_network_pfrules.py

@@ -19,7 +19,7 @@
 """
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (stopRouter,
+from marvin.lib.base import (stopRouter,
                                          startRouter,
                                          Account,
                                          VpcOffering,
@@ -32,11 +32,11 @@ from marvin.integration.lib.base import (stopRouter,
                                          Network,
                                          VirtualMachine,
                                          LoadBalancerRule)
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                            get_zone,
                                            get_template,
                                            list_routers)
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 import socket
 import time
 

test/integration/component/test_vpc_network_staticnatrule.py

@@ -19,7 +19,7 @@
 """
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.base import (Account,
+from marvin.lib.base import (Account,
                                          VpcOffering,
                                          VPC,
                                          ServiceOffering,
@@ -32,11 +32,11 @@ from marvin.integration.lib.base import (Account,
                                          StaticNATRule)
 from marvin.cloudstackAPI import (stopRouter,
                                   startRouter)
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                            get_zone,
                                            get_template,
                                            list_routers)
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 import socket
 import time
 

test/integration/component/test_vpc_offerings.py

@@ -23,9 +23,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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 import datetime
 

test/integration/component/test_vpc_routers.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 import datetime
 
 

test/integration/component/test_vpc_vm_life_cycle.py

@@ -20,8 +20,8 @@
 #Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.utils import cleanup_resources, validateList
+from marvin.lib.utils import cleanup_resources, validateList
-from marvin.integration.lib.base import (VirtualMachine,
+from marvin.lib.base import (VirtualMachine,
                                          NATRule,
                                          LoadBalancerRule,
                                          StaticNATRule,
@@ -35,7 +35,7 @@ from marvin.integration.lib.base import (VirtualMachine,
                                          Account,
                                          ServiceOffering,
                                          Host)
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                            get_zone,
                                            get_template,
                                            get_free_vlan,

test/integration/component/test_vpc_vms_deployment.py

@@ -20,7 +20,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,
                                          NetworkOffering,
                                          VpcOffering,
                                          VPC,
@@ -36,13 +36,13 @@ from marvin.integration.lib.base import (VirtualMachine,
                                          StaticNATRule,
                                          Configurations)
 
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                            get_zone,
                                            get_template,
                                            wait_for_cleanup,
                                            get_free_vlan)
 
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 from marvin.cloudstackAPI import rebootRouter
 
 

test/integration/component/test_vpn_users.py

@@ -21,7 +21,7 @@
 from nose.plugins.attrib import attr
 from marvin.cloudstackException import cloudstackAPIException
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.integration.lib.base import (
+from marvin.lib.base import (
                                         Account,
                                         ServiceOffering,
                                         VirtualMachine,
@@ -31,11 +31,11 @@ from marvin.integration.lib.base import (
                                         Configurations,
                                         NATRule
                                         )
-from marvin.integration.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,
                                         get_zone,
                                         get_template
                                         )
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 
 class Services:

test/integration/smoke/test_affinity_groups.py

@@ -18,9 +18,9 @@
 
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from marvin.sshClient import SshClient
 from nose.plugins.attrib import attr
 

test/integration/smoke/test_deploy_vm.py

@@ -23,13 +23,13 @@ from marvin.cloudstackTestCase import cloudstackTestCase
 #Import Integration Libraries
 
 #base - contains all resources as entities and defines create, delete, list operations on them
-from marvin.integration.lib.base import Account, VirtualMachine, ServiceOffering
+from marvin.lib.base import Account, VirtualMachine, ServiceOffering
 
 #utils - utility classes for common cleanup, external library wrappers etc
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.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.lib.common import get_zone, get_domain, get_template
 
 from nose.plugins.attrib import attr
 

test/integration/smoke/test_deploy_vm_with_userdata.py

@@ -16,11 +16,11 @@
 # under the License.
 
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.integration.lib.base import (ServiceOffering,
+from marvin.lib.base import (ServiceOffering,
                                          VirtualMachine,
                                          Account)
-from marvin.integration.lib.common import get_template, get_zone, list_virtual_machines
+from marvin.lib.common import get_template, get_zone, list_virtual_machines
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 from nose.plugins.attrib import attr
 
 import random

test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py

@@ -16,9 +16,9 @@
 # under the License.
 
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.integration.lib.base import Account, VirtualMachine, ServiceOffering, Host, Cluster
+from marvin.lib.base import Account, VirtualMachine, ServiceOffering, Host, Cluster
-from marvin.integration.lib.common import get_zone, get_domain, get_template
+from marvin.lib.common import get_zone, get_domain, get_template
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 from nose.plugins.attrib import attr
 
 class TestDeployVmWithVariedPlanners(cloudstackTestCase):

test/integration/smoke/test_disk_offerings.py

@@ -20,9 +20,9 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 
 _multiprocess_shared_ = True

test/integration/smoke/test_global_settings.py

@@ -19,9 +19,9 @@
 #Import Local Modules
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 #Import System modules
 

test/integration/smoke/test_guest_vlan_range.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.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 import datetime
 
 class TestDedicateGuestVlanRange(cloudstackTestCase):

test/integration/smoke/test_hosts.py

@@ -20,9 +20,9 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 
 #Import System modules

test/integration/smoke/test_internal_lb.py

@@ -19,9 +19,9 @@
 #Import Local Modules
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 
 class TestInternalLb(cloudstackTestCase):

test/integration/smoke/test_iso.py

@@ -20,9 +20,9 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 import urllib
 from random import random

test/integration/smoke/test_loadbalance.py

@@ -18,9 +18,9 @@
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 #Import System modules
 import time

test/integration/smoke/test_multipleips_per_nic.py

@@ -23,13 +23,13 @@ from marvin.cloudstackTestCase import cloudstackTestCase
 #Import Integration Libraries
 
 #base - contains all resources as entities and defines create, delete, list operations on them
-from marvin.integration.lib.base import Account, VirtualMachine, ServiceOffering
+from marvin.lib.base import Account, VirtualMachine, ServiceOffering
 
 #utils - utility classes for common cleanup, external library wrappers etc
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.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.lib.common import get_zone, get_domain, get_template
 
 from marvin.cloudstackAPI.addIpToNic import addIpToNicCmd
 from marvin.cloudstackAPI.removeIpFromNic import removeIpFromNicCmd

test/integration/smoke/test_network.py

@@ -22,9 +22,9 @@ from marvin.cloudstackException import CloudstackAPIException
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.sshClient import SshClient
-from marvin.integration.lib.utils import *
+from marvin.lib.utils import *
-from marvin.integration.lib.base import *
+from marvin.lib.base import *
-from marvin.integration.lib.common import *
+from marvin.lib.common import *
 from nose.plugins.attrib import attr
 #Import System modules
 import time