Cisco's unplug_iface refers to non existing exception

Bug #1006226

An extra exception,InvalidDetach has been added to cisco_exception.py and
unplug_iface has been redirected to this exception

Change-Id: I5d1e4070fd0cb60a973e55e5645509aef58e8083

diff --git a/quantum/plugins/cisco/common/cisco_exceptions.py b/quantum/plugins/cisco/common/cisco_exceptions.py
index 149da5d3612b88e8734a8ead15878d97990da493..2623f745cfee27e36de1071cf0dc91139209c191 100644 (file)
--- a/quantum/plugins/cisco/common/cisco_exceptions.py
+++ b/quantum/plugins/cisco/common/cisco_exceptions.py
@@ -183,3 +183,9 @@ class InvalidAttach(exceptions.QuantumException):
                 "attachment ID with port ID happens implicitly when "
                 "VM is instantiated; attach operation can be "
                 "performed subsequently.")
+
+
+class InvalidDetach(exceptions.QuantumException):
+    message = _("Unable to unplug the attachment %(att_id)s from port "
+                "%(port_id)s for network %(net_id)s. The attachment "
+                "%(att_id)s does not exist.")

diff --git a/quantum/plugins/cisco/l2network_plugin.py b/quantum/plugins/cisco/l2network_plugin.py
index ae03ac4396dd9d65589ff929818635cb3b47e29c..6c6787b98745d6b39fcebda6545abca429fb9bbd 100644 (file)
--- a/quantum/plugins/cisco/l2network_plugin.py
+++ b/quantum/plugins/cisco/l2network_plugin.py
@@ -288,8 +288,8 @@ class L2Network(QuantumPluginBase):
         port = db.port_get(net_id, port_id)
         attachment_id = port[const.INTERFACEID]
         if attachment_id is None:
-            raise exc.InvalidDetach(port_id=port_id, net_id=net_id,
-                                    att_id=remote_interface_id)
+            raise cexc.InvalidDetach(port_id=port_id, net_id=net_id,
+                                     att_id=remote_interface_id)
         self._invoke_device_plugins(self._func_name(), [tenant_id, net_id,
                                                         port_id])
         attachment_id = attachment_id[:const.UUID_LENGTH]