Merge "Prevent stale isolated tenants from blocking test runs"
diff --git a/tempest/manager.py b/tempest/manager.py
index c64227c..4469301 100644
--- a/tempest/manager.py
+++ b/tempest/manager.py
@@ -40,11 +40,11 @@
ImagesClient = images_client.ImagesClient
FlavorsClient = flavors_client.FlavorsClient
ServersClient = servers_client.ServersClientJSON
-LimitsClient = limits_client.LimitsClient
+LimitsClient = limits_client.LimitsClientJSON
ExtensionsClient = extensions_client.ExtensionsClient
SecurityGroupsClient = security_groups_client.SecurityGroupsClient
FloatingIPsClient = floating_ips_client.FloatingIPsClient
-KeyPairsClient = keypairs_client.KeyPairsClient
+KeyPairsClient = keypairs_client.KeyPairsClientJSON
VolumesClient = volumes_client.VolumesClient
ConsoleOutputsClient = console_output_client.ConsoleOutputsClient
diff --git a/tempest/openstack.py b/tempest/openstack.py
index b9912f1..e5f6404 100644
--- a/tempest/openstack.py
+++ b/tempest/openstack.py
@@ -23,25 +23,37 @@
from tempest.services.network.json.network_client import NetworkClient
from tempest.services.nova.json.images_client import ImagesClient
from tempest.services.nova.json.flavors_client import FlavorsClient
+from tempest.services.nova.json.limits_client import LimitsClientJSON
from tempest.services.nova.json.servers_client import ServersClientJSON
-from tempest.services.nova.json.limits_client import LimitsClient
from tempest.services.nova.json.extensions_client import ExtensionsClient
from tempest.services.nova.json.security_groups_client \
import SecurityGroupsClient
from tempest.services.nova.json.floating_ips_client import FloatingIPsClient
-from tempest.services.nova.json.keypairs_client import KeyPairsClient
+from tempest.services.nova.json.keypairs_client import KeyPairsClientJSON
from tempest.services.nova.json.volumes_client import VolumesClient
from tempest.services.nova.json.console_output_client \
import ConsoleOutputsClient
+from tempest.services.nova.xml.keypairs_client import KeyPairsClientXML
+from tempest.services.nova.xml.limits_client import LimitsClientXML
from tempest.services.nova.xml.servers_client import ServersClientXML
LOG = logging.getLogger(__name__)
+KEYPAIRS_CLIENTS = {
+ "json": KeyPairsClientJSON,
+ "xml": KeyPairsClientXML,
+}
+
SERVERS_CLIENTS = {
"json": ServersClientJSON,
"xml": ServersClientXML,
}
+LIMITS_CLIENTS = {
+ "json": LimitsClientJSON,
+ "xml": LimitsClientXML,
+}
+
class Manager(object):
@@ -84,14 +96,14 @@
try:
self.servers_client = SERVERS_CLIENTS[interface](*client_args)
+ self.limits_client = LIMITS_CLIENTS[interface](*client_args)
+ self.keypairs_client = KEYPAIRS_CLIENTS[interface](*client_args)
except KeyError:
msg = "Unsupported interface type `%s'" % interface
raise exceptions.InvalidConfiguration(msg)
self.flavors_client = FlavorsClient(*client_args)
self.images_client = ImagesClient(*client_args)
- self.limits_client = LimitsClient(*client_args)
self.extensions_client = ExtensionsClient(*client_args)
- self.keypairs_client = KeyPairsClient(*client_args)
self.security_groups_client = SecurityGroupsClient(*client_args)
self.floating_ips_client = FloatingIPsClient(*client_args)
self.volumes_client = VolumesClient(*client_args)
diff --git a/tempest/services/nova/json/keypairs_client.py b/tempest/services/nova/json/keypairs_client.py
index 4e72a01..1ccc65a 100644
--- a/tempest/services/nova/json/keypairs_client.py
+++ b/tempest/services/nova/json/keypairs_client.py
@@ -2,11 +2,11 @@
import json
-class KeyPairsClient(RestClient):
+class KeyPairsClientJSON(RestClient):
def __init__(self, config, username, password, auth_url, tenant_name=None):
- super(KeyPairsClient, self).__init__(config, username, password,
- auth_url, tenant_name)
+ super(KeyPairsClientJSON, self).__init__(config, username, password,
+ auth_url, tenant_name)
self.service = self.config.compute.catalog_type
def list_keypairs(self):
diff --git a/tempest/services/nova/json/limits_client.py b/tempest/services/nova/json/limits_client.py
index 163b685..d0dc153 100644
--- a/tempest/services/nova/json/limits_client.py
+++ b/tempest/services/nova/json/limits_client.py
@@ -2,10 +2,10 @@
from tempest.common.rest_client import RestClient
-class LimitsClient(RestClient):
+class LimitsClientJSON(RestClient):
def __init__(self, config, username, password, auth_url, tenant_name=None):
- super(LimitsClient, self).__init__(config, username, password,
+ super(LimitsClientJSON, self).__init__(config, username, password,
auth_url, tenant_name)
self.service = self.config.compute.catalog_type
diff --git a/tempest/services/nova/xml/keypairs_client.py b/tempest/services/nova/xml/keypairs_client.py
new file mode 100644
index 0000000..7c05480
--- /dev/null
+++ b/tempest/services/nova/xml/keypairs_client.py
@@ -0,0 +1,69 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+#
+# Copyright 2012 IBM
+# 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 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
+
+
+class KeyPairsClientXML(RestClientXML):
+
+ def __init__(self, config, username, password, auth_url, tenant_name=None):
+ super(KeyPairsClientXML, self).__init__(config, username, password,
+ auth_url, tenant_name)
+ self.service = self.config.compute.catalog_type
+
+ def list_keypairs(self):
+ resp, body = self.get("os-keypairs", self.headers)
+ node = etree.fromstring(body)
+ body = [{'keypair': xml_to_json(x)} for x in node.getchildren()]
+ return resp, body
+
+ def get_keypair(self, key_name):
+ resp, body = self.get("os-keypairs/%s" % str(key_name), self.headers)
+ body = xml_to_json(etree.fromstring(body))
+ return resp, body
+
+ def create_keypair(self, name, pub_key=None):
+ doc = Document()
+
+ keypair_element = Element("keypair")
+
+ if pub_key:
+ public_key_element = Element("public_key")
+ public_key_text = Text(pub_key)
+ public_key_element.append(public_key_text)
+ keypair_element.append(public_key_element)
+
+ name_element = Element("name")
+ name_text = Text(name)
+ name_element.append(name_text)
+ keypair_element.append(name_element)
+
+ doc.append(keypair_element)
+
+ resp, body = self.post("os-keypairs",
+ headers=self.headers, body=str(doc))
+ body = xml_to_json(etree.fromstring(body))
+ return resp, body
+
+ def delete_keypair(self, key_name):
+ return self.delete("os-keypairs/%s" % str(key_name))
diff --git a/tempest/services/nova/xml/limits_client.py b/tempest/services/nova/xml/limits_client.py
new file mode 100644
index 0000000..3f47484
--- /dev/null
+++ b/tempest/services/nova/xml/limits_client.py
@@ -0,0 +1,59 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+#
+# Copyright 2012 IBM
+# 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 RestClientXML
+from lxml import etree
+from lxml import objectify
+
+NS = "{http://docs.openstack.org/common/api/v1.0}"
+
+
+class LimitsClientXML(RestClientXML):
+
+ def __init__(self, config, username, password, auth_url, tenant_name=None):
+ super(LimitsClientXML, self).__init__(config, username, password,
+ auth_url, tenant_name)
+ self.service = self.config.compute.catalog_type
+
+ def get_limits(self):
+ resp, body = self.get("limits", self.headers)
+ body = objectify.fromstring(body)
+ lim = NS + 'absolute'
+ ret = {}
+
+ for el in body[lim].iterchildren():
+ attributes = el.attrib
+ if attributes['name'] == 'maxServerMeta':
+ ret['maxServerMeta'] = int(attributes['value'])
+ elif attributes['name'] == 'maxPersonality':
+ ret['maxPersonality'] = int(attributes['value'])
+ elif attributes['name'] == 'maxPersonalitySize':
+ ret['maxPersonalitySize'] = int(attributes['value'])
+
+ return resp, ret
+
+ def get_max_server_meta(self):
+ resp, limits_dict = self.get_limits()
+ return resp, limits_dict['maxServerMeta']
+
+ def get_personality_file_limit(self):
+ resp, limits_dict = self.get_limits()
+ return resp, limits_dict['maxPersonality']
+
+ def get_personality_size_limit(self):
+ resp, limits_dict = self.get_limits()
+ return resp, limits_dict['maxPersonalitySize']
diff --git a/tempest/tests/compute/test_attach_volume.py b/tempest/tests/compute/test_attach_volume.py
index 07bd7aa..7fe86dd 100644
--- a/tempest/tests/compute/test_attach_volume.py
+++ b/tempest/tests/compute/test_attach_volume.py
@@ -22,16 +22,15 @@
from tempest.common.utils.data_utils import rand_name
from tempest.common.utils.linux.remote_client import RemoteClient
from tempest import openstack
-from tempest.tests.compute.base import BaseComputeTest
+from tempest.tests.compute import base
-class TestAttachVolume(BaseComputeTest):
+class AttachVolumeTest(object):
run_ssh = tempest.config.TempestConfig().compute.run_ssh
- @classmethod
+ @staticmethod
def setUpClass(cls):
- super(TestAttachVolume, cls).setUpClass()
cls.device = 'vdb'
def _detach(self, server_id, volume_id):
@@ -108,3 +107,19 @@
if attached:
self._detach(server['id'], volume['id'])
self._delete(server['id'], volume['id'])
+
+
+class TestAttachVolumeJSON(base.BaseComputeTestJSON,
+ AttachVolumeTest):
+ @classmethod
+ def setUpClass(cls):
+ super(TestAttachVolumeJSON, cls).setUpClass()
+ AttachVolumeTest.setUpClass(cls)
+
+
+class TestAttachVolumeXML(base.BaseComputeTestXML,
+ AttachVolumeTest):
+ @classmethod
+ def setUpClass(cls):
+ super(TestAttachVolumeXML, cls).setUpClass()
+ AttachVolumeTest.setUpClass(cls)
diff --git a/tempest/tests/compute/test_keypairs.py b/tempest/tests/compute/test_keypairs.py
index 1c21678..33a26c9 100644
--- a/tempest/tests/compute/test_keypairs.py
+++ b/tempest/tests/compute/test_keypairs.py
@@ -20,15 +20,11 @@
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name
-from tempest.tests.compute.base import BaseComputeTest
+from tempest.tests.compute.base import BaseComputeTestJSON
+from tempest.tests.compute.base import BaseComputeTestXML
-class KeyPairsTest(BaseComputeTest):
-
- @classmethod
- def setUpClass(cls):
- super(KeyPairsTest, cls).setUpClass()
- cls.client = cls.keypairs_client
+class KeyPairsTestBase(object):
@attr(type='positive')
def test_keypairs_create_list_delete(self):
@@ -220,3 +216,17 @@
pass
else:
self.fail('invalid name')
+
+
+class KeyPairsTestXML(BaseComputeTestXML, KeyPairsTestBase):
+ @classmethod
+ def setUpClass(cls):
+ super(KeyPairsTestXML, cls).setUpClass()
+ cls.client = cls.keypairs_client
+
+
+class KeyPairsTestJSON(BaseComputeTestJSON, KeyPairsTestBase):
+ @classmethod
+ def setUpClass(cls):
+ super(KeyPairsTestJSON, cls).setUpClass()
+ cls.client = cls.keypairs_client
diff --git a/tempest/tests/compute/test_security_groups.py b/tempest/tests/compute/test_security_groups.py
index f5d9848..4444d62 100644
--- a/tempest/tests/compute/test_security_groups.py
+++ b/tempest/tests/compute/test_security_groups.py
@@ -19,14 +19,13 @@
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name
-from tempest.tests.compute.base import BaseComputeTest
+from tempest.tests.compute import base
-class SecurityGroupsTest(BaseComputeTest):
+class SecurityGroupsTest(object):
- @classmethod
+ @staticmethod
def setUpClass(cls):
- super(SecurityGroupsTest, cls).setUpClass()
cls.client = cls.security_groups_client
@attr(type='positive')
@@ -311,3 +310,19 @@
self.client.delete_security_group(sg2_id)
self.assertEqual(202, resp.status)
+
+
+class SecurityGroupsTestJSON(base.BaseComputeTestJSON,
+ SecurityGroupsTest):
+ @classmethod
+ def setUpClass(cls):
+ super(SecurityGroupsTestJSON, cls).setUpClass()
+ SecurityGroupsTest.setUpClass(cls)
+
+
+class SecurityGroupsTestXML(base.BaseComputeTestXML,
+ SecurityGroupsTest):
+ @classmethod
+ def setUpClass(cls):
+ super(SecurityGroupsTestXML, cls).setUpClass()
+ SecurityGroupsTest.setUpClass(cls)
diff --git a/tempest/tests/compute/test_server_personality.py b/tempest/tests/compute/test_server_personality.py
index e34aeea..be60f40 100644
--- a/tempest/tests/compute/test_server_personality.py
+++ b/tempest/tests/compute/test_server_personality.py
@@ -21,16 +21,10 @@
from tempest import exceptions
from tempest.common.utils.data_utils import rand_name
-from tempest.tests.compute.base import BaseComputeTest
+from tempest.tests.compute import base
-class ServerPersonalityTest(BaseComputeTest):
-
- @classmethod
- def setUpClass(cls):
- super(ServerPersonalityTest, cls).setUpClass()
- cls.client = cls.servers_client
- cls.user_client = cls.limits_client
+class ServerPersonalityTestBase(object):
def test_personality_files_exceed_limit(self):
"""
@@ -79,6 +73,29 @@
personality=personality)
self.assertEqual('202', resp['status'])
+ except Exception:
+ raise Error(resp['message'])
+
#Teardown
finally:
self.client.delete_server(server['id'])
+
+
+class ServerPersonalityTestXML(base.BaseComputeTestXML,
+ ServerPersonalityTestBase):
+ @classmethod
+ def setUpClass(cls):
+ cls._interface = "xml"
+ super(ServerPersonalityTestXML, cls).setUpClass()
+ cls.client = cls.servers_client
+ cls.user_client = cls.limits_client
+
+
+class ServerPersonalityTestJSON(base.BaseComputeTestJSON,
+ ServerPersonalityTestBase):
+ @classmethod
+ def setUpClass(cls):
+ cls._interface = "json"
+ super(ServerPersonalityTestJSON, cls).setUpClass()
+ cls.client = cls.servers_client
+ cls.user_client = cls.limits_client