diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py index fbe05e7646..6683b78ced 100644 --- a/tempest/common/rest_client.py +++ b/tempest/common/rest_client.py @@ -22,7 +22,7 @@ from lxml import etree import time from tempest import exceptions -from tempest.services.nova.xml.common import xml_to_json +from tempest.services.compute.xml.common import xml_to_json # redrive rate limited calls at most twice MAX_RECURSION_DEPTH = 2 diff --git a/tempest/manager.py b/tempest/manager.py index ce7cf9379c..fda887c4ec 100644 --- a/tempest/manager.py +++ b/tempest/manager.py @@ -31,16 +31,16 @@ from tempest import exceptions # Tempest REST Fuzz testing client libs from tempest.services.network.json import network_client from tempest.services.volume.json import volumes_client -from tempest.services.nova.json import images_client -from tempest.services.nova.json import flavors_client -from tempest.services.nova.json import servers_client -from tempest.services.nova.json import limits_client -from tempest.services.nova.json import extensions_client -from tempest.services.nova.json import security_groups_client -from tempest.services.nova.json import floating_ips_client -from tempest.services.nova.json import keypairs_client -from tempest.services.nova.json import volumes_extensions_client -from tempest.services.nova.json import console_output_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 NetworkClient = network_client.NetworkClient ImagesClient = images_client.ImagesClientJSON diff --git a/tempest/openstack.py b/tempest/openstack.py index 359e6c64f9..35562b1e76 100644 --- a/tempest/openstack.py +++ b/tempest/openstack.py @@ -25,31 +25,32 @@ 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.nova.json.extensions_client import ExtensionsClientJSON -from tempest.services.nova.json.flavors_client import FlavorsClientJSON -from tempest.services.nova.json.floating_ips_client import \ +from tempest.services.compute.json.extensions_client import \ +ExtensionsClientJSON +from tempest.services.compute.json.flavors_client import FlavorsClientJSON +from tempest.services.compute.json.floating_ips_client import \ FloatingIPsClientJSON -from tempest.services.nova.json.images_client import ImagesClientJSON -from tempest.services.nova.json.limits_client import LimitsClientJSON -from tempest.services.nova.json.servers_client import ServersClientJSON -from tempest.services.nova.json.security_groups_client \ +from tempest.services.compute.json.images_client import ImagesClientJSON +from tempest.services.compute.json.limits_client import LimitsClientJSON +from tempest.services.compute.json.servers_client import ServersClientJSON +from tempest.services.compute.json.security_groups_client \ import SecurityGroupsClientJSON -from tempest.services.nova.json.keypairs_client import KeyPairsClientJSON -from tempest.services.nova.json.volumes_extensions_client \ +from tempest.services.compute.json.keypairs_client import KeyPairsClientJSON +from tempest.services.compute.json.volumes_extensions_client \ import VolumesExtensionsClientJSON -from tempest.services.nova.json.console_output_client \ +from tempest.services.compute.json.console_output_client \ import ConsoleOutputsClient -from tempest.services.nova.xml.extensions_client import ExtensionsClientXML -from tempest.services.nova.xml.flavors_client import FlavorsClientXML -from tempest.services.nova.xml.floating_ips_client import \ +from tempest.services.compute.xml.extensions_client import ExtensionsClientXML +from tempest.services.compute.xml.flavors_client import FlavorsClientXML +from tempest.services.compute.xml.floating_ips_client import \ FloatingIPsClientXML -from tempest.services.nova.xml.images_client import ImagesClientXML -from tempest.services.nova.xml.keypairs_client import KeyPairsClientXML -from tempest.services.nova.xml.limits_client import LimitsClientXML -from tempest.services.nova.xml.security_groups_client \ +from tempest.services.compute.xml.images_client import ImagesClientXML +from tempest.services.compute.xml.keypairs_client import KeyPairsClientXML +from tempest.services.compute.xml.limits_client import LimitsClientXML +from tempest.services.compute.xml.security_groups_client \ import SecurityGroupsClientXML -from tempest.services.nova.xml.servers_client import ServersClientXML -from tempest.services.nova.xml.volumes_extensions_client \ +from tempest.services.compute.xml.servers_client import ServersClientXML +from tempest.services.compute.xml.volumes_extensions_client \ import VolumesExtensionsClientXML from tempest.services.volume.json.volumes_client import VolumesClientJSON from tempest.services.volume.xml.volumes_client import VolumesClientXML diff --git a/tempest/services/nova/__init__.py b/tempest/services/compute/__init__.py similarity index 100% rename from tempest/services/nova/__init__.py rename to tempest/services/compute/__init__.py diff --git a/tempest/services/nova/json/__init__.py b/tempest/services/compute/json/__init__.py similarity index 100% rename from tempest/services/nova/json/__init__.py rename to tempest/services/compute/json/__init__.py diff --git a/tempest/services/nova/json/console_output_client.py b/tempest/services/compute/json/console_output_client.py similarity index 51% rename from tempest/services/nova/json/console_output_client.py rename to tempest/services/compute/json/console_output_client.py index b2f2a39ec6..d12fd7d932 100644 --- a/tempest/services/nova/json/console_output_client.py +++ b/tempest/services/compute/json/console_output_client.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + from tempest.common.rest_client import RestClient import json diff --git a/tempest/services/nova/json/extensions_client.py b/tempest/services/compute/json/extensions_client.py similarity index 52% rename from tempest/services/nova/json/extensions_client.py rename to tempest/services/compute/json/extensions_client.py index 620b240cc4..c0200df309 100644 --- a/tempest/services/nova/json/extensions_client.py +++ b/tempest/services/compute/json/extensions_client.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + from tempest.common.rest_client import RestClient import json diff --git a/tempest/services/nova/json/flavors_client.py b/tempest/services/compute/json/flavors_client.py similarity index 76% rename from tempest/services/nova/json/flavors_client.py rename to tempest/services/compute/json/flavors_client.py index ca1770bcf1..01708a23d7 100644 --- a/tempest/services/nova/json/flavors_client.py +++ b/tempest/services/compute/json/flavors_client.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + from tempest.common.rest_client import RestClient import json diff --git a/tempest/services/nova/json/floating_ips_client.py b/tempest/services/compute/json/floating_ips_client.py similarity index 80% rename from tempest/services/nova/json/floating_ips_client.py rename to tempest/services/compute/json/floating_ips_client.py index 8a1b08f7e6..6219f34884 100644 --- a/tempest/services/nova/json/floating_ips_client.py +++ b/tempest/services/compute/json/floating_ips_client.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + from tempest.common.rest_client import RestClient from tempest import exceptions import json diff --git a/tempest/services/nova/json/hosts_client.py b/tempest/services/compute/json/hosts_client.py similarity index 100% rename from tempest/services/nova/json/hosts_client.py rename to tempest/services/compute/json/hosts_client.py diff --git a/tempest/services/nova/json/images_client.py b/tempest/services/compute/json/images_client.py similarity index 88% rename from tempest/services/nova/json/images_client.py rename to tempest/services/compute/json/images_client.py index b2a4a12ce1..102590c452 100644 --- a/tempest/services/nova/json/images_client.py +++ b/tempest/services/compute/json/images_client.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + from tempest.common.rest_client import RestClient from tempest import exceptions import json diff --git a/tempest/services/nova/json/keypairs_client.py b/tempest/services/compute/json/keypairs_client.py similarity index 68% rename from tempest/services/nova/json/keypairs_client.py rename to tempest/services/compute/json/keypairs_client.py index ce80de802f..553936cd91 100644 --- a/tempest/services/nova/json/keypairs_client.py +++ b/tempest/services/compute/json/keypairs_client.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + from tempest.common.rest_client import RestClient import json diff --git a/tempest/services/nova/json/limits_client.py b/tempest/services/compute/json/limits_client.py similarity index 58% rename from tempest/services/nova/json/limits_client.py rename to tempest/services/compute/json/limits_client.py index 1f83ebfafa..f363bf7879 100644 --- a/tempest/services/nova/json/limits_client.py +++ b/tempest/services/compute/json/limits_client.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + import json from tempest.common.rest_client import RestClient diff --git a/tempest/services/nova/json/security_groups_client.py b/tempest/services/compute/json/security_groups_client.py similarity index 82% rename from tempest/services/nova/json/security_groups_client.py rename to tempest/services/compute/json/security_groups_client.py index 79392493d8..9d8de23fc1 100644 --- a/tempest/services/nova/json/security_groups_client.py +++ b/tempest/services/compute/json/security_groups_client.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + from tempest.common.rest_client import RestClient import json diff --git a/tempest/services/nova/json/servers_client.py b/tempest/services/compute/json/servers_client.py similarity index 95% rename from tempest/services/nova/json/servers_client.py rename to tempest/services/compute/json/servers_client.py index a96dacbb41..5f37f59d43 100644 --- a/tempest/services/nova/json/servers_client.py +++ b/tempest/services/compute/json/servers_client.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + from tempest import exceptions from tempest.common.rest_client import RestClient import json diff --git a/tempest/services/nova/json/volumes_extensions_client.py b/tempest/services/compute/json/volumes_extensions_client.py similarity index 84% rename from tempest/services/nova/json/volumes_extensions_client.py rename to tempest/services/compute/json/volumes_extensions_client.py index 4c0a9620cc..5ac1124569 100644 --- a/tempest/services/nova/json/volumes_extensions_client.py +++ b/tempest/services/compute/json/volumes_extensions_client.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + from tempest import exceptions from tempest.common.rest_client import RestClient import json diff --git a/tempest/services/nova/xml/__init__.py b/tempest/services/compute/xml/__init__.py similarity index 100% rename from tempest/services/nova/xml/__init__.py rename to tempest/services/compute/xml/__init__.py diff --git a/tempest/services/nova/xml/common.py b/tempest/services/compute/xml/common.py similarity index 100% rename from tempest/services/nova/xml/common.py rename to tempest/services/compute/xml/common.py diff --git a/tempest/services/nova/xml/extensions_client.py b/tempest/services/compute/xml/extensions_client.py similarity index 56% rename from tempest/services/nova/xml/extensions_client.py rename to tempest/services/compute/xml/extensions_client.py index c64efc8ca8..3deaa55c94 100644 --- a/tempest/services/nova/xml/extensions_client.py +++ b/tempest/services/compute/xml/extensions_client.py @@ -1,6 +1,23 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + from lxml import etree from tempest.common.rest_client import RestClientXML -from tempest.services.nova.xml.common import xml_to_json +from tempest.services.compute.xml.common import xml_to_json class ExtensionsClientXML(RestClientXML): diff --git a/tempest/services/nova/xml/flavors_client.py b/tempest/services/compute/xml/flavors_client.py similarity index 76% rename from tempest/services/nova/xml/flavors_client.py rename to tempest/services/compute/xml/flavors_client.py index 43a9a11b2c..63ce267a04 100644 --- a/tempest/services/nova/xml/flavors_client.py +++ b/tempest/services/compute/xml/flavors_client.py @@ -1,12 +1,29 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + import urllib from lxml import etree from tempest.common.rest_client import RestClientXML -from tempest.services.nova.xml.common import Document -from tempest.services.nova.xml.common import Element -from tempest.services.nova.xml.common import xml_to_json -from tempest.services.nova.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 xml_to_json +from tempest.services.compute.xml.common import XMLNS_11 XMLNS_OS_FLV_EXT_DATA = \ diff --git a/tempest/services/nova/xml/floating_ips_client.py b/tempest/services/compute/xml/floating_ips_client.py similarity index 95% rename from tempest/services/nova/xml/floating_ips_client.py rename to tempest/services/compute/xml/floating_ips_client.py index 21b0cc5493..2f8792692b 100644 --- a/tempest/services/nova/xml/floating_ips_client.py +++ b/tempest/services/compute/xml/floating_ips_client.py @@ -19,9 +19,9 @@ from lxml import etree from tempest.common.rest_client import RestClientXML from tempest import exceptions -from tempest.services.nova.xml.common import xml_to_json -from tempest.services.nova.xml.common import Document -from tempest.services.nova.xml.common import Element +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 Element class FloatingIPsClientXML(RestClientXML): diff --git a/tempest/services/nova/xml/images_client.py b/tempest/services/compute/xml/images_client.py similarity index 96% rename from tempest/services/nova/xml/images_client.py rename to tempest/services/compute/xml/images_client.py index 0df8dfceee..12ad4d401d 100644 --- a/tempest/services/nova/xml/images_client.py +++ b/tempest/services/compute/xml/images_client.py @@ -22,11 +22,11 @@ from lxml import etree from tempest import exceptions from tempest.common.rest_client import RestClientXML -from tempest.services.nova.xml.common import Document -from tempest.services.nova.xml.common import Element -from tempest.services.nova.xml.common import Text -from tempest.services.nova.xml.common import xml_to_json -from tempest.services.nova.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 Text +from tempest.services.compute.xml.common import xml_to_json +from tempest.services.compute.xml.common import XMLNS_11 class ImagesClientXML(RestClientXML): diff --git a/tempest/services/nova/xml/keypairs_client.py b/tempest/services/compute/xml/keypairs_client.py similarity index 91% rename from tempest/services/nova/xml/keypairs_client.py rename to tempest/services/compute/xml/keypairs_client.py index 7c05480d86..d258537033 100644 --- a/tempest/services/nova/xml/keypairs_client.py +++ b/tempest/services/compute/xml/keypairs_client.py @@ -18,10 +18,10 @@ from lxml import etree from tempest.common.rest_client import RestClientXML -from tempest.services.nova.xml.common import Document -from tempest.services.nova.xml.common import Element -from tempest.services.nova.xml.common import Text -from tempest.services.nova.xml.common import xml_to_json +from tempest.services.compute.xml.common import Document +from tempest.services.compute.xml.common import Element +from tempest.services.compute.xml.common import Text +from tempest.services.compute.xml.common import xml_to_json class KeyPairsClientXML(RestClientXML): diff --git a/tempest/services/nova/xml/limits_client.py b/tempest/services/compute/xml/limits_client.py similarity index 100% rename from tempest/services/nova/xml/limits_client.py rename to tempest/services/compute/xml/limits_client.py diff --git a/tempest/services/nova/xml/security_groups_client.py b/tempest/services/compute/xml/security_groups_client.py similarity index 95% rename from tempest/services/nova/xml/security_groups_client.py rename to tempest/services/compute/xml/security_groups_client.py index 8edd1afb9e..0e35112457 100644 --- a/tempest/services/nova/xml/security_groups_client.py +++ b/tempest/services/compute/xml/security_groups_client.py @@ -18,10 +18,10 @@ from lxml import etree from tempest.common.rest_client import RestClientXML -from tempest.services.nova.xml.common import Document -from tempest.services.nova.xml.common import Element -from tempest.services.nova.xml.common import Text -from tempest.services.nova.xml.common import xml_to_json +from tempest.services.compute.xml.common import Document +from tempest.services.compute.xml.common import Element +from tempest.services.compute.xml.common import Text +from tempest.services.compute.xml.common import xml_to_json class SecurityGroupsClientXML(RestClientXML): diff --git a/tempest/services/nova/xml/servers_client.py b/tempest/services/compute/xml/servers_client.py similarity index 97% rename from tempest/services/nova/xml/servers_client.py rename to tempest/services/compute/xml/servers_client.py index 353f1c368f..d7c88b7d5c 100644 --- a/tempest/services/nova/xml/servers_client.py +++ b/tempest/services/compute/xml/servers_client.py @@ -19,11 +19,11 @@ import logging from lxml import etree from tempest import exceptions from tempest.common.rest_client import RestClientXML -from tempest.services.nova.xml.common import Document -from tempest.services.nova.xml.common import Element -from tempest.services.nova.xml.common import Text -from tempest.services.nova.xml.common import xml_to_json -from tempest.services.nova.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 Text +from tempest.services.compute.xml.common import xml_to_json +from tempest.services.compute.xml.common import XMLNS_11 import time LOG = logging.getLogger(__name__) diff --git a/tempest/services/nova/xml/volumes_extensions_client.py b/tempest/services/compute/xml/volumes_extensions_client.py similarity index 94% rename from tempest/services/nova/xml/volumes_extensions_client.py rename to tempest/services/compute/xml/volumes_extensions_client.py index fffea446ef..6869360be2 100644 --- a/tempest/services/nova/xml/volumes_extensions_client.py +++ b/tempest/services/compute/xml/volumes_extensions_client.py @@ -15,17 +15,16 @@ # License for the specific language governing permissions and limitations # under the License. - import time from lxml import etree from tempest import exceptions from tempest.common.rest_client import RestClientXML -from tempest.services.nova.xml.common import xml_to_json -from tempest.services.nova.xml.common import XMLNS_11 -from tempest.services.nova.xml.common import Element -from tempest.services.nova.xml.common import Text -from tempest.services.nova.xml.common import Document +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 Element +from tempest.services.compute.xml.common import Text +from tempest.services.compute.xml.common import Document class VolumesExtensionsClientXML(RestClientXML): diff --git a/tempest/services/identity/xml/admin_client.py b/tempest/services/identity/xml/admin_client.py index 953a4d51f6..0ace18408e 100644 --- a/tempest/services/identity/xml/admin_client.py +++ b/tempest/services/identity/xml/admin_client.py @@ -19,10 +19,10 @@ import logging from lxml import etree from tempest.common.rest_client import RestClient from tempest.common.rest_client import RestClientXML -from tempest.services.nova.xml.common import Document -from tempest.services.nova.xml.common import Element -from tempest.services.nova.xml.common import Text -from tempest.services.nova.xml.common import xml_to_json +from tempest.services.compute.xml.common import Document +from tempest.services.compute.xml.common import Element +from tempest.services.compute.xml.common import Text +from tempest.services.compute.xml.common import xml_to_json from tempest import exceptions import httplib2 import json diff --git a/tempest/services/volume/xml/volumes_client.py b/tempest/services/volume/xml/volumes_client.py index d05e85b59b..ef5f3e9892 100644 --- a/tempest/services/volume/xml/volumes_client.py +++ b/tempest/services/volume/xml/volumes_client.py @@ -21,11 +21,11 @@ from lxml import etree from tempest.common.rest_client import RestClientXML from tempest import exceptions -from tempest.services.nova.xml.common import xml_to_json -from tempest.services.nova.xml.common import XMLNS_11 -from tempest.services.nova.xml.common import Element -from tempest.services.nova.xml.common import Text -from tempest.services.nova.xml.common import Document +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 Element +from tempest.services.compute.xml.common import Text +from tempest.services.compute.xml.common import Document class VolumesClientXML(RestClientXML): diff --git a/tempest/tests/compute/flavors/__init__.py b/tempest/tests/compute/flavors/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tempest/tests/compute/test_flavors.py b/tempest/tests/compute/flavors/test_flavors.py similarity index 100% rename from tempest/tests/compute/test_flavors.py rename to tempest/tests/compute/flavors/test_flavors.py diff --git a/tempest/tests/compute/floating_ips/__init__.py b/tempest/tests/compute/floating_ips/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tempest/tests/compute/test_floating_ips_actions.py b/tempest/tests/compute/floating_ips/test_floating_ips_actions.py similarity index 100% rename from tempest/tests/compute/test_floating_ips_actions.py rename to tempest/tests/compute/floating_ips/test_floating_ips_actions.py diff --git a/tempest/tests/compute/test_list_floating_ips.py b/tempest/tests/compute/floating_ips/test_list_floating_ips.py similarity index 100% rename from tempest/tests/compute/test_list_floating_ips.py rename to tempest/tests/compute/floating_ips/test_list_floating_ips.py diff --git a/tempest/tests/compute/images/__init__.py b/tempest/tests/compute/images/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tempest/tests/compute/test_image_metadata.py b/tempest/tests/compute/images/test_image_metadata.py similarity index 100% rename from tempest/tests/compute/test_image_metadata.py rename to tempest/tests/compute/images/test_image_metadata.py diff --git a/tempest/tests/compute/test_images.py b/tempest/tests/compute/images/test_images.py similarity index 100% rename from tempest/tests/compute/test_images.py rename to tempest/tests/compute/images/test_images.py diff --git a/tempest/tests/compute/test_images_whitebox.py b/tempest/tests/compute/images/test_images_whitebox.py similarity index 100% rename from tempest/tests/compute/test_images_whitebox.py rename to tempest/tests/compute/images/test_images_whitebox.py diff --git a/tempest/tests/compute/test_list_image_filters.py b/tempest/tests/compute/images/test_list_image_filters.py similarity index 100% rename from tempest/tests/compute/test_list_image_filters.py rename to tempest/tests/compute/images/test_list_image_filters.py diff --git a/tempest/tests/compute/test_list_images.py b/tempest/tests/compute/images/test_list_images.py similarity index 100% rename from tempest/tests/compute/test_list_images.py rename to tempest/tests/compute/images/test_list_images.py diff --git a/tempest/tests/compute/keypairs/__init__.py b/tempest/tests/compute/keypairs/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tempest/tests/compute/test_keypairs.py b/tempest/tests/compute/keypairs/test_keypairs.py similarity index 100% rename from tempest/tests/compute/test_keypairs.py rename to tempest/tests/compute/keypairs/test_keypairs.py diff --git a/tempest/tests/compute/security_groups/__init__.py b/tempest/tests/compute/security_groups/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tempest/tests/compute/test_security_group_rules.py b/tempest/tests/compute/security_groups/test_security_group_rules.py similarity index 100% rename from tempest/tests/compute/test_security_group_rules.py rename to tempest/tests/compute/security_groups/test_security_group_rules.py diff --git a/tempest/tests/compute/test_security_groups.py b/tempest/tests/compute/security_groups/test_security_groups.py similarity index 100% rename from tempest/tests/compute/test_security_groups.py rename to tempest/tests/compute/security_groups/test_security_groups.py diff --git a/tempest/tests/compute/servers/__init__.py b/tempest/tests/compute/servers/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tempest/tests/compute/test_console_output.py b/tempest/tests/compute/servers/test_console_output.py similarity index 100% rename from tempest/tests/compute/test_console_output.py rename to tempest/tests/compute/servers/test_console_output.py diff --git a/tempest/tests/compute/test_create_server.py b/tempest/tests/compute/servers/test_create_server.py similarity index 100% rename from tempest/tests/compute/test_create_server.py rename to tempest/tests/compute/servers/test_create_server.py diff --git a/tempest/tests/compute/test_disk_config.py b/tempest/tests/compute/servers/test_disk_config.py similarity index 100% rename from tempest/tests/compute/test_disk_config.py rename to tempest/tests/compute/servers/test_disk_config.py diff --git a/tempest/tests/compute/test_list_server_filters.py b/tempest/tests/compute/servers/test_list_server_filters.py similarity index 100% rename from tempest/tests/compute/test_list_server_filters.py rename to tempest/tests/compute/servers/test_list_server_filters.py diff --git a/tempest/tests/compute/test_list_servers_negative.py b/tempest/tests/compute/servers/test_list_servers_negative.py similarity index 100% rename from tempest/tests/compute/test_list_servers_negative.py rename to tempest/tests/compute/servers/test_list_servers_negative.py diff --git a/tempest/tests/compute/test_server_actions.py b/tempest/tests/compute/servers/test_server_actions.py similarity index 100% rename from tempest/tests/compute/test_server_actions.py rename to tempest/tests/compute/servers/test_server_actions.py diff --git a/tempest/tests/compute/test_server_addresses.py b/tempest/tests/compute/servers/test_server_addresses.py similarity index 100% rename from tempest/tests/compute/test_server_addresses.py rename to tempest/tests/compute/servers/test_server_addresses.py diff --git a/tempest/tests/compute/test_server_advanced_ops.py b/tempest/tests/compute/servers/test_server_advanced_ops.py similarity index 100% rename from tempest/tests/compute/test_server_advanced_ops.py rename to tempest/tests/compute/servers/test_server_advanced_ops.py diff --git a/tempest/tests/compute/test_server_basic_ops.py b/tempest/tests/compute/servers/test_server_basic_ops.py similarity index 100% rename from tempest/tests/compute/test_server_basic_ops.py rename to tempest/tests/compute/servers/test_server_basic_ops.py diff --git a/tempest/tests/compute/test_server_metadata.py b/tempest/tests/compute/servers/test_server_metadata.py similarity index 100% rename from tempest/tests/compute/test_server_metadata.py rename to tempest/tests/compute/servers/test_server_metadata.py diff --git a/tempest/tests/compute/test_server_personality.py b/tempest/tests/compute/servers/test_server_personality.py similarity index 100% rename from tempest/tests/compute/test_server_personality.py rename to tempest/tests/compute/servers/test_server_personality.py diff --git a/tempest/tests/compute/test_servers.py b/tempest/tests/compute/servers/test_servers.py similarity index 100% rename from tempest/tests/compute/test_servers.py rename to tempest/tests/compute/servers/test_servers.py diff --git a/tempest/tests/compute/test_servers_negative.py b/tempest/tests/compute/servers/test_servers_negative.py similarity index 100% rename from tempest/tests/compute/test_servers_negative.py rename to tempest/tests/compute/servers/test_servers_negative.py diff --git a/tempest/tests/compute/test_servers_whitebox.py b/tempest/tests/compute/servers/test_servers_whitebox.py similarity index 100% rename from tempest/tests/compute/test_servers_whitebox.py rename to tempest/tests/compute/servers/test_servers_whitebox.py diff --git a/tempest/tests/compute/test_live_block_migration.py b/tempest/tests/compute/test_live_block_migration.py index fb175f3be7..ae8b774c8d 100644 --- a/tempest/tests/compute/test_live_block_migration.py +++ b/tempest/tests/compute/test_live_block_migration.py @@ -26,8 +26,8 @@ from tempest.common.utils.linux.remote_client import RemoteClient from tempest import config from tempest import exceptions -from tempest.services.nova.json.hosts_client import HostsClientJSON -from tempest.services.nova.json.servers_client import ServersClientJSON +from tempest.services.compute.json.hosts_client import HostsClientJSON +from tempest.services.compute.json.servers_client import ServersClientJSON @attr(category='live-migration') diff --git a/tempest/tests/compute/volumes/__init__.py b/tempest/tests/compute/volumes/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tempest/tests/compute/test_attach_volume.py b/tempest/tests/compute/volumes/test_attach_volume.py similarity index 100% rename from tempest/tests/compute/test_attach_volume.py rename to tempest/tests/compute/volumes/test_attach_volume.py diff --git a/tempest/tests/compute/test_volumes_get.py b/tempest/tests/compute/volumes/test_volumes_get.py similarity index 100% rename from tempest/tests/compute/test_volumes_get.py rename to tempest/tests/compute/volumes/test_volumes_get.py diff --git a/tempest/tests/compute/test_volumes_list.py b/tempest/tests/compute/volumes/test_volumes_list.py similarity index 100% rename from tempest/tests/compute/test_volumes_list.py rename to tempest/tests/compute/volumes/test_volumes_list.py diff --git a/tempest/tests/compute/test_volumes_negative.py b/tempest/tests/compute/volumes/test_volumes_negative.py similarity index 100% rename from tempest/tests/compute/test_volumes_negative.py rename to tempest/tests/compute/volumes/test_volumes_negative.py