From ad1c7a35dec614a26de0a426950fa005df5f489d Mon Sep 17 00:00:00 2001 From: "Sean M. Collins" Date: Wed, 10 Jun 2015 10:23:44 -0400 Subject: [PATCH] Remove get_namespace from API extensions Based on the conversation on the ML. http://lists.openstack.org/pipermail/openstack-dev/2015-June/066219.html APIImpact DocImpact Closes-Bug: #1464023 Depends-On: 6f900fc429bf24cb31e0d2f149aa732055fd5956 Change-Id: I3c406910991c33cf959c5345d76153eabe3ace2d --- neutron/api/extensions.py | 21 ------------------- neutron/extensions/agent.py | 4 ---- neutron/extensions/allowedaddresspairs.py | 4 ---- neutron/extensions/dhcpagentscheduler.py | 4 ---- neutron/extensions/dvr.py | 5 ----- neutron/extensions/external_net.py | 8 ------- neutron/extensions/extra_dhcp_opt.py | 4 ---- neutron/extensions/extraroute.py | 4 ---- neutron/extensions/flavor.py | 4 ---- neutron/extensions/l3.py | 4 ---- neutron/extensions/l3_ext_gw_mode.py | 4 ---- neutron/extensions/l3_ext_ha_mode.py | 4 ---- neutron/extensions/l3agentscheduler.py | 4 ---- neutron/extensions/metering.py | 4 ---- neutron/extensions/multiprovidernet.py | 4 ---- neutron/extensions/netmtu.py | 4 ---- neutron/extensions/portbindings.py | 4 ---- neutron/extensions/portsecurity.py | 4 ---- neutron/extensions/providernet.py | 4 ---- neutron/extensions/quotasv2.py | 4 ---- neutron/extensions/routerservicetype.py | 4 ---- neutron/extensions/securitygroup.py | 5 ----- neutron/extensions/servicetype.py | 4 ---- neutron/extensions/subnetallocation.py | 5 ----- neutron/extensions/vlantransparent.py | 4 ---- .../plugins/cisco/extensions/credential.py | 5 ----- neutron/plugins/cisco/extensions/n1kv.py | 4 ---- .../cisco/extensions/network_profile.py | 4 ---- .../cisco/extensions/policy_profile.py | 4 ---- neutron/plugins/cisco/extensions/qos.py | 5 ----- .../ml2/drivers/cisco/n1kv/extensions/n1kv.py | 4 ---- .../plugins/nec/extensions/packetfilter.py | 4 ---- .../plugins/nec/extensions/router_provider.py | 4 ---- .../extensions/advancedserviceproviders.py | 6 ------ neutron/plugins/vmware/extensions/lsn.py | 4 ---- .../plugins/vmware/extensions/maclearning.py | 4 ---- .../plugins/vmware/extensions/networkgw.py | 4 ---- neutron/plugins/vmware/extensions/nvp_qos.py | 4 ---- neutron/plugins/vmware/extensions/qos.py | 4 ---- .../plugins/vmware/extensions/routertype.py | 4 ---- .../plugins/vmware/extensions/vnicindex.py | 4 ---- neutron/tests/api/test_extensions.py | 1 - neutron/tests/unit/api/test_extensions.py | 6 +----- neutron/tests/unit/dummy_plugin.py | 4 ---- neutron/tests/unit/extension_stubs.py | 3 --- .../unit/extensions/extendedattribute.py | 4 ---- .../unit/extensions/extensionattribute.py | 4 ---- neutron/tests/unit/extensions/foxinsocks.py | 3 --- neutron/tests/unit/extensions/v2attributes.py | 3 --- .../plugins/ml2/extensions/fake_extension.py | 5 ----- 50 files changed, 1 insertion(+), 224 deletions(-) diff --git a/neutron/api/extensions.py b/neutron/api/extensions.py index fa275bfe02f..396dc817cb7 100644 --- a/neutron/api/extensions.py +++ b/neutron/api/extensions.py @@ -91,13 +91,6 @@ class ExtensionDescriptor(object): """ raise NotImplementedError() - def get_namespace(self): - """The XML namespace for the extension. - - e.g. 'http://www.fox.in.socks/api/ext/pie/v1.0' - """ - raise NotImplementedError() - def get_updated(self): """The timestamp when the extension was last updated. @@ -175,18 +168,6 @@ class ExtensionDescriptor(object): if extended_attrs: attrs.update(extended_attrs) - def get_alias_namespace_compatibility_map(self): - """Returns mappings between extension aliases and XML namespaces. - - The mappings are XML namespaces that should, for backward compatibility - reasons, be added to the XML serialization of extended attributes. - This allows an established extended attribute to be provided by - another extension than the original one while keeping its old alias - in the name. - :return: A dictionary of extension_aliases and namespace strings. - """ - return {} - class ActionExtensionController(wsgi.Controller): @@ -235,7 +216,6 @@ class ExtensionController(wsgi.Controller): ext_data['name'] = ext.get_name() ext_data['alias'] = ext.get_alias() ext_data['description'] = ext.get_description() - ext_data['namespace'] = ext.get_namespace() ext_data['updated'] = ext.get_updated() ext_data['links'] = [] # TODO(dprince): implement extension links return ext_data @@ -503,7 +483,6 @@ class ExtensionManager(object): LOG.debug('Ext name: %s', extension.get_name()) LOG.debug('Ext alias: %s', extension.get_alias()) LOG.debug('Ext description: %s', extension.get_description()) - LOG.debug('Ext namespace: %s', extension.get_namespace()) LOG.debug('Ext updated: %s', extension.get_updated()) except AttributeError as ex: LOG.exception(_LE("Exception loading extension: %s"), unicode(ex)) diff --git a/neutron/extensions/agent.py b/neutron/extensions/agent.py index 4dee27c6ed7..2f67a3a7b57 100644 --- a/neutron/extensions/agent.py +++ b/neutron/extensions/agent.py @@ -86,10 +86,6 @@ class Agent(object): def get_description(cls): return "The agent management extension." - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/agent/api/v2.0" - @classmethod def get_updated(cls): return "2013-02-03T10:00:00-00:00" diff --git a/neutron/extensions/allowedaddresspairs.py b/neutron/extensions/allowedaddresspairs.py index 2e618eef249..807548a61cf 100644 --- a/neutron/extensions/allowedaddresspairs.py +++ b/neutron/extensions/allowedaddresspairs.py @@ -117,10 +117,6 @@ class Allowedaddresspairs(object): def get_description(cls): return "Provides allowed address pairs" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/allowedaddresspairs/api/v2.0" - @classmethod def get_updated(cls): return "2013-07-23T10:00:00-00:00" diff --git a/neutron/extensions/dhcpagentscheduler.py b/neutron/extensions/dhcpagentscheduler.py index 42817cd1fb1..ebd8ff55d70 100644 --- a/neutron/extensions/dhcpagentscheduler.py +++ b/neutron/extensions/dhcpagentscheduler.py @@ -91,10 +91,6 @@ class Dhcpagentscheduler(extensions.ExtensionDescriptor): def get_description(cls): return "Schedule networks among dhcp agents" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/dhcp_agent_scheduler/api/v1.0" - @classmethod def get_updated(cls): return "2013-02-07T10:00:00-00:00" diff --git a/neutron/extensions/dvr.py b/neutron/extensions/dvr.py index bb5720e9dad..811c92f649f 100644 --- a/neutron/extensions/dvr.py +++ b/neutron/extensions/dvr.py @@ -57,11 +57,6 @@ class Dvr(object): def get_description(cls): return "Enables configuration of Distributed Virtual Routers." - @classmethod - def get_namespace(cls): - return ("http://docs.openstack.org/ext/" - "%s/api/v1.0" % constants.L3_DISTRIBUTED_EXT_ALIAS) - @classmethod def get_updated(cls): return "2014-06-1T10:00:00-00:00" diff --git a/neutron/extensions/external_net.py b/neutron/extensions/external_net.py index 2a985f9d3ca..54b481092f6 100644 --- a/neutron/extensions/external_net.py +++ b/neutron/extensions/external_net.py @@ -16,7 +16,6 @@ from neutron.api import extensions from neutron.api.v2 import attributes as attr from neutron.common import exceptions as nexception -from neutron.extensions import l3 class ExternalNetworkInUse(nexception.InUse): @@ -50,10 +49,6 @@ class External_net(extensions.ExtensionDescriptor): def get_description(cls): return _("Adds external network attribute to network resource.") - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/neutron/external_net/api/v1.0" - @classmethod def get_updated(cls): return "2013-01-14T10:00:00-00:00" @@ -63,6 +58,3 @@ class External_net(extensions.ExtensionDescriptor): return EXTENDED_ATTRIBUTES_2_0 else: return {} - - def get_alias_namespace_compatibility_map(self): - return {l3.L3.get_alias(): l3.L3.get_namespace()} diff --git a/neutron/extensions/extra_dhcp_opt.py b/neutron/extensions/extra_dhcp_opt.py index 0de062c7cd5..8d3063b22dd 100644 --- a/neutron/extensions/extra_dhcp_opt.py +++ b/neutron/extensions/extra_dhcp_opt.py @@ -84,10 +84,6 @@ class Extra_dhcp_opt(extensions.ExtensionDescriptor): "be specified (e.g. tftp-server, server-ip-address, " "bootfile-name)") - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/neutron/extra_dhcp_opt/api/v1.0" - @classmethod def get_updated(cls): return "2013-03-17T12:00:00-00:00" diff --git a/neutron/extensions/extraroute.py b/neutron/extensions/extraroute.py index 2e6916c601a..feb3b4a9722 100644 --- a/neutron/extensions/extraroute.py +++ b/neutron/extensions/extraroute.py @@ -58,10 +58,6 @@ class Extraroute(object): def get_description(cls): return "Extra routes configuration for L3 router" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/neutron/extraroutes/api/v1.0" - @classmethod def get_updated(cls): return "2013-02-01T10:00:00-00:00" diff --git a/neutron/extensions/flavor.py b/neutron/extensions/flavor.py index 8679259bd31..9cafb13ef0a 100644 --- a/neutron/extensions/flavor.py +++ b/neutron/extensions/flavor.py @@ -53,10 +53,6 @@ class Flavor(extensions.ExtensionDescriptor): def get_description(cls): return "Flavor" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/flavor/api/v1.0" - @classmethod def get_updated(cls): return "2012-07-20T10:00:00-00:00" diff --git a/neutron/extensions/l3.py b/neutron/extensions/l3.py index b38d34907fa..bcbe15a62e4 100644 --- a/neutron/extensions/l3.py +++ b/neutron/extensions/l3.py @@ -175,10 +175,6 @@ class L3(extensions.ExtensionDescriptor): " between L2 Neutron networks and access to external" " networks via a NAT gateway.") - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/neutron/router/api/v1.0" - @classmethod def get_updated(cls): return "2012-07-20T10:00:00-00:00" diff --git a/neutron/extensions/l3_ext_gw_mode.py b/neutron/extensions/l3_ext_gw_mode.py index ae0ab1d54b9..a9726a18c29 100644 --- a/neutron/extensions/l3_ext_gw_mode.py +++ b/neutron/extensions/l3_ext_gw_mode.py @@ -54,10 +54,6 @@ class L3_ext_gw_mode(extensions.ExtensionDescriptor): return ("Extension of the router abstraction for specifying whether " "SNAT should occur on the external gateway") - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/neutron/ext-gw-mode/api/v1.0" - @classmethod def get_updated(cls): return "2013-03-28T10:00:00-00:00" diff --git a/neutron/extensions/l3_ext_ha_mode.py b/neutron/extensions/l3_ext_ha_mode.py index 006cd54d493..a2a3b859dbc 100644 --- a/neutron/extensions/l3_ext_ha_mode.py +++ b/neutron/extensions/l3_ext_ha_mode.py @@ -82,10 +82,6 @@ class L3_ext_ha_mode(extensions.ExtensionDescriptor): def get_description(cls): return "Add HA capability to routers." - @classmethod - def get_namespace(cls): - return "" - @classmethod def get_updated(cls): return "2014-04-26T00:00:00-00:00" diff --git a/neutron/extensions/l3agentscheduler.py b/neutron/extensions/l3agentscheduler.py index c786680a437..50a5e34c99b 100644 --- a/neutron/extensions/l3agentscheduler.py +++ b/neutron/extensions/l3agentscheduler.py @@ -120,10 +120,6 @@ class L3agentscheduler(extensions.ExtensionDescriptor): def get_description(cls): return "Schedule routers among l3 agents" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/l3_agent_scheduler/api/v1.0" - @classmethod def get_updated(cls): return "2013-02-07T10:00:00-00:00" diff --git a/neutron/extensions/metering.py b/neutron/extensions/metering.py index 8485fc40d85..177cf379df6 100644 --- a/neutron/extensions/metering.py +++ b/neutron/extensions/metering.py @@ -97,10 +97,6 @@ class Metering(extensions.ExtensionDescriptor): def get_description(cls): return "Neutron Metering extension." - @classmethod - def get_namespace(cls): - return "http://wiki.openstack.org/wiki/Neutron/Metering/Bandwidth#API" - @classmethod def get_updated(cls): return "2013-06-12T10:00:00-00:00" diff --git a/neutron/extensions/multiprovidernet.py b/neutron/extensions/multiprovidernet.py index 4fba23fbde0..18b769702df 100644 --- a/neutron/extensions/multiprovidernet.py +++ b/neutron/extensions/multiprovidernet.py @@ -107,10 +107,6 @@ class Multiprovidernet(extensions.ExtensionDescriptor): return ("Expose mapping of virtual networks to multiple physical " "networks") - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/multi-provider/api/v1.0" - @classmethod def get_updated(cls): return "2013-06-27T10:00:00-00:00" diff --git a/neutron/extensions/netmtu.py b/neutron/extensions/netmtu.py index 55245fdf9a6..b4332511367 100644 --- a/neutron/extensions/netmtu.py +++ b/neutron/extensions/netmtu.py @@ -39,10 +39,6 @@ class Netmtu(extensions.ExtensionDescriptor): def get_description(cls): return "Provides MTU attribute for a network resource." - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/net_mtu/api/v1.0" - @classmethod def get_updated(cls): return "2015-03-25T10:00:00-00:00" diff --git a/neutron/extensions/portbindings.py b/neutron/extensions/portbindings.py index 63fca88ec09..3c50a4f2f8b 100644 --- a/neutron/extensions/portbindings.py +++ b/neutron/extensions/portbindings.py @@ -124,10 +124,6 @@ class Portbindings(extensions.ExtensionDescriptor): def get_description(cls): return "Expose port bindings of a virtual port to external application" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/binding/api/v1.0" - @classmethod def get_updated(cls): return "2014-02-03T10:00:00-00:00" diff --git a/neutron/extensions/portsecurity.py b/neutron/extensions/portsecurity.py index 68663f9e16c..573e04fc011 100644 --- a/neutron/extensions/portsecurity.py +++ b/neutron/extensions/portsecurity.py @@ -63,10 +63,6 @@ class Portsecurity(object): def get_description(cls): return "Provides port security" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/portsecurity/api/v1.0" - @classmethod def get_updated(cls): return "2012-07-23T10:00:00-00:00" diff --git a/neutron/extensions/providernet.py b/neutron/extensions/providernet.py index 6a60ca9a22d..1cc8865f233 100644 --- a/neutron/extensions/providernet.py +++ b/neutron/extensions/providernet.py @@ -85,10 +85,6 @@ class Providernet(extensions.ExtensionDescriptor): def get_description(cls): return "Expose mapping of virtual networks to physical networks" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/provider/api/v1.0" - @classmethod def get_updated(cls): return "2012-09-07T10:00:00-00:00" diff --git a/neutron/extensions/quotasv2.py b/neutron/extensions/quotasv2.py index bddad4fe5b4..b5f8d020d37 100644 --- a/neutron/extensions/quotasv2.py +++ b/neutron/extensions/quotasv2.py @@ -125,10 +125,6 @@ class Quotasv2(extensions.ExtensionDescriptor): description += ' per tenant' return description - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/network/ext/quotas-sets/api/v2.0" - @classmethod def get_updated(cls): return "2012-07-29T10:00:00-00:00" diff --git a/neutron/extensions/routerservicetype.py b/neutron/extensions/routerservicetype.py index cce9cf85d33..d81197a5f94 100644 --- a/neutron/extensions/routerservicetype.py +++ b/neutron/extensions/routerservicetype.py @@ -38,10 +38,6 @@ class Routerservicetype(object): def get_description(cls): return "Provides router service type" - @classmethod - def get_namespace(cls): - return "" - @classmethod def get_updated(cls): return "2013-01-29T00:00:00-00:00" diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py index a772be5692f..fd3508a8b23 100644 --- a/neutron/extensions/securitygroup.py +++ b/neutron/extensions/securitygroup.py @@ -291,11 +291,6 @@ class Securitygroup(extensions.ExtensionDescriptor): def get_description(cls): return "The security groups extension." - @classmethod - def get_namespace(cls): - # todo - return "http://docs.openstack.org/ext/securitygroups/api/v2.0" - @classmethod def get_updated(cls): return "2012-10-05T10:00:00-00:00" diff --git a/neutron/extensions/servicetype.py b/neutron/extensions/servicetype.py index a972f6f45e9..3a257478014 100644 --- a/neutron/extensions/servicetype.py +++ b/neutron/extensions/servicetype.py @@ -58,10 +58,6 @@ class Servicetype(extensions.ExtensionDescriptor): return _("API for retrieving service providers for " "Neutron advanced services") - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/neutron/service-type/api/v1.0" - @classmethod def get_updated(cls): return "2013-01-20T00:00:00-00:00" diff --git a/neutron/extensions/subnetallocation.py b/neutron/extensions/subnetallocation.py index fd8035c10a7..3a9712aa472 100644 --- a/neutron/extensions/subnetallocation.py +++ b/neutron/extensions/subnetallocation.py @@ -32,11 +32,6 @@ class Subnetallocation(extensions.ExtensionDescriptor): def get_description(cls): return "Enables allocation of subnets from a subnet pool" - @classmethod - def get_namespace(cls): - return ("http://docs.openstack.org/ext/" - "%s/api/v1.0" % constants.SUBNET_ALLOCATION_EXT_ALIAS) - @classmethod def get_updated(cls): return "2015-03-30T10:00:00-00:00" diff --git a/neutron/extensions/vlantransparent.py b/neutron/extensions/vlantransparent.py index 4c2d8f980d8..0e83fb51175 100644 --- a/neutron/extensions/vlantransparent.py +++ b/neutron/extensions/vlantransparent.py @@ -60,10 +60,6 @@ class Vlantransparent(object): def get_description(cls): return "Provides Vlan Transparent Networks" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/vlantransparent/api/v1.0" - @classmethod def get_updated(cls): return "2015-03-23T09:00:00-00:00" diff --git a/neutron/plugins/cisco/extensions/credential.py b/neutron/plugins/cisco/extensions/credential.py index 01749357bd3..f4d1f7f8f4f 100644 --- a/neutron/plugins/cisco/extensions/credential.py +++ b/neutron/plugins/cisco/extensions/credential.py @@ -55,11 +55,6 @@ class Credential(extensions.ExtensionDescriptor): """Returns Extended Resource Description.""" return "Credential include username and password" - @classmethod - def get_namespace(cls): - """Returns Extended Resource Namespace.""" - return "http://docs.ciscocloud.com/api/ext/credential/v2.0" - @classmethod def get_updated(cls): """Returns Extended Resource Update Time.""" diff --git a/neutron/plugins/cisco/extensions/n1kv.py b/neutron/plugins/cisco/extensions/n1kv.py index 59552ac3c8d..e754e0a2504 100644 --- a/neutron/plugins/cisco/extensions/n1kv.py +++ b/neutron/plugins/cisco/extensions/n1kv.py @@ -84,10 +84,6 @@ class N1kv(extensions.ExtensionDescriptor): def get_description(cls): return "Expose network profile" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/n1kv/api/v2.0" - @classmethod def get_updated(cls): return "2012-11-15T10:00:00-00:00" diff --git a/neutron/plugins/cisco/extensions/network_profile.py b/neutron/plugins/cisco/extensions/network_profile.py index b2752a06c2c..6a16cc2f058 100644 --- a/neutron/plugins/cisco/extensions/network_profile.py +++ b/neutron/plugins/cisco/extensions/network_profile.py @@ -75,10 +75,6 @@ class Network_profile(extensions.ExtensionDescriptor): def get_description(cls): return ("Profile includes the type of profile for N1kv") - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/n1kv/network-profile/api/v2.0" - @classmethod def get_updated(cls): return "2012-07-20T10:00:00-00:00" diff --git a/neutron/plugins/cisco/extensions/policy_profile.py b/neutron/plugins/cisco/extensions/policy_profile.py index 9c028e76b6b..04515c20c3a 100644 --- a/neutron/plugins/cisco/extensions/policy_profile.py +++ b/neutron/plugins/cisco/extensions/policy_profile.py @@ -54,10 +54,6 @@ class Policy_profile(extensions.ExtensionDescriptor): def get_description(cls): return "Profile includes the type of profile for N1kv" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/n1kv/policy-profile/api/v2.0" - @classmethod def get_updated(cls): return "2012-07-20T10:00:00-00:00" diff --git a/neutron/plugins/cisco/extensions/qos.py b/neutron/plugins/cisco/extensions/qos.py index db642f1d4b7..b9428f23dad 100644 --- a/neutron/plugins/cisco/extensions/qos.py +++ b/neutron/plugins/cisco/extensions/qos.py @@ -42,11 +42,6 @@ class Qos(extensions.ExtensionDescriptor): """Returns Ext Resource Description.""" return "qos includes qos_name and qos_desc" - @classmethod - def get_namespace(cls): - """Returns Ext Resource Namespace.""" - return "http://docs.ciscocloud.com/api/ext/qos/v1.0" - @classmethod def get_updated(cls): """Returns Ext Resource update.""" diff --git a/neutron/plugins/ml2/drivers/cisco/n1kv/extensions/n1kv.py b/neutron/plugins/ml2/drivers/cisco/n1kv/extensions/n1kv.py index 7cd4f8cbd83..726779c9df2 100644 --- a/neutron/plugins/ml2/drivers/cisco/n1kv/extensions/n1kv.py +++ b/neutron/plugins/ml2/drivers/cisco/n1kv/extensions/n1kv.py @@ -42,10 +42,6 @@ class N1kv(extensions.ExtensionDescriptor): def get_description(cls): return _("Add new policy profile attribute to port resource.") - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/neutron/n1kv/api/v2.0" - @classmethod def get_updated(cls): return "2014-11-23T13:33:25-00:00" diff --git a/neutron/plugins/nec/extensions/packetfilter.py b/neutron/plugins/nec/extensions/packetfilter.py index 3711995ea34..7c9971f8a96 100644 --- a/neutron/plugins/nec/extensions/packetfilter.py +++ b/neutron/plugins/nec/extensions/packetfilter.py @@ -174,10 +174,6 @@ class Packetfilter(extensions.ExtensionDescriptor): def get_description(cls): return "PacketFilters on OFC" - @classmethod - def get_namespace(cls): - return "http://www.nec.co.jp/api/ext/packet_filter/v2.0" - @classmethod def get_updated(cls): return "2013-07-16T00:00:00+09:00" diff --git a/neutron/plugins/nec/extensions/router_provider.py b/neutron/plugins/nec/extensions/router_provider.py index 5098a47fda0..e16e4ab9f7c 100644 --- a/neutron/plugins/nec/extensions/router_provider.py +++ b/neutron/plugins/nec/extensions/router_provider.py @@ -44,10 +44,6 @@ class Router_provider(object): def get_description(cls): return "Router Provider Support" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/router_provider/api/v1.0" - @classmethod def get_updated(cls): return "2013-08-20T10:00:00-00:00" diff --git a/neutron/plugins/vmware/extensions/advancedserviceproviders.py b/neutron/plugins/vmware/extensions/advancedserviceproviders.py index ba620363964..dc088eff292 100644 --- a/neutron/plugins/vmware/extensions/advancedserviceproviders.py +++ b/neutron/plugins/vmware/extensions/advancedserviceproviders.py @@ -39,12 +39,6 @@ class Advancedserviceproviders(object): def get_description(cls): return "Id of the advanced service providers attached to the subnet" - @classmethod - def get_namespace(cls): - return( - "http://docs.openstack.org/ext/neutron/" - "advanced_service_providers/api/v1.0") - @classmethod def get_updated(cls): return "2014-12-11T12:00:00-00:00" diff --git a/neutron/plugins/vmware/extensions/lsn.py b/neutron/plugins/vmware/extensions/lsn.py index 4a7d3ca3da5..a5b6a94ccf9 100644 --- a/neutron/plugins/vmware/extensions/lsn.py +++ b/neutron/plugins/vmware/extensions/lsn.py @@ -52,10 +52,6 @@ class Lsn(object): def get_description(cls): return "Enables configuration of NSX Logical Services Node." - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/%s/api/v2.0" % EXT_ALIAS - @classmethod def get_updated(cls): return "2013-10-05T10:00:00-00:00" diff --git a/neutron/plugins/vmware/extensions/maclearning.py b/neutron/plugins/vmware/extensions/maclearning.py index 21c66915085..f7b30f7cdd3 100644 --- a/neutron/plugins/vmware/extensions/maclearning.py +++ b/neutron/plugins/vmware/extensions/maclearning.py @@ -41,10 +41,6 @@ class Maclearning(object): def get_description(cls): return "Provides MAC learning capabilities." - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/maclearning/api/v1.0" - @classmethod def get_updated(cls): return "2013-05-1T10:00:00-00:00" diff --git a/neutron/plugins/vmware/extensions/networkgw.py b/neutron/plugins/vmware/extensions/networkgw.py index 1e9bc2ace6f..2fc18c0169e 100644 --- a/neutron/plugins/vmware/extensions/networkgw.py +++ b/neutron/plugins/vmware/extensions/networkgw.py @@ -173,10 +173,6 @@ class Networkgw(object): def get_description(cls): return "Connects Neutron networks with external networks at layer 2." - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/network-gateway/api/v1.0" - @classmethod def get_updated(cls): return "2014-01-01T00:00:00-00:00" diff --git a/neutron/plugins/vmware/extensions/nvp_qos.py b/neutron/plugins/vmware/extensions/nvp_qos.py index 470f267b5a2..14d30ce9eae 100644 --- a/neutron/plugins/vmware/extensions/nvp_qos.py +++ b/neutron/plugins/vmware/extensions/nvp_qos.py @@ -34,7 +34,3 @@ class Nvp_qos(qos.Qos): @classmethod def get_description(cls): return "NVP QoS extension (deprecated)." - - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/nvp-qos/api/v2.0" diff --git a/neutron/plugins/vmware/extensions/qos.py b/neutron/plugins/vmware/extensions/qos.py index 30e6f8c7d02..b2aeeb467c7 100644 --- a/neutron/plugins/vmware/extensions/qos.py +++ b/neutron/plugins/vmware/extensions/qos.py @@ -176,10 +176,6 @@ class Qos(object): def get_description(cls): return "NSX QoS extension." - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/qos-queue/api/v2.0" - @classmethod def get_updated(cls): return "2014-01-01T00:00:00-00:00" diff --git a/neutron/plugins/vmware/extensions/routertype.py b/neutron/plugins/vmware/extensions/routertype.py index ba7c831a23d..0705f02eb20 100644 --- a/neutron/plugins/vmware/extensions/routertype.py +++ b/neutron/plugins/vmware/extensions/routertype.py @@ -41,10 +41,6 @@ class Routertype(object): def get_description(cls): return "Enables configuration of NSXv router type." - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/router-type/api/v1.0" - @classmethod def get_updated(cls): return "2015-1-12T10:00:00-00:00" diff --git a/neutron/plugins/vmware/extensions/vnicindex.py b/neutron/plugins/vmware/extensions/vnicindex.py index 9b0e6d05ce6..27888fb4442 100644 --- a/neutron/plugins/vmware/extensions/vnicindex.py +++ b/neutron/plugins/vmware/extensions/vnicindex.py @@ -41,10 +41,6 @@ class Vnicindex(object): def get_description(cls): return ("Enable a port to be associated with a VNIC index") - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/neutron/vnic_index/api/v1.0" - @classmethod def get_updated(cls): return "2014-09-15T12:00:00-00:00" diff --git a/neutron/tests/api/test_extensions.py b/neutron/tests/api/test_extensions.py index 56be8189f7e..1e3d824c3bd 100644 --- a/neutron/tests/api/test_extensions.py +++ b/neutron/tests/api/test_extensions.py @@ -61,7 +61,6 @@ class ExtensionsTestJSON(base.BaseNetworkTest): self.assertIn('updated', ext_details.keys()) self.assertIn('name', ext_details.keys()) self.assertIn('description', ext_details.keys()) - self.assertIn('namespace', ext_details.keys()) self.assertIn('links', ext_details.keys()) self.assertIn('alias', ext_details.keys()) self.assertEqual(ext_details['name'], ext_name) diff --git a/neutron/tests/unit/api/test_extensions.py b/neutron/tests/unit/api/test_extensions.py index 9a32e865f94..38a99ea280a 100644 --- a/neutron/tests/unit/api/test_extensions.py +++ b/neutron/tests/unit/api/test_extensions.py @@ -474,7 +474,7 @@ class ExtensionManagerTest(base.BaseTestCase): """Invalid extension. This Extension doesn't implement extension methods : - get_name, get_description, get_namespace and get_updated + get_name, get_description and get_updated """ def get_alias(self): return "invalid_extension" @@ -621,16 +621,12 @@ class ExtensionControllerTest(testlib_api.WebTestCase): 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): 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" + self.fmt, diff --git a/neutron/tests/unit/dummy_plugin.py b/neutron/tests/unit/dummy_plugin.py index 0e7fcd98f4e..09d5ff658c0 100644 --- a/neutron/tests/unit/dummy_plugin.py +++ b/neutron/tests/unit/dummy_plugin.py @@ -63,10 +63,6 @@ class Dummy(object): def get_description(cls): return "Dummy stuff" - @classmethod - def get_namespace(cls): - return "http://docs.openstack.org/ext/neutron/dummy/api/v1.0" - @classmethod def get_updated(cls): return "2012-11-20T10:00:00-00:00" diff --git a/neutron/tests/unit/extension_stubs.py b/neutron/tests/unit/extension_stubs.py index e8e23063f01..f98d2149186 100644 --- a/neutron/tests/unit/extension_stubs.py +++ b/neutron/tests/unit/extension_stubs.py @@ -33,9 +33,6 @@ class StubExtension(object): def get_description(self): return "" - def get_namespace(self): - return "" - def get_updated(self): return "" diff --git a/neutron/tests/unit/extensions/extendedattribute.py b/neutron/tests/unit/extensions/extendedattribute.py index 6754bffa0e4..2f2f2de1594 100644 --- a/neutron/tests/unit/extensions/extendedattribute.py +++ b/neutron/tests/unit/extensions/extendedattribute.py @@ -39,10 +39,6 @@ class Extendedattribute(extensions.ExtensionDescriptor): def get_description(cls): return "Provides extended_attr attribute to router" - @classmethod - def get_namespace(cls): - return "" - @classmethod def get_updated(cls): return "2013-02-05T00:00:00-00:00" diff --git a/neutron/tests/unit/extensions/extensionattribute.py b/neutron/tests/unit/extensions/extensionattribute.py index 22814fc80b5..f289c8b0625 100644 --- a/neutron/tests/unit/extensions/extensionattribute.py +++ b/neutron/tests/unit/extensions/extensionattribute.py @@ -52,10 +52,6 @@ class Extensionattribute(extensions.ExtensionDescriptor): def get_description(cls): return "Extension Test Resource" - @classmethod - def get_namespace(cls): - return "" - @classmethod def get_updated(cls): return "2013-02-05T10:00:00-00:00" diff --git a/neutron/tests/unit/extensions/foxinsocks.py b/neutron/tests/unit/extensions/foxinsocks.py index 4c8fc387c50..39d2bd829bb 100644 --- a/neutron/tests/unit/extensions/foxinsocks.py +++ b/neutron/tests/unit/extensions/foxinsocks.py @@ -51,9 +51,6 @@ class Foxinsocks(object): def get_description(self): return "The Fox In Socks Extension" - def get_namespace(self): - return "http://www.fox.in.socks/api/ext/pie/v1.0" - def get_updated(self): return "2011-01-22T13:25:27-06:00" diff --git a/neutron/tests/unit/extensions/v2attributes.py b/neutron/tests/unit/extensions/v2attributes.py index ab40f260af9..6259eb35659 100644 --- a/neutron/tests/unit/extensions/v2attributes.py +++ b/neutron/tests/unit/extensions/v2attributes.py @@ -35,9 +35,6 @@ class V2attributes(object): def get_description(self): return "Demonstrates extended attributes on V2 core resources" - def get_namespace(self): - return "http://docs.openstack.org/ext/examples/v2attributes/api/v1.0" - def get_updated(self): return "2012-07-18T10:00:00-00:00" diff --git a/neutron/tests/unit/plugins/ml2/extensions/fake_extension.py b/neutron/tests/unit/plugins/ml2/extensions/fake_extension.py index fdc94c12890..985e4ebc834 100644 --- a/neutron/tests/unit/plugins/ml2/extensions/fake_extension.py +++ b/neutron/tests/unit/plugins/ml2/extensions/fake_extension.py @@ -53,11 +53,6 @@ class Fake_extension(extensions.ExtensionDescriptor): def get_description(cls): return _("Adds test attributes to core resources.") - @classmethod - def get_namespace(cls): - return ("http://docs.openstack.org/ext/neutron/ml2/test/" - "fake_extension/api/v1.0") - @classmethod def get_updated(cls): return "2014-07-16T10:00:00-00:00"