From 3f013e370d79b28752be67d7125674885381d13b Mon Sep 17 00:00:00 2001 From: gongysh Date: Sun, 5 Aug 2012 20:04:24 -0300 Subject: [PATCH] Adds xml support for quantum v2 API. Fixes bug 1007998. blueprint quantum-v2-api-xml Author: gongysh Change-Id: I5f5407e767f8203f980b77075109845bc1553ed9 --- quantum/api/extensions.py | 6 +- quantum/api/v2/attributes.py | 17 + quantum/api/v2/base.py | 13 +- quantum/api/v2/resource.py | 42 +- quantum/common/constants.py | 16 + quantum/db/quota_db.py | 2 +- quantum/extensions/l3.py | 2 + quantum/extensions/loadbalancer.py | 2 + quantum/extensions/quotasv2.py | 3 +- quantum/extensions/securitygroup.py | 2 + quantum/extensions/servicetype.py | 5 + .../tests/unit/cisco/test_network_plugin.py | 24 +- .../db/loadbalancer/test_db_loadbalancer.py | 181 ++++---- .../linuxbridge/test_lb_security_group.py | 22 +- quantum/tests/unit/test_api_v2.py | 163 ++++--- quantum/tests/unit/test_api_v2_resource.py | 59 ++- quantum/tests/unit/test_db_plugin.py | 427 +++++++++--------- .../unit/test_extension_security_group.py | 229 +++++----- quantum/tests/unit/test_extensions.py | 18 +- quantum/tests/unit/test_l3_plugin.py | 114 +++-- .../tests/unit/test_loadbalancer_plugin.py | 144 +++--- .../tests/unit/test_quota_per_tenant_ext.py | 62 +-- .../tests/unit/test_security_groups_rpc.py | 60 +-- quantum/tests/unit/test_servicetype.py | 103 +++-- quantum/tests/unit/test_wsgi.py | 117 ++++- quantum/tests/unit/testlib_api.py | 28 ++ quantum/wsgi.py | 349 +++++++------- 27 files changed, 1301 insertions(+), 909 deletions(-) diff --git a/quantum/api/extensions.py b/quantum/api/extensions.py index 707383fe8..5062ee15e 100644 --- a/quantum/api/extensions.py +++ b/quantum/api/extensions.py @@ -25,11 +25,12 @@ import routes import webob.dec import webob.exc +from quantum.api.v2 import attributes +from quantum.common import constants from quantum.common import exceptions import quantum.extensions from quantum.manager import QuantumManager from quantum.openstack.common import cfg -from quantum.openstack.common import importutils from quantum.openstack.common import log as logging from quantum import wsgi @@ -436,6 +437,8 @@ class ExtensionManager(object): attr_map[resource].update(resource_attrs) else: attr_map[resource] = resource_attrs + if extended_attrs: + attributes.EXT_NSES[ext.get_alias()] = ext.get_namespace() except AttributeError: LOG.exception(_("Error fetching extended attributes for " "extension '%s'"), ext.get_name()) @@ -536,7 +539,6 @@ class PluginAwareExtensionManager(ExtensionManager): "supported_extension_aliases") and alias in plugin.supported_extension_aliases) for plugin in self.plugins.values()) - plugin_provider = cfg.CONF.core_plugin if not supports_extension: LOG.warn(_("Extension %s not supported by any of loaded plugins"), alias) diff --git a/quantum/api/v2/attributes.py b/quantum/api/v2/attributes.py index 96c9b29a6..8bf10a1f4 100644 --- a/quantum/api/v2/attributes.py +++ b/quantum/api/v2/attributes.py @@ -18,6 +18,7 @@ import netaddr import re +from quantum.common import constants from quantum.common import exceptions as q_exc from quantum.openstack.common import log as logging from quantum.openstack.common import uuidutils @@ -536,3 +537,19 @@ RESOURCE_HIERARCHY_MAP = { 'ports': {'parent': 'networks', 'identified_by': 'network_id'}, 'subnets': {'parent': 'networks', 'identified_by': 'network_id'} } + +PLURALS = {'networks': 'network', + 'ports': 'port', + 'subnets': 'subnet', + 'dns_nameservers': 'dns_nameserver', + 'host_routes': 'host_route', + 'allocation_pools': 'allocation_pool', + 'fixed_ips': 'fixed_ip', + 'extensions': 'extension'} +EXT_NSES = {} + + +def get_attr_metadata(): + return {'plurals': PLURALS, + 'xmlns': constants.XML_NS_V20, + constants.EXT_NS: EXT_NSES} diff --git a/quantum/api/v2/base.py b/quantum/api/v2/base.py index e741462c5..31c5fd63d 100644 --- a/quantum/api/v2/base.py +++ b/quantum/api/v2/base.py @@ -26,8 +26,8 @@ from quantum.openstack.common.notifier import api as notifier_api from quantum import policy from quantum import quota + LOG = logging.getLogger(__name__) -XML_NS_V20 = 'http://openstack.org/quantum/api/v2.0' FAULT_MAP = {exceptions.NotFound: webob.exc.HTTPNotFound, exceptions.Conflict: webob.exc.HTTPConflict, @@ -527,13 +527,4 @@ def create_resource(collection, resource, plugin, params, allow_bulk=False, controller = Controller(plugin, collection, resource, params, allow_bulk, member_actions=member_actions, parent=parent) - # NOTE(jkoelker) To anyone wishing to add "proper" xml support - # this is where you do it - serializers = {} - # 'application/xml': wsgi.XMLDictSerializer(metadata, XML_NS_V20), - - deserializers = {} - # 'application/xml': wsgi.XMLDeserializer(metadata), - - return wsgi_resource.Resource(controller, FAULT_MAP, deserializers, - serializers) + return wsgi_resource.Resource(controller, FAULT_MAP) diff --git a/quantum/api/v2/resource.py b/quantum/api/v2/resource.py index 12d7b6c2a..437e454b3 100644 --- a/quantum/api/v2/resource.py +++ b/quantum/api/v2/resource.py @@ -18,13 +18,11 @@ Utility methods for working with WSGI servers redux """ import netaddr -import webob import webob.dec import webob.exc +from quantum.api.v2 import attributes from quantum.common import exceptions -from quantum import context -from quantum.openstack.common import jsonutils as json from quantum.openstack.common import log as logging from quantum import wsgi @@ -32,31 +30,20 @@ from quantum import wsgi LOG = logging.getLogger(__name__) -class Request(webob.Request): - """Add some Openstack API-specific logic to the base webob.Request.""" - - def best_match_content_type(self): - supported = ('application/json', ) - return self.accept.best_match(supported, - default_match='application/json') - - @property - def context(self): - #Eventually the Auth[NZ] code will supply this. (mdragon) - #when that happens this if block should raise instead. - if 'quantum.context' not in self.environ: - self.environ['quantum.context'] = context.get_admin_context() - return self.environ['quantum.context'] +class Request(wsgi.Request): + pass def Resource(controller, faults=None, deserializers=None, serializers=None): """Represents an API entity resource and the associated serialization and deserialization logic """ - default_deserializers = {'application/xml': wsgi.XMLDeserializer(), - 'application/json': lambda x: json.loads(x)} - default_serializers = {'application/xml': wsgi.XMLDictSerializer(), - 'application/json': lambda x: json.dumps(x)} + xml_deserializer = wsgi.XMLDeserializer(attributes.get_attr_metadata()) + default_deserializers = {'application/xml': xml_deserializer, + 'application/json': wsgi.JSONDeserializer()} + xml_serializer = wsgi.XMLDictSerializer(attributes.get_attr_metadata()) + default_serializers = {'application/xml': xml_serializer, + 'application/json': wsgi.JSONDictSerializer()} format_types = {'xml': 'application/xml', 'json': 'application/json'} action_status = dict(create=201, delete=204) @@ -81,7 +68,6 @@ def Resource(controller, faults=None, deserializers=None, serializers=None): args.pop('controller', None) fmt = args.pop('format', None) action = args.pop('action', None) - content_type = format_types.get(fmt, request.best_match_content_type()) deserializer = deserializers.get(content_type) @@ -89,7 +75,7 @@ def Resource(controller, faults=None, deserializers=None, serializers=None): try: if request.body: - args['body'] = deserializer(request.body) + args['body'] = deserializer.deserialize(request.body)['body'] method = getattr(controller, action) @@ -98,7 +84,7 @@ def Resource(controller, faults=None, deserializers=None, serializers=None): exceptions.QuantumException, netaddr.AddrFormatError) as e: LOG.exception(_('%s failed'), action) - body = serializer({'QuantumError': str(e)}) + body = serializer.serialize({'QuantumError': str(e)}) kwargs = {'body': body, 'content_type': content_type} for fault in faults: if isinstance(e, fault): @@ -106,7 +92,7 @@ def Resource(controller, faults=None, deserializers=None, serializers=None): raise webob.exc.HTTPInternalServerError(**kwargs) except webob.exc.HTTPException as e: LOG.exception(_('%s failed'), action) - e.body = serializer({'QuantumError': str(e)}) + e.body = serializer.serialize({'QuantumError': str(e)}) e.content_type = content_type raise except Exception as e: @@ -115,12 +101,12 @@ def Resource(controller, faults=None, deserializers=None, serializers=None): # Do not expose details of 500 error to clients. msg = _('Request Failed: internal server error while ' 'processing your request.') - body = serializer({'QuantumError': msg}) + body = serializer.serialize({'QuantumError': msg}) kwargs = {'body': body, 'content_type': content_type} raise webob.exc.HTTPInternalServerError(**kwargs) status = action_status.get(action, 200) - body = serializer(result) + body = serializer.serialize(result) # NOTE(jkoelker) Comply with RFC2616 section 9.7 if status == 204: content_type = '' diff --git a/quantum/common/constants.py b/quantum/common/constants.py index 9eac348e2..5ff6a740c 100644 --- a/quantum/common/constants.py +++ b/quantum/common/constants.py @@ -33,3 +33,19 @@ INTERFACE_KEY = '_interfaces' IPv4 = 'IPv4' IPv6 = 'IPv6' + +EXT_NS = '_extension_ns' +XML_NS_V20 = 'http://openstack.org/quantum/api/v2.0' +XSI_NAMESPACE = "http://www.w3.org/2001/XMLSchema-instance" +XSI_ATTR = "xsi:nil" +XSI_NIL_ATTR = "xmlns:xsi" +TYPE_XMLNS = "xmlns:quantum" +TYPE_ATTR = "quantum:type" +VIRTUAL_ROOT_KEY = "_v_root" + +TYPE_BOOL = "bool" +TYPE_INT = "int" +TYPE_LONG = "long" +TYPE_FLOAT = "float" +TYPE_LIST = "list" +TYPE_DICT = "dict" diff --git a/quantum/db/quota_db.py b/quantum/db/quota_db.py index c72f9f329..c4954d209 100644 --- a/quantum/db/quota_db.py +++ b/quantum/db/quota_db.py @@ -103,7 +103,7 @@ class DbQuotaDriver(object): tenant_quota[quota['resource']] = quota['limit'] - return all_tenant_quotas.itervalues() + return all_tenant_quotas.values() @staticmethod def update_quota_limit(context, tenant_id, resource, limit): diff --git a/quantum/extensions/l3.py b/quantum/extensions/l3.py index 2da288270..5499c7a60 100644 --- a/quantum/extensions/l3.py +++ b/quantum/extensions/l3.py @@ -185,6 +185,8 @@ class L3(extensions.ExtensionDescriptor): @classmethod def get_resources(cls): """ Returns Ext Resources """ + my_plurals = [(key, key[:-1]) for key in RESOURCE_ATTRIBUTE_MAP.keys()] + attr.PLURALS.update(dict(my_plurals)) exts = [] plugin = manager.QuantumManager.get_plugin() for resource_name in ['router', 'floatingip']: diff --git a/quantum/extensions/loadbalancer.py b/quantum/extensions/loadbalancer.py index 4bd9ef369..df423233c 100644 --- a/quantum/extensions/loadbalancer.py +++ b/quantum/extensions/loadbalancer.py @@ -257,6 +257,8 @@ class Loadbalancer(extensions.ExtensionDescriptor): @classmethod def get_resources(cls): + my_plurals = [(key, key[:-1]) for key in RESOURCE_ATTRIBUTE_MAP.keys()] + attr.PLURALS.update(dict(my_plurals)) resources = [] plugin = manager.QuantumManager.get_service_plugins()[ constants.LOADBALANCER] diff --git a/quantum/extensions/quotasv2.py b/quantum/extensions/quotasv2.py index 27fe671ff..d1e1cc605 100644 --- a/quantum/extensions/quotasv2.py +++ b/quantum/extensions/quotasv2.py @@ -51,7 +51,8 @@ class QuotaSetsController(wsgi.Controller): self._driver = importutils.import_class(DB_QUOTA_DRIVER) def _get_body(self, request): - body = self._deserialize(request.body, request.get_content_type()) + body = self._deserialize(request.body, + request.best_match_content_type()) attr_info = EXTENDED_ATTRIBUTES_2_0[RESOURCE_COLLECTION] req_body = base.Controller.prepare_request_body( request.context, body, False, self._resource_name, attr_info) diff --git a/quantum/extensions/securitygroup.py b/quantum/extensions/securitygroup.py index c48e7f890..756c0753c 100644 --- a/quantum/extensions/securitygroup.py +++ b/quantum/extensions/securitygroup.py @@ -289,6 +289,8 @@ class Securitygroup(extensions.ExtensionDescriptor): @classmethod def get_resources(cls): """ Returns Ext Resources """ + my_plurals = [(key, key[:-1]) for key in RESOURCE_ATTRIBUTE_MAP.keys()] + attr.PLURALS.update(dict(my_plurals)) exts = [] plugin = manager.QuantumManager.get_plugin() for resource_name in ['security_group', 'security_group_rule']: diff --git a/quantum/extensions/servicetype.py b/quantum/extensions/servicetype.py index 45ea1612f..d4a987cd4 100644 --- a/quantum/extensions/servicetype.py +++ b/quantum/extensions/servicetype.py @@ -183,6 +183,11 @@ class Servicetype(extensions.ExtensionDescriptor): @classmethod def get_resources(cls): """ Returns Extended Resource for service type management """ + my_plurals = [(key.replace('-', '_'), + key[:-1].replace('-', '_')) for + key in RESOURCE_ATTRIBUTE_MAP.keys()] + my_plurals.append(('service_definitions', 'service_definition')) + attributes.PLURALS.update(dict(my_plurals)) controller = base.create_resource( COLLECTION_NAME, RESOURCE_NAME, diff --git a/quantum/tests/unit/cisco/test_network_plugin.py b/quantum/tests/unit/cisco/test_network_plugin.py index d670bea98..7efa198fd 100644 --- a/quantum/tests/unit/cisco/test_network_plugin.py +++ b/quantum/tests/unit/cisco/test_network_plugin.py @@ -87,7 +87,7 @@ class TestCiscoPortsV2(CiscoNetworkPluginV2TestCase, patched_plugin.side_effect = side_effect with self.network() as net: - res = self._create_port_bulk('json', 2, + res = self._create_port_bulk(self.fmt, 2, net['network']['id'], 'test', True) @@ -109,7 +109,7 @@ class TestCiscoPortsV2(CiscoNetworkPluginV2TestCase, *args, **kwargs) patched_plugin.side_effect = side_effect - res = self._create_port_bulk('json', 2, net['network']['id'], + res = self._create_port_bulk(self.fmt, 2, net['network']['id'], 'test', True, context=ctx) # We expect a 500 as we injected a fault in the plugin self._validate_behavior_on_bulk_failure(res, 'ports') @@ -137,7 +137,7 @@ class TestCiscoNetworksV2(CiscoNetworkPluginV2TestCase, return self._do_side_effect(patched_plugin, orig, *args, **kwargs) patched_plugin.side_effect = side_effect - res = self._create_network_bulk('json', 2, 'test', True) + res = self._create_network_bulk(self.fmt, 2, 'test', True) LOG.debug("response is %s" % res) # We expect a 500 as we injected a fault in the plugin self._validate_behavior_on_bulk_failure(res, 'networks') @@ -155,7 +155,7 @@ class TestCiscoNetworksV2(CiscoNetworkPluginV2TestCase, *args, **kwargs) patched_plugin.side_effect = side_effect - res = self._create_network_bulk('json', 2, 'test', True) + res = self._create_network_bulk(self.fmt, 2, 'test', True) # We expect a 500 as we injected a fault in the plugin self._validate_behavior_on_bulk_failure(res, 'networks') @@ -185,7 +185,7 @@ class TestCiscoSubnetsV2(CiscoNetworkPluginV2TestCase, patched_plugin.side_effect = side_effect with self.network() as net: - res = self._create_subnet_bulk('json', 2, + res = self._create_subnet_bulk(self.fmt, 2, net['network']['id'], 'test') # We expect a 500 as we injected a fault in the plugin @@ -204,9 +204,21 @@ class TestCiscoSubnetsV2(CiscoNetworkPluginV2TestCase, patched_plugin.side_effect = side_effect with self.network() as net: - res = self._create_subnet_bulk('json', 2, + res = self._create_subnet_bulk(self.fmt, 2, net['network']['id'], 'test') # We expect a 500 as we injected a fault in the plugin self._validate_behavior_on_bulk_failure(res, 'subnets') + + +class TestCiscoPortsV2XML(TestCiscoPortsV2): + fmt = 'xml' + + +class TestCiscoNetworksV2XML(TestCiscoNetworksV2): + fmt = 'xml' + + +class TestCiscoSubnetsV2XML(TestCiscoSubnetsV2): + fmt = 'xml' diff --git a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py index 9037a0099..c53f67500 100644 --- a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py +++ b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py @@ -17,30 +17,24 @@ import contextlib import logging import os -import unittest2 import webob.exc -import quantum from quantum.api.extensions import ExtensionMiddleware from quantum.api.extensions import PluginAwareExtensionManager from quantum.api.v2 import attributes from quantum.api.v2.router import APIRouter from quantum.common import config -from quantum.common import exceptions as q_exc from quantum.common.test_lib import test_config -from quantum import context from quantum.db import api as db -from quantum.db import db_base_plugin_v2 -from quantum.db import models_v2 +import quantum.extensions from quantum.extensions import loadbalancer from quantum.manager import QuantumManager from quantum.openstack.common import cfg -from quantum.openstack.common import timeutils from quantum.plugins.common import constants from quantum.plugins.services.loadbalancer import loadbalancerPlugin -from quantum.tests.unit import test_extensions +from quantum.tests.unit import testlib_api from quantum.tests.unit.testlib_api import create_request -from quantum.wsgi import Serializer, JSONDeserializer +from quantum import wsgi LOG = logging.getLogger(__name__) @@ -60,7 +54,7 @@ def etcdir(*p): return os.path.join(ETCDIR, *p) -class LoadBalancerPluginDbTestCase(unittest2.TestCase): +class LoadBalancerPluginDbTestCase(testlib_api.WebTestCase): def setUp(self, core_plugin=None, lb_plugin=None): super(LoadBalancerPluginDbTestCase, self).setUp() @@ -75,11 +69,6 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): self._tenant_id = "test-tenant" self._subnet_id = "0c798ed8-33ba-11e2-8b28-000c291c4d14" - json_deserializer = JSONDeserializer() - self._deserializers = { - 'application/json': json_deserializer, - } - if not core_plugin: core_plugin = test_config.get('plugin_name_v2', DB_CORE_PLUGIN_KLASS) @@ -103,11 +92,11 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): ) app = config.load_paste_app('extensions_test_app') self.ext_api = ExtensionMiddleware(app, ext_mgr=ext_mgr) + super(LoadBalancerPluginDbTestCase, self).setUp() def tearDown(self): super(LoadBalancerPluginDbTestCase, self).tearDown() self.api = None - self._deserializers = None self._skip_native_bulk = None self.ext_api = None @@ -118,8 +107,10 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): # Restore the original attribute map loadbalancer.RESOURCE_ATTRIBUTE_MAP = self._attribute_map_bk - def _req(self, method, resource, data=None, fmt='json', + def _req(self, method, resource, data=None, fmt=None, id=None, subresource=None, sub_id=None, params=None, action=None): + if not fmt: + fmt = self.fmt if id and action: path = '/lb/%(resource)s/%(id)s/%(action)s.%(fmt)s' % locals() elif id and subresource and sub_id: @@ -138,7 +129,8 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): content_type = 'application/%s' % fmt body = None if data is not None: # empty dict is valid - body = Serializer().serialize(data, content_type) + body = wsgi.Serializer( + attributes.get_attr_metadata()).serialize(data, content_type) req = create_request(path, body, @@ -147,32 +139,27 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): query_string=params) return req - def new_create_request(self, resource, data, fmt='json', id=None, + def new_create_request(self, resource, data, fmt=None, id=None, subresource=None): return self._req('POST', resource, data, fmt, id=id, subresource=subresource) - def new_list_request(self, resource, fmt='json', params=None): + def new_list_request(self, resource, fmt=None, params=None): return self._req('GET', resource, None, fmt, params=params) - def new_show_request(self, resource, id, fmt='json', action=None, + def new_show_request(self, resource, id, fmt=None, action=None, subresource=None, sub_id=None): return self._req('GET', resource, None, fmt, id=id, action=action, subresource=subresource, sub_id=sub_id) - def new_delete_request(self, resource, id, fmt='json', + def new_delete_request(self, resource, id, fmt=None, subresource=None, sub_id=None): return self._req('DELETE', resource, None, fmt, id=id, subresource=subresource, sub_id=sub_id) - def new_update_request(self, resource, data, id, fmt='json'): + def new_update_request(self, resource, data, id, fmt=None): return self._req('PUT', resource, data, fmt, id=id) - def deserialize(self, content_type, response): - ctype = 'application/%s' % content_type - data = self._deserializers[ctype].deserialize(response.body)['body'] - return data - def _create_vip(self, fmt, name, pool_id, protocol, port, admin_status_up, expected_res_status=None, **kwargs): data = {'vip': {'name': name, @@ -267,25 +254,27 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): req = self.new_show_request(resource, id) res = req.get_response(self._api_for_resource(resource)) self.assertEqual(res.status_int, expected_code) - return self.deserialize('json', res) + return self.deserialize(res) def _update(self, resource, id, new_data, expected_code=webob.exc.HTTPOk.code): req = self.new_update_request(resource, new_data, id) res = req.get_response(self._api_for_resource(resource)) self.assertEqual(res.status_int, expected_code) - return self.deserialize('json', res) + return self.deserialize(res) - def _list(self, resource, fmt='json', query_params=None): + def _list(self, resource, fmt=None, query_params=None): req = self.new_list_request(resource, fmt, query_params) res = req.get_response(self._api_for_resource(resource)) self.assertEqual(res.status_int, webob.exc.HTTPOk.code) - return self.deserialize('json', res) + return self.deserialize(res) @contextlib.contextmanager - def vip(self, fmt='json', name='vip1', pool=None, + def vip(self, fmt=None, name='vip1', pool=None, protocol='HTTP', port=80, admin_status_up=True, no_delete=False, address="172.16.1.123", **kwargs): + if not fmt: + fmt = self.fmt if not pool: with self.pool() as pool: pool_id = pool['pool']['id'] @@ -297,7 +286,7 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): admin_status_up, address=address, **kwargs) - vip = self.deserialize(fmt, res) + vip = self.deserialize(res) if res.status_int >= 400: raise webob.exc.HTTPClientError(code=res.status_int) yield vip @@ -313,7 +302,7 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): admin_status_up, address=address, **kwargs) - vip = self.deserialize(fmt, res) + vip = self.deserialize(res) if res.status_int >= 400: raise webob.exc.HTTPClientError(code=res.status_int) yield vip @@ -321,16 +310,18 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): self._delete('vips', vip['vip']['id']) @contextlib.contextmanager - def pool(self, fmt='json', name='pool1', lb_method='ROUND_ROBIN', + def pool(self, fmt=None, name='pool1', lb_method='ROUND_ROBIN', protocol='HTTP', admin_status_up=True, no_delete=False, **kwargs): + if not fmt: + fmt = self.fmt res = self._create_pool(fmt, name, lb_method, protocol, admin_status_up, **kwargs) - pool = self.deserialize(fmt, res) + pool = self.deserialize(res) if res.status_int >= 400: raise webob.exc.HTTPClientError(code=res.status_int) yield pool @@ -338,15 +329,17 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): self._delete('pools', pool['pool']['id']) @contextlib.contextmanager - def member(self, fmt='json', address='192.168.1.100', + def member(self, fmt=None, address='192.168.1.100', port=80, admin_status_up=True, no_delete=False, **kwargs): + if not fmt: + fmt = self.fmt res = self._create_member(fmt, address, port, admin_status_up, **kwargs) - member = self.deserialize(fmt, res) + member = self.deserialize(res) if res.status_int >= 400: raise webob.exc.HTTPClientError(code=res.status_int) yield member @@ -354,10 +347,12 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): self._delete('members', member['member']['id']) @contextlib.contextmanager - def health_monitor(self, fmt='json', type='TCP', + def health_monitor(self, fmt=None, type='TCP', delay=30, timeout=10, max_retries=3, admin_status_up=True, no_delete=False, **kwargs): + if not fmt: + fmt = self.fmt res = self._create_health_monitor(fmt, type, delay, @@ -365,7 +360,7 @@ class LoadBalancerPluginDbTestCase(unittest2.TestCase): max_retries, admin_status_up, **kwargs) - health_monitor = self.deserialize(fmt, res) + health_monitor = self.deserialize(res) the_health_monitor = health_monitor['health_monitor'] if res.status_int >= 400: raise webob.exc.HTTPClientError(code=res.status_int) @@ -452,7 +447,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): # Try resetting session_persistence req = self.new_update_request('vips', update_info, v['vip']['id']) - res = self.deserialize('json', req.get_response(self.ext_api)) + res = self.deserialize(req.get_response(self.ext_api)) # If session persistence has been removed, it won't be present in # the response. @@ -476,7 +471,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): 'cookie_name': "jesssionId"}, 'admin_state_up': False}} req = self.new_update_request('vips', data, vip['vip']['id']) - res = self.deserialize('json', req.get_response(self.ext_api)) + res = self.deserialize(req.get_response(self.ext_api)) for k, v in keys: self.assertEqual(res['vip'][k], v) @@ -501,7 +496,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): with self.vip(name=name) as vip: req = self.new_show_request('vips', vip['vip']['id']) - res = self.deserialize('json', req.get_response(self.ext_api)) + res = self.deserialize(req.get_response(self.ext_api)) for k, v in keys: self.assertEqual(res['vip'][k], v) @@ -517,7 +512,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): ('status', 'PENDING_CREATE')] with self.vip(name=name): req = self.new_list_request('vips') - res = self.deserialize('json', req.get_response(self.ext_api)) + res = self.deserialize(req.get_response(self.ext_api)) for k, v in keys: self.assertEqual(res['vips'][0][k], v) @@ -548,7 +543,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): name = "pool2" with self.pool(name=name) as pool: pool_id = pool['pool']['id'] - res1 = self._create_member('json', + res1 = self._create_member(self.fmt, '192.168.1.100', '80', True, @@ -556,11 +551,10 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): weight=1) req = self.new_show_request('pools', pool_id, - fmt='json') - pool_updated = self.deserialize('json', - req.get_response(self.ext_api)) + fmt=self.fmt) + pool_updated = self.deserialize(req.get_response(self.ext_api)) - member1 = self.deserialize('json', res1) + member1 = self.deserialize(res1) self.assertEqual(member1['member']['id'], pool_updated['pool']['members'][0]) self.assertEqual(len(pool_updated['pool']['members']), 1) @@ -596,8 +590,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): with self.pool(name=name) as pool: req = self.new_show_request('pools', pool['pool']['id'], - fmt='json') - res = self.deserialize('json', req.get_response(self.ext_api)) + fmt=self.fmt) + res = self.deserialize(req.get_response(self.ext_api)) for k, v in keys: self.assertEqual(res['pool'][k], v) @@ -612,9 +606,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): pool_id=pool_id) as member2: req = self.new_show_request('pools', pool_id, - fmt='json') + fmt=self.fmt) pool_update = self.deserialize( - 'json', req.get_response(self.ext_api)) self.assertIn(member1['member']['id'], pool_update['pool']['members']) @@ -634,17 +627,15 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): with self.member(pool_id=pool1['pool']['id']) as member: req = self.new_show_request('pools', pool1['pool']['id'], - fmt='json') + fmt=self.fmt) pool1_update = self.deserialize( - 'json', req.get_response(self.ext_api)) self.assertEqual(len(pool1_update['pool']['members']), 1) req = self.new_show_request('pools', pool2['pool']['id'], - fmt='json') + fmt=self.fmt) pool2_update = self.deserialize( - 'json', req.get_response(self.ext_api)) self.assertEqual(len(pool1_update['pool']['members']), 1) self.assertEqual(len(pool2_update['pool']['members']), 0) @@ -655,23 +646,20 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_update_request('members', data, member['member']['id']) - res = self.deserialize('json', - req.get_response(self.ext_api)) + res = self.deserialize(req.get_response(self.ext_api)) for k, v in keys: self.assertEqual(res['member'][k], v) req = self.new_show_request('pools', pool1['pool']['id'], - fmt='json') + fmt=self.fmt) pool1_update = self.deserialize( - 'json', req.get_response(self.ext_api)) req = self.new_show_request('pools', pool2['pool']['id'], - fmt='json') + fmt=self.fmt) pool2_update = self.deserialize( - 'json', req.get_response(self.ext_api)) self.assertEqual(len(pool2_update['pool']['members']), 1) @@ -689,9 +677,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_show_request('pools', pool_id, - fmt='json') + fmt=self.fmt) pool_update = self.deserialize( - 'json', req.get_response(self.ext_api)) self.assertEqual(len(pool_update['pool']['members']), 0) @@ -707,8 +694,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): with self.member(pool_id=pool['pool']['id']) as member: req = self.new_show_request('members', member['member']['id'], - fmt='json') - res = self.deserialize('json', req.get_response(self.ext_api)) + fmt=self.fmt) + res = self.deserialize(req.get_response(self.ext_api)) for k, v in keys: self.assertEqual(res['member'][k], v) @@ -740,7 +727,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_update_request("health_monitors", data, monitor['health_monitor']['id']) - res = self.deserialize('json', req.get_response(self.ext_api)) + res = self.deserialize(req.get_response(self.ext_api)) for k, v in keys: self.assertEqual(res['health_monitor'][k], v) @@ -762,8 +749,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): ('status', 'PENDING_CREATE')] req = self.new_show_request('health_monitors', monitor['health_monitor']['id'], - fmt='json') - res = self.deserialize('json', req.get_response(self.ext_api)) + fmt=self.fmt) + res = self.deserialize(req.get_response(self.ext_api)) for k, v in keys: self.assertEqual(res['health_monitor'][k], v) @@ -776,8 +763,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_show_request("pools", pool['pool']['id'], subresource="stats", - fmt='json') - res = self.deserialize('json', req.get_response(self.ext_api)) + fmt=self.fmt) + res = self.deserialize(req.get_response(self.ext_api)) for k, v in keys: self.assertEqual(res['stats'][k], v) @@ -791,7 +778,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_create_request( "pools", data, - fmt='json', + fmt=self.fmt, id=pool['pool']['id'], subresource="health_monitors") res = req.get_response(self.ext_api) @@ -803,7 +790,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_create_request( "pools", data, - fmt='json', + fmt=self.fmt, id=pool['pool']['id'], subresource="health_monitors") res = req.get_response(self.ext_api) @@ -812,9 +799,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_show_request( 'pools', pool['pool']['id'], - fmt='json') - res = self.deserialize('json', - req.get_response(self.ext_api)) + fmt=self.fmt) + res = self.deserialize(req.get_response(self.ext_api)) self.assertIn(monitor1['health_monitor']['id'], res['pool']['health_monitors']) self.assertIn(monitor2['health_monitor']['id'], @@ -831,7 +817,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_create_request( "pools", data, - fmt='json', + fmt=self.fmt, id=pool['pool']['id'], subresource="health_monitors") res = req.get_response(self.ext_api) @@ -843,7 +829,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_create_request( "pools", data, - fmt='json', + fmt=self.fmt, id=pool['pool']['id'], subresource="health_monitors") res = req.get_response(self.ext_api) @@ -852,7 +838,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): # remove one of healthmonitor from the pool req = self.new_delete_request( "pools", - fmt='json', + fmt=self.fmt, id=pool['pool']['id'], sub_id=monitor1['health_monitor']['id'], subresource="health_monitors") @@ -862,9 +848,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_show_request( 'pools', pool['pool']['id'], - fmt='json') - res = self.deserialize('json', - req.get_response(self.ext_api)) + fmt=self.fmt) + res = self.deserialize(req.get_response(self.ext_api)) self.assertNotIn(monitor1['health_monitor']['id'], res['pool']['health_monitors']) self.assertIn(monitor2['health_monitor']['id'], @@ -879,26 +864,26 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): pool_id = pool['pool']['id'] vip_id = vip['vip']['id'] # Add two members - res1 = self._create_member('json', + res1 = self._create_member(self.fmt, '192.168.1.100', '80', True, pool_id=pool_id, weight=1) - res2 = self._create_member('json', + res2 = self._create_member(self.fmt, '192.168.1.101', '80', True, pool_id=pool_id, weight=2) # Add a health_monitor - req = self._create_health_monitor('json', + req = self._create_health_monitor(self.fmt, 'HTTP', '10', '10', '3', True) - health_monitor = self.deserialize('json', req) + health_monitor = self.deserialize(req) self.assertEqual(req.status_int, 201) # Associate the health_monitor to the pool @@ -907,7 +892,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): 'tenant_id': self._tenant_id}} req = self.new_create_request("pools", data, - fmt='json', + fmt=self.fmt, id=pool['pool']['id'], subresource="health_monitors") res = req.get_response(self.ext_api) @@ -916,11 +901,10 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): # Get pool and vip req = self.new_show_request('pools', pool_id, - fmt='json') - pool_updated = self.deserialize('json', - req.get_response(self.ext_api)) - member1 = self.deserialize('json', res1) - member2 = self.deserialize('json', res2) + fmt=self.fmt) + pool_updated = self.deserialize(req.get_response(self.ext_api)) + member1 = self.deserialize(res1) + member2 = self.deserialize(res2) self.assertIn(member1['member']['id'], pool_updated['pool']['members']) self.assertIn(member2['member']['id'], @@ -930,9 +914,8 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): req = self.new_show_request('vips', vip_id, - fmt='json') - vip_updated = self.deserialize('json', - req.get_response(self.ext_api)) + fmt=self.fmt) + vip_updated = self.deserialize(req.get_response(self.ext_api)) self.assertEqual(vip_updated['vip']['pool_id'], pool_updated['pool']['id']) @@ -941,3 +924,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): health_monitor['health_monitor']['id']) self._delete('members', member1['member']['id']) self._delete('members', member2['member']['id']) + + +class TestLoadBalancerXML(TestLoadBalancer): + fmt = 'xml' diff --git a/quantum/tests/unit/linuxbridge/test_lb_security_group.py b/quantum/tests/unit/linuxbridge/test_lb_security_group.py index 9ac5e75b9..8712c2747 100644 --- a/quantum/tests/unit/linuxbridge/test_lb_security_group.py +++ b/quantum/tests/unit/linuxbridge/test_lb_security_group.py @@ -83,8 +83,8 @@ class TestLinuxBridgeSecurityGroups(LinuxBridgeSecurityGroupsTestCase, with self.subnet(n): with self.security_group() as sg: security_group_id = sg['security_group']['id'] - res = self._create_port('json', n['network']['id']) - port = self.deserialize('json', res) + res = self._create_port(self.fmt, n['network']['id']) + port = self.deserialize(self.fmt, res) data = {'port': {'fixed_ips': port['port']['fixed_ips'], 'name': port['port']['name'], @@ -93,7 +93,8 @@ class TestLinuxBridgeSecurityGroups(LinuxBridgeSecurityGroupsTestCase, req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, + req.get_response(self.api)) self.assertEquals(res['port'][ext_sg.SECURITYGROUPS][0], security_group_id) self._delete('ports', port['port']['id']) @@ -104,14 +105,18 @@ class TestLinuxBridgeSecurityGroups(LinuxBridgeSecurityGroupsTestCase, mock.ANY, [security_group_id])]) +class TestLinuxBridgeSecurityGroupsXML(TestLinuxBridgeSecurityGroups): + fmt = 'xml' + + class TestLinuxBridgeSecurityGroupsDB(LinuxBridgeSecurityGroupsTestCase): def test_security_group_get_port_from_device(self): with self.network() as n: with self.subnet(n): with self.security_group() as sg: security_group_id = sg['security_group']['id'] - res = self._create_port('json', n['network']['id']) - port = self.deserialize('json', res) + res = self._create_port(self.fmt, n['network']['id']) + port = self.deserialize(self.fmt, res) fixed_ips = port['port']['fixed_ips'] data = {'port': {'fixed_ips': fixed_ips, 'name': port['port']['name'], @@ -120,7 +125,8 @@ class TestLinuxBridgeSecurityGroupsDB(LinuxBridgeSecurityGroupsTestCase): req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, + req.get_response(self.api)) port_id = res['port']['id'] device_id = port_id[:8] port_dict = lb_db.get_port_from_device(device_id) @@ -135,3 +141,7 @@ class TestLinuxBridgeSecurityGroupsDB(LinuxBridgeSecurityGroupsTestCase): def test_security_group_get_port_from_device_with_no_port(self): port_dict = lb_db.get_port_from_device('bad_device_id') self.assertEqual(None, port_dict) + + +class TestLinuxBridgeSecurityGroupsDBXML(TestLinuxBridgeSecurityGroupsDB): + fmt = 'xml' diff --git a/quantum/tests/unit/test_api_v2.py b/quantum/tests/unit/test_api_v2.py index 1c81a22b5..db2b6d645 100644 --- a/quantum/tests/unit/test_api_v2.py +++ b/quantum/tests/unit/test_api_v2.py @@ -28,12 +28,15 @@ from quantum.api.v2 import attributes from quantum.api.v2 import base from quantum.api.v2 import router from quantum.common import config +from quantum.common import constants from quantum.common import exceptions as q_exc from quantum import context from quantum.manager import QuantumManager from quantum.openstack.common import cfg from quantum.openstack.common.notifier import api as notifer_api from quantum.openstack.common import uuidutils +from quantum.tests.unit import testlib_api +from quantum import wsgi ROOTDIR = os.path.dirname(os.path.dirname(__file__)) @@ -105,6 +108,7 @@ class APIv2TestBase(unittest.TestCase): api = router.APIRouter() self.api = webtest.TestApp(api) + super(APIv2TestBase, self).setUp() def tearDown(self): self._plugin_patcher.stop() @@ -270,7 +274,9 @@ class APIv2TestCase(APIv2TestBase): # Note: since all resources use the same controller and validation # logic, we actually get really good coverage from testing just networks. -class JSONV2TestCase(APIv2TestBase): +class JSONV2TestCase(APIv2TestBase, testlib_api.WebTestCase): + def setUp(self): + super(JSONV2TestCase, self).setUp() def _test_list(self, req_tenant_id, real_tenant_id): env = {} @@ -287,19 +293,21 @@ class JSONV2TestCase(APIv2TestBase): instance = self.plugin.return_value instance.get_networks.return_value = return_value - res = self.api.get(_get_path('networks'), extra_environ=env) - self.assertTrue('networks' in res.json) + res = self.api.get(_get_path('networks', + fmt=self.fmt), extra_environ=env) + res = self.deserialize(res) + self.assertTrue('networks' in res) if not req_tenant_id or req_tenant_id == real_tenant_id: # expect full list returned - self.assertEqual(len(res.json['networks']), 1) - output_dict = res.json['networks'][0] + self.assertEqual(len(res['networks']), 1) + output_dict = res['networks'][0] input_dict['shared'] = False self.assertEqual(len(input_dict), len(output_dict)) for k, v in input_dict.iteritems(): self.assertEqual(v, output_dict[k]) else: # expect no results - self.assertEqual(len(res.json['networks']), 0) + self.assertEqual(len(res['networks']), 0) def test_list_noauth(self): self._test_list(None, _uuid()) @@ -324,11 +332,13 @@ class JSONV2TestCase(APIv2TestBase): instance.create_network.return_value = return_value instance.get_networks_count.return_value = 0 - res = self.api.post_json(_get_path('networks'), data) - + res = self.api.post(_get_path('networks', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt) self.assertEqual(res.status_int, exc.HTTPCreated.code) - self.assertTrue('network' in res.json) - net = res.json['network'] + res = self.deserialize(res) + self.assertTrue('network' in res) + net = res['network'] self.assertEqual(net['id'], net_id) self.assertEqual(net['status'], "ACTIVE") @@ -346,21 +356,25 @@ class JSONV2TestCase(APIv2TestBase): instance.create_network.return_value = return_value instance.get_networks_count.return_value = 0 - res = self.api.post_json(_get_path('networks'), initial_input) - + res = self.api.post(_get_path('networks', fmt=self.fmt), + self.serialize(initial_input), + content_type='application/' + self.fmt) instance.create_network.assert_called_with(mock.ANY, network=full_input) self.assertEqual(res.status_int, exc.HTTPCreated.code) - self.assertTrue('network' in res.json) - net = res.json['network'] + res = self.deserialize(res) + self.assertIn('network', res) + net = res['network'] self.assertEqual(net['id'], net_id) self.assertEqual(net['admin_state_up'], True) self.assertEqual(net['status'], "ACTIVE") def test_create_no_keystone_env(self): data = {'name': 'net1'} - res = self.api.post_json(_get_path('networks'), data, - expect_errors=True) + res = self.api.post(_get_path('networks', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt, + expect_errors=True) self.assertEqual(res.status_int, exc.HTTPBadRequest.code) def test_create_with_keystone_env(self): @@ -380,8 +394,10 @@ class JSONV2TestCase(APIv2TestBase): instance.create_network.return_value = return_value instance.get_networks_count.return_value = 0 - res = self.api.post_json(_get_path('networks'), initial_input, - extra_environ=env) + res = self.api.post(_get_path('networks', fmt=self.fmt), + self.serialize(initial_input), + content_type='application/' + self.fmt, + extra_environ=env) instance.create_network.assert_called_with(mock.ANY, network=full_input) @@ -391,33 +407,44 @@ class JSONV2TestCase(APIv2TestBase): tenant_id = _uuid() data = {'network': {'name': 'net1', 'tenant_id': tenant_id}} env = {'quantum.context': context.Context('', tenant_id + "bad")} - res = self.api.post_json(_get_path('networks'), data, - expect_errors=True, - extra_environ=env) + res = self.api.post(_get_path('networks', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt, + expect_errors=True, + extra_environ=env) self.assertEqual(res.status_int, exc.HTTPBadRequest.code) def test_create_no_body(self): data = {'whoa': None} - res = self.api.post_json(_get_path('networks'), data, - expect_errors=True) + res = self.api.post(_get_path('networks', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt, + expect_errors=True) self.assertEqual(res.status_int, exc.HTTPBadRequest.code) def test_create_no_resource(self): - res = self.api.post_json(_get_path('networks'), dict(), - expect_errors=True) + data = {} + res = self.api.post(_get_path('networks', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt, + expect_errors=True) self.assertEqual(res.status_int, exc.HTTPBadRequest.code) def test_create_missing_attr(self): data = {'port': {'what': 'who', 'tenant_id': _uuid()}} - res = self.api.post_json(_get_path('ports'), data, - expect_errors=True) + res = self.api.post(_get_path('ports', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt, + expect_errors=True) self.assertEqual(res.status_int, 400) def test_create_readonly_attr(self): data = {'network': {'name': 'net1', 'tenant_id': _uuid(), 'status': "ACTIVE"}} - res = self.api.post_json(_get_path('networks'), data, - expect_errors=True) + res = self.api.post(_get_path('networks', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt, + expect_errors=True) self.assertEqual(res.status_int, 400) def test_create_bulk(self): @@ -436,28 +463,35 @@ class JSONV2TestCase(APIv2TestBase): instance = self.plugin.return_value instance.create_network.side_effect = side_effect instance.get_networks_count.return_value = 0 - - res = self.api.post_json(_get_path('networks'), data) + res = self.api.post(_get_path('networks', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt) self.assertEqual(res.status_int, exc.HTTPCreated.code) def test_create_bulk_no_networks(self): data = {'networks': []} - res = self.api.post_json(_get_path('networks'), data, - expect_errors=True) + res = self.api.post(_get_path('networks', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt, + expect_errors=True) self.assertEqual(res.status_int, exc.HTTPBadRequest.code) def test_create_bulk_missing_attr(self): data = {'ports': [{'what': 'who', 'tenant_id': _uuid()}]} - res = self.api.post_json(_get_path('ports'), data, - expect_errors=True) + res = self.api.post(_get_path('ports', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt, + expect_errors=True) self.assertEqual(res.status_int, 400) def test_create_bulk_partial_body(self): data = {'ports': [{'device_id': 'device_1', 'tenant_id': _uuid()}, {'tenant_id': _uuid()}]} - res = self.api.post_json(_get_path('ports'), data, - expect_errors=True) + res = self.api.post(_get_path('ports', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt, + expect_errors=True) self.assertEqual(res.status_int, 400) def test_create_attr_not_specified(self): @@ -484,12 +518,14 @@ class JSONV2TestCase(APIv2TestBase): instance.get_network.return_value = {'tenant_id': unicode(tenant_id)} instance.get_ports_count.return_value = 1 instance.create_port.return_value = return_value - res = self.api.post_json(_get_path('ports'), initial_input) - + res = self.api.post(_get_path('ports', fmt=self.fmt), + self.serialize(initial_input), + content_type='application/' + self.fmt) instance.create_port.assert_called_with(mock.ANY, port=full_input) self.assertEqual(res.status_int, exc.HTTPCreated.code) - self.assertTrue('port' in res.json) - port = res.json['port'] + res = self.deserialize(res) + self.assertIn('port', res) + port = res['port'] self.assertEqual(port['network_id'], net_id) self.assertEqual(port['mac_address'], 'ca:fe:de:ad:be:ef') @@ -505,11 +541,13 @@ class JSONV2TestCase(APIv2TestBase): instance.create_network.return_value = return_value instance.get_networks_count.return_value = 0 - res = self.api.post_json(_get_path('networks'), data) - + res = self.api.post(_get_path('networks', fmt=self.fmt), + self.serialize(data), + content_type='application/' + self.fmt) self.assertEqual(res.status_int, exc.HTTPCreated.code) - self.assertTrue('network' in res.json) - net = res.json['network'] + res = self.deserialize(res) + self.assertIn('network', res) + net = res['network'] self.assertEqual(net['id'], net_id) self.assertEqual(net['status'], "ACTIVE") self.assertFalse('v2attrs:something' in net) @@ -521,7 +559,9 @@ class JSONV2TestCase(APIv2TestBase): instance = self.plugin.return_value instance.get_network.return_value = return_value - self.api.get(_get_path('networks', id=uuidutils.generate_uuid())) + self.api.get(_get_path('networks', + id=uuidutils.generate_uuid(), + fmt=self.fmt)) def _test_delete(self, req_tenant_id, real_tenant_id, expected_code, expect_errors=False): @@ -534,7 +574,8 @@ class JSONV2TestCase(APIv2TestBase): instance.delete_network.return_value = None res = self.api.delete(_get_path('networks', - id=uuidutils.generate_uuid()), + id=uuidutils.generate_uuid(), + fmt=self.fmt), extra_environ=env, expect_errors=expect_errors) self.assertEqual(res.status_int, expected_code) @@ -566,7 +607,8 @@ class JSONV2TestCase(APIv2TestBase): instance.get_network.return_value = data res = self.api.get(_get_path('networks', - id=uuidutils.generate_uuid()), + id=uuidutils.generate_uuid(), + fmt=self.fmt), extra_environ=env, expect_errors=expect_errors) self.assertEqual(res.status_int, expected_code) @@ -602,11 +644,12 @@ class JSONV2TestCase(APIv2TestBase): 'shared': False} instance.update_network.return_value = return_value - res = self.api.put_json(_get_path('networks', - id=uuidutils.generate_uuid()), - data, - extra_environ=env, - expect_errors=expect_errors) + res = self.api.put(_get_path('networks', + id=uuidutils.generate_uuid(), + fmt=self.fmt), + self.serialize(data), + extra_environ=env, + expect_errors=expect_errors) self.assertEqual(res.status_int, expected_code) def test_update_noauth(self): @@ -623,8 +666,10 @@ class JSONV2TestCase(APIv2TestBase): def test_update_readonly_field(self): data = {'network': {'status': "NANANA"}} - res = self.api.put_json(_get_path('networks', id=_uuid()), data, - expect_errors=True) + res = self.api.put(_get_path('networks', id=_uuid()), + self.serialize(data), + content_type='application/' + self.fmt, + expect_errors=True) self.assertEqual(res.status_int, 400) @@ -705,6 +750,12 @@ class SubresourceTest(unittest.TestCase): network_id='id1') +# Note: since all resources use the same controller and validation +# logic, we actually get really good coverage from testing just networks. +class XMLV2TestCase(JSONV2TestCase): + fmt = 'xml' + + class V2Views(unittest.TestCase): def _view(self, keys, collection, resource): data = dict((key, 'value') for key in keys) @@ -778,7 +829,7 @@ class NotificationTest(APIv2TestBase): def test_network_update_notifer(self): self._resource_op_notifier('update', 'network') - def test_network_create_notifer(self): + def test_network_create_notifer_with_log_level(self): cfg.CONF.set_override('default_notification_level', 'DEBUG') self._resource_op_notifier('create', 'network', notification_level='DEBUG') diff --git a/quantum/tests/unit/test_api_v2_resource.py b/quantum/tests/unit/test_api_v2_resource.py index 619fd05e7..30e5ab4b9 100644 --- a/quantum/tests/unit/test_api_v2_resource.py +++ b/quantum/tests/unit/test_api_v2_resource.py @@ -27,15 +27,68 @@ import webtest from quantum.api.v2 import resource as wsgi_resource from quantum.common import exceptions as q_exc from quantum import context +from quantum import wsgi class RequestTestCase(unittest.TestCase): def setUp(self): self.req = wsgi_resource.Request({'foo': 'bar'}) - def test_best_match_content_type(self): - self.assertEqual(self.req.best_match_content_type(), - 'application/json') + def test_content_type_missing(self): + request = wsgi.Request.blank('/tests/123', method='POST') + request.body = "" + self.assertEqual(None, request.get_content_type()) + + def test_content_type_with_charset(self): + request = wsgi.Request.blank('/tests/123') + request.headers["Content-Type"] = "application/json; charset=UTF-8" + result = request.get_content_type() + self.assertEqual(result, "application/json") + + def test_content_type_from_accept(self): + for content_type in ('application/xml', + 'application/json'): + request = wsgi.Request.blank('/tests/123') + request.headers["Accept"] = content_type + result = request.best_match_content_type() + self.assertEqual(result, content_type) + + def test_content_type_from_accept_best(self): + request = wsgi.Request.blank('/tests/123') + request.headers["Accept"] = "application/xml, application/json" + result = request.best_match_content_type() + self.assertEqual(result, "application/json") + + request = wsgi.Request.blank('/tests/123') + request.headers["Accept"] = ("application/json; q=0.3, " + "application/xml; q=0.9") + result = request.best_match_content_type() + self.assertEqual(result, "application/xml") + + def test_content_type_from_query_extension(self): + request = wsgi.Request.blank('/tests/123.xml') + result = request.best_match_content_type() + self.assertEqual(result, "application/xml") + + request = wsgi.Request.blank('/tests/123.json') + result = request.best_match_content_type() + self.assertEqual(result, "application/json") + + request = wsgi.Request.blank('/tests/123.invalid') + result = request.best_match_content_type() + self.assertEqual(result, "application/json") + + def test_content_type_accept_and_query_extension(self): + request = wsgi.Request.blank('/tests/123.xml') + request.headers["Accept"] = "application/json" + result = request.best_match_content_type() + self.assertEqual(result, "application/xml") + + def test_content_type_accept_default(self): + request = wsgi.Request.blank('/tests/123.unsupported') + request.headers["Accept"] = "application/unsupported1" + result = request.best_match_content_type() + self.assertEqual(result, "application/json") def test_context_with_quantum_context(self): ctxt = context.Context('fake_user', 'fake_tenant') diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py index 455856cae..dffe31ca4 100644 --- a/quantum/tests/unit/test_db_plugin.py +++ b/quantum/tests/unit/test_db_plugin.py @@ -42,8 +42,7 @@ from quantum.manager import QuantumManager from quantum.openstack.common import cfg from quantum.openstack.common import timeutils from quantum.tests.unit import test_extensions -from quantum.tests.unit.testlib_api import create_request -from quantum.wsgi import Serializer, JSONDeserializer +from quantum.tests.unit import testlib_api DB_PLUGIN_KLASS = 'quantum.db.db_base_plugin_v2.QuantumDbPluginV2' @@ -60,7 +59,8 @@ def etcdir(*p): return os.path.join(ETCDIR, *p) -class QuantumDbPluginV2TestCase(unittest2.TestCase): +class QuantumDbPluginV2TestCase(testlib_api.WebTestCase): + fmt = 'json' def setUp(self, plugin=None): super(QuantumDbPluginV2TestCase, self).setUp() @@ -84,11 +84,6 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): copy()) self._tenant_id = 'test-tenant' - json_deserializer = JSONDeserializer() - self._deserializers = { - 'application/json': json_deserializer, - } - if not plugin: plugin = test_config.get('plugin_name_v2', DB_PLUGIN_KLASS) # Create the default configurations @@ -105,6 +100,7 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): self.api = APIRouter() # Set the defualt port status self.port_create_status = 'ACTIVE' + super(QuantumDbPluginV2TestCase, self).setUp() def _is_native_bulk_supported(): plugin_obj = QuantumManager.get_plugin() @@ -133,8 +129,9 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): # Restore the original attribute map attributes.RESOURCE_ATTRIBUTE_MAP = self._attribute_map_bk - def _req(self, method, resource, data=None, fmt='json', + def _req(self, method, resource, data=None, fmt=None, id=None, params=None, action=None): + fmt = fmt or self.fmt if id and action: path = '/%(resource)s/%(id)s/%(action)s.%(fmt)s' % locals() elif id: @@ -145,29 +142,26 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): content_type = 'application/%s' % fmt body = None if data is not None: # empty dict is valid - body = Serializer().serialize(data, content_type) - return create_request(path, - body, - content_type, - method, - query_string=params) + body = self.serialize(data) + return testlib_api.create_request(path, body, content_type, method, + query_string=params) - def new_create_request(self, resource, data, fmt='json'): + def new_create_request(self, resource, data, fmt=None): return self._req('POST', resource, data, fmt) - def new_list_request(self, resource, fmt='json', params=None): + def new_list_request(self, resource, fmt=None, params=None): return self._req('GET', resource, None, fmt, params=params) - def new_show_request(self, resource, id, fmt='json'): + def new_show_request(self, resource, id, fmt=None): return self._req('GET', resource, None, fmt, id=id) - def new_delete_request(self, resource, id, fmt='json'): + def new_delete_request(self, resource, id, fmt=None): return self._req('DELETE', resource, None, fmt, id=id) - def new_update_request(self, resource, data, id, fmt='json'): + def new_update_request(self, resource, data, id, fmt=None): return self._req('PUT', resource, data, fmt, id=id) - def new_action_request(self, resource, data, id, action, fmt='json'): + def new_action_request(self, resource, data, id, action, fmt=None): return self._req('PUT', resource, data, fmt, id=id, action=action) def deserialize(self, content_type, response): @@ -391,7 +385,7 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): req.environ['quantum.context'] = quantum_context res = req.get_response(self._api_for_resource(resource)) self.assertEqual(res.status_int, expected_code) - return self.deserialize('json', res) + return self.deserialize(self.fmt, res) def _update(self, resource, id, new_data, expected_code=webob.exc.HTTPOk.code, @@ -402,16 +396,17 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): req.environ['quantum.context'] = quantum_context res = req.get_response(self._api_for_resource(resource)) self.assertEqual(res.status_int, expected_code) - return self.deserialize('json', res) + return self.deserialize(self.fmt, res) - def _list(self, resource, fmt='json', quantum_context=None, + def _list(self, resource, fmt=None, quantum_context=None, query_params=None): + fmt = fmt or self.fmt req = self.new_list_request(resource, fmt, query_params) if quantum_context: req.environ['quantum.context'] = quantum_context res = req.get_response(self._api_for_resource(resource)) self.assertEqual(res.status_int, webob.exc.HTTPOk.code) - return self.deserialize('json', res) + return self.deserialize(fmt, res) def _do_side_effect(self, patched_plugin, orig, *args, **kwargs): """ Invoked by test cases for injecting failures in plugin """ @@ -425,13 +420,13 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): req = self.new_list_request(collection) res = req.get_response(self.api) self.assertEqual(res.status_int, 200) - items = self.deserialize('json', res) + items = self.deserialize(self.fmt, res) self.assertEqual(len(items[collection]), 0) def _validate_behavior_on_bulk_success(self, res, collection, names=['test_0', 'test_1']): self.assertEqual(res.status_int, 201) - items = self.deserialize('json', res)[collection] + items = self.deserialize(self.fmt, res)[collection] self.assertEqual(len(items), 2) self.assertEqual(items[0]['name'], 'test_0') self.assertEqual(items[1]['name'], 'test_1') @@ -447,10 +442,11 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): @contextlib.contextmanager def network(self, name='net1', admin_status_up=True, - fmt='json', + fmt=None, do_delete=True, **kwargs): - network = self._make_network(fmt, name, admin_status_up, **kwargs) + network = self._make_network(fmt or self.fmt, name, + admin_status_up, **kwargs) try: yield network finally: @@ -465,7 +461,7 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): def subnet(self, network=None, gateway_ip=ATTR_NOT_SPECIFIED, cidr='10.0.0.0/24', - fmt='json', + fmt=None, ip_version=4, allocation_pools=None, enable_dhcp=True, @@ -477,7 +473,7 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): else dummy_context_func()) as network_to_use: if network: network_to_use = network - subnet = self._make_subnet(fmt, + subnet = self._make_subnet(fmt or self.fmt, network_to_use, gateway_ip, cidr, @@ -494,14 +490,14 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): self._delete('subnets', subnet['subnet']['id']) @contextlib.contextmanager - def port(self, subnet=None, fmt='json', no_delete=False, + def port(self, subnet=None, fmt=None, no_delete=False, **kwargs): with (self.subnet() if not subnet else dummy_context_func()) as subnet_to_use: if subnet: subnet_to_use = subnet net_id = subnet_to_use['subnet']['network_id'] - port = self._make_port(fmt, net_id, **kwargs) + port = self._make_port(fmt or self.fmt, net_id, **kwargs) try: yield port finally: @@ -530,7 +526,7 @@ class TestBasicGet(QuantumDbPluginV2TestCase): class TestV2HTTPResponse(QuantumDbPluginV2TestCase): def test_create_returns_201(self): - res = self._create_network('json', 'net2', True) + res = self._create_network(self.fmt, 'net2', True) self.assertEqual(res.status_int, 201) def test_list_returns_200(self): @@ -540,7 +536,7 @@ class TestV2HTTPResponse(QuantumDbPluginV2TestCase): def _check_list_with_fields(self, res, field_name): self.assertEqual(res.status_int, 200) - body = self.deserialize('json', res) + body = self.deserialize(self.fmt, res) # further checks: 1 networks self.assertEqual(len(body['networks']), 1) # 1 field in the network record @@ -549,14 +545,14 @@ class TestV2HTTPResponse(QuantumDbPluginV2TestCase): self.assertIn(field_name, body['networks'][0]) def test_list_with_fields(self): - self._create_network('json', 'some_net', True) + self._create_network(self.fmt, 'some_net', True) req = self.new_list_request('networks', params="fields=name") res = req.get_response(self.api) self._check_list_with_fields(res, 'name') def test_list_with_fields_noadmin(self): tenant_id = 'some_tenant' - self._create_network('json', + self._create_network(self.fmt, 'some_net', True, tenant_id=tenant_id, @@ -575,7 +571,7 @@ class TestV2HTTPResponse(QuantumDbPluginV2TestCase): """ tenant_id = 'some_tenant' - self._create_network('json', + self._create_network(self.fmt, 'some_net', True, tenant_id=tenant_id, @@ -592,8 +588,8 @@ class TestV2HTTPResponse(QuantumDbPluginV2TestCase): self.assertEqual(res.status_int, 200) def test_delete_returns_204(self): - res = self._create_network('json', 'net1', True) - net = self.deserialize('json', res) + res = self._create_network(self.fmt, 'net1', True) + net = self.deserialize(self.fmt, res) req = self.new_delete_request('networks', net['network']['id']) res = req.get_response(self.api) self.assertEqual(res.status_int, 204) @@ -648,12 +644,12 @@ class TestPortsV2(QuantumDbPluginV2TestCase): def test_create_port_public_network(self): keys = [('admin_state_up', True), ('status', self.port_create_status)] with self.network(shared=True) as network: - port_res = self._create_port('json', + port_res = self._create_port(self.fmt, network['network']['id'], 201, tenant_id='another_tenant', set_context=True) - port = self.deserialize('json', port_res) + port = self.deserialize(self.fmt, port_res) for k, v in keys: self.assertEqual(port['port'][k], v) self.assertTrue('mac_address' in port['port']) @@ -666,12 +662,12 @@ class TestPortsV2(QuantumDbPluginV2TestCase): ('status', self.port_create_status), ('fixed_ips', [{'subnet_id': subnet['subnet']['id'], 'ip_address': '10.0.0.2'}])] - port_res = self._create_port('json', + port_res = self._create_port(self.fmt, network['network']['id'], 201, tenant_id='another_tenant', set_context=True) - port = self.deserialize('json', port_res) + port = self.deserialize(self.fmt, port_res) for k, v in keys: self.assertEqual(port['port'][k], v) self.assertTrue('mac_address' in port['port']) @@ -681,10 +677,10 @@ class TestPortsV2(QuantumDbPluginV2TestCase): if self._skip_native_bulk: self.skipTest("Plugin does not support native bulk port create") with self.network() as net: - res = self._create_port_bulk('json', 2, net['network']['id'], + res = self._create_port_bulk(self.fmt, 2, net['network']['id'], 'test', True) self._validate_behavior_on_bulk_success(res, 'ports') - for p in self.deserialize('json', res)['ports']: + for p in self.deserialize(self.fmt, res)['ports']: self._delete('ports', p['id']) def test_create_ports_bulk_emulated(self): @@ -699,23 +695,23 @@ class TestPortsV2(QuantumDbPluginV2TestCase): with mock.patch('__builtin__.hasattr', new=fakehasattr): with self.network() as net: - res = self._create_port_bulk('json', 2, net['network']['id'], + res = self._create_port_bulk(self.fmt, 2, net['network']['id'], 'test', True) self._validate_behavior_on_bulk_success(res, 'ports') - for p in self.deserialize('json', res)['ports']: + for p in self.deserialize(self.fmt, res)['ports']: self._delete('ports', p['id']) def test_create_ports_bulk_wrong_input(self): with self.network() as net: overrides = {1: {'admin_state_up': 'doh'}} - res = self._create_port_bulk('json', 2, net['network']['id'], + res = self._create_port_bulk(self.fmt, 2, net['network']['id'], 'test', True, override=overrides) self.assertEqual(res.status_int, 400) req = self.new_list_request('ports') res = req.get_response(self.api) self.assertEqual(res.status_int, 200) - ports = self.deserialize('json', res) + ports = self.deserialize(self.fmt, res) self.assertEqual(len(ports['ports']), 0) def test_create_ports_bulk_emulated_plugin_failure(self): @@ -739,7 +735,7 @@ class TestPortsV2(QuantumDbPluginV2TestCase): patched_plugin.side_effect = side_effect with self.network() as net: - res = self._create_port_bulk('json', 2, + res = self._create_port_bulk(self.fmt, 2, net['network']['id'], 'test', True) @@ -760,7 +756,7 @@ class TestPortsV2(QuantumDbPluginV2TestCase): *args, **kwargs) patched_plugin.side_effect = side_effect - res = self._create_port_bulk('json', 2, net['network']['id'], + res = self._create_port_bulk(self.fmt, 2, net['network']['id'], 'test', True, context=ctx) # We expect a 500 as we injected a fault in the plugin self._validate_behavior_on_bulk_failure(res, 'ports') @@ -805,27 +801,27 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s def test_show_port(self): with self.port() as port: - req = self.new_show_request('ports', port['port']['id'], 'json') - sport = self.deserialize('json', req.get_response(self.api)) + req = self.new_show_request('ports', port['port']['id'], self.fmt) + sport = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(port['port']['id'], sport['port']['id']) def test_delete_port(self): port_id = None with self.port() as port: port_id = port['port']['id'] - req = self.new_show_request('port', 'json', port['port']['id']) + req = self.new_show_request('port', self.fmt, port['port']['id']) res = req.get_response(self.api) self.assertEqual(res.status_int, 404) def test_delete_port_public_network(self): with self.network(shared=True) as network: - port_res = self._create_port('json', + port_res = self._create_port(self.fmt, network['network']['id'], 201, tenant_id='another_tenant', set_context=True) - port = self.deserialize('json', port_res) + port = self.deserialize(self.fmt, port_res) port_id = port['port']['id'] # delete the port self._delete('ports', port['port']['id']) @@ -835,7 +831,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s with self.port() as port: data = {'port': {'admin_state_up': False}} req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(res['port']['admin_state_up'], data['port']['admin_state_up']) @@ -847,7 +843,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self.assertEqual(res.status_int, 400) def test_delete_network_if_port_exists(self): - fmt = 'json' with self.port() as port: req = self.new_delete_request('networks', port['port']['network_id']) @@ -855,16 +850,11 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self.assertEqual(res.status_int, 409) def test_delete_network_port_exists_owned_by_network(self): - gateway_ip = '10.0.0.1' - cidr = '10.0.0.0/24' - fmt = 'json' - # Create new network - - res = self._create_network(fmt=fmt, name='net', + res = self._create_network(fmt=self.fmt, name='net', admin_status_up=True) - network = self.deserialize(fmt, res) + network = self.deserialize(self.fmt, res) network_id = network['network']['id'] - self._create_port(fmt, network_id, device_owner='network:dhcp') + self._create_port(self.fmt, network_id, device_owner='network:dhcp') req = self.new_delete_request('networks', network_id) res = req.get_response(self.api) self.assertEqual(res.status_int, 204) @@ -876,18 +866,17 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s 'fixed_ips': []}} req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(res['port']['admin_state_up'], data['port']['admin_state_up']) self.assertEqual(res['port']['fixed_ips'], data['port']['fixed_ips']) def test_no_more_port_exception(self): - fmt = 'json' with self.subnet(cidr='10.0.0.0/32') as subnet: id = subnet['subnet']['network_id'] - res = self._create_port(fmt, id) - data = self.deserialize(fmt, res) + res = self._create_port(self.fmt, id) + data = self.deserialize(self.fmt, res) msg = str(q_exc.IpAddressGenerationFailure(net_id=id)) self.assertEqual(data['QuantumError'], msg) self.assertEqual(res.status_int, 409) @@ -908,7 +897,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s 'ip_address': "10.0.0.10"}]}} req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) ips = res['port']['fixed_ips'] self.assertEqual(len(ips), 1) self.assertEqual(ips[0]['ip_address'], '10.0.0.10') @@ -927,7 +916,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s subnet['subnet']['id']}]}} req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(res['port']['admin_state_up'], data['port']['admin_state_up']) ips = res['port']['fixed_ips'] @@ -946,7 +935,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s subnet['subnet']['id']}]}} req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(res['port']['admin_state_up'], data['port']['admin_state_up']) ips = res['port']['fixed_ips'] @@ -957,7 +946,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self.assertEqual(ips[1]['subnet_id'], subnet['subnet']['id']) def test_requested_duplicate_mac(self): - fmt = 'json' with self.port() as port: mac = port['port']['mac_address'] # check that MAC address matches base MAC @@ -965,8 +953,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self.assertTrue(mac.startswith(base_mac)) kwargs = {"mac_address": mac} net_id = port['port']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_mac_generation(self): @@ -1000,18 +988,16 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s def fake_gen_mac(context, net_id): raise q_exc.MacAddressGenerationFailure(net_id=net_id) - fmt = 'json' with mock.patch.object(quantum.db.db_base_plugin_v2.QuantumDbPluginV2, '_generate_mac', new=fake_gen_mac): - res = self._create_network(fmt=fmt, name='net1', + res = self._create_network(fmt=self.fmt, name='net1', admin_status_up=True) - network = self.deserialize(fmt, res) + network = self.deserialize(self.fmt, res) net_id = network['network']['id'] - res = self._create_port(fmt, net_id=net_id) + res = self._create_port(self.fmt, net_id=net_id) self.assertEqual(res.status_int, 503) def test_requested_duplicate_ip(self): - fmt = 'json' with self.subnet() as subnet: with self.port(subnet=subnet) as port: ips = port['port']['fixed_ips'] @@ -1022,12 +1008,11 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s kwargs = {"fixed_ips": [{'subnet_id': subnet['subnet']['id'], 'ip_address': ips[0]['ip_address']}]} net_id = port['port']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_requested_subnet_delete(self): - fmt = 'json' with self.subnet() as subnet: with self.port(subnet=subnet) as port: ips = port['port']['fixed_ips'] @@ -1040,7 +1025,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self.assertEqual(res.status_int, 404) def test_requested_subnet_id(self): - fmt = 'json' with self.subnet() as subnet: with self.port(subnet=subnet) as port: ips = port['port']['fixed_ips'] @@ -1050,8 +1034,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s # Request a IP from specific subnet kwargs = {"fixed_ips": [{'subnet_id': subnet['subnet']['id']}]} net_id = port['port']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port2 = self.deserialize(self.fmt, res) ips = port2['port']['fixed_ips'] self.assertEqual(len(ips), 1) self.assertEqual(ips[0]['ip_address'], '10.0.0.3') @@ -1059,29 +1043,27 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self._delete('ports', port2['port']['id']) def test_requested_subnet_id_not_on_network(self): - fmt = 'json' with self.subnet() as subnet: with self.port(subnet=subnet) as port: # Create new network - res = self._create_network(fmt=fmt, name='net2', + res = self._create_network(fmt=self.fmt, name='net2', admin_status_up=True) - network2 = self.deserialize(fmt, res) - subnet2 = self._make_subnet(fmt, network2, "1.1.1.1", + network2 = self.deserialize(self.fmt, res) + subnet2 = self._make_subnet(self.fmt, network2, "1.1.1.1", "1.1.1.0/24", ip_version=4) net_id = port['port']['network_id'] # Request a IP from specific subnet kwargs = {"fixed_ips": [{'subnet_id': subnet2['subnet']['id']}]} net_id = port['port']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) self.assertEqual(res.status_int, 400) def test_overlapping_subnets(self): - fmt = 'json' with self.subnet() as subnet: tenant_id = subnet['subnet']['tenant_id'] net_id = subnet['subnet']['network_id'] - res = self._create_subnet(fmt, + res = self._create_subnet(self.fmt, tenant_id=tenant_id, net_id=net_id, cidr='10.0.0.225/28', @@ -1090,31 +1072,30 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self.assertEqual(res.status_int, 400) def test_requested_subnet_id_v4_and_v6(self): - fmt = 'json' with self.subnet() as subnet: # Get a IPv4 and IPv6 address tenant_id = subnet['subnet']['tenant_id'] net_id = subnet['subnet']['network_id'] - res = self._create_subnet(fmt, + res = self._create_subnet(self.fmt, tenant_id=tenant_id, net_id=net_id, cidr='2607:f0d0:1002:51::0/124', ip_version=6, gateway_ip=ATTR_NOT_SPECIFIED) - subnet2 = self.deserialize(fmt, res) + subnet2 = self.deserialize(self.fmt, res) kwargs = {"fixed_ips": [{'subnet_id': subnet['subnet']['id']}, {'subnet_id': subnet2['subnet']['id']}]} - res = self._create_port(fmt, net_id=net_id, **kwargs) - port3 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port3 = self.deserialize(self.fmt, res) ips = port3['port']['fixed_ips'] self.assertEqual(len(ips), 2) self.assertEqual(ips[0]['ip_address'], '10.0.0.2') self.assertEqual(ips[0]['subnet_id'], subnet['subnet']['id']) self.assertEqual(ips[1]['ip_address'], '2607:f0d0:1002:51::2') self.assertEqual(ips[1]['subnet_id'], subnet2['subnet']['id']) - res = self._create_port(fmt, net_id=net_id) - port4 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id) + port4 = self.deserialize(self.fmt, res) # Check that a v4 and a v6 address are allocated ips = port4['port']['fixed_ips'] self.assertEqual(len(ips), 2) @@ -1126,7 +1107,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self._delete('ports', port4['port']['id']) def test_range_allocation(self): - fmt = 'json' with self.subnet(gateway_ip='10.0.0.3', cidr='10.0.0.0/29') as subnet: kwargs = {"fixed_ips": @@ -1136,8 +1116,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s {'subnet_id': subnet['subnet']['id']}, {'subnet_id': subnet['subnet']['id']}]} net_id = subnet['subnet']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port = self.deserialize(self.fmt, res) ips = port['port']['fixed_ips'] self.assertEqual(len(ips), 5) alloc = ['10.0.0.1', '10.0.0.2', '10.0.0.4', '10.0.0.5', @@ -1157,8 +1137,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s {'subnet_id': subnet['subnet']['id']}, {'subnet_id': subnet['subnet']['id']}]} net_id = subnet['subnet']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port = self.deserialize(self.fmt, res) ips = port['port']['fixed_ips'] self.assertEqual(len(ips), 5) alloc = ['11.0.0.1', '11.0.0.2', '11.0.0.3', '11.0.0.4', @@ -1170,7 +1150,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self._delete('ports', port['port']['id']) def test_requested_invalid_fixed_ips(self): - fmt = 'json' with self.subnet() as subnet: with self.port(subnet=subnet) as port: ips = port['port']['fixed_ips'] @@ -1183,8 +1162,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s {'subnet_id': '00000000-ffff-ffff-ffff-000000000000'}]} net_id = port['port']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 404) # Test invalid IP address on specified subnet_id @@ -1192,8 +1171,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s [{'subnet_id': subnet['subnet']['id'], 'ip_address': '1.1.1.1'}]} net_id = port['port']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) # Test invalid addresses - IP's not on subnet or network @@ -1202,8 +1181,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s net_id = port['port']['network_id'] for ip in bad_ips: kwargs = {"fixed_ips": [{'ip_address': ip}]} - res = self._create_port(fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) # Enable allocation of gateway address @@ -1211,8 +1190,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s [{'subnet_id': subnet['subnet']['id'], 'ip_address': '10.0.0.1'}]} net_id = port['port']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port2 = self.deserialize(self.fmt, res) ips = port2['port']['fixed_ips'] self.assertEqual(len(ips), 1) self.assertEqual(ips[0]['ip_address'], '10.0.0.1') @@ -1220,18 +1199,16 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self._delete('ports', port2['port']['id']) def test_invalid_ip(self): - fmt = 'json' with self.subnet() as subnet: # Allocate specific IP kwargs = {"fixed_ips": [{'subnet_id': subnet['subnet']['id'], 'ip_address': '1011.0.0.5'}]} net_id = subnet['subnet']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_requested_split(self): - fmt = 'json' with self.subnet() as subnet: with self.port(subnet=subnet) as port: ports_to_delete = [] @@ -1243,8 +1220,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s kwargs = {"fixed_ips": [{'subnet_id': subnet['subnet']['id'], 'ip_address': '10.0.0.5'}]} net_id = port['port']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port2 = self.deserialize(self.fmt, res) ports_to_delete.append(port2) ips = port2['port']['fixed_ips'] self.assertEqual(len(ips), 1) @@ -1254,8 +1231,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s allocated = ['10.0.0.3', '10.0.0.4', '10.0.0.6'] for a in allocated: - res = self._create_port(fmt, net_id=net_id) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id) + port2 = self.deserialize(self.fmt, res) ports_to_delete.append(port2) ips = port2['port']['fixed_ips'] self.assertEqual(len(ips), 1) @@ -1267,7 +1244,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self._delete('ports', p['port']['id']) def test_duplicate_ips(self): - fmt = 'json' with self.subnet() as subnet: # Allocate specific IP kwargs = {"fixed_ips": [{'subnet_id': subnet['subnet']['id'], @@ -1275,34 +1251,31 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s {'subnet_id': subnet['subnet']['id'], 'ip_address': '10.0.0.5'}]} net_id = subnet['subnet']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_fixed_ip_invalid_subnet_id(self): - fmt = 'json' with self.subnet() as subnet: # Allocate specific IP kwargs = {"fixed_ips": [{'subnet_id': 'i am invalid', 'ip_address': '10.0.0.5'}]} net_id = subnet['subnet']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_fixed_ip_invalid_ip(self): - fmt = 'json' with self.subnet() as subnet: # Allocate specific IP kwargs = {"fixed_ips": [{'subnet_id': subnet['subnet']['id'], 'ip_address': '10.0.0.55555'}]} net_id = subnet['subnet']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_requested_ips_only(self): - fmt = 'json' with self.subnet() as subnet: with self.port(subnet=subnet) as port: ips = port['port']['fixed_ips'] @@ -1315,8 +1288,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s for i in ips_only: kwargs = {"fixed_ips": [{'ip_address': i}]} net_id = port['port']['network_id'] - res = self._create_port(fmt, net_id=net_id, **kwargs) - port = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) + port = self.deserialize(self.fmt, res) ports_to_delete.append(port) ips = port['port']['fixed_ips'] self.assertEqual(len(ips), 1) @@ -1330,7 +1303,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s # set expirations to past so that recycling is checked reference = datetime.datetime(2012, 8, 13, 23, 11, 0) cfg.CONF.set_override('dhcp_lease_duration', 0) - fmt = 'json' with self.subnet(cidr='10.0.1.0/24') as subnet: with self.port(subnet=subnet) as port: @@ -1344,15 +1316,15 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s net_id = port['port']['network_id'] ports = [] for i in range(16 - 3): - res = self._create_port(fmt, net_id=net_id) - p = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id) + p = self.deserialize(self.fmt, res) ports.append(p) for i in range(16 - 3): x = random.randrange(0, len(ports), 1) p = ports.pop(x) self._delete('ports', p['port']['id']) - res = self._create_port(fmt, net_id=net_id) - port = self.deserialize(fmt, res) + res = self._create_port(self.fmt, net_id=net_id) + port = self.deserialize(self.fmt, res) ips = port['port']['fixed_ips'] self.assertEqual(len(ips), 1) self.assertEqual(ips[0]['ip_address'], '10.0.1.3') @@ -1517,7 +1489,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): name = 'net1' keys = [('subnets', []), ('name', name), ('admin_state_up', True), ('status', 'ACTIVE'), ('shared', False)] - with self.network(name=name) as net: + with self.network(name=name, arg_list=('test',), test=None) as net: for k, v in keys: self.assertEqual(net['network'][k], v) @@ -1547,7 +1519,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): req = self.new_update_request('networks', data, network['network']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(res['network']['name'], data['network']['name']) @@ -1568,7 +1540,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): req = self.new_update_request('networks', data, network['network']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertTrue(res['network']['shared']) def test_update_network_with_subnet_set_shared(self): @@ -1578,7 +1550,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): req = self.new_update_request('networks', data, network['network']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertTrue(res['network']['shared']) # must query db to see whether subnet's shared attribute # has been updated or not @@ -1589,7 +1561,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): def test_update_network_set_not_shared_single_tenant(self): with self.network(shared=True) as network: - res1 = self._create_port('json', + res1 = self._create_port(self.fmt, network['network']['id'], 201, tenant_id=network['network']['tenant_id'], @@ -1598,14 +1570,14 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): req = self.new_update_request('networks', data, network['network']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertFalse(res['network']['shared']) - port1 = self.deserialize('json', res1) + port1 = self.deserialize(self.fmt, res1) self._delete('ports', port1['port']['id']) def test_update_network_set_not_shared_other_tenant_returns_409(self): with self.network(shared=True) as network: - res1 = self._create_port('json', + res1 = self._create_port(self.fmt, network['network']['id'], 201, tenant_id='somebody_else', @@ -1615,17 +1587,17 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): data, network['network']['id']) self.assertEqual(req.get_response(self.api).status_int, 409) - port1 = self.deserialize('json', res1) + port1 = self.deserialize(self.fmt, res1) self._delete('ports', port1['port']['id']) def test_update_network_set_not_shared_multi_tenants_returns_409(self): with self.network(shared=True) as network: - res1 = self._create_port('json', + res1 = self._create_port(self.fmt, network['network']['id'], 201, tenant_id='somebody_else', set_context=True) - res2 = self._create_port('json', + res2 = self._create_port(self.fmt, network['network']['id'], 201, tenant_id=network['network']['tenant_id'], @@ -1635,19 +1607,19 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): data, network['network']['id']) self.assertEqual(req.get_response(self.api).status_int, 409) - port1 = self.deserialize('json', res1) - port2 = self.deserialize('json', res2) + port1 = self.deserialize(self.fmt, res1) + port2 = self.deserialize(self.fmt, res2) self._delete('ports', port1['port']['id']) self._delete('ports', port2['port']['id']) def test_update_network_set_not_shared_multi_tenants2_returns_409(self): with self.network(shared=True) as network: - res1 = self._create_port('json', + res1 = self._create_port(self.fmt, network['network']['id'], 201, tenant_id='somebody_else', set_context=True) - self._create_subnet('json', + self._create_subnet(self.fmt, network['network']['id'], '10.0.0.0/24', 201, @@ -1659,13 +1631,13 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): network['network']['id']) self.assertEqual(req.get_response(self.api).status_int, 409) - port1 = self.deserialize('json', res1) + port1 = self.deserialize(self.fmt, res1) self._delete('ports', port1['port']['id']) def test_create_networks_bulk_native(self): if self._skip_native_bulk: self.skipTest("Plugin does not support native bulk network create") - res = self._create_network_bulk('json', 2, 'test', True) + res = self._create_network_bulk(self.fmt, 2, 'test', True) self._validate_behavior_on_bulk_success(res, 'networks') def test_create_networks_bulk_native_quotas(self): @@ -1673,7 +1645,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): self.skipTest("Plugin does not support native bulk network create") quota = 4 cfg.CONF.set_override('quota_network', quota, group='QUOTAS') - res = self._create_network_bulk('json', quota + 1, 'test', True) + res = self._create_network_bulk(self.fmt, quota + 1, 'test', True) self._validate_behavior_on_bulk_failure(res, 'networks', errcode=409) def test_create_networks_bulk_tenants_and_quotas(self): @@ -1690,7 +1662,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): {'network': {'name': 'n2', 'tenant_id': 't1'}}] - res = self._create_bulk_from_list('json', 'network', networks) + res = self._create_bulk_from_list(self.fmt, 'network', networks) self.assertEqual(res.status_int, 201) def test_create_networks_bulk_tenants_and_quotas_fail(self): @@ -1709,7 +1681,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): {'network': {'name': 'n2', 'tenant_id': 't1'}}] - res = self._create_bulk_from_list('json', 'network', networks) + res = self._create_bulk_from_list(self.fmt, 'network', networks) self.assertEqual(res.status_int, 409) def test_create_networks_bulk_emulated(self): @@ -1723,18 +1695,18 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): with mock.patch('__builtin__.hasattr', new=fakehasattr): - res = self._create_network_bulk('json', 2, 'test', True) + res = self._create_network_bulk(self.fmt, 2, 'test', True) self._validate_behavior_on_bulk_success(res, 'networks') def test_create_networks_bulk_wrong_input(self): - res = self._create_network_bulk('json', 2, 'test', True, + res = self._create_network_bulk(self.fmt, 2, 'test', True, override={1: {'admin_state_up': 'doh'}}) self.assertEqual(res.status_int, 400) req = self.new_list_request('networks') res = req.get_response(self.api) self.assertEqual(res.status_int, 200) - nets = self.deserialize('json', res) + nets = self.deserialize(self.fmt, res) self.assertEqual(len(nets['networks']), 0) def test_create_networks_bulk_emulated_plugin_failure(self): @@ -1757,7 +1729,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): *args, **kwargs) patched_plugin.side_effect = side_effect - res = self._create_network_bulk('json', 2, 'test', True) + res = self._create_network_bulk(self.fmt, 2, 'test', True) # We expect a 500 as we injected a fault in the plugin self._validate_behavior_on_bulk_failure(res, 'networks') @@ -1773,7 +1745,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): *args, **kwargs) patched_plugin.side_effect = side_effect - res = self._create_network_bulk('json', 2, 'test', True) + res = self._create_network_bulk(self.fmt, 2, 'test', True) # We expect a 500 as we injected a fault in the plugin self._validate_behavior_on_bulk_failure(res, 'networks') @@ -1798,7 +1770,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): with self.network(name='net1') as net1: req = self.new_list_request('networks', params='fields=name') - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(1, len(res['networks'])) self.assertEqual(res['networks'][0]['name'], net1['network']['name']) @@ -1817,7 +1789,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): def test_show_network(self): with self.network(name='net1') as net: req = self.new_show_request('networks', net['network']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(res['network']['name'], net['network']['name']) @@ -1825,12 +1797,11 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): with self.network(name='net1') as net: with self.subnet(net) as subnet: req = self.new_show_request('networks', net['network']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(res['network']['subnets'][0], subnet['subnet']['id']) def test_invalid_admin_status(self): - fmt = 'json' value = [[7, False, 400], [True, True, 201], ["True", True, 201], ["true", True, 201], [1, True, 201], ["False", False, 201], [False, False, 201], ["false", False, 201], @@ -1843,7 +1814,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): req = network_req.get_response(self.api) self.assertEqual(req.status_int, v[2]) if v[2] == 201: - res = self.deserialize(fmt, req) + res = self.deserialize(self.fmt, req) self.assertEqual(res['network']['admin_state_up'], v[1]) @@ -1871,7 +1842,8 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): cidr = '10.0.0.0/24' subnet = self._test_create_subnet(gateway_ip=gateway_ip, cidr=cidr) - self.assertTrue('name' in subnet['subnet']) + self.assertEqual(4, subnet['subnet']['ip_version']) + self.assertIn('name', subnet['subnet']) def test_create_two_subnets(self): gateway_ips = ['10.0.0.1', '10.0.1.1'] @@ -1886,11 +1858,11 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): net_req = self.new_show_request('networks', network['network']['id']) raw_res = net_req.get_response(self.api) - net_res = self.deserialize('json', raw_res) + net_res = self.deserialize(self.fmt, raw_res) for subnet_id in net_res['network']['subnets']: sub_req = self.new_show_request('subnets', subnet_id) raw_res = sub_req.get_response(self.api) - sub_res = self.deserialize('json', raw_res) + sub_res = self.deserialize(self.fmt, raw_res) self.assertIn(sub_res['subnet']['cidr'], cidrs) self.assertIn(sub_res['subnet']['gateway_ip'], gateway_ips) @@ -1958,7 +1930,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): if self._skip_native_bulk: self.skipTest("Plugin does not support native bulk subnet create") with self.network() as net: - res = self._create_subnet_bulk('json', 2, net['network']['id'], + res = self._create_subnet_bulk(self.fmt, 2, net['network']['id'], 'test') self._validate_behavior_on_bulk_success(res, 'subnets') @@ -1974,7 +1946,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): with mock.patch('__builtin__.hasattr', new=fakehasattr): with self.network() as net: - res = self._create_subnet_bulk('json', 2, + res = self._create_subnet_bulk(self.fmt, 2, net['network']['id'], 'test') self._validate_behavior_on_bulk_success(res, 'subnets') @@ -2000,7 +1972,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): patched_plugin.side_effect = side_effect with self.network() as net: - res = self._create_subnet_bulk('json', 2, + res = self._create_subnet_bulk(self.fmt, 2, net['network']['id'], 'test') # We expect a 500 as we injected a fault in the plugin @@ -2018,7 +1990,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): patched_plugin.side_effect = side_effect with self.network() as net: - res = self._create_subnet_bulk('json', 2, + res = self._create_subnet_bulk(self.fmt, 2, net['network']['id'], 'test') @@ -2028,12 +2000,11 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): def test_delete_subnet(self): gateway_ip = '10.0.0.1' cidr = '10.0.0.0/24' - fmt = 'json' # Create new network - res = self._create_network(fmt=fmt, name='net', + res = self._create_network(fmt=self.fmt, name='net', admin_status_up=True) - network = self.deserialize(fmt, res) - subnet = self._make_subnet(fmt, network, gateway_ip, + network = self.deserialize(self.fmt, res) + subnet = self._make_subnet(self.fmt, network, gateway_ip, cidr, ip_version=4) req = self.new_delete_request('subnets', subnet['subnet']['id']) res = req.get_response(self.api) @@ -2042,15 +2013,14 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): def test_delete_subnet_port_exists_owned_by_network(self): gateway_ip = '10.0.0.1' cidr = '10.0.0.0/24' - fmt = 'json' # Create new network - res = self._create_network(fmt=fmt, name='net', + res = self._create_network(fmt=self.fmt, name='net', admin_status_up=True) - network = self.deserialize(fmt, res) + network = self.deserialize(self.fmt, res) network_id = network['network']['id'] - subnet = self._make_subnet(fmt, network, gateway_ip, + subnet = self._make_subnet(self.fmt, network, gateway_ip, cidr, ip_version=4) - self._create_port(fmt, + self._create_port(self.fmt, network['network']['id'], device_owner='network:dhcp') req = self.new_delete_request('subnets', subnet['subnet']['id']) @@ -2063,7 +2033,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): id = subnet['subnet']['id'] req = self.new_delete_request('subnets', id) res = req.get_response(self.api) - data = self.deserialize('json', res) + data = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) msg = str(q_exc.SubnetInUse(subnet_id=id)) self.assertEqual(data['QuantumError'], msg) @@ -2071,12 +2041,11 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): def test_delete_network(self): gateway_ip = '10.0.0.1' cidr = '10.0.0.0/24' - fmt = 'json' # Create new network - res = self._create_network(fmt=fmt, name='net', + res = self._create_network(fmt=self.fmt, name='net', admin_status_up=True) - network = self.deserialize(fmt, res) - subnet = self._make_subnet(fmt, network, gateway_ip, + network = self.deserialize(self.fmt, res) + subnet = self._make_subnet(self.fmt, network, gateway_ip, cidr, ip_version=4) req = self.new_delete_request('networks', network['network']['id']) res = req.get_response(self.api) @@ -2252,7 +2221,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): def test_create_force_subnet_gw_values(self): cfg.CONF.set_override('force_gateway_on_subnet', True) with self.network() as network: - self._create_subnet('json', + self._create_subnet(self.fmt, network['network']['id'], '10.0.0.0/24', 400, @@ -2282,7 +2251,6 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): def test_subnet_with_allocation_range(self): cfg.CONF.set_override('dhcp_lease_duration', 0) - fmt = 'json' with self.network() as network: net_id = network['network']['id'] data = {'subnet': {'network_id': net_id, @@ -2293,14 +2261,14 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): 'allocation_pools': [{'start': '10.0.0.100', 'end': '10.0.0.120'}]}} subnet_req = self.new_create_request('subnets', data) - subnet = self.deserialize('json', + subnet = self.deserialize(self.fmt, subnet_req.get_response(self.api)) # Check fixed IP not in allocation range kwargs = {"fixed_ips": [{'subnet_id': subnet['subnet']['id'], 'ip_address': '10.0.0.10'}]} - res = self._create_port(fmt, net_id=net_id, **kwargs) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) self.assertEqual(res.status_int, 201) - port = self.deserialize('json', res) + port = self.deserialize(self.fmt, res) port_id = port['port']['id'] # delete the port self._delete('ports', port['port']['id']) @@ -2308,9 +2276,9 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): # Check when fixed IP is gateway kwargs = {"fixed_ips": [{'subnet_id': subnet['subnet']['id'], 'ip_address': '10.0.0.1'}]} - res = self._create_port(fmt, net_id=net_id, **kwargs) + res = self._create_port(self.fmt, net_id=net_id, **kwargs) self.assertEqual(res.status_int, 201) - port = self.deserialize('json', res) + port = self.deserialize(self.fmt, res) port_id = port['port']['id'] # delete the port self._delete('ports', port['port']['id']) @@ -2506,7 +2474,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): data = {'subnet': {'gateway_ip': '11.0.0.1'}} req = self.new_update_request('subnets', data, subnet['subnet']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(res['subnet']['gateway_ip'], data['subnet']['gateway_ip']) @@ -2577,7 +2545,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): with self.subnet(network=network) as subnet: req = self.new_show_request('subnets', subnet['subnet']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(res['subnet']['id'], subnet['subnet']['id']) self.assertEqual(res['subnet']['network_id'], @@ -2604,7 +2572,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): req = self.new_list_request('subnets') req.environ['quantum.context'] = context.Context( '', 'some_tenant') - res = self.deserialize('json', + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(len(res['subnets']), 1) self.assertEqual(res['subnets'][0]['cidr'], @@ -2612,7 +2580,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): # admin will see both subnets admin_req = self.new_list_request('subnets') admin_res = self.deserialize( - 'json', admin_req.get_response(self.api)) + self.fmt, admin_req.get_response(self.api)) self.assertEqual(len(admin_res['subnets']), 2) cidrs = [sub['cidr'] for sub in admin_res['subnets']] self.assertIn(subnet['subnet']['cidr'], cidrs) @@ -2770,7 +2738,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): data = {'subnet': {'dns_nameservers': ['11.0.0.1']}} req = self.new_update_request('subnets', data, subnet['subnet']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(res['subnet']['dns_nameservers'], data['subnet']['dns_nameservers']) @@ -2779,12 +2747,12 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): data = {'subnet': {'dns_nameservers': None}} req = self.new_update_request('subnets', data, subnet['subnet']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual([], res['subnet']['dns_nameservers']) data = {'subnet': {'dns_nameservers': ['11.0.0.3']}} req = self.new_update_request('subnets', data, subnet['subnet']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(data['subnet']['dns_nameservers'], res['subnet']['dns_nameservers']) @@ -2803,7 +2771,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): [{'destination': '12.0.0.0/8', 'nexthop': '1.2.3.4'}]}} req = self.new_update_request('subnets', data, subnet['subnet']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(res['subnet']['host_routes'], data['subnet']['host_routes']) @@ -2813,13 +2781,13 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): data = {'subnet': {'host_routes': None}} req = self.new_update_request('subnets', data, subnet['subnet']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual([], res['subnet']['host_routes']) data = {'subnet': {'host_routes': [{'destination': '12.0.0.0/8', 'nexthop': '1.2.3.4'}]}} req = self.new_update_request('subnets', data, subnet['subnet']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEqual(data['subnet']['host_routes'], res['subnet']['host_routes']) @@ -2837,13 +2805,12 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): def test_delete_subnet_with_dns(self): gateway_ip = '10.0.0.1' cidr = '10.0.0.0/24' - fmt = 'json' dns_nameservers = ['1.2.3.4'] # Create new network - res = self._create_network(fmt=fmt, name='net', + res = self._create_network(fmt=self.fmt, name='net', admin_status_up=True) - network = self.deserialize(fmt, res) - subnet = self._make_subnet(fmt, network, gateway_ip, + network = self.deserialize(self.fmt, res) + subnet = self._make_subnet(self.fmt, network, gateway_ip, cidr, ip_version=4, dns_nameservers=dns_nameservers) req = self.new_delete_request('subnets', subnet['subnet']['id']) @@ -2853,14 +2820,13 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): def test_delete_subnet_with_route(self): gateway_ip = '10.0.0.1' cidr = '10.0.0.0/24' - fmt = 'json' host_routes = [{'destination': '135.207.0.0/16', 'nexthop': '1.2.3.4'}] # Create new network - res = self._create_network(fmt=fmt, name='net', + res = self._create_network(fmt=self.fmt, name='net', admin_status_up=True) - network = self.deserialize(fmt, res) - subnet = self._make_subnet(fmt, network, gateway_ip, + network = self.deserialize(self.fmt, res) + subnet = self._make_subnet(self.fmt, network, gateway_ip, cidr, ip_version=4, host_routes=host_routes) req = self.new_delete_request('subnets', subnet['subnet']['id']) @@ -2870,15 +2836,14 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): def test_delete_subnet_with_dns_and_route(self): gateway_ip = '10.0.0.1' cidr = '10.0.0.0/24' - fmt = 'json' dns_nameservers = ['1.2.3.4'] host_routes = [{'destination': '135.207.0.0/16', 'nexthop': '1.2.3.4'}] # Create new network - res = self._create_network(fmt=fmt, name='net', + res = self._create_network(fmt=self.fmt, name='net', admin_status_up=True) - network = self.deserialize(fmt, res) - subnet = self._make_subnet(fmt, network, gateway_ip, + network = self.deserialize(self.fmt, res) + subnet = self._make_subnet(self.fmt, network, gateway_ip, cidr, ip_version=4, dns_nameservers=dns_nameservers, host_routes=host_routes) @@ -2901,3 +2866,23 @@ class DbModelTestCase(unittest2.TestCase): "admin_state_up=True, shared=None}>") final_exp = exp_start_with + exp_middle + exp_end_with self.assertEqual(actual_repr_output, final_exp) + + +class TestBasicGetXML(TestBasicGet): + fmt = 'xml' + + +class TestNetworksV2XML(TestNetworksV2): + fmt = 'xml' + + +class TestPortsV2XML(TestPortsV2): + fmt = 'xml' + + +class TestSubnetsV2XML(TestSubnetsV2): + fmt = 'xml' + + +class TestV2HTTPResponseXML(TestV2HTTPResponse): + fmt = 'xml' diff --git a/quantum/tests/unit/test_extension_security_group.py b/quantum/tests/unit/test_extension_security_group.py index f24c01b45..1ee83ce25 100644 --- a/quantum/tests/unit/test_extension_security_group.py +++ b/quantum/tests/unit/test_extension_security_group.py @@ -113,14 +113,16 @@ class SecurityGroupsTestCase(test_db_plugin.QuantumDbPluginV2TestCase): return self.deserialize(fmt, res) def _make_security_group_rule(self, fmt, rules, **kwargs): - res = self._create_security_group_rule('json', rules) + res = self._create_security_group_rule(self.fmt, rules) if res.status_int >= 400: raise webob.exc.HTTPClientError(code=res.status_int) return self.deserialize(fmt, res) @contextlib.contextmanager def security_group(self, name='webservers', description='webservers', - external_id=None, fmt='json', no_delete=False): + external_id=None, fmt=None, no_delete=False): + if not fmt: + fmt = self.fmt security_group = self._make_security_group(fmt, name, description, external_id) try: @@ -136,8 +138,10 @@ class SecurityGroupsTestCase(test_db_plugin.QuantumDbPluginV2TestCase): direction='ingress', protocol='tcp', port_range_min='22', port_range_max='22', source_ip_prefix=None, source_group_id=None, - external_id=None, fmt='json', no_delete=False, + external_id=None, fmt=None, no_delete=False, ethertype='IPv4'): + if not fmt: + fmt = self.fmt rule = self._build_security_group_rule(security_group_id, direction, protocol, port_range_min, @@ -146,7 +150,7 @@ class SecurityGroupsTestCase(test_db_plugin.QuantumDbPluginV2TestCase): source_group_id, external_id, ethertype=ethertype) - security_group_rule = self._make_security_group_rule('json', rule) + security_group_rule = self._make_security_group_rule(self.fmt, rule) try: yield security_group_rule finally: @@ -155,6 +159,10 @@ class SecurityGroupsTestCase(test_db_plugin.QuantumDbPluginV2TestCase): security_group_rule['security_group_rule']['id']) +class SecurityGroupsTestCaseXML(SecurityGroupsTestCase): + fmt = 'xml' + + class SecurityGroupTestPlugin(db_base_plugin_v2.QuantumDbPluginV2, securitygroups_db.SecurityGroupDbMixin): """ Test plugin that implements necessary calls on create/delete port for @@ -231,36 +239,36 @@ class TestSecurityGroups(SecurityGroupDBTestCase): def test_default_security_group(self): with self.network(): res = self.new_list_request('security-groups') - groups = self.deserialize('json', res.get_response(self.ext_api)) + groups = self.deserialize(self.fmt, res.get_response(self.ext_api)) self.assertEqual(len(groups['security_groups']), 1) def test_create_security_group_proxy_mode_not_admin(self): cfg.CONF.set_override('proxy_mode', True, 'SECURITYGROUP') - res = self._create_security_group('json', 'webservers', + res = self._create_security_group(self.fmt, 'webservers', 'webservers', '1', tenant_id='bad_tenant', set_context=True) - self.deserialize('json', res) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 403) def test_create_security_group_no_external_id_proxy_mode(self): cfg.CONF.set_override('proxy_mode', True, 'SECURITYGROUP') - res = self._create_security_group('json', 'webservers', + res = self._create_security_group(self.fmt, 'webservers', 'webservers') - self.deserialize('json', res) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_create_security_group_no_external_id_not_proxy_mode(self): - res = self._create_security_group('json', 'webservers', + res = self._create_security_group(self.fmt, 'webservers', 'webservers', '1') - self.deserialize('json', res) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_create_default_security_group_fail(self): name = 'default' description = 'my webservers' - res = self._create_security_group('json', name, description) - self.deserialize('json', res) + res = self._create_security_group(self.fmt, name, description) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_create_security_group_duplicate_external_id(self): @@ -269,9 +277,9 @@ class TestSecurityGroups(SecurityGroupDBTestCase): description = 'my webservers' external_id = 1 with self.security_group(name, description, external_id): - res = self._create_security_group('json', name, description, + res = self._create_security_group(self.fmt, name, description, external_id) - self.deserialize('json', res) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_list_security_groups(self): @@ -279,7 +287,7 @@ class TestSecurityGroups(SecurityGroupDBTestCase): description = 'my webservers' with self.security_group(name, description): res = self.new_list_request('security-groups') - groups = self.deserialize('json', res.get_response(self.ext_api)) + groups = self.deserialize(self.fmt, res.get_response(self.ext_api)) self.assertEqual(len(groups['security_groups']), 2) for group in groups['security_groups']: if group['name'] == 'default': @@ -342,7 +350,6 @@ class TestSecurityGroups(SecurityGroupDBTestCase): with self.security_group(name, description) as sg: source_group_id = sg['security_group']['id'] res = self.new_show_request('security-groups', source_group_id) - security_group_id = sg['security_group']['id'] direction = "ingress" source_ip_prefix = "10.0.0.0/24" @@ -361,7 +368,7 @@ class TestSecurityGroups(SecurityGroupDBTestCase): source_ip_prefix): group = self.deserialize( - 'json', res.get_response(self.ext_api)) + self.fmt, res.get_response(self.ext_api)) sg_rule = group['security_group']['security_group_rules'] self.assertEqual(group['security_group']['id'], source_group_id) @@ -379,17 +386,17 @@ class TestSecurityGroups(SecurityGroupDBTestCase): def test_delete_default_security_group_fail(self): with self.network(): res = self.new_list_request('security-groups') - sg = self.deserialize('json', res.get_response(self.ext_api)) + sg = self.deserialize(self.fmt, res.get_response(self.ext_api)) self._delete('security-groups', sg['security_groups'][0]['id'], 409) def test_default_security_group_rules(self): with self.network(): res = self.new_list_request('security-groups') - groups = self.deserialize('json', res.get_response(self.ext_api)) + groups = self.deserialize(self.fmt, res.get_response(self.ext_api)) self.assertEqual(len(groups['security_groups']), 1) res = self.new_list_request('security-group-rules') - rules = self.deserialize('json', res.get_response(self.ext_api)) + rules = self.deserialize(self.fmt, res.get_response(self.ext_api)) self.assertEqual(len(rules['security_group_rules']), 2) # just generic rules to allow default egress and # intergroup communicartion @@ -459,8 +466,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): port_range_max, source_ip_prefix, source_group_id) - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_create_security_group_rule_bad_security_group_id(self): @@ -474,8 +481,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): protocol, port_range_min, port_range_max, source_ip_prefix) - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 404) def test_create_security_group_rule_bad_tenant(self): @@ -488,8 +495,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): 'port_range_max': '22', 'tenant_id': "bad_tenant"}} - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 404) def test_create_security_group_rule_exteral_id_proxy_mode(self): @@ -505,8 +512,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): 'tenant_id': 'test_tenant', 'source_group_id': sg['security_group']['id']}} - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 201) def test_create_security_group_rule_exteral_id_not_proxy_mode(self): @@ -521,8 +528,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): 'tenant_id': 'test_tenant', 'source_group_id': sg['security_group']['id']}} - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_create_security_group_rule_not_admin(self): @@ -538,18 +545,18 @@ class TestSecurityGroups(SecurityGroupDBTestCase): 'external_id': 1, 'source_group_id': sg['security_group']['id']}} - res = self._create_security_group_rule('json', rule, + res = self._create_security_group_rule(self.fmt, rule, tenant_id='bad_tenant', set_context=True) - self.deserialize('json', res) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 403) def test_create_security_group_rule_bad_tenant_source_group_id(self): with self.security_group() as sg: - res = self._create_security_group('json', 'webservers', + res = self._create_security_group(self.fmt, 'webservers', 'webservers', tenant_id='bad_tenant') - sg2 = self.deserialize('json', res) + sg2 = self.deserialize(self.fmt, res) rule = {'security_group_rule': {'security_group_id': sg2['security_group']['id'], 'direction': 'ingress', @@ -559,18 +566,18 @@ class TestSecurityGroups(SecurityGroupDBTestCase): 'tenant_id': 'bad_tenant', 'source_group_id': sg['security_group']['id']}} - res = self._create_security_group_rule('json', rule, + res = self._create_security_group_rule(self.fmt, rule, tenant_id='bad_tenant', set_context=True) - self.deserialize('json', res) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 404) def test_create_security_group_rule_bad_tenant_security_group_rule(self): with self.security_group() as sg: - res = self._create_security_group('json', 'webservers', + res = self._create_security_group(self.fmt, 'webservers', 'webservers', tenant_id='bad_tenant') - self.deserialize('json', res) + self.deserialize(self.fmt, res) rule = {'security_group_rule': {'security_group_id': sg['security_group']['id'], 'direction': 'ingress', @@ -579,10 +586,10 @@ class TestSecurityGroups(SecurityGroupDBTestCase): 'port_range_max': '22', 'tenant_id': 'bad_tenant'}} - res = self._create_security_group_rule('json', rule, + res = self._create_security_group_rule(self.fmt, rule, tenant_id='bad_tenant', set_context=True) - self.deserialize('json', res) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 404) def test_create_security_group_rule_bad_source_group_id(self): @@ -599,8 +606,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): protocol, port_range_min, port_range_max, source_group_id=source_group_id) - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 404) def test_create_security_group_rule_duplicate_rules(self): @@ -611,9 +618,9 @@ class TestSecurityGroups(SecurityGroupDBTestCase): with self.security_group_rule(security_group_id): rule = self._build_security_group_rule( sg['security_group']['id'], 'ingress', 'tcp', '22', '22') - self._create_security_group_rule('json', rule) - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + self._create_security_group_rule(self.fmt, rule) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_create_security_group_rule_min_port_greater_max(self): @@ -624,9 +631,9 @@ class TestSecurityGroups(SecurityGroupDBTestCase): with self.security_group_rule(security_group_id): rule = self._build_security_group_rule( sg['security_group']['id'], 'ingress', 'tcp', '50', '22') - self._create_security_group_rule('json', rule) - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + self._create_security_group_rule(self.fmt, rule) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_create_security_group_rule_ports_but_no_protocol(self): @@ -637,17 +644,17 @@ class TestSecurityGroups(SecurityGroupDBTestCase): with self.security_group_rule(security_group_id): rule = self._build_security_group_rule( sg['security_group']['id'], 'ingress', None, '22', '22') - self._create_security_group_rule('json', rule) - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + self._create_security_group_rule(self.fmt, rule) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_update_port_with_security_group(self): with self.network() as n: with self.subnet(n): with self.security_group() as sg: - res = self._create_port('json', n['network']['id']) - port = self.deserialize('json', res) + res = self._create_port(self.fmt, n['network']['id']) + port = self.deserialize(self.fmt, res) data = {'port': {'fixed_ips': port['port']['fixed_ips'], 'name': port['port']['name'], @@ -656,7 +663,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, + req.get_response(self.api)) self.assertEqual(res['port'][ext_sg.SECURITYGROUPS][0], sg['security_group']['id']) @@ -666,7 +674,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, + req.get_response(self.api)) self.assertEqual(res['port'][ext_sg.SECURITYGROUPS][0], sg['security_group']['id']) @@ -678,10 +687,10 @@ class TestSecurityGroups(SecurityGroupDBTestCase): with self.security_group() as sg1: with self.security_group() as sg2: res = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], security_groups=[sg1['security_group']['id'], sg2['security_group']['id']]) - port = self.deserialize('json', res) + port = self.deserialize(self.fmt, res) self.assertEqual(len( port['port'][ext_sg.SECURITYGROUPS]), 2) self._delete('ports', port['port']['id']) @@ -690,10 +699,10 @@ class TestSecurityGroups(SecurityGroupDBTestCase): with self.network() as n: with self.subnet(n): with self.security_group() as sg: - res = self._create_port('json', n['network']['id'], + res = self._create_port(self.fmt, n['network']['id'], security_groups=( [sg['security_group']['id']])) - port = self.deserialize('json', res) + port = self.deserialize(self.fmt, res) data = {'port': {'fixed_ips': port['port']['fixed_ips'], 'name': port['port']['name'], @@ -701,7 +710,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, + req.get_response(self.api)) self.assertEqual(res['port'].get(ext_sg.SECURITYGROUPS), []) self._delete('ports', port['port']['id']) @@ -710,10 +720,10 @@ class TestSecurityGroups(SecurityGroupDBTestCase): with self.network() as n: with self.subnet(n): with self.security_group() as sg: - res = self._create_port('json', n['network']['id'], + res = self._create_port(self.fmt, n['network']['id'], security_groups=( [sg['security_group']['id']])) - port = self.deserialize('json', res) + port = self.deserialize(self.fmt, res) data = {'port': {'fixed_ips': port['port']['fixed_ips'], 'name': port['port']['name'], @@ -721,7 +731,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, + req.get_response(self.api)) self.assertEqual(res['port'].get(ext_sg.SECURITYGROUPS), []) self._delete('ports', port['port']['id']) @@ -729,20 +740,20 @@ class TestSecurityGroups(SecurityGroupDBTestCase): def test_create_port_with_bad_security_group(self): with self.network() as n: with self.subnet(n): - res = self._create_port('json', n['network']['id'], + res = self._create_port(self.fmt, n['network']['id'], security_groups=['bad_id']) - self.deserialize('json', res) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_create_delete_security_group_port_in_use(self): with self.network() as n: with self.subnet(n): with self.security_group() as sg: - res = self._create_port('json', n['network']['id'], + res = self._create_port(self.fmt, n['network']['id'], security_groups=( [sg['security_group']['id']])) - port = self.deserialize('json', res) + port = self.deserialize(self.fmt, res) self.assertEqual(port['port'][ext_sg.SECURITYGROUPS][0], sg['security_group']['id']) # try to delete security group that's in use @@ -764,8 +775,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): '23', '10.0.0.1/24') rules = {'security_group_rules': [rule1['security_group_rule'], rule2['security_group_rule']]} - res = self._create_security_group_rule('json', rules) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rules) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 201) def test_create_security_group_rule_bulk_emulated(self): @@ -789,8 +800,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): rules = {'security_group_rules': [rule1['security_group_rule'], rule2['security_group_rule']] } - res = self._create_security_group_rule('json', rules) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rules) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 201) def test_create_security_group_rule_duplicate_rule_in_post(self): @@ -803,8 +814,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): '22', '10.0.0.1/24') rules = {'security_group_rules': [rule['security_group_rule'], rule['security_group_rule']]} - res = self._create_security_group_rule('json', rules) - rule = self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rules) + rule = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_create_security_group_rule_duplicate_rule_in_post_emulated(self): @@ -825,8 +836,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): '10.0.0.1/24') rules = {'security_group_rules': [rule['security_group_rule'], rule['security_group_rule']]} - res = self._create_security_group_rule('json', rules) - rule = self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rules) + rule = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_create_security_group_rule_duplicate_rule_db(self): @@ -838,9 +849,9 @@ class TestSecurityGroups(SecurityGroupDBTestCase): 'ingress', 'tcp', '22', '22', '10.0.0.1/24') rules = {'security_group_rules': [rule]} - self._create_security_group_rule('json', rules) - res = self._create_security_group_rule('json', rules) - rule = self.deserialize('json', res) + self._create_security_group_rule(self.fmt, rules) + res = self._create_security_group_rule(self.fmt, rules) + rule = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_create_security_group_rule_duplicate_rule_db_emulated(self): @@ -859,9 +870,9 @@ class TestSecurityGroups(SecurityGroupDBTestCase): sg['security_group']['id'], 'ingress', 'tcp', '22', '22', '10.0.0.1/24') rules = {'security_group_rules': [rule]} - self._create_security_group_rule('json', rules) - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + self._create_security_group_rule(self.fmt, rules) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_create_security_group_rule_differnt_security_group_ids(self): @@ -880,8 +891,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): rules = {'security_group_rules': [rule1['security_group_rule'], rule2['security_group_rule']] } - res = self._create_security_group_rule('json', rules) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rules) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_create_security_group_rule_with_invalid_ethertype(self): @@ -898,8 +909,8 @@ class TestSecurityGroups(SecurityGroupDBTestCase): source_ip_prefix, source_group_id, ethertype='IPv5') - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_create_security_group_rule_with_invalid_protocol(self): @@ -915,23 +926,25 @@ class TestSecurityGroups(SecurityGroupDBTestCase): port_range_max, source_ip_prefix, source_group_id) - res = self._create_security_group_rule('json', rule) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rule) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_validate_port_external_id_quantum_id(self): cfg.CONF.set_override('proxy_mode', True, 'SECURITYGROUP') with self.network() as n: with self.subnet(n): - sg1 = (self.deserialize('json', - self._create_security_group('json', 'foo', 'bar', '1'))) - sg2 = (self.deserialize('json', - self._create_security_group('json', 'foo', 'bar', '2'))) + sg1 = (self.deserialize(self.fmt, + self._create_security_group(self.fmt, + 'foo', 'bar', '1'))) + sg2 = (self.deserialize(self.fmt, + self._create_security_group(self.fmt, + 'foo', 'bar', '2'))) res = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], security_groups=[sg1['security_group']['id']]) - port = self.deserialize('json', res) + port = self.deserialize(self.fmt, res) # This request updates the port sending the quantum security # group id in and a nova security group id. data = {'port': {'fixed_ips': port['port']['fixed_ips'], @@ -941,7 +954,7 @@ class TestSecurityGroups(SecurityGroupDBTestCase): sg2['security_group']['id']]}} req = self.new_update_request('ports', data, port['port']['id']) - res = self.deserialize('json', req.get_response(self.api)) + res = self.deserialize(self.fmt, req.get_response(self.api)) self.assertEquals(len(res['port'][ext_sg.SECURITYGROUPS]), 2) for sg_id in res['port'][ext_sg.SECURITYGROUPS]: # only security group id's should be @@ -956,25 +969,27 @@ class TestSecurityGroups(SecurityGroupDBTestCase): string_id = '1' int_id = 2 self.deserialize( - 'json', self._create_security_group('json', 'foo', 'bar', - string_id)) + self.fmt, self._create_security_group(self.fmt, + 'foo', 'bar', + string_id)) self.deserialize( - 'json', self._create_security_group('json', 'foo', 'bar', - int_id)) + self.fmt, self._create_security_group(self.fmt, + 'foo', 'bar', + int_id)) res = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], security_groups=[string_id, int_id]) - port = self.deserialize('json', res) + port = self.deserialize(self.fmt, res) self._delete('ports', port['port']['id']) def test_create_port_with_non_uuid_or_int(self): with self.network() as n: with self.subnet(n): - res = self._create_port('json', n['network']['id'], + res = self._create_port(self.fmt, n['network']['id'], security_groups=['not_valid']) - self.deserialize('json', res) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_validate_port_external_id_fail(self): @@ -983,8 +998,12 @@ class TestSecurityGroups(SecurityGroupDBTestCase): with self.subnet(n): bad_id = 1 res = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], security_groups=[bad_id]) - self.deserialize('json', res) + self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 404) + + +class TestSecurityGroupsXML(TestSecurityGroups): + fmt = 'xml' diff --git a/quantum/tests/unit/test_extensions.py b/quantum/tests/unit/test_extensions.py index 83ffaf255..e287ab1da 100644 --- a/quantum/tests/unit/test_extensions.py +++ b/quantum/tests/unit/test_extensions.py @@ -30,6 +30,7 @@ from quantum.openstack.common import log as logging from quantum.plugins.common import constants from quantum.tests.unit import extension_stubs as ext_stubs import quantum.tests.unit.extensions +from quantum.tests.unit import testlib_api from quantum import wsgi @@ -523,33 +524,40 @@ class PluginAwareExtensionManagerTest(unittest.TestCase): self.assertTrue("e1" in ext_mgr.extensions) -class ExtensionControllerTest(unittest.TestCase): +class ExtensionControllerTest(testlib_api.WebTestCase): def setUp(self): super(ExtensionControllerTest, self).setUp() self.test_app = _setup_extensions_test_app() def test_index_gets_all_registerd_extensions(self): - response = self.test_app.get("/extensions") - foxnsox = response.json["extensions"][0] + response = self.test_app.get("/extensions." + self.fmt) + res_body = self.deserialize(response) + foxnsox = res_body["extensions"][0] self.assertEqual(foxnsox["alias"], "FOXNSOX") self.assertEqual(foxnsox["namespace"], "http://www.fox.in.socks/api/ext/pie/v1.0") def test_extension_can_be_accessed_by_alias(self): - foxnsox_extension = self.test_app.get("/extensions/FOXNSOX").json + response = self.test_app.get("/extensions/FOXNSOX." + self.fmt) + foxnsox_extension = self.deserialize(response) foxnsox_extension = foxnsox_extension['extension'] self.assertEqual(foxnsox_extension["alias"], "FOXNSOX") self.assertEqual(foxnsox_extension["namespace"], "http://www.fox.in.socks/api/ext/pie/v1.0") def test_show_returns_not_found_for_non_existent_extension(self): - response = self.test_app.get("/extensions/non_existent", status="*") + response = self.test_app.get("/extensions/non_existent" + self.fmt, + status="*") self.assertEqual(response.status_int, 404) +class ExtensionControllerTestXML(ExtensionControllerTest): + fmt = 'xml' + + def app_factory(global_conf, **local_conf): conf = global_conf.copy() conf.update(local_conf) diff --git a/quantum/tests/unit/test_l3_plugin.py b/quantum/tests/unit/test_l3_plugin.py index 0eebdc537..6cc1b6d04 100644 --- a/quantum/tests/unit/test_l3_plugin.py +++ b/quantum/tests/unit/test_l3_plugin.py @@ -48,6 +48,7 @@ from quantum.openstack.common import uuidutils from quantum.tests.unit import test_api_v2 from quantum.tests.unit import test_db_plugin from quantum.tests.unit import test_extensions +from quantum.tests.unit import testlib_api LOG = logging.getLogger(__name__) @@ -68,7 +69,8 @@ class L3TestExtensionManager(object): return [] -class L3NatExtensionTestCase(unittest.TestCase): +class L3NatExtensionTestCase(testlib_api.WebTestCase): + fmt = 'json' def setUp(self): @@ -100,6 +102,7 @@ class L3NatExtensionTestCase(unittest.TestCase): ext_mgr = L3TestExtensionManager() self.ext_mdw = test_extensions.setup_extensions_middleware(ext_mgr) self.api = webtest.TestApp(self.ext_mdw) + super(L3NatExtensionTestCase, self).setUp() def tearDown(self): self._plugin_patcher.stop() @@ -121,12 +124,15 @@ class L3NatExtensionTestCase(unittest.TestCase): instance = self.plugin.return_value instance.create_router.return_value = return_value instance.get_routers_count.return_value = 0 - res = self.api.post_json(_get_path('routers'), data) + res = self.api.post(_get_path('routers', fmt=self.fmt), + self.serialize(data), + content_type='application/%s' % self.fmt) instance.create_router.assert_called_with(mock.ANY, router=data) self.assertEqual(res.status_int, exc.HTTPCreated.code) - self.assertTrue('router' in res.json) - router = res.json['router'] + res = self.deserialize(res) + self.assertTrue('router' in res) + router = res['router'] self.assertEqual(router['id'], router_id) self.assertEqual(router['status'], "ACTIVE") self.assertEqual(router['admin_state_up'], True) @@ -139,14 +145,15 @@ class L3NatExtensionTestCase(unittest.TestCase): instance = self.plugin.return_value instance.get_routers.return_value = return_value - res = self.api.get(_get_path('routers')) + res = self.api.get(_get_path('routers', fmt=self.fmt)) instance.get_routers.assert_called_with(mock.ANY, fields=mock.ANY, filters=mock.ANY) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('routers' in res.json) - self.assertEqual(1, len(res.json['routers'])) - self.assertEqual(router_id, res.json['routers'][0]['id']) + res = self.deserialize(res) + self.assertTrue('routers' in res) + self.assertEqual(1, len(res['routers'])) + self.assertEqual(router_id, res['routers'][0]['id']) def test_router_update(self): router_id = _uuid() @@ -158,14 +165,16 @@ class L3NatExtensionTestCase(unittest.TestCase): instance = self.plugin.return_value instance.update_router.return_value = return_value - res = self.api.put_json(_get_path('routers', id=router_id), - update_data) + res = self.api.put(_get_path('routers', id=router_id, + fmt=self.fmt), + self.serialize(update_data)) instance.update_router.assert_called_with(mock.ANY, router_id, router=update_data) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('router' in res.json) - router = res.json['router'] + res = self.deserialize(res) + self.assertTrue('router' in res) + router = res['router'] self.assertEqual(router['id'], router_id) self.assertEqual(router['status'], "ACTIVE") self.assertEqual(router['admin_state_up'], False) @@ -179,13 +188,15 @@ class L3NatExtensionTestCase(unittest.TestCase): instance = self.plugin.return_value instance.get_router.return_value = return_value - res = self.api.get(_get_path('routers', id=router_id)) + res = self.api.get(_get_path('routers', id=router_id, + fmt=self.fmt)) instance.get_router.assert_called_with(mock.ANY, router_id, fields=mock.ANY) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('router' in res.json) - router = res.json['router'] + res = self.deserialize(res) + self.assertTrue('router' in res) + router = res['router'] self.assertEqual(router['id'], router_id) self.assertEqual(router['status'], "ACTIVE") self.assertEqual(router['admin_state_up'], False) @@ -212,15 +223,21 @@ class L3NatExtensionTestCase(unittest.TestCase): instance.add_router_interface.return_value = return_value path = _get_path('routers', id=router_id, - action="add_router_interface") - res = self.api.put_json(path, interface_data) + action="add_router_interface", + fmt=self.fmt) + res = self.api.put(path, self.serialize(interface_data)) instance.add_router_interface.assert_called_with(mock.ANY, router_id, interface_data) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('port_id' in res.json) - self.assertEqual(res.json['port_id'], port_id) - self.assertEqual(res.json['subnet_id'], subnet_id) + res = self.deserialize(res) + self.assertTrue('port_id' in res) + self.assertEqual(res['port_id'], port_id) + self.assertEqual(res['subnet_id'], subnet_id) + + +class L3NatExtensionTestCaseXML(L3NatExtensionTestCase): + fmt = 'xml' # This plugin class is just for testing @@ -355,12 +372,12 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): "%s_router_interface" % action) res = req.get_response(self.ext_api) self.assertEqual(res.status_int, expected_code) - return self.deserialize('json', res) + return self.deserialize(self.fmt, res) @contextlib.contextmanager def router(self, name='router1', admin_status_up=True, - fmt='json', tenant_id=_uuid(), set_context=False): - router = self._make_router(fmt, tenant_id, name, + fmt=None, tenant_id=_uuid(), set_context=False): + router = self._make_router(fmt or self.fmt, tenant_id, name, admin_status_up, set_context) try: yield router @@ -385,9 +402,9 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): data['router']['name'] = 'router1' data['router']['external_gateway_info'] = { 'network_id': s['subnet']['network_id']} - router_req = self.new_create_request('routers', data, 'json') + router_req = self.new_create_request('routers', data, self.fmt) res = router_req.get_response(self.ext_api) - router = self.deserialize('json', res) + router = self.deserialize(self.fmt, res) self.assertEqual( s['subnet']['network_id'], router['router']['external_gateway_info']['network_id']) @@ -844,8 +861,8 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): None, p['port']['id']) # create another port for testing failure case - res = self._create_port('json', p['port']['network_id']) - p2 = self.deserialize('json', res) + res = self._create_port(self.fmt, p['port']['network_id']) + p2 = self.deserialize(self.fmt, res) self._router_interface_action('remove', r['router']['id'], None, @@ -867,10 +884,9 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): self.assertEqual(res.status_int, 404) def test_router_delete_with_port_existed_returns_409(self): - fmt = 'json' with self.subnet() as subnet: - res = self._create_router(fmt, _uuid()) - router = self.deserialize(fmt, res) + res = self._create_router(self.fmt, _uuid()) + router = self.deserialize(self.fmt, res) self._router_interface_action('add', router['router']['id'], subnet['subnet']['id'], @@ -888,10 +904,9 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): private_sub = {'subnet': {'id': p['port']['fixed_ips'][0]['subnet_id']}} with self.subnet(cidr='12.0.0.0/24') as public_sub: - fmt = 'json' self._set_net_external(public_sub['subnet']['network_id']) - res = self._create_router(fmt, _uuid()) - r = self.deserialize(fmt, res) + res = self._create_router(self.fmt, _uuid()) + r = self.deserialize(self.fmt, res) self._add_external_gateway_to_router( r['router']['id'], public_sub['subnet']['network_id']) @@ -899,10 +914,10 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): private_sub['subnet']['id'], None) res = self._create_floatingip( - fmt, public_sub['subnet']['network_id'], + self.fmt, public_sub['subnet']['network_id'], port_id=p['port']['id']) self.assertEqual(res.status_int, exc.HTTPCreated.code) - floatingip = self.deserialize(fmt, res) + floatingip = self.deserialize(self.fmt, res) self._delete('routers', r['router']['id'], expected_code=exc.HTTPConflict.code) # Cleanup @@ -990,7 +1005,7 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): fip['floatingip']['id']) @contextlib.contextmanager - def floatingip_with_assoc(self, port_id=None, fmt='json', + def floatingip_with_assoc(self, port_id=None, fmt=None, set_context=False): with self.subnet(cidr='11.0.0.0/24') as public_sub: self._set_net_external(public_sub['subnet']['network_id']) @@ -1008,7 +1023,7 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): private_sub['subnet']['id'], None) floatingip = self._make_floatingip( - fmt, + fmt or self.fmt, public_sub['subnet']['network_id'], port_id=private_port['port']['id'], set_context=False) @@ -1025,7 +1040,7 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): public_sub['subnet']['network_id']) @contextlib.contextmanager - def floatingip_no_assoc(self, private_sub, fmt='json', set_context=False): + def floatingip_no_assoc(self, private_sub, fmt=None, set_context=False): with self.subnet(cidr='12.0.0.0/24') as public_sub: self._set_net_external(public_sub['subnet']['network_id']) with self.router() as r: @@ -1039,7 +1054,7 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): None) floatingip = self._make_floatingip( - fmt, + fmt or self.fmt, public_sub['subnet']['network_id'], set_context=set_context) yield floatingip @@ -1066,7 +1081,6 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): expected_code=exc.HTTPNotFound.code) def test_floatingip_with_assoc_fails(self): - fmt = 'json' with self.subnet(cidr='200.0.0.1/24') as public_sub: self._set_net_external(public_sub['subnet']['network_id']) with self.port() as private_port: @@ -1086,7 +1100,7 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): resource='floatingip', msg='fake_error') res = self._create_floatingip( - fmt, + self.fmt, public_sub['subnet']['network_id'], port_id=private_port['port']['id']) self.assertEqual(res.status_int, 400) @@ -1151,7 +1165,7 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): def test_two_fips_one_port_invalid_return_409(self): with self.floatingip_with_assoc() as fip1: res = self._create_floatingip( - 'json', + self.fmt, fip1['floatingip']['floating_network_id'], fip1['floatingip']['port_id']) self.assertEqual(res.status_int, exc.HTTPConflict.code) @@ -1172,7 +1186,7 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): with self.port() as private_port: with self.router() as r: res = self._create_floatingip( - 'json', + self.fmt, public_sub['subnet']['network_id'], port_id=private_port['port']['id']) # this should be some kind of error @@ -1185,7 +1199,7 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): # that is not the case with self.router() as r: res = self._create_floatingip( - 'json', + self.fmt, public_sub['subnet']['network_id']) self.assertEqual(res.status_int, exc.HTTPBadRequest.code) @@ -1200,7 +1214,7 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): None) res = self._create_floatingip( - 'json', + self.fmt, public_network['network']['id'], port_id=private_port['port']['id']) self.assertEqual(res.status_int, exc.HTTPBadRequest.code) @@ -1212,19 +1226,19 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): def test_create_floatingip_invalid_floating_network_id_returns_400(self): # API-level test - no need to create all objects for l3 plugin - res = self._create_floatingip('json', 'iamnotanuuid', + res = self._create_floatingip(self.fmt, 'iamnotanuuid', uuidutils.generate_uuid(), '192.168.0.1') self.assertEqual(res.status_int, 400) def test_create_floatingip_invalid_floating_port_id_returns_400(self): # API-level test - no need to create all objects for l3 plugin - res = self._create_floatingip('json', uuidutils.generate_uuid(), + res = self._create_floatingip(self.fmt, uuidutils.generate_uuid(), 'iamnotanuuid', '192.168.0.1') self.assertEqual(res.status_int, 400) def test_create_floatingip_invalid_fixed_ip_address_returns_400(self): # API-level test - no need to create all objects for l3 plugin - res = self._create_floatingip('json', uuidutils.generate_uuid(), + res = self._create_floatingip(self.fmt, uuidutils.generate_uuid(), uuidutils.generate_uuid(), 'iamnotnanip') self.assertEqual(res.status_int, 400) @@ -1466,3 +1480,7 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): fip['floatingip']['port_id']) self.assertTrue(floatingips[0]['fixed_ip_address'] is not None) self.assertTrue(floatingips[0]['router_id'] is not None) + + +class L3NatDBTestCaseXML(L3NatDBTestCase): + fmt = 'xml' diff --git a/quantum/tests/unit/test_loadbalancer_plugin.py b/quantum/tests/unit/test_loadbalancer_plugin.py index 5c98c6507..72a77b530 100644 --- a/quantum/tests/unit/test_loadbalancer_plugin.py +++ b/quantum/tests/unit/test_loadbalancer_plugin.py @@ -22,6 +22,7 @@ from webob import exc import webtest from quantum.api import extensions +from quantum.api.v2 import attributes from quantum.common import config from quantum.extensions import loadbalancer from quantum import manager @@ -30,6 +31,7 @@ from quantum.openstack.common import uuidutils from quantum.plugins.common import constants from quantum.tests.unit import test_api_v2 from quantum.tests.unit import test_extensions +from quantum.tests.unit import testlib_api _uuid = uuidutils.generate_uuid @@ -48,7 +50,8 @@ class LoadBalancerTestExtensionManager(object): return [] -class LoadBalancerExtensionTestCase(unittest2.TestCase): +class LoadBalancerExtensionTestCase(testlib_api.WebTestCase): + fmt = 'json' def setUp(self): @@ -75,6 +78,7 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): ext_mgr = LoadBalancerTestExtensionManager() self.ext_mdw = test_extensions.setup_extensions_middleware(ext_mgr) self.api = webtest.TestApp(self.ext_mdw) + super(LoadBalancerExtensionTestCase, self).setUp() def tearDown(self): self._plugin_patcher.stop() @@ -100,12 +104,15 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.create_vip.return_value = return_value - res = self.api.post_json(_get_path('lb/vips'), data) + res = self.api.post(_get_path('lb/vips', fmt=self.fmt), + self.serialize(data), + content_type='application/%s' % self.fmt) instance.create_vip.assert_called_with(mock.ANY, vip=data) self.assertEqual(res.status_int, exc.HTTPCreated.code) - self.assertTrue('vip' in res.json) - self.assertEqual(res.json['vip'], return_value) + res = self.deserialize(res) + self.assertIn('vip', res) + self.assertEqual(res['vip'], return_value) def test_vip_list(self): vip_id = _uuid() @@ -117,7 +124,7 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.get_vips.return_value = return_value - res = self.api.get(_get_path('lb/vips')) + res = self.api.get(_get_path('lb/vips', fmt=self.fmt)) instance.get_vips.assert_called_with(mock.ANY, fields=mock.ANY, filters=mock.ANY) @@ -135,14 +142,15 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.update_vip.return_value = return_value - res = self.api.put_json(_get_path('lb/vips', id=vip_id), - update_data) + res = self.api.put(_get_path('lb/vips', id=vip_id, fmt=self.fmt), + self.serialize(update_data)) instance.update_vip.assert_called_with(mock.ANY, vip_id, vip=update_data) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('vip' in res.json) - self.assertEqual(res.json['vip'], return_value) + res = self.deserialize(res) + self.assertIn('vip', res) + self.assertEqual(res['vip'], return_value) def test_vip_get(self): vip_id = _uuid() @@ -155,18 +163,20 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.get_vip.return_value = return_value - res = self.api.get(_get_path('lb/vips', id=vip_id)) + res = self.api.get(_get_path('lb/vips', id=vip_id, fmt=self.fmt)) instance.get_vip.assert_called_with(mock.ANY, vip_id, fields=mock.ANY) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('vip' in res.json) - self.assertEqual(res.json['vip'], return_value) + res = self.deserialize(res) + self.assertIn('vip', res) + self.assertEqual(res['vip'], return_value) def _test_entity_delete(self, entity): """ does the entity deletion based on naming convention """ entity_id = _uuid() - res = self.api.delete(_get_path('lb/' + entity + 's', id=entity_id)) + res = self.api.delete(_get_path('lb/' + entity + 's', id=entity_id, + fmt=self.fmt)) delete_entity = getattr(self.plugin.return_value, "delete_" + entity) delete_entity.assert_called_with(mock.ANY, entity_id) self.assertEqual(res.status_int, exc.HTTPNoContent.code) @@ -190,12 +200,15 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.create_pool.return_value = return_value - res = self.api.post_json(_get_path('lb/pools'), data) + res = self.api.post(_get_path('lb/pools', fmt=self.fmt), + self.serialize(data), + content_type='application/%s' % self.fmt) instance.create_pool.assert_called_with(mock.ANY, pool=data) self.assertEqual(res.status_int, exc.HTTPCreated.code) - self.assertTrue('pool' in res.json) - self.assertEqual(res.json['pool'], return_value) + res = self.deserialize(res) + self.assertIn('pool', res) + self.assertEqual(res['pool'], return_value) def test_pool_list(self): pool_id = _uuid() @@ -207,7 +220,7 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.get_pools.return_value = return_value - res = self.api.get(_get_path('lb/pools')) + res = self.api.get(_get_path('lb/pools', fmt=self.fmt)) instance.get_pools.assert_called_with(mock.ANY, fields=mock.ANY, filters=mock.ANY) @@ -225,14 +238,15 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.update_pool.return_value = return_value - res = self.api.put_json(_get_path('lb/pools', id=pool_id), - update_data) + res = self.api.put(_get_path('lb/pools', id=pool_id, fmt=self.fmt), + self.serialize(update_data)) instance.update_pool.assert_called_with(mock.ANY, pool_id, pool=update_data) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('pool' in res.json) - self.assertEqual(res.json['pool'], return_value) + res = self.deserialize(res) + self.assertIn('pool', res) + self.assertEqual(res['pool'], return_value) def test_pool_get(self): pool_id = _uuid() @@ -245,13 +259,14 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.get_pool.return_value = return_value - res = self.api.get(_get_path('lb/pools', id=pool_id)) + res = self.api.get(_get_path('lb/pools', id=pool_id, fmt=self.fmt)) instance.get_pool.assert_called_with(mock.ANY, pool_id, fields=mock.ANY) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('pool' in res.json) - self.assertEqual(res.json['pool'], return_value) + res = self.deserialize(res) + self.assertIn('pool', res) + self.assertEqual(res['pool'], return_value) def test_pool_delete(self): self._test_entity_delete('pool') @@ -264,13 +279,14 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance.stats.return_value = stats path = _get_path('lb/pools', id=pool_id, - action="stats") + action="stats", fmt=self.fmt) res = self.api.get(path) instance.stats.assert_called_with(mock.ANY, pool_id) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('stats' in res.json) - self.assertEqual(res.json['stats'], stats['stats']) + res = self.deserialize(res) + self.assertIn('stats', res) + self.assertEqual(res['stats'], stats['stats']) def test_member_create(self): member_id = _uuid() @@ -285,12 +301,15 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.create_member.return_value = return_value - res = self.api.post_json(_get_path('lb/members'), data) + res = self.api.post(_get_path('lb/members', fmt=self.fmt), + self.serialize(data), + content_type='application/%s' % self.fmt) instance.create_member.assert_called_with(mock.ANY, member=data) self.assertEqual(res.status_int, exc.HTTPCreated.code) - self.assertTrue('member' in res.json) - self.assertEqual(res.json['member'], return_value) + res = self.deserialize(res) + self.assertIn('member', res) + self.assertEqual(res['member'], return_value) def test_member_list(self): member_id = _uuid() @@ -302,7 +321,7 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.get_members.return_value = return_value - res = self.api.get(_get_path('lb/members')) + res = self.api.get(_get_path('lb/members', fmt=self.fmt)) instance.get_members.assert_called_with(mock.ANY, fields=mock.ANY, filters=mock.ANY) @@ -319,14 +338,16 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.update_member.return_value = return_value - res = self.api.put_json(_get_path('lb/members', id=member_id), - update_data) + res = self.api.put(_get_path('lb/members', id=member_id, + fmt=self.fmt), + self.serialize(update_data)) instance.update_member.assert_called_with(mock.ANY, member_id, member=update_data) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('member' in res.json) - self.assertEqual(res.json['member'], return_value) + res = self.deserialize(res) + self.assertIn('member', res) + self.assertEqual(res['member'], return_value) def test_member_get(self): member_id = _uuid() @@ -338,13 +359,15 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.get_member.return_value = return_value - res = self.api.get(_get_path('lb/members', id=member_id)) + res = self.api.get(_get_path('lb/members', id=member_id, + fmt=self.fmt)) instance.get_member.assert_called_with(mock.ANY, member_id, fields=mock.ANY) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('member' in res.json) - self.assertEqual(res.json['member'], return_value) + res = self.deserialize(res) + self.assertIn('member', res) + self.assertEqual(res['member'], return_value) def test_member_delete(self): self._test_entity_delete('member') @@ -365,12 +388,16 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.create_health_monitor.return_value = return_value - res = self.api.post_json(_get_path('lb/health_monitors'), data) + res = self.api.post(_get_path('lb/health_monitors', + fmt=self.fmt), + self.serialize(data), + content_type='application/%s' % self.fmt) instance.create_health_monitor.assert_called_with(mock.ANY, health_monitor=data) self.assertEqual(res.status_int, exc.HTTPCreated.code) - self.assertTrue('health_monitor' in res.json) - self.assertEqual(res.json['health_monitor'], return_value) + res = self.deserialize(res) + self.assertIn('health_monitor', res) + self.assertEqual(res['health_monitor'], return_value) def test_health_monitor_list(self): health_monitor_id = _uuid() @@ -382,7 +409,7 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.get_health_monitors.return_value = return_value - res = self.api.get(_get_path('lb/health_monitors')) + res = self.api.get(_get_path('lb/health_monitors', fmt=self.fmt)) instance.get_health_monitors.assert_called_with( mock.ANY, fields=mock.ANY, filters=mock.ANY) @@ -400,15 +427,17 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance = self.plugin.return_value instance.update_health_monitor.return_value = return_value - res = self.api.put_json(_get_path('lb/health_monitors', - id=health_monitor_id), - update_data) + res = self.api.put(_get_path('lb/health_monitors', + id=health_monitor_id, + fmt=self.fmt), + self.serialize(update_data)) instance.update_health_monitor.assert_called_with( mock.ANY, health_monitor_id, health_monitor=update_data) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('health_monitor' in res.json) - self.assertEqual(res.json['health_monitor'], return_value) + res = self.deserialize(res) + self.assertIn('health_monitor', res) + self.assertEqual(res['health_monitor'], return_value) def test_health_monitor_get(self): health_monitor_id = _uuid() @@ -422,13 +451,15 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance.get_health_monitor.return_value = return_value res = self.api.get(_get_path('lb/health_monitors', - id=health_monitor_id)) + id=health_monitor_id, + fmt=self.fmt)) instance.get_health_monitor.assert_called_with( mock.ANY, health_monitor_id, fields=mock.ANY) self.assertEqual(res.status_int, exc.HTTPOk.code) - self.assertTrue('health_monitor' in res.json) - self.assertEqual(res.json['health_monitor'], return_value) + res = self.deserialize(res) + self.assertIn('health_monitor', res) + self.assertEqual(res['health_monitor'], return_value) def test_health_monitor_delete(self): self._test_entity_delete('health_monitor') @@ -441,12 +472,15 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): return_value = copy.copy(data['health_monitor']) instance = self.plugin.return_value instance.create_pool_health_monitor.return_value = return_value - res = self.api.post_json('/lb/pools/id1/health_monitors', data) + res = self.api.post('/lb/pools/id1/health_monitors', + self.serialize(data), + content_type='application/%s' % self.fmt) instance.create_pool_health_monitor.assert_called_with( mock.ANY, pool_id='id1', health_monitor=data) self.assertEqual(res.status_int, exc.HTTPCreated.code) - self.assertTrue('health_monitor' in res.json) - self.assertEqual(res.json['health_monitor'], return_value) + res = self.deserialize(res) + self.assertIn('health_monitor', res) + self.assertEqual(res['health_monitor'], return_value) def test_delete_pool_health_monitor(self): health_monitor_id = _uuid() @@ -458,3 +492,7 @@ class LoadBalancerExtensionTestCase(unittest2.TestCase): instance.delete_pool_health_monitor.assert_called_with( mock.ANY, health_monitor_id, pool_id='id1') self.assertEqual(res.status_int, exc.HTTPNoContent.code) + + +class LoadBalancerExtensionTestCaseXML(LoadBalancerExtensionTestCase): + fmt = 'xml' diff --git a/quantum/tests/unit/test_quota_per_tenant_ext.py b/quantum/tests/unit/test_quota_per_tenant_ext.py index 8505136e8..fa13b11a3 100644 --- a/quantum/tests/unit/test_quota_per_tenant_ext.py +++ b/quantum/tests/unit/test_quota_per_tenant_ext.py @@ -15,16 +15,16 @@ from quantum.plugins.linuxbridge.db import l2network_db_v2 from quantum import quota from quantum.tests.unit import test_api_v2 from quantum.tests.unit import test_extensions - +from quantum.tests.unit import testlib_api TARGET_PLUGIN = ('quantum.plugins.linuxbridge.lb_quantum_plugin' '.LinuxBridgePluginV2') - _get_path = test_api_v2._get_path -class QuotaExtensionTestCase(unittest.TestCase): +class QuotaExtensionTestCase(testlib_api.WebTestCase): + fmt = 'json' def setUp(self): db._ENGINE = None @@ -67,6 +67,7 @@ class QuotaExtensionTestCase(unittest.TestCase): app = config.load_paste_app('extensions_test_app') ext_middleware = extensions.ExtensionMiddleware(app, ext_mgr=ext_mgr) self.api = webtest.TestApp(ext_middleware) + super(QuotaExtensionTestCase, self).setUp() def tearDown(self): self._plugin_patcher.stop() @@ -80,24 +81,27 @@ class QuotaExtensionTestCase(unittest.TestCase): attributes.RESOURCE_ATTRIBUTE_MAP = self.saved_attr_map def test_quotas_loaded_right(self): - res = self.api.get(_get_path('quotas')) + res = self.api.get(_get_path('quotas', fmt=self.fmt)) + quota = self.deserialize(res) + self.assertEqual([], quota['quotas']) self.assertEqual(200, res.status_int) def test_quotas_default_values(self): tenant_id = 'tenant_id1' env = {'quantum.context': context.Context('', tenant_id)} - res = self.api.get(_get_path('quotas', id=tenant_id), + res = self.api.get(_get_path('quotas', id=tenant_id, fmt=self.fmt), extra_environ=env) - self.assertEqual(10, res.json['quota']['network']) - self.assertEqual(10, res.json['quota']['subnet']) - self.assertEqual(50, res.json['quota']['port']) - self.assertEqual(-1, res.json['quota']['extra1']) + quota = self.deserialize(res) + self.assertEqual(10, quota['quota']['network']) + self.assertEqual(10, quota['quota']['subnet']) + self.assertEqual(50, quota['quota']['port']) + self.assertEqual(-1, quota['quota']['extra1']) def test_show_quotas_with_admin(self): tenant_id = 'tenant_id1' env = {'quantum.context': context.Context('', tenant_id + '2', is_admin=True)} - res = self.api.get(_get_path('quotas', id=tenant_id), + res = self.api.get(_get_path('quotas', id=tenant_id, fmt=self.fmt), extra_environ=env) self.assertEqual(200, res.status_int) @@ -105,7 +109,7 @@ class QuotaExtensionTestCase(unittest.TestCase): tenant_id = 'tenant_id1' env = {'quantum.context': context.Context('', tenant_id + '2', is_admin=False)} - res = self.api.get(_get_path('quotas', id=tenant_id), + res = self.api.get(_get_path('quotas', id=tenant_id, fmt=self.fmt), extra_environ=env, expect_errors=True) self.assertEqual(403, res.status_int) @@ -114,10 +118,9 @@ class QuotaExtensionTestCase(unittest.TestCase): env = {'quantum.context': context.Context('', tenant_id, is_admin=False)} quotas = {'quota': {'network': 100}} - res = self.api.put_json(_get_path('quotas', id=tenant_id, - fmt='json'), - quotas, extra_environ=env, - expect_errors=True) + res = self.api.put(_get_path('quotas', id=tenant_id, fmt=self.fmt), + self.serialize(quotas), extra_environ=env, + expect_errors=True) self.assertEqual(403, res.status_int) def test_update_quotas_with_admin(self): @@ -125,19 +128,20 @@ class QuotaExtensionTestCase(unittest.TestCase): env = {'quantum.context': context.Context('', tenant_id + '2', is_admin=True)} quotas = {'quota': {'network': 100}} - res = self.api.put_json(_get_path('quotas', id=tenant_id, fmt='json'), - quotas, extra_environ=env) + res = self.api.put(_get_path('quotas', id=tenant_id, fmt=self.fmt), + self.serialize(quotas), extra_environ=env) self.assertEqual(200, res.status_int) env2 = {'quantum.context': context.Context('', tenant_id)} - res = self.api.get(_get_path('quotas', id=tenant_id), - extra_environ=env2).json - self.assertEqual(100, res['quota']['network']) + res = self.api.get(_get_path('quotas', id=tenant_id, fmt=self.fmt), + extra_environ=env2) + quota = self.deserialize(res) + self.assertEqual(100, quota['quota']['network']) def test_delete_quotas_with_admin(self): tenant_id = 'tenant_id1' env = {'quantum.context': context.Context('', tenant_id + '2', is_admin=True)} - res = self.api.delete(_get_path('quotas', id=tenant_id, fmt='json'), + res = self.api.delete(_get_path('quotas', id=tenant_id, fmt=self.fmt), extra_environ=env) self.assertEqual(204, res.status_int) @@ -145,7 +149,7 @@ class QuotaExtensionTestCase(unittest.TestCase): tenant_id = 'tenant_id1' env = {'quantum.context': context.Context('', tenant_id, is_admin=False)} - res = self.api.delete(_get_path('quotas', id=tenant_id, fmt='json'), + res = self.api.delete(_get_path('quotas', id=tenant_id, fmt=self.fmt), extra_environ=env, expect_errors=True) self.assertEqual(403, res.status_int) @@ -161,8 +165,9 @@ class QuotaExtensionTestCase(unittest.TestCase): env = {'quantum.context': context.Context('', tenant_id, is_admin=True)} quotas = {'quota': {'network': 5}} - res = self.api.put_json(_get_path('quotas', id=tenant_id, fmt='json'), - quotas, extra_environ=env) + res = self.api.put(_get_path('quotas', id=tenant_id, + fmt=self.fmt), + self.serialize(quotas), extra_environ=env) self.assertEqual(200, res.status_int) quota.QUOTAS.limit_check(context.Context('', tenant_id), tenant_id, @@ -173,8 +178,9 @@ class QuotaExtensionTestCase(unittest.TestCase): env = {'quantum.context': context.Context('', tenant_id, is_admin=True)} quotas = {'quota': {'network': 5}} - res = self.api.put_json(_get_path('quotas', id=tenant_id, fmt='json'), - quotas, extra_environ=env) + res = self.api.put(_get_path('quotas', id=tenant_id, + fmt=self.fmt), + self.serialize(quotas), extra_environ=env) self.assertEqual(200, res.status_int) with self.assertRaises(exceptions.OverQuota): quota.QUOTAS.limit_check(context.Context('', tenant_id), @@ -187,3 +193,7 @@ class QuotaExtensionTestCase(unittest.TestCase): quota.QUOTAS.limit_check(context.Context('', tenant_id), tenant_id, network=-1) + + +class QuotaExtensionTestCaseXML(QuotaExtensionTestCase): + fmt = 'xml' diff --git a/quantum/tests/unit/test_security_groups_rpc.py b/quantum/tests/unit/test_security_groups_rpc.py index abd2ae3b6..e64c112eb 100644 --- a/quantum/tests/unit/test_security_groups_rpc.py +++ b/quantum/tests/unit/test_security_groups_rpc.py @@ -67,14 +67,14 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): rules = { 'security_group_rules': [rule1['security_group_rule'], rule2['security_group_rule']]} - res = self._create_security_group_rule('json', rules) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rules) + self.deserialize(self.fmt, res) self.assertEquals(res.status_int, 201) res1 = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], security_groups=[sg1_id]) - ports_rest1 = self.deserialize('json', res1) + ports_rest1 = self.deserialize(self.fmt, res1) port_id1 = ports_rest1['port']['id'] self.rpc.devices = {port_id1: ports_rest1['port']} devices = [port_id1, 'no_exist_device'] @@ -116,14 +116,14 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): rules = { 'security_group_rules': [rule1['security_group_rule'], rule2['security_group_rule']]} - res = self._create_security_group_rule('json', rules) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rules) + self.deserialize(self.fmt, res) self.assertEquals(res.status_int, 201) res1 = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], security_groups=[sg1_id]) - ports_rest1 = self.deserialize('json', res1) + ports_rest1 = self.deserialize(self.fmt, res1) port_id1 = ports_rest1['port']['id'] self.rpc.devices = {port_id1: ports_rest1['port']} devices = [port_id1, 'no_exist_device'] @@ -162,23 +162,23 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): '25', source_group_id=sg2['security_group']['id']) rules = { 'security_group_rules': [rule1['security_group_rule']]} - res = self._create_security_group_rule('json', rules) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rules) + self.deserialize(self.fmt, res) self.assertEquals(res.status_int, 201) res1 = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], security_groups=[sg1_id, sg2_id]) - ports_rest1 = self.deserialize('json', res1) + ports_rest1 = self.deserialize(self.fmt, res1) port_id1 = ports_rest1['port']['id'] self.rpc.devices = {port_id1: ports_rest1['port']} devices = [port_id1, 'no_exist_device'] res2 = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], security_groups=[sg2_id]) - ports_rest2 = self.deserialize('json', res2) + ports_rest2 = self.deserialize(self.fmt, res2) port_id2 = ports_rest2['port']['id'] ctx = context.get_admin_context() ports_rpc = self.rpc.security_group_rules_for_devices( @@ -219,15 +219,15 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): rules = { 'security_group_rules': [rule1['security_group_rule'], rule2['security_group_rule']]} - res = self._create_security_group_rule('json', rules) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rules) + self.deserialize(self.fmt, res) self.assertEquals(res.status_int, 201) res1 = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], fixed_ips=[{'subnet_id': subnet_v6['subnet']['id']}], security_groups=[sg1_id]) - ports_rest1 = self.deserialize('json', res1) + ports_rest1 = self.deserialize(self.fmt, res1) port_id1 = ports_rest1['port']['id'] self.rpc.devices = {port_id1: ports_rest1['port']} devices = [port_id1, 'no_exist_device'] @@ -273,15 +273,15 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): rules = { 'security_group_rules': [rule1['security_group_rule'], rule2['security_group_rule']]} - res = self._create_security_group_rule('json', rules) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rules) + self.deserialize(self.fmt, res) self.assertEquals(res.status_int, 201) res1 = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], fixed_ips=[{'subnet_id': subnet_v6['subnet']['id']}], security_groups=[sg1_id]) - ports_rest1 = self.deserialize('json', res1) + ports_rest1 = self.deserialize(self.fmt, res1) port_id1 = ports_rest1['port']['id'] self.rpc.devices = {port_id1: ports_rest1['port']} devices = [port_id1, 'no_exist_device'] @@ -325,25 +325,25 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): source_group_id=sg2['security_group']['id']) rules = { 'security_group_rules': [rule1['security_group_rule']]} - res = self._create_security_group_rule('json', rules) - self.deserialize('json', res) + res = self._create_security_group_rule(self.fmt, rules) + self.deserialize(self.fmt, res) self.assertEquals(res.status_int, 201) res1 = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], fixed_ips=[{'subnet_id': subnet_v6['subnet']['id']}], security_groups=[sg1_id, sg2_id]) - ports_rest1 = self.deserialize('json', res1) + ports_rest1 = self.deserialize(self.fmt, res1) port_id1 = ports_rest1['port']['id'] self.rpc.devices = {port_id1: ports_rest1['port']} devices = [port_id1, 'no_exist_device'] res2 = self._create_port( - 'json', n['network']['id'], + self.fmt, n['network']['id'], fixed_ips=[{'subnet_id': subnet_v6['subnet']['id']}], security_groups=[sg2_id]) - ports_rest2 = self.deserialize('json', res2) + ports_rest2 = self.deserialize(self.fmt, res2) port_id2 = ports_rest2['port']['id'] ctx = context.get_admin_context() @@ -364,6 +364,10 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): self._delete('ports', port_id2) +class SGServerRpcCallBackMixinTestCaseXML(SGServerRpcCallBackMixinTestCase): + fmt = 'xml' + + class SGAgentRpcCallBackMixinTestCase(unittest.TestCase): def setUp(self): self.rpc = sg_rpc.SecurityGroupAgentRpcCallbackMixin() diff --git a/quantum/tests/unit/test_servicetype.py b/quantum/tests/unit/test_servicetype.py index 160c806f9..78d7e28be 100644 --- a/quantum/tests/unit/test_servicetype.py +++ b/quantum/tests/unit/test_servicetype.py @@ -26,9 +26,9 @@ import webob.exc as webexc import webtest from quantum.api import extensions +from quantum.api.v2 import attributes from quantum import context from quantum.db import api as db_api -from quantum.db import models_v2 from quantum.db import servicetype_db from quantum.extensions import servicetype from quantum import manager @@ -38,6 +38,7 @@ from quantum.tests.unit import dummy_plugin as dp from quantum.tests.unit import test_api_v2 from quantum.tests.unit import test_db_plugin from quantum.tests.unit import test_extensions +from quantum.tests.unit import testlib_api LOG = logging.getLogger(__name__) @@ -62,7 +63,8 @@ class TestServiceTypeExtensionManager(object): return [] -class ServiceTypeTestCaseBase(unittest.TestCase): +class ServiceTypeTestCaseBase(testlib_api.WebTestCase): + fmt = 'json' def setUp(self): # This is needed because otherwise a failure will occur due to @@ -79,6 +81,7 @@ class ServiceTypeTestCaseBase(unittest.TestCase): self.ext_mdw = test_extensions.setup_extensions_middleware(ext_mgr) self.api = webtest.TestApp(self.ext_mdw) self.resource_name = servicetype.RESOURCE_NAME.replace('-', '_') + super(ServiceTypeTestCaseBase, self).setUp() def tearDown(self): self.api = None @@ -119,15 +122,18 @@ class ServiceTypeExtensionTestCase(ServiceTypeTestCaseBase): instance = self.mock_mgr.return_value instance.create_service_type.return_value = return_value expect_errors = expected_status >= webexc.HTTPBadRequest.code - res = self.api.post_json(_get_path('service-types'), data, - extra_environ=env, - expect_errors=expect_errors) + res = self.api.post(_get_path('service-types', fmt=self.fmt), + self.serialize(data), + extra_environ=env, + expect_errors=expect_errors, + content_type='application/%s' % self.fmt) self.assertEqual(res.status_int, expected_status) if not expect_errors: instance.create_service_type.assert_called_with(mock.ANY, service_type=data) - self.assertTrue(self.resource_name in res.json) - svc_type = res.json[self.resource_name] + res = self.deserialize(res) + self.assertTrue(self.resource_name in res) + svc_type = res[self.resource_name] self.assertEqual(svc_type['id'], svc_type_id) # NOTE(salvatore-orlando): The following two checks are # probably not essential @@ -149,15 +155,17 @@ class ServiceTypeExtensionTestCase(ServiceTypeTestCaseBase): instance = self.mock_mgr.return_value expect_errors = expected_status >= webexc.HTTPBadRequest.code instance.update_service_type.return_value = return_value - res = self.api.put_json(_get_path('service-types/%s' % svc_type_id), - data) + res = self.api.put(_get_path('service-types/%s' % svc_type_id, + fmt=self.fmt), + self.serialize(data)) if not expect_errors: instance.update_service_type.assert_called_with(mock.ANY, svc_type_id, service_type=data) self.assertEqual(res.status_int, webexc.HTTPOk.code) - self.assertTrue(self.resource_name in res.json) - svc_type = res.json[self.resource_name] + res = self.deserialize(res) + self.assertTrue(self.resource_name in res) + svc_type = res[self.resource_name] self.assertEqual(svc_type['id'], svc_type_id) self.assertEqual(svc_type['name'], data[self.resource_name]['name']) @@ -171,7 +179,8 @@ class ServiceTypeExtensionTestCase(ServiceTypeTestCaseBase): def test_service_type_delete(self): svctype_id = _uuid() instance = self.mock_mgr.return_value - res = self.api.delete(_get_path('service-types/%s' % svctype_id)) + res = self.api.delete(_get_path('service-types/%s' % svctype_id, + fmt=self.fmt)) instance.delete_service_type.assert_called_with(mock.ANY, svctype_id) self.assertEqual(res.status_int, webexc.HTTPNoContent.code) @@ -185,7 +194,8 @@ class ServiceTypeExtensionTestCase(ServiceTypeTestCaseBase): instance = self.mock_mgr.return_value instance.get_service_type.return_value = return_value - res = self.api.get(_get_path('service-types/%s' % svctype_id)) + res = self.api.get(_get_path('service-types/%s' % svctype_id, + fmt=self.fmt)) instance.get_service_type.assert_called_with(mock.ANY, svctype_id, @@ -201,7 +211,8 @@ class ServiceTypeExtensionTestCase(ServiceTypeTestCaseBase): instance = self.mock_mgr.return_value instance.get_service_types.return_value = return_value - res = self.api.get(_get_path('service-types')) + res = self.api.get(_get_path('service-types', + fmt=self.fmt)) instance.get_service_types.assert_called_with(mock.ANY, fields=mock.ANY, @@ -231,6 +242,10 @@ class ServiceTypeExtensionTestCase(ServiceTypeTestCaseBase): self._test_service_type_update(env=env) +class ServiceTypeExtensionTestCaseXML(ServiceTypeExtensionTestCase): + fmt = 'xml' + + class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase): def setUp(self): @@ -256,7 +271,7 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase): service_defs = [{'service_class': constants.DUMMY, 'plugin': dp.DUMMY_PLUGIN_NAME}] res = self._create_service_type(name, service_defs) - svc_type = res.json + svc_type = self.deserialize(res) if res.status_int >= 400: raise webexc.HTTPClientError(code=res.status_int) yield svc_type @@ -269,10 +284,11 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase): self._delete_service_type(svc_type[self.resource_name]['id']) def _list_service_types(self): - return self.api.get(_get_path('service-types')) + return self.api.get(_get_path('service-types', fmt=self.fmt)) def _show_service_type(self, svctype_id, expect_errors=False): - return self.api.get(_get_path('service-types/%s' % str(svctype_id)), + return self.api.get(_get_path('service-types/%s' % str(svctype_id), + fmt=self.fmt), expect_errors=expect_errors) def _create_service_type(self, name, service_defs, @@ -285,14 +301,19 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase): data[self.resource_name]['default'] = default if 'tenant_id' not in data[self.resource_name]: data[self.resource_name]['tenant_id'] = 'fake' - return self.api.post_json(_get_path('service-types'), data, - expect_errors=expect_errors) + return self.api.post(_get_path('service-types', fmt=self.fmt), + self.serialize(data), + expect_errors=expect_errors, + content_type='application/%s' % self.fmt) def _create_dummy(self, dummyname='dummyobject'): data = {'dummy': {'name': dummyname, 'tenant_id': 'fake'}} - dummy_res = self.api.post_json(_get_path('dummys'), data) - return dummy_res.json['dummy'] + dummy_res = self.api.post(_get_path('dummys', fmt=self.fmt), + self.serialize(data), + content_type='application/%s' % self.fmt) + dummy_res = self.deserialize(dummy_res) + return dummy_res['dummy'] def _update_service_type(self, svc_type_id, name, service_defs, default=None, expect_errors=False): @@ -303,28 +324,34 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase): # set this attribute only if True if default: data[self.resource_name]['default'] = default - return self.api.put_json( - _get_path('service-types/%s' % str(svc_type_id)), data, + return self.api.put( + _get_path('service-types/%s' % str(svc_type_id), fmt=self.fmt), + self.serialize(data), expect_errors=expect_errors) def _delete_service_type(self, svctype_id, expect_errors=False): - return self.api.delete(_get_path('service-types/%s' % str(svctype_id)), + return self.api.delete(_get_path('service-types/%s' % str(svctype_id), + fmt=self.fmt), expect_errors=expect_errors) def _validate_service_type(self, res, name, service_defs, svc_type_id=None): - self.assertTrue(self.resource_name in res.json) - svc_type = res.json[self.resource_name] + res = self.deserialize(res) + self.assertTrue(self.resource_name in res) + svc_type = res[self.resource_name] if svc_type_id: self.assertEqual(svc_type['id'], svc_type_id) if name: self.assertEqual(svc_type['name'], name) if service_defs: + target_defs = [] # unspecified drivers will value None in response for svc_def in service_defs: - svc_def['driver'] = svc_def.get('driver') + new_svc_def = svc_def.copy() + new_svc_def['driver'] = svc_def.get('driver') + target_defs.append(new_svc_def) self.assertEqual(svc_type['service_definitions'], - service_defs) + target_defs) self.assertEqual(svc_type['default'], False) def _test_service_type_create(self, name='test', @@ -390,7 +417,7 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase): self.service_type('st2')): res = self._list_service_types() self.assertEqual(res.status_int, webexc.HTTPOk.code) - data = res.json + data = self.deserialize(res) self.assertTrue('service_types' in data) # it must be 3 because we have the default service type too! self.assertEquals(len(data['service_types']), 3) @@ -398,7 +425,7 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase): def test_get_default_service_type(self): res = self._list_service_types() self.assertEqual(res.status_int, webexc.HTTPOk.code) - data = res.json + data = self.deserialize(res) self.assertTrue('service_types' in data) self.assertEquals(len(data['service_types']), 1) def_svc_type = data['service_types'][0] @@ -426,15 +453,23 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase): def test_create_dummy_increases_service_type_refcount(self): dummy = self._create_dummy() svc_type_res = self._show_service_type(dummy['service_type']) - svc_type = svc_type_res.json[self.resource_name] + svc_type_res = self.deserialize(svc_type_res) + svc_type = svc_type_res[self.resource_name] self.assertEquals(svc_type['num_instances'], 1) def test_delete_dummy_decreases_service_type_refcount(self): dummy = self._create_dummy() svc_type_res = self._show_service_type(dummy['service_type']) - svc_type = svc_type_res.json[self.resource_name] + svc_type_res = self.deserialize(svc_type_res) + svc_type = svc_type_res[self.resource_name] self.assertEquals(svc_type['num_instances'], 1) - self.api.delete(_get_path('dummys/%s' % str(dummy['id']))) + self.api.delete(_get_path('dummys/%s' % str(dummy['id']), + fmt=self.fmt)) svc_type_res = self._show_service_type(dummy['service_type']) - svc_type = svc_type_res.json[self.resource_name] + svc_type_res = self.deserialize(svc_type_res) + svc_type = svc_type_res[self.resource_name] self.assertEquals(svc_type['num_instances'], 0) + + +class ServiceTypeManagerTestCaseXML(ServiceTypeManagerTestCase): + fmt = 'xml' diff --git a/quantum/tests/unit/test_wsgi.py b/quantum/tests/unit/test_wsgi.py index d455fe41b..6cc80cd41 100644 --- a/quantum/tests/unit/test_wsgi.py +++ b/quantum/tests/unit/test_wsgi.py @@ -15,11 +15,13 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import socket +import mock import unittest2 as unittest +from quantum.api.v2 import attributes +from quantum.common import constants from quantum.common import exceptions as exception from quantum import wsgi @@ -256,3 +258,116 @@ class ResourceTest(unittest.TestCase): request = FakeRequest() result = resource(request) self.assertEqual(400, result.status_int) + + +class XMLDictSerializerTest(unittest.TestCase): + def test_xml(self): + NETWORK = {'network': {'test': None, + 'tenant_id': 'test-tenant', + 'name': 'net1', + 'admin_state_up': True, + 'subnets': [], + 'dict': {}, + 'int': 3, + 'long': 4L, + 'float': 5.0, + 'prefix:external': True, + 'tests': [{'test1': 'value1'}, + {'test2': 2, 'test3': 3}]}} + # XML is: + # + # # Empty List + # 3 # Integer text + # 4 # Long text + # 5.0 # Float text + # # Empty Dict + # net1 + # True # Bool + # # None + # test-tenant + # # We must have a namespace defined in root for prefix:external + # True + # # List + # value1 + # 3 + # 2 + # + # + + metadata = attributes.get_attr_metadata() + ns = {'prefix': 'http://xxxx.yy.com'} + metadata[constants.EXT_NS] = ns + metadata['plurals'] = {'tests': 'test'} + serializer = wsgi.XMLDictSerializer(metadata) + result = serializer.serialize(NETWORK) + deserializer = wsgi.XMLDeserializer(metadata) + new_net = deserializer.deserialize(result)['body'] + self.assertEqual(NETWORK, new_net) + + def test_None(self): + data = None + # Since it is None, we use xsi:nil='true'. + # In addition, we use an + # virtual XML root _v_root to wrap the XML doc. + # XML is: + # <_v_root xsi:nil="true" + # xmlns="http://openstack.org/quantum/api/v2.0" + # xmlns:quantum="http://openstack.org/quantum/api/v2.0" + # xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" /> + serializer = wsgi.XMLDictSerializer(attributes.get_attr_metadata()) + result = serializer.serialize(data) + deserializer = wsgi.XMLDeserializer(attributes.get_attr_metadata()) + new_data = deserializer.deserialize(result)['body'] + self.assertIsNone(new_data) + + def test_empty_dic_xml(self): + data = {} + # Since it is an empty dict, we use quantum:type='dict' and + # an empty XML element to represent it. In addition, we use an + # virtual XML root _v_root to wrap the XML doc. + # XML is: + # <_v_root quantum:type="dict" + # xmlns="http://openstack.org/quantum/api/v2.0" + # xmlns:quantum="http://openstack.org/quantum/api/v2.0" + # xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" /> + serializer = wsgi.XMLDictSerializer(attributes.get_attr_metadata()) + result = serializer.serialize(data) + deserializer = wsgi.XMLDeserializer(attributes.get_attr_metadata()) + new_data = deserializer.deserialize(result)['body'] + self.assertEqual(data, new_data) + + def test_non_root_one_item_dic_xml(self): + data = {'test1': 1} + # We have a key in this dict, and its value is an integer. + # XML is: + # + # 1 + + serializer = wsgi.XMLDictSerializer(attributes.get_attr_metadata()) + result = serializer.serialize(data) + deserializer = wsgi.XMLDeserializer(attributes.get_attr_metadata()) + new_data = deserializer.deserialize(result)['body'] + self.assertEqual(data, new_data) + + def test_non_root_two_items_dic_xml(self): + data = {'test1': 1, 'test2': '2'} + # We have no root element in this data, We will use a virtual + # root element _v_root to wrap the doct. + # The XML is: + # <_v_root xmlns="http://openstack.org/quantum/api/v2.0" + # xmlns:quantum="http://openstack.org/quantum/api/v2.0" + # xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + # 12 + # + + serializer = wsgi.XMLDictSerializer(attributes.get_attr_metadata()) + result = serializer.serialize(data) + deserializer = wsgi.XMLDeserializer(attributes.get_attr_metadata()) + new_data = deserializer.deserialize(result)['body'] + self.assertEqual(data, new_data) diff --git a/quantum/tests/unit/testlib_api.py b/quantum/tests/unit/testlib_api.py index 7573be99d..0e27d17af 100644 --- a/quantum/tests/unit/testlib_api.py +++ b/quantum/tests/unit/testlib_api.py @@ -13,6 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +import unittest2 as unittest + +from quantum.api.v2 import attributes from quantum import wsgi @@ -30,3 +33,28 @@ def create_request(path, body, content_type, method='GET', if context: req.environ['quantum.context'] = context return req + + +class WebTestCase(unittest.TestCase): + fmt = 'json' + + def setUp(self): + json_deserializer = wsgi.JSONDeserializer() + xml_deserializer = wsgi.XMLDeserializer( + attributes.get_attr_metadata()) + self._deserializers = { + 'application/json': json_deserializer, + 'application/xml': xml_deserializer, + } + super(WebTestCase, self).setUp() + + def deserialize(self, response): + ctype = 'application/%s' % self.fmt + data = self._deserializers[ctype].deserialize(response.body)['body'] + return data + + def serialize(self, data): + ctype = 'application/%s' % self.fmt + result = wsgi.Serializer( + attributes.get_attr_metadata()).serialize(data, ctype) + return result diff --git a/quantum/wsgi.py b/quantum/wsgi.py index 5b052712b..1af25eef0 100644 --- a/quantum/wsgi.py +++ b/quantum/wsgi.py @@ -20,7 +20,7 @@ Utility methods for working with WSGI servers """ import socket import sys -from xml.dom import minidom +from xml.etree import ElementTree as etree from xml.parsers import expat import eventlet.wsgi @@ -29,6 +29,7 @@ import routes.middleware import webob.dec import webob.exc +from quantum.common import constants from quantum.common import exceptions as exception from quantum import context from quantum.openstack.common import jsonutils @@ -173,12 +174,12 @@ class Request(webob.Request): 2) Content-type header 3) Accept* headers """ - # First lookup http request + # First lookup http request path parts = self.path.rsplit('.', 1) if len(parts) > 1: - format = parts[1] - if format in ['json', 'xml']: - return 'application/{0}'.format(parts[1]) + _format = parts[1] + if _format in ['json', 'xml']: + return 'application/{0}'.format(_format) #Then look up content header type_from_header = self.get_content_type() @@ -195,9 +196,9 @@ class Request(webob.Request): if "Content-Type" not in self.headers: LOG.debug(_("Missing Content-Type")) return None - type = self.content_type - if type in allowed_types: - return type + _type = self.content_type + if _type in allowed_types: + return _type return None @property @@ -247,15 +248,31 @@ class XMLDictSerializer(DictSerializer): """ super(XMLDictSerializer, self).__init__() self.metadata = metadata or {} + if not xmlns: + xmlns = self.metadata.get('xmlns') + if not xmlns: + xmlns = constants.XML_NS_V20 self.xmlns = xmlns def default(self, data): - # We expect data to contain a single key which is the XML root. - root_key = data.keys()[0] - doc = minidom.Document() - node = self._to_xml_node(doc, self.metadata, root_key, data[root_key]) - - return self.to_xml_string(node) + # We expect data to contain a single key which is the XML root or + # non root + try: + key_len = data and len(data.keys()) or 0 + if (key_len == 1): + root_key = data.keys()[0] + root_value = data[root_key] + else: + root_key = constants.VIRTUAL_ROOT_KEY + root_value = data + doc = etree.Element("_temp_root") + used_prefixes = [] + self._to_xml_node(doc, self.metadata, root_key, + root_value, used_prefixes) + return self.to_xml_string(list(doc)[0], used_prefixes) + except AttributeError as e: + LOG.exception(str(e)) + return '' def __call__(self, data): # Provides a migration path to a cleaner WSGI layer, this @@ -263,39 +280,36 @@ class XMLDictSerializer(DictSerializer): # like originally intended return self.default(data) - def to_xml_string(self, node, has_atom=False): - self._add_xmlns(node, has_atom) - return node.toxml('UTF-8') + def to_xml_string(self, node, used_prefixes, has_atom=False): + self._add_xmlns(node, used_prefixes, has_atom) + return etree.tostring(node, encoding='UTF-8') #NOTE (ameade): the has_atom should be removed after all of the # xml serializers and view builders have been updated to the current # spec that required all responses include the xmlns:atom, the has_atom # flag is to prevent current tests from breaking - def _add_xmlns(self, node, has_atom=False): - if self.xmlns is not None: - node.setAttribute('xmlns', self.xmlns) + def _add_xmlns(self, node, used_prefixes, has_atom=False): + node.set('xmlns', self.xmlns) + node.set(constants.TYPE_XMLNS, self.xmlns) if has_atom: - node.setAttribute('xmlns:atom', "http://www.w3.org/2005/Atom") + node.set('xmlns:atom', "http://www.w3.org/2005/Atom") + node.set(constants.XSI_NIL_ATTR, constants.XSI_NAMESPACE) + ext_ns = self.metadata.get(constants.EXT_NS, {}) + for prefix in used_prefixes: + if prefix in ext_ns: + node.set('xmlns:' + prefix, ext_ns[prefix]) - def _to_xml_node(self, doc, metadata, nodename, data): + def _to_xml_node(self, parent, metadata, nodename, data, used_prefixes): """Recursive method to convert data members to XML nodes.""" - result = doc.createElement(nodename) - - # Set the xml namespace if one is specified - # TODO(justinsb): We could also use prefixes on the keys - xmlns = metadata.get('xmlns', None) - if xmlns: - result.setAttribute('xmlns', xmlns) - + result = etree.SubElement(parent, nodename) + if ":" in nodename: + used_prefixes.append(nodename.split(":", 1)[0]) #TODO(bcwaldon): accomplish this without a type-check if isinstance(data, list): - collections = metadata.get('list_collections', {}) - if nodename in collections: - metadata = collections[nodename] - for item in data: - node = doc.createElement(metadata['item_name']) - node.setAttribute(metadata['item_key'], str(item)) - result.appendChild(node) + if not data: + result.set( + constants.TYPE_ATTR, + constants.TYPE_LIST) return result singular = metadata.get('plurals', {}).get(nodename, None) if singular is None: @@ -304,41 +318,55 @@ class XMLDictSerializer(DictSerializer): else: singular = 'item' for item in data: - node = self._to_xml_node(doc, metadata, singular, item) - result.appendChild(node) + self._to_xml_node(result, metadata, singular, item, + used_prefixes) #TODO(bcwaldon): accomplish this without a type-check elif isinstance(data, dict): - collections = metadata.get('dict_collections', {}) - if nodename in collections: - metadata = collections[nodename] - for k, v in data.items(): - node = doc.createElement(metadata['item_name']) - node.setAttribute(metadata['item_key'], str(k)) - text = doc.createTextNode(str(v)) - node.appendChild(text) - result.appendChild(node) + if not data: + result.set( + constants.TYPE_ATTR, + constants.TYPE_DICT) return result attrs = metadata.get('attributes', {}).get(nodename, {}) for k, v in data.items(): if k in attrs: - result.setAttribute(k, str(v)) + result.set(k, str(v)) else: - node = self._to_xml_node(doc, metadata, k, v) - result.appendChild(node) + self._to_xml_node(result, metadata, k, v, + used_prefixes) + elif data is None: + result.set(constants.XSI_ATTR, 'true') else: - # Type is atom - node = doc.createTextNode(str(data)) - result.appendChild(node) + if isinstance(data, bool): + result.set( + constants.TYPE_ATTR, + constants.TYPE_BOOL) + elif isinstance(data, int): + result.set( + constants.TYPE_ATTR, + constants.TYPE_INT) + elif isinstance(data, long): + result.set( + constants.TYPE_ATTR, + constants.TYPE_LONG) + elif isinstance(data, float): + result.set( + constants.TYPE_ATTR, + constants.TYPE_FLOAT) + LOG.debug(_("Data %(data)s type is %(type)s"), + {'data': data, + 'type': type(data)}) + result.text = str(data) return result def _create_link_nodes(self, xml_doc, links): link_nodes = [] for link in links: link_node = xml_doc.createElement('atom:link') - link_node.setAttribute('rel', link['rel']) - link_node.setAttribute('href', link['href']) + link_node.set('rel', link['rel']) + link_node.set('href', link['href']) if 'type' in link: - link_node.setAttribute('type', link['type']) + link_node.set('type', link['type']) link_nodes.append(link_node) return link_nodes @@ -426,15 +454,51 @@ class XMLDeserializer(TextDeserializer): """ super(XMLDeserializer, self).__init__() self.metadata = metadata or {} + xmlns = self.metadata.get('xmlns') + if not xmlns: + xmlns = constants.XML_NS_V20 + self.xmlns = xmlns + + def _get_key(self, tag): + tags = tag.split("}", 1) + if len(tags) == 2: + ns = tags[0][1:] + bare_tag = tags[1] + ext_ns = self.metadata.get(constants.EXT_NS, {}) + if ns == self.xmlns: + return bare_tag + for prefix, _ns in ext_ns.items(): + if ns == _ns: + return prefix + ":" + bare_tag + else: + return tag def _from_xml(self, datastring): + if datastring is None: + return None plurals = set(self.metadata.get('plurals', {})) try: - node = minidom.parseString(datastring).childNodes[0] - return {node.nodeName: self._from_xml_node(node, plurals)} - except expat.ExpatError: - msg = _("Cannot understand XML") - raise exception.MalformedRequestBody(reason=msg) + node = etree.fromstring(datastring) + result = self._from_xml_node(node, plurals) + root_tag = self._get_key(node.tag) + if root_tag == constants.VIRTUAL_ROOT_KEY: + return result + else: + return {root_tag: result} + except Exception as e: + parseError = False + # Python2.7 + if (hasattr(etree, 'ParseError') and + isinstance(e, getattr(etree, 'ParseError'))): + parseError = True + # Python2.6 + elif isinstance(e, expat.ExpatError): + parseError = True + if parseError: + msg = _("Cannot understand XML") + raise exception.MalformedRequestBody(reason=msg) + else: + raise def _from_xml_node(self, node, listnames): """Convert a minidom node to a simple Python type. @@ -443,18 +507,46 @@ class XMLDeserializer(TextDeserializer): be considered list items. """ - if len(node.childNodes) == 1 and node.childNodes[0].nodeType == 3: - return node.childNodes[0].nodeValue - elif node.nodeName in listnames: - return [self._from_xml_node(n, listnames) for n in node.childNodes] + attrNil = node.get(str(etree.QName(constants.XSI_NAMESPACE, "nil"))) + attrType = node.get(str(etree.QName( + self.metadata.get('xmlns'), "type"))) + if (attrNil and attrNil.lower() == 'true'): + return None + elif not len(node) and not node.text: + if (attrType and attrType == constants.TYPE_DICT): + return {} + elif (attrType and attrType == constants.TYPE_LIST): + return [] + else: + return '' + elif (len(node) == 0 and node.text): + converters = {constants.TYPE_BOOL: + lambda x: x.lower() == 'true', + constants.TYPE_INT: + lambda x: int(x), + constants.TYPE_LONG: + lambda x: long(x), + constants.TYPE_FLOAT: + lambda x: float(x)} + if attrType and attrType in converters: + return converters[attrType](node.text) + else: + return node.text + elif self._get_key(node.tag) in listnames: + return [self._from_xml_node(n, listnames) for n in node] else: result = dict() - for attr in node.attributes.keys(): - result[attr] = node.attributes[attr].nodeValue - for child in node.childNodes: - if child.nodeType != node.TEXT_NODE: - result[child.nodeName] = self._from_xml_node(child, - listnames) + for attr in node.keys(): + if (attr == 'xmlns' or + attr.startswith('xmlns:') or + attr == constants.XSI_ATTR or + attr == constants.TYPE_ATTR): + continue + result[self._get_key(attr)] = node.get[attr] + children = list(node) + for child in children: + result[self._get_key(child.tag)] = self._from_xml_node( + child, listnames) return result def find_first_child_named(self, parent, name): @@ -960,7 +1052,7 @@ class Controller(object): """ _metadata = getattr(type(self), '_serialization_metadata', {}) serializer = Serializer(_metadata) - return serializer.deserialize(data, content_type) + return serializer.deserialize(data, content_type)['body'] def get_default_xmlns(self, req): """Provide the XML namespace to use if none is otherwise specified.""" @@ -984,8 +1076,8 @@ class Serializer(object): def _get_serialize_handler(self, content_type): handlers = { - 'application/json': self._to_json, - 'application/xml': self._to_xml, + 'application/json': JSONDictSerializer(), + 'application/xml': XMLDictSerializer(self.metadata), } try: @@ -995,7 +1087,7 @@ class Serializer(object): def serialize(self, data, content_type): """Serialize a dictionary into the specified content type.""" - return self._get_serialize_handler(content_type)(data) + return self._get_serialize_handler(content_type).serialize(data) def deserialize(self, datastring, content_type): """Deserialize a string to a dictionary. @@ -1004,115 +1096,18 @@ class Serializer(object): """ try: - return self.get_deserialize_handler(content_type)(datastring) + return self.get_deserialize_handler(content_type).deserialize( + datastring) except Exception: raise webob.exc.HTTPBadRequest(_("Could not deserialize data")) def get_deserialize_handler(self, content_type): handlers = { - 'application/json': self._from_json, - 'application/xml': self._from_xml, + 'application/json': JSONDeserializer(), + 'application/xml': XMLDeserializer(self.metadata), } try: return handlers[content_type] except Exception: raise exception.InvalidContentType(content_type=content_type) - - def _from_json(self, datastring): - return jsonutils.loads(datastring) - - def _from_xml(self, datastring): - xmldata = self.metadata.get('application/xml', {}) - plurals = set(xmldata.get('plurals', {})) - node = minidom.parseString(datastring).childNodes[0] - return {node.nodeName: self._from_xml_node(node, plurals)} - - def _from_xml_node(self, node, listnames): - """Convert a minidom node to a simple Python type. - - listnames is a collection of names of XML nodes whose subnodes should - be considered list items. - - """ - if len(node.childNodes) == 1 and node.childNodes[0].nodeType == 3: - return node.childNodes[0].nodeValue - elif node.nodeName in listnames: - return [self._from_xml_node(n, listnames) - for n in node.childNodes if n.nodeType != node.TEXT_NODE] - else: - result = dict() - for attr in node.attributes.keys(): - result[attr] = node.attributes[attr].nodeValue - for child in node.childNodes: - if child.nodeType != node.TEXT_NODE: - result[child.nodeName] = self._from_xml_node(child, - listnames) - return result - - def _to_json(self, data): - return jsonutils.dumps(data) - - def _to_xml(self, data): - metadata = self.metadata.get('application/xml', {}) - # We expect data to contain a single key which is the XML root. - root_key = data.keys()[0] - doc = minidom.Document() - node = self._to_xml_node(doc, metadata, root_key, data[root_key]) - - xmlns = node.getAttribute('xmlns') - if not xmlns and self.default_xmlns: - node.setAttribute('xmlns', self.default_xmlns) - - return node.toprettyxml(indent='', newl='') - - def _to_xml_node(self, doc, metadata, nodename, data): - """Recursive method to convert data members to XML nodes.""" - result = doc.createElement(nodename) - - # Set the xml namespace if one is specified - # TODO(justinsb): We could also use prefixes on the keys - xmlns = metadata.get('xmlns', None) - if xmlns: - result.setAttribute('xmlns', xmlns) - if isinstance(data, list): - collections = metadata.get('list_collections', {}) - if nodename in collections: - metadata = collections[nodename] - for item in data: - node = doc.createElement(metadata['item_name']) - node.setAttribute(metadata['item_key'], str(item)) - result.appendChild(node) - return result - singular = metadata.get('plurals', {}).get(nodename, None) - if singular is None: - if nodename.endswith('s'): - singular = nodename[:-1] - else: - singular = 'item' - for item in data: - node = self._to_xml_node(doc, metadata, singular, item) - result.appendChild(node) - elif isinstance(data, dict): - collections = metadata.get('dict_collections', {}) - if nodename in collections: - metadata = collections[nodename] - for k, v in data.items(): - node = doc.createElement(metadata['item_name']) - node.setAttribute(metadata['item_key'], str(k)) - text = doc.createTextNode(str(v)) - node.appendChild(text) - result.appendChild(node) - return result - attrs = metadata.get('attributes', {}).get(nodename, {}) - for k, v in data.items(): - if k in attrs: - result.setAttribute(k, str(v)) - else: - node = self._to_xml_node(doc, metadata, k, v) - result.appendChild(node) - else: - # Type is atom. - node = doc.createTextNode(str(data)) - result.appendChild(node) - return result