General cleanup/organization of compute tests

* Renamed services/nova to compute
* Added OpenStack license where missed to compute services/tests
* Broke down compute tests into separate packages by functionality

Change-Id: Ibb1f3ec74b83816205a0bed7d0e062ebf9677525

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

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

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

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
 

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
 

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
 

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

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

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
 

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
 

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
 

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

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

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

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 = \

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

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

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

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

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

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

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

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

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