Merge "Fix extension description and remove unused exception"

This commit is contained in:
Jenkins 2014-01-12 00:39:26 +00:00 committed by Gerrit Code Review
commit 0997cde767

View File

@ -20,14 +20,9 @@
from neutron.api import extensions from neutron.api import extensions
from neutron.api.v2 import attributes as attrs from neutron.api.v2 import attributes as attrs
from neutron.common import exceptions as qexception
from neutron.extensions import l3 from neutron.extensions import l3
class RouterDNatDisabled(qexception.BadRequest):
message = _("DNat is disabled for the router %(router_id)s. Floating IPs "
"cannot be associated.")
EXTENDED_ATTRIBUTES_2_0 = { EXTENDED_ATTRIBUTES_2_0 = {
'routers': {l3.EXTERNAL_GW_INFO: 'routers': {l3.EXTERNAL_GW_INFO:
{'allow_post': True, {'allow_post': True,
@ -56,7 +51,7 @@ class L3_ext_gw_mode(extensions.ExtensionDescriptor):
@classmethod @classmethod
def get_description(cls): def get_description(cls):
return ("Extension of the router abstraction for specifying whether " return ("Extension of the router abstraction for specifying whether "
"SNAT, DNAT or both should occur on the external gateway") "SNAT should occur on the external gateway")
@classmethod @classmethod
def get_namespace(cls): def get_namespace(cls):