Fix import order to comply with import ordering rules.

Fixes pep8 failures TEMPEST N306 and N301.

Change-Id: I87d6ef4058170da73ff64d4e4a4caf43f8a18046
This commit is contained in:
Matthew Treinish 2012-12-07 13:44:02 -05:00
parent c71a063472
commit a83a16ead5
73 changed files with 256 additions and 206 deletions

View File

@ -15,8 +15,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import json
import httplib2 import httplib2
import json
import logging import logging
from lxml import etree from lxml import etree
import time import time

View File

@ -15,12 +15,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import time
import socket
import warnings
import select
from cStringIO import StringIO from cStringIO import StringIO
import select
import socket
import time
import warnings
from tempest import exceptions from tempest import exceptions

View File

@ -15,10 +15,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import itertools
import random import random
import re import re
import urllib import urllib
import itertools
from tempest import exceptions from tempest import exceptions

View File

@ -1,10 +1,11 @@
from tempest.common.ssh import Client
from tempest.config import TempestConfig
from tempest.common import utils
from tempest.exceptions import SSHTimeout, ServerUnreachable
import time
import re import re
import time
from tempest.common.ssh import Client
from tempest.common import utils
from tempest.config import TempestConfig
from tempest.exceptions import ServerUnreachable
from tempest.exceptions import SSHTimeout
class RemoteClient(): class RemoteClient():

View File

@ -29,19 +29,19 @@ except ImportError:
import tempest.config import tempest.config
from tempest import exceptions from tempest import exceptions
# Tempest REST Fuzz testing client libs # Tempest REST Fuzz testing client libs
from tempest.services.compute.json import console_output_client
from tempest.services.compute.json import extensions_client
from tempest.services.compute.json import flavors_client
from tempest.services.compute.json import floating_ips_client
from tempest.services.compute.json import images_client
from tempest.services.compute.json import keypairs_client
from tempest.services.compute.json import limits_client
from tempest.services.compute.json import quotas_client
from tempest.services.compute.json import security_groups_client
from tempest.services.compute.json import servers_client
from tempest.services.compute.json import volumes_extensions_client
from tempest.services.network.json import network_client from tempest.services.network.json import network_client
from tempest.services.volume.json import volumes_client from tempest.services.volume.json import volumes_client
from tempest.services.compute.json import images_client
from tempest.services.compute.json import flavors_client
from tempest.services.compute.json import servers_client
from tempest.services.compute.json import limits_client
from tempest.services.compute.json import extensions_client
from tempest.services.compute.json import security_groups_client
from tempest.services.compute.json import floating_ips_client
from tempest.services.compute.json import keypairs_client
from tempest.services.compute.json import volumes_extensions_client
from tempest.services.compute.json import console_output_client
from tempest.services.compute.json import quotas_client
NetworkClient = network_client.NetworkClient NetworkClient = network_client.NetworkClient
ImagesClient = images_client.ImagesClientJSON ImagesClient = images_client.ImagesClientJSON

View File

@ -19,47 +19,47 @@ import logging
from tempest import config from tempest import config
from tempest import exceptions from tempest import exceptions
from tempest.services.identity.json.admin_client import AdminClientJSON from tempest.services.boto.clients import APIClientEC2
from tempest.services.identity.json.admin_client import TokenClientJSON from tempest.services.boto.clients import ObjectClientS3
from tempest.services.identity.xml.admin_client import AdminClientXML
from tempest.services.identity.xml.admin_client import TokenClientXML
from tempest.services.image import service as image_service
from tempest.services.network.json.network_client import NetworkClient
from tempest.services.compute.json.extensions_client import \ from tempest.services.compute.json.extensions_client import \
ExtensionsClientJSON ExtensionsClientJSON
from tempest.services.compute.json.flavors_client import FlavorsClientJSON from tempest.services.compute.json.flavors_client import FlavorsClientJSON
from tempest.services.compute.json.floating_ips_client import \ from tempest.services.compute.json.floating_ips_client import \
FloatingIPsClientJSON FloatingIPsClientJSON
from tempest.services.compute.json.images_client import ImagesClientJSON from tempest.services.compute.json.images_client import ImagesClientJSON
from tempest.services.compute.json.limits_client import LimitsClientJSON from tempest.services.compute.json.limits_client import LimitsClientJSON
from tempest.services.compute.json.servers_client import ServersClientJSON from tempest.services.compute.json.servers_client import ServersClientJSON
from tempest.services.compute.json.security_groups_client \ from tempest.services.compute.json.security_groups_client import \
import SecurityGroupsClientJSON SecurityGroupsClientJSON
from tempest.services.compute.json.keypairs_client import KeyPairsClientJSON from tempest.services.compute.json.keypairs_client import KeyPairsClientJSON
from tempest.services.compute.json.volumes_extensions_client \ from tempest.services.compute.json.quotas_client import QuotasClient
import VolumesExtensionsClientJSON from tempest.services.compute.json.volumes_extensions_client import \
from tempest.services.compute.json.console_output_client \ VolumesExtensionsClientJSON
import ConsoleOutputsClient from tempest.services.compute.json.console_output_client import \
ConsoleOutputsClient
from tempest.services.compute.xml.extensions_client import ExtensionsClientXML from tempest.services.compute.xml.extensions_client import ExtensionsClientXML
from tempest.services.compute.xml.flavors_client import FlavorsClientXML from tempest.services.compute.xml.flavors_client import FlavorsClientXML
from tempest.services.compute.xml.floating_ips_client import \ from tempest.services.compute.xml.floating_ips_client import \
FloatingIPsClientXML FloatingIPsClientXML
from tempest.services.compute.xml.images_client import ImagesClientXML from tempest.services.compute.xml.images_client import ImagesClientXML
from tempest.services.compute.xml.keypairs_client import KeyPairsClientXML from tempest.services.compute.xml.keypairs_client import KeyPairsClientXML
from tempest.services.compute.xml.limits_client import LimitsClientXML from tempest.services.compute.xml.limits_client import LimitsClientXML
from tempest.services.compute.xml.security_groups_client \ from tempest.services.compute.xml.security_groups_client \
import SecurityGroupsClientXML import SecurityGroupsClientXML
from tempest.services.compute.xml.servers_client import ServersClientXML from tempest.services.compute.xml.servers_client import ServersClientXML
from tempest.services.compute.xml.volumes_extensions_client \ from tempest.services.compute.xml.volumes_extensions_client import \
import VolumesExtensionsClientXML VolumesExtensionsClientXML
from tempest.services.volume.json.volumes_client import VolumesClientJSON from tempest.services.identity.json.admin_client import AdminClientJSON
from tempest.services.volume.xml.volumes_client import VolumesClientXML from tempest.services.identity.json.admin_client import TokenClientJSON
from tempest.services.identity.xml.admin_client import AdminClientXML
from tempest.services.identity.xml.admin_client import TokenClientXML
from tempest.services.image import service as image_service
from tempest.services.network.json.network_client import NetworkClient
from tempest.services.object_storage.account_client import AccountClient from tempest.services.object_storage.account_client import AccountClient
from tempest.services.object_storage.container_client import ContainerClient from tempest.services.object_storage.container_client import ContainerClient
from tempest.services.object_storage.object_client import ObjectClient from tempest.services.object_storage.object_client import ObjectClient
from tempest.services.boto.clients import APIClientEC2 from tempest.services.volume.json.volumes_client import VolumesClientJSON
from tempest.services.boto.clients import ObjectClientS3 from tempest.services.volume.xml.volumes_client import VolumesClientXML
from tempest.services.compute.json.quotas_client import QuotasClient
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -15,17 +15,16 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import boto
from ConfigParser import DuplicateSectionError from ConfigParser import DuplicateSectionError
from contextlib import closing
import re
from types import MethodType
import boto
from tempest.exceptions import InvalidConfiguration from tempest.exceptions import InvalidConfiguration
from tempest.exceptions import NotFound from tempest.exceptions import NotFound
import re
from types import MethodType
from contextlib import closing
class BotoClientBase(object): class BotoClientBase(object):

View File

@ -15,12 +15,14 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import boto
from boto.s3.connection import OrdinaryCallingFormat
from boto.ec2.regioninfo import RegionInfo
from tempest.services.boto import BotoClientBase
import urlparse import urlparse
import boto
from boto.ec2.regioninfo import RegionInfo
from boto.s3.connection import OrdinaryCallingFormat
from tempest.services.boto import BotoClientBase
class APIClientEC2(BotoClientBase): class APIClientEC2(BotoClientBase):

View File

@ -15,9 +15,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.common.rest_client import RestClient
import json import json
from tempest.common.rest_client import RestClient
class ConsoleOutputsClient(RestClient): class ConsoleOutputsClient(RestClient):

View File

@ -15,9 +15,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.common.rest_client import RestClient
import json import json
from tempest.common.rest_client import RestClient
class ExtensionsClientJSON(RestClient): class ExtensionsClientJSON(RestClient):

View File

@ -15,10 +15,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.common.rest_client import RestClient
import json import json
import urllib import urllib
from tempest.common.rest_client import RestClient
class FlavorsClientJSON(RestClient): class FlavorsClientJSON(RestClient):

View File

@ -15,11 +15,12 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.common.rest_client import RestClient
from tempest import exceptions
import json import json
import urllib import urllib
from tempest.common.rest_client import RestClient
from tempest import exceptions
class FloatingIPsClientJSON(RestClient): class FloatingIPsClientJSON(RestClient):
def __init__(self, config, username, password, auth_url, tenant_name=None): def __init__(self, config, username, password, auth_url, tenant_name=None):

View File

@ -1,6 +1,7 @@
from tempest.common.rest_client import RestClient
import json import json
from tempest.common.rest_client import RestClient
class HostsClientJSON(RestClient): class HostsClientJSON(RestClient):

View File

@ -15,12 +15,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.common.rest_client import RestClient
from tempest import exceptions
import json import json
import time import time
import urllib import urllib
from tempest.common.rest_client import RestClient
from tempest import exceptions
class ImagesClientJSON(RestClient): class ImagesClientJSON(RestClient):

View File

@ -15,9 +15,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.common.rest_client import RestClient
import json import json
from tempest.common.rest_client import RestClient
class KeyPairsClientJSON(RestClient): class KeyPairsClientJSON(RestClient):

View File

@ -15,10 +15,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.common.rest_client import RestClient
import json import json
import urllib import urllib
from tempest.common.rest_client import RestClient
class SecurityGroupsClientJSON(RestClient): class SecurityGroupsClientJSON(RestClient):

View File

@ -15,12 +15,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest import exceptions
from tempest.common.rest_client import RestClient
import json import json
import time import time
import urllib import urllib
from tempest.common.rest_client import RestClient
from tempest import exceptions
class ServersClientJSON(RestClient): class ServersClientJSON(RestClient):

View File

@ -15,12 +15,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest import exceptions
from tempest.common.rest_client import RestClient
import json import json
import time import time
import urllib import urllib
from tempest.common.rest_client import RestClient
from tempest import exceptions
class VolumesExtensionsClientJSON(RestClient): class VolumesExtensionsClientJSON(RestClient):

View File

@ -20,9 +20,9 @@ import urllib
from tempest.common.rest_client import RestClientXML from tempest.common.rest_client import RestClientXML
from tempest import exceptions from tempest import exceptions
from tempest.services.compute.xml.common import xml_to_json
from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import Document
from tempest.services.compute.xml.common import Element from tempest.services.compute.xml.common import Element
from tempest.services.compute.xml.common import xml_to_json
class FloatingIPsClientXML(RestClientXML): class FloatingIPsClientXML(RestClientXML):

View File

@ -20,8 +20,8 @@ import urllib
from lxml import etree from lxml import etree
from tempest import exceptions
from tempest.common.rest_client import RestClientXML from tempest.common.rest_client import RestClientXML
from tempest import exceptions
from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import Document
from tempest.services.compute.xml.common import Element from tempest.services.compute.xml.common import Element
from tempest.services.compute.xml.common import Text from tempest.services.compute.xml.common import Text

View File

@ -15,10 +15,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.common.rest_client import RestClientXML
from lxml import etree from lxml import etree
from lxml import objectify from lxml import objectify
from tempest.common.rest_client import RestClientXML
NS = "{http://docs.openstack.org/common/api/v1.0}" NS = "{http://docs.openstack.org/common/api/v1.0}"

View File

@ -16,16 +16,19 @@
# under the License. # under the License.
import logging import logging
import time
import urllib
from lxml import etree from lxml import etree
from tempest import exceptions
from tempest.common.rest_client import RestClientXML from tempest.common.rest_client import RestClientXML
from tempest import exceptions
from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import Document
from tempest.services.compute.xml.common import Element from tempest.services.compute.xml.common import Element
from tempest.services.compute.xml.common import Text from tempest.services.compute.xml.common import Text
from tempest.services.compute.xml.common import xml_to_json from tempest.services.compute.xml.common import xml_to_json
from tempest.services.compute.xml.common import XMLNS_11 from tempest.services.compute.xml.common import XMLNS_11
import time
import urllib
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -16,16 +16,17 @@
# under the License. # under the License.
import time import time
from lxml import etree
import urllib import urllib
from tempest import exceptions from lxml import etree
from tempest.common.rest_client import RestClientXML from tempest.common.rest_client import RestClientXML
from tempest.services.compute.xml.common import xml_to_json from tempest import exceptions
from tempest.services.compute.xml.common import XMLNS_11 from tempest.services.compute.xml.common import Document
from tempest.services.compute.xml.common import Element from tempest.services.compute.xml.common import Element
from tempest.services.compute.xml.common import Text from tempest.services.compute.xml.common import Text
from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import xml_to_json
from tempest.services.compute.xml.common import XMLNS_11
class VolumesExtensionsClientXML(RestClientXML): class VolumesExtensionsClientXML(RestClientXML):

View File

@ -1,8 +1,9 @@
from tempest.common.rest_client import RestClient
from tempest import exceptions
import httplib2 import httplib2
import json import json
from tempest.common.rest_client import RestClient
from tempest import exceptions
class AdminClientJSON(RestClient): class AdminClientJSON(RestClient):

View File

@ -15,17 +15,20 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import httplib2
import json
import logging import logging
from lxml import etree from lxml import etree
from tempest.common.rest_client import RestClient from tempest.common.rest_client import RestClient
from tempest.common.rest_client import RestClientXML from tempest.common.rest_client import RestClientXML
from tempest import exceptions
from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import Document
from tempest.services.compute.xml.common import Element from tempest.services.compute.xml.common import Element
from tempest.services.compute.xml.common import Text from tempest.services.compute.xml.common import Text
from tempest.services.compute.xml.common import xml_to_json from tempest.services.compute.xml.common import xml_to_json
from tempest import exceptions
import httplib2
import json
XMLNS = "http://docs.openstack.org/identity/api/v2.0" XMLNS = "http://docs.openstack.org/identity/api/v2.0"

View File

@ -22,11 +22,11 @@ from lxml import etree
from tempest.common.rest_client import RestClientXML from tempest.common.rest_client import RestClientXML
from tempest import exceptions from tempest import exceptions
from tempest.services.compute.xml.common import xml_to_json from tempest.services.compute.xml.common import Document
from tempest.services.compute.xml.common import XMLNS_11
from tempest.services.compute.xml.common import Element from tempest.services.compute.xml.common import Element
from tempest.services.compute.xml.common import Text from tempest.services.compute.xml.common import Text
from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import xml_to_json
from tempest.services.compute.xml.common import XMLNS_11
class VolumesClientXML(RestClientXML): class VolumesClientXML(RestClientXML):

View File

@ -15,21 +15,25 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import unittest2 as unittest
import nose
import tempest.tests.boto
from tempest.exceptions import TearDownException
from tempest.tests.boto.utils.wait import state_wait, wait_no_exception
from tempest.tests.boto.utils.wait import re_search_wait, wait_exception
import boto
from boto.s3.key import Key
from boto.s3.bucket import Bucket
from boto.exception import BotoServerError
from contextlib import closing from contextlib import closing
import re
import logging import logging
import re
import time import time
import boto
from boto.exception import BotoServerError
from boto.s3.bucket import Bucket
from boto.s3.key import Key
import nose
import unittest2 as unittest
from tempest.exceptions import TearDownException
import tempest.tests.boto
from tempest.tests.boto.utils.wait import re_search_wait
from tempest.tests.boto.utils.wait import state_wait
from tempest.tests.boto.utils.wait import wait_exception
from tempest.tests.boto.utils.wait import wait_no_exception
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -15,16 +15,18 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import tempest.config
from tempest.common.utils.file_utils import have_effective_read_access
import os
import tempest.openstack
import re
import keystoneclient.exceptions
import boto.exception
import logging import logging
import os
import re
import urlparse import urlparse
import boto.exception
import keystoneclient.exceptions
from tempest.common.utils.file_utils import have_effective_read_access
import tempest.config
import tempest.openstack
A_I_IMAGES_READY = False # ari,ami,aki A_I_IMAGES_READY = False # ari,ami,aki
S3_CAN_CONNECT_ERROR = "Unknown Error" S3_CAN_CONNECT_ERROR = "Unknown Error"
EC2_CAN_CONNECT_ERROR = "Unknown Error" EC2_CAN_CONNECT_ERROR = "Unknown Error"

View File

@ -15,21 +15,23 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import nose
from nose.plugins.attrib import attr
import unittest2 as unittest
from tempest.testboto import BotoTestCase
from tempest.tests.boto.utils.s3 import s3_upload_dir
import tempest.tests.boto
from tempest.common.utils.data_utils import rand_name
from tempest.exceptions import EC2RegisterImageException
from tempest.tests.boto.utils.wait import state_wait, re_search_wait
from tempest import openstack
from tempest.common.utils.linux.remote_client import RemoteClient
from boto.s3.key import Key
from contextlib import closing from contextlib import closing
import logging import logging
from boto.s3.key import Key
import nose
from nose.plugins.attrib import attr
import unittest2 as unittest
from tempest.common.utils.data_utils import rand_name
from tempest.common.utils.linux.remote_client import RemoteClient
from tempest.exceptions import EC2RegisterImageException
from tempest import openstack
from tempest.testboto import BotoTestCase
import tempest.tests.boto
from tempest.tests.boto.utils.s3 import s3_upload_dir
from tempest.tests.boto.utils.wait import re_search_wait
from tempest.tests.boto.utils.wait import state_wait
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -15,12 +15,12 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest.testboto import BotoTestCase
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import openstack from tempest import openstack
from tempest.testboto import BotoTestCase
def compare_key_pairs(a, b): def compare_key_pairs(a, b):

View File

@ -17,8 +17,9 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest.testboto import BotoTestCase
from tempest import openstack from tempest import openstack
from tempest.testboto import BotoTestCase
@attr("EC2") @attr("EC2")

View File

@ -17,9 +17,10 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest.testboto import BotoTestCase
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import openstack from tempest import openstack
from tempest.testboto import BotoTestCase
@attr("EC2") @attr("EC2")

View File

@ -15,14 +15,15 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from nose.plugins.attrib import attr
from tempest.testboto import BotoTestCase
from tempest import openstack
import unittest2 as unittest
import logging import logging
import time import time
from nose.plugins.attrib import attr
import unittest2 as unittest
from tempest import openstack
from tempest.testboto import BotoTestCase
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -17,9 +17,10 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest.testboto import BotoTestCase
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import openstack from tempest import openstack
from tempest.testboto import BotoTestCase
@attr("S3") @attr("S3")

View File

@ -15,19 +15,21 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from contextlib import closing
import logging
import os
from boto.s3.key import Key
import nose
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest.common.utils.data_utils import rand_name
from tempest import openstack from tempest import openstack
from tempest.testboto import BotoTestCase from tempest.testboto import BotoTestCase
import tempest.tests.boto import tempest.tests.boto
from tempest.tests.boto.utils.wait import state_wait
from tempest.tests.boto.utils.s3 import s3_upload_dir from tempest.tests.boto.utils.s3 import s3_upload_dir
from tempest.common.utils.data_utils import rand_name from tempest.tests.boto.utils.wait import state_wait
from contextlib import closing
from boto.s3.key import Key
import logging
import nose
import os
@attr("S3", "EC2") @attr("S3", "EC2")

View File

@ -15,14 +15,16 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from contextlib import closing
from boto.s3.key import Key
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest.testboto import BotoTestCase
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import openstack from tempest import openstack
from tempest.testboto import BotoTestCase
from tempest.tests import boto from tempest.tests import boto
from boto.s3.key import Key
from contextlib import closing
@attr("S3") @attr("S3")

View File

@ -15,13 +15,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import boto
from boto.s3.key import Key
from contextlib import closing from contextlib import closing
import logging
import os import os
import re import re
import logging
import boto
from boto.s3.key import Key
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -15,12 +15,14 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import tempest.config
import time
from unittest2 import TestCase
import logging import logging
import re import re
import time
from boto.exception import BotoServerError from boto.exception import BotoServerError
from unittest2 import TestCase
import tempest.config
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -19,8 +19,8 @@ import nose
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest.tests.compute import base
from tempest.tests import compute from tempest.tests import compute
from tempest.tests.compute import base
class FlavorsAdminTestBase(object): class FlavorsAdminTestBase(object):

View File

@ -17,9 +17,9 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from tempest.tests.compute.base import BaseComputeTest
from tempest.services.compute.admin.json import quotas_client as adm_quotas
from tempest import exceptions from tempest import exceptions
from tempest.services.compute.admin.json import quotas_client as adm_quotas
from tempest.tests.compute.base import BaseComputeTest
class QuotasTest(BaseComputeTest): class QuotasTest(BaseComputeTest):

View File

@ -18,13 +18,13 @@
import logging import logging
import time import time
import unittest2 as unittest
import nose import nose
import unittest2 as unittest
from tempest.common.utils.data_utils import rand_name
from tempest import config from tempest import config
from tempest import exceptions from tempest import exceptions
from tempest import openstack from tempest import openstack
from tempest.common.utils.data_utils import rand_name
__all__ = ['BaseComputeTest', 'BaseComputeTestJSON', 'BaseComputeTestXML', __all__ = ['BaseComputeTest', 'BaseComputeTestJSON', 'BaseComputeTestXML',
'BaseComputeAdminTestJSON', 'BaseComputeAdminTestXML'] 'BaseComputeAdminTestJSON', 'BaseComputeAdminTestXML']

View File

@ -18,9 +18,9 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest import openstack
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest import openstack
from tempest.tests.compute import base from tempest.tests.compute import base

View File

@ -18,8 +18,8 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.compute import base from tempest.tests.compute import base

View File

@ -15,16 +15,17 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import nose
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
import nose
from tempest.common.utils.data_utils import rand_name, parse_image_id from tempest.common.utils.data_utils import parse_image_id
from tempest.common.utils.data_utils import rand_name
import tempest.config import tempest.config
from tempest import exceptions from tempest import exceptions
from tempest import openstack from tempest import openstack
from tempest.tests.compute import base
from tempest.tests import compute from tempest.tests import compute
from tempest.tests.compute import base
class ImagesTestBase(object): class ImagesTestBase(object):

View File

@ -17,8 +17,9 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from tempest.common.utils.data_utils import parse_image_id
from tempest.common.utils.data_utils import rand_name
from tempest import exceptions from tempest import exceptions
from tempest.common.utils.data_utils import rand_name, parse_image_id
from tempest.tests.compute.base import BaseComputeTest from tempest.tests.compute.base import BaseComputeTest

View File

@ -17,8 +17,9 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from tempest.common.utils.data_utils import parse_image_id
from tempest.common.utils.data_utils import rand_name
from tempest import exceptions from tempest import exceptions
from tempest.common.utils.data_utils import rand_name, parse_image_id
from tempest.tests.compute.base import BaseComputeTest from tempest.tests.compute.base import BaseComputeTest

View File

@ -18,8 +18,8 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.compute.base import BaseComputeTestJSON from tempest.tests.compute.base import BaseComputeTestJSON
from tempest.tests.compute.base import BaseComputeTestXML from tempest.tests.compute.base import BaseComputeTestXML

View File

@ -17,8 +17,8 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.compute import base from tempest.tests.compute import base

View File

@ -17,8 +17,8 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.compute import base from tempest.tests.compute import base

View File

@ -18,8 +18,8 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.compute.base import BaseComputeTest from tempest.tests.compute.base import BaseComputeTest

View File

@ -20,11 +20,12 @@ import base64
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
import tempest.config
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest.common.utils.linux.remote_client import RemoteClient from tempest.common.utils.linux.remote_client import RemoteClient
from tempest.tests.compute import base import tempest.config
from tempest.tests import compute from tempest.tests import compute
from tempest.tests.compute import base
class ServersTest(object): class ServersTest(object):

View File

@ -19,10 +19,10 @@ import nose
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest.tests.compute.base import BaseComputeTest from tempest import exceptions
from tempest.tests import compute from tempest.tests import compute
from tempest.tests.compute.base import BaseComputeTest
class TestServerDiskConfig(BaseComputeTest): class TestServerDiskConfig(BaseComputeTest):

View File

@ -15,15 +15,16 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import nose.plugins.skip
import nose
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import nose.plugins.skip
import unittest2 as unittest import unittest2 as unittest
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.compute import base from tempest.tests.compute import base
from tempest.tests import utils from tempest.tests import utils
import nose
class ListServerFiltersTest(object): class ListServerFiltersTest(object):

View File

@ -18,14 +18,14 @@
import re import re
import sys import sys
import unittest2 as unittest
import nose import nose
import unittest2 as unittest
from tempest.common.utils.data_utils import rand_name
from tempest import exceptions from tempest import exceptions
from tempest import openstack from tempest import openstack
from tempest.common.utils.data_utils import rand_name
from tempest.tests.compute.base import BaseComputeTest
from tempest.tests import compute from tempest.tests import compute
from tempest.tests.compute.base import BaseComputeTest
class ListServersNegativeTest(BaseComputeTest): class ListServersNegativeTest(BaseComputeTest):

View File

@ -21,12 +21,12 @@ import time
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
import tempest.config
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest.common.utils.linux.remote_client import RemoteClient from tempest.common.utils.linux.remote_client import RemoteClient
from tempest.tests.compute import base import tempest.config
from tempest import exceptions
from tempest.tests import compute from tempest.tests import compute
from tempest.tests.compute import base
class ServerActionsTestBase(object): class ServerActionsTestBase(object):

View File

@ -17,8 +17,8 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.compute.base import BaseComputeTest from tempest.tests.compute.base import BaseComputeTest

View File

@ -19,8 +19,8 @@ import base64
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.compute import base from tempest.tests.compute import base

View File

@ -17,13 +17,13 @@
import sys import sys
import nose
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
import nose
from tempest.common.utils.data_utils import rand_name
from tempest import exceptions from tempest import exceptions
from tempest import openstack from tempest import openstack
from tempest.common.utils.data_utils import rand_name
from tempest.tests.compute.base import BaseComputeTest from tempest.tests.compute.base import BaseComputeTest

View File

@ -15,12 +15,12 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest import exceptions import nose
from tempest import whitebox
from tempest.tests.identity.base import BaseIdentityAdminTest
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import nose from tempest import exceptions
from tempest.tests.identity.base import BaseIdentityAdminTest
from tempest import whitebox
@attr(type='whitebox') @attr(type='whitebox')

View File

@ -16,15 +16,16 @@
# under the License. # under the License.
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from nose.tools import raises
from nose import SkipTest from nose import SkipTest
from nose.tools import raises
import unittest2 as unittest import unittest2 as unittest
from tempest import openstack from tempest.common.utils.data_utils import parse_image_id
from tempest.common.utils.data_utils import rand_name, parse_image_id from tempest.common.utils.data_utils import rand_name
from tempest import exceptions from tempest import exceptions
from tempest.tests.compute.base import BaseComputeTest from tempest import openstack
from tempest.tests import compute from tempest.tests import compute
from tempest.tests.compute.base import BaseComputeTest
class AuthorizationTest(BaseComputeTest): class AuthorizationTest(BaseComputeTest):

View File

@ -15,19 +15,19 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import nose
import unittest2 as unittest
from nose.plugins.attrib import attr
import random import random
import string import string
from tempest.tests.compute import base import nose
from nose.plugins.attrib import attr
import unittest2 as unittest
from tempest.common.utils.linux.remote_client import RemoteClient from tempest.common.utils.linux.remote_client import RemoteClient
from tempest import config from tempest import config
from tempest import exceptions from tempest import exceptions
from tempest.services.compute.json.hosts_client import HostsClientJSON from tempest.services.compute.json.hosts_client import HostsClientJSON
from tempest.services.compute.json.servers_client import ServersClientJSON from tempest.services.compute.json.servers_client import ServersClientJSON
from tempest.tests.compute import base
@attr(category='live-migration') @attr(category='live-migration')

View File

@ -18,9 +18,9 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
import tempest.config
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest.common.utils.linux.remote_client import RemoteClient from tempest.common.utils.linux.remote_client import RemoteClient
import tempest.config
from tempest import openstack from tempest import openstack
from tempest.tests.compute import base from tempest.tests.compute import base

View File

@ -18,8 +18,8 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from nose.tools import raises from nose.tools import raises
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.compute import base from tempest.tests.compute import base

View File

@ -17,8 +17,8 @@
import unittest2 as unittest import unittest2 as unittest
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.identity import base from tempest.tests.identity import base

View File

@ -17,8 +17,8 @@
import nose import nose
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.identity import base from tempest.tests.identity import base

View File

@ -17,8 +17,8 @@
import unittest2 as unittest import unittest2 as unittest
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.identity import base from tempest.tests.identity import base

View File

@ -18,8 +18,8 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import unittest2 as unittest import unittest2 as unittest
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.identity import base from tempest.tests.identity import base

View File

@ -18,9 +18,9 @@
import nose import nose
import unittest2 as unittest import unittest2 as unittest
from tempest.common.utils.data_utils import rand_name
from tempest import exceptions from tempest import exceptions
from tempest import openstack from tempest import openstack
from tempest.common.utils.data_utils import rand_name
class BaseNetworkTest(unittest.TestCase): class BaseNetworkTest(unittest.TestCase):

View File

@ -16,7 +16,9 @@
# under the License. # under the License.
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from tempest.common.utils.data_utils import rand_name, arbitrary_string
from tempest.common.utils.data_utils import arbitrary_string
from tempest.common.utils.data_utils import rand_name
from tempest.tests.object_storage import base from tempest.tests.object_storage import base

View File

@ -16,7 +16,9 @@
# under the License. # under the License.
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from tempest.common.utils.data_utils import rand_name, arbitrary_string
from tempest.common.utils.data_utils import arbitrary_string
from tempest.common.utils.data_utils import rand_name
from tempest.tests.object_storage import base from tempest.tests.object_storage import base

View File

@ -17,14 +17,14 @@
import logging import logging
import time import time
import nose
import nose
import unittest2 as unittest import unittest2 as unittest
from tempest import config
from tempest import openstack
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import config
from tempest import exceptions from tempest import exceptions
from tempest import openstack
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -18,8 +18,8 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from nose.tools import raises from nose.tools import raises
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.tests.volume import base from tempest.tests.volume import base

View File

@ -17,15 +17,15 @@
import logging import logging
import os import os
import sys
import shlex import shlex
import subprocess import subprocess
import sys
import nose import nose
from sqlalchemy import create_engine, MetaData from sqlalchemy import create_engine, MetaData
from tempest.common.utils.data_utils import rand_name
from tempest.common.ssh import Client from tempest.common.ssh import Client
from tempest.common.utils.data_utils import rand_name
from tempest import exceptions from tempest import exceptions
from tempest import test from tempest import test
from tempest.tests import compute from tempest.tests import compute