CLOUDSTACK-6006: Remove integration folder and lib

This commit is contained in:
Santhosh Edukulla 2014-02-04 12:01:58 +05:30 committed by Girish Shilamkar
parent a908b8d94b
commit bf72441d13
132 changed files with 433 additions and 436 deletions

View File

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

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
#Import System modules
import time

View File

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

View File

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

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
# from netaddr import *
import netaddr
from nose.plugins.attrib import attr

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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)

View File

@ -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,

View File

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

View File

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

View File

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

View File

@ -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):

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from nose.plugins.attrib import attr
import telnetlib

View File

@ -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

View File

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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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

View File

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

View File

@ -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.integration.lib.utils import *
from marvin.integration.lib.common import *
from marvin.lib.base import *
from marvin.lib.utils import *
from marvin.lib.common import *
from nose.plugins.attrib import attr
from marvin.sshClient import SshClient
import unittest

View File

@ -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

View File

@ -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)

View File

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

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from nose.plugins.attrib import attr
#Import System modules
import time

View File

@ -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

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from nose.plugins.attrib import attr
#Import System modules
import time

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
import netaddr
from nose.plugins.attrib import attr

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from nose.plugins.attrib import attr
import urllib

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from netaddr import *
from nose.plugins.attrib import attr

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
import netaddr
from nose.plugins.attrib import attr

View File

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

View File

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

View File

@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
from marvin.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from marvin.codes import PASS
import datetime

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

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

View File

@ -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,

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.integration.lib.utils import is_snapshot_on_nfs
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from marvin.lib.utils import is_snapshot_on_nfs
class Services:

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.integration.lib.utils import is_snapshot_on_nfs
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from marvin.lib.utils import is_snapshot_on_nfs
import os

View File

@ -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,

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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)

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
#Import System modules
import time

View File

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

View File

@ -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.integration.lib.base import (VirtualMachine,
from marvin.lib.utils import cleanup_resources, validateList
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,

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

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

View File

@ -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.integration.lib.base import (VirtualMachine,
from marvin.lib.utils import cleanup_resources, validateList
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,

View File

@ -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

View File

@ -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:

View File

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

View File

@ -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

View File

@ -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.integration.lib.utils import cleanup_resources
from marvin.lib.common import get_template, get_zone, list_virtual_machines
from marvin.lib.utils import cleanup_resources
from nose.plugins.attrib import attr
import random

View File

@ -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.integration.lib.common import get_zone, get_domain, get_template
from marvin.integration.lib.utils import cleanup_resources
from marvin.lib.base import Account, VirtualMachine, ServiceOffering, Host, Cluster
from marvin.lib.common import get_zone, get_domain, get_template
from marvin.lib.utils import cleanup_resources
from nose.plugins.attrib import attr
class TestDeployVmWithVariedPlanners(cloudstackTestCase):

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from nose.plugins.attrib import attr
#Import System modules
import time

View File

@ -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

View File

@ -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.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from nose.plugins.attrib import attr
#Import System modules
import time

Some files were not shown because too many files have changed in this diff Show More