Merge lp:~snaiksat/neutron/sumit-post-diablo-rbp into lp:~cisco-openstack/neutron/post-diablo-rbp

[Sumit Naiksatam]

* Clarification on hostname convention.

* The exceptions file was updated was not checked in before. Also fixed a bug in l2network_plugin, to reference the correct exception class.

* Updated README to clarify plug/unplug operations.

* update_port_bindings() updates any of the column values only if they are non-null. Added a couple of functions to be able to set the instance_id and vif_id to any value (including NULL).

* removing debug statements

* Changes for component-specific logging and fixes for VIF-ID association and disassociation.

* Adding detach_port extension operation to be invoked from the unplug method in vif driver.

[Edgar Magana (emagana)]

All code changes look good as well as the README section.

review: Approve

[Ying Liu (yinliu2)]

Look good to me.

review: Approve

=== modified file 'extensions/_novatenant_view.py'
--- extensions/_novatenant_view.py	2011-08-26 19:31:57 +0000
+++ extensions/_novatenant_view.py	2011-10-07 03:38:42 +0000
@@ -45,3 +45,7 @@
     def build_vif(self, vif_data):
         """Return VIF description."""
         return dict(vif_desc=vif_data[const.VIF_DESC])
+
+    def build_result(self, result_data):
+        """Return result True/False"""
+        return dict(result=result_data)

=== modified file 'extensions/novatenant.py'
--- extensions/novatenant.py	2011-08-30 16:16:23 +0000
+++ extensions/novatenant.py	2011-10-07 03:38:42 +0000
@@ -64,7 +64,8 @@
         parent_resource = dict(member_name="tenant",
                                collection_name="extensions/csco/tenants")
         member_actions = {'schedule_host': "PUT",
-                          'associate_port': "PUT"}
+                          'associate_port': "PUT",
+                          'detach_port': "PUT"}
         controller = NovatenantsController(QuantumManager.get_plugin())
         return [extensions.ResourceExtension('novatenants', controller,
                                              parent=parent_resource,
@@ -154,3 +155,24 @@
             return result
         except qexception.PortNotFound as exp:
             return faults.Fault(faults.PortNotFound(exp))
+
+    def detach_port(self, request, tenant_id, id):
+        content_type = request.best_match_content_type()
+        try:
+            req_params = \
+                self._parse_request_params(request,
+                                           self._schedule_host_ops_param_list)
+        except exc.HTTPError as exp:
+            return faults.Fault(exp)
+
+        instance_id = req_params['instance_id']
+        instance_desc = req_params['instance_desc']
+
+        try:
+            vif = self._plugin. \
+            detach_port(tenant_id, instance_id, instance_desc)
+            builder = novatenant_view.get_view_builder(request)
+            result = builder.build_result(True)
+            return result
+        except qexception.PortNotFound as exp:
+            return faults.Fault(faults.PortNotFound(exp))

=== modified file 'quantum/plugins/cisco/README'
--- quantum/plugins/cisco/README	2011-09-02 07:08:26 +0000
+++ quantum/plugins/cisco/README	2011-10-07 03:38:42 +0000
@@ -205,7 +205,9 @@
     quantum/plugins/cisco/conf/ucs_inventory.ini file. You can configure multiple
     UCSMs per deployment, multiple chassis per UCSM, and multiple blades per
     chassis. Chassis ID and blade ID can be obtained from the UCSM (they will
-    typically be numbers like 1, 2, 3, etc.)
+    typically be numbers like 1, 2, 3, etc.). Also make sure that you put the exact
+    hostname as nova sees it (the host column in the services table of the nova
+    DB will give you that information).
 
 [ucsm-1]
 ip_address = <put_ucsm_ip_address_here>
@@ -241,8 +243,8 @@
 Multi NIC support for VMs
 -------------------------
 As indicated earlier, if your Nova setup has a project with more than one network,
-Nova will try to create a vritual network interface (VIF) on the VM for each of those
-networks. That implies that,
+Nova will try to create a virtual network interface (VIF) on the VM for each of those
+networks. That implies -
 
     (1) You should create the same number of networks in Quantum as in your Nova
         project.
@@ -325,12 +327,18 @@
     Note that when using UCS and the 802.1Qbh features, the association of the
     VIF-ID (also referred to as interface ID) on the VM's NIC with a port will
     happen automatically when the VM is instantiated. At this point, doing a
-    show_port will reveal the VIF-ID associated with the port.
+    show_port will reveal the VIF-ID associated with the port. To indicate that
+    this VIF-ID is still detached from the network it would eventually be on, you
+    will see the suffix "(detached)" on the VIF-ID. This indicates that although
+    the VIF-ID and the port have been associated, the VIF still does not have
+    connectivity to the network on which the port resides. That connectivity
+    will be established only after the plug/attach operation is performed (as
+    described in the next step).
 
 # PYTHONPATH=. python quantum/plugins/cisco/client/cli.py show_port demo c4a2bea7-a528-4caf-b16e-80397cd1663a 118ac473-294d-480e-8f6d-425acbbe81ae
 Logical Port ID: 118ac473-294d-480e-8f6d-425acbbe81ae
 administrative State: ACTIVE
-interface: b73e3585-d074-4379-8dde-931c0fc4db0e
+interface: b73e3585-d074-4379-8dde-931c0fc4db0e(detached)
 on Virtual Network: c4a2bea7-a528-4caf-b16e-80397cd1663a
 for Tenant: demo
 
@@ -347,17 +355,23 @@
 
 
 8.  Unplug an interface and port from the network
-    Note: Before unplugging, make a note of the interface ID (you can use the
-    show_port CLI as before). While the VM, which has a VIF  with this interface
-    ID still exists, you can only plug that same interface back into this port.
-    So the subsequent plug interface operation on this port will have to make
-    use of the same interface ID.
 
 # PYTHONPATH=. python quantum/plugins/cisco/client/cli.py unplug_iface demo c4a2bea7-a528-4caf-b16e-80397cd1663a 118ac473-294d-480e-8f6d-425acbbe81ae
 Unplugged interface from Logical Port: 118ac473-294d-480e-8f6d-425acbbe81ae
 on Virtual Network: c4a2bea7-a528-4caf-b16e-80397cd1663a
 for Tenant: demo
 
+    Note: After unplugging, if you check the details of the port, you will
+    see the VIF-IF associated with the port (but now suffixed with the state
+    "detached"). At this point, it is possible to plug the VIF into the network
+    again making use of the same VIF-ID. In general, once associated, the VIF-ID
+    cannot be disassociated with the port until the VM is terminated. After the
+    VM is terminated, the VIF-ID will be automatically disassociated from the
+    port. To summarize, association and disassociation of the VIF-ID with a port
+    happens automatically at the time of creating and terminating the VM. The
+    connectivity of the VIF to the network is controlled by the user via the
+    plug and unplug operations.
+
 
 How to test the installation
 ----------------------------

=== modified file 'quantum/plugins/cisco/common/cisco_configparser.py'
--- quantum/plugins/cisco/common/cisco_configparser.py	2011-08-16 23:03:32 +0000
+++ quantum/plugins/cisco/common/cisco_configparser.py	2011-10-07 03:38:42 +0000
@@ -19,13 +19,9 @@
 #
 """
 
-import logging as LOG
 from configobj import ConfigObj
 from quantum.plugins.cisco.common import cisco_constants as const
 
-LOG.basicConfig(level=LOG.WARN)
-LOG.getLogger(const.LOGGER_COMPONENT_NAME)
-
 
 class CiscoConfigParser(ConfigObj):
     """Config Parser based on the ConfigObj module"""

=== modified file 'quantum/plugins/cisco/common/cisco_constants.py'
--- quantum/plugins/cisco/common/cisco_constants.py	2011-01-08 00:44:09 +0000
+++ quantum/plugins/cisco/common/cisco_constants.py	2011-10-07 03:38:42 +0000
@@ -153,3 +153,13 @@
 NETID_LIST = 'net_id_list'
 
 DELIMITERS = "[,;:\b\s]"
+
+UUID_LENGTH = 36
+
+UNPLUGGED = '(detached)'
+
+ASSOCIATION_STATUS = 'association_status'
+
+ATTACHED = 'attached'
+
+DETACHED = 'detached'

=== modified file 'quantum/plugins/cisco/common/cisco_credentials.py'
--- quantum/plugins/cisco/common/cisco_credentials.py	2011-08-26 02:54:08 +0000
+++ quantum/plugins/cisco/common/cisco_credentials.py	2011-10-07 03:38:42 +0000
@@ -19,7 +19,6 @@
 #
 """
 
-import logging as LOG
 import os
 
 from quantum.plugins.cisco.common import cisco_configparser as confp
@@ -27,9 +26,6 @@
 from quantum.plugins.cisco.common import cisco_exceptions as cexc
 from quantum.plugins.cisco.db import l2network_db as cdb
 
-LOG.basicConfig(level=LOG.WARN)
-LOG.getLogger(const.LOGGER_COMPONENT_NAME)
-
 TENANT = const.NETWORK_ADMIN
 
 CREDENTIALS_FILE = "../conf/credentials.ini"

=== modified file 'quantum/plugins/cisco/common/cisco_exceptions.py'
--- quantum/plugins/cisco/common/cisco_exceptions.py	2011-08-30 23:09:51 +0000
+++ quantum/plugins/cisco/common/cisco_exceptions.py	2011-10-07 03:38:42 +0000
@@ -176,6 +176,14 @@
     message = _("PortVnic Binding %(port_id) is not present")
 
 
+class InvalidAttach(exceptions.QuantumException):
+    message = _("Unable to plug the attachment %(att_id)s into port " \
+                "%(port_id)s for network %(net_id)s. Association of " \
+                "attachment ID with port ID happens implicitly when " \
+                "VM is instantiated; attach operation can be " \
+                "performed subsequently.")
+
+
 try:
     _("test")
 except NameError:

=== modified file 'quantum/plugins/cisco/common/cisco_utils.py'
--- quantum/plugins/cisco/common/cisco_utils.py	2011-08-31 19:56:01 +0000
+++ quantum/plugins/cisco/common/cisco_utils.py	2011-10-07 03:38:42 +0000
@@ -20,7 +20,7 @@
 """
 
 import hashlib
-import logging as LOG
+import logging
 import MySQLdb
 import traceback
 
@@ -28,8 +28,7 @@
 from quantum.plugins.cisco.db import api as db
 from quantum.plugins.cisco.db import l2network_db as cdb
 
-LOG.basicConfig(level=LOG.WARN)
-LOG.getLogger(const.LOGGER_COMPONENT_NAME)
+LOG = logging.getLogger(__name__)
 
 
 def get16ByteUUID(uuid):

=== modified file 'quantum/plugins/cisco/db/ucs_db.py'
--- quantum/plugins/cisco/db/ucs_db.py	2011-08-25 23:29:30 +0000
+++ quantum/plugins/cisco/db/ucs_db.py	2011-10-07 03:38:42 +0000
@@ -117,6 +117,38 @@
         raise c_exc.PortVnicNotFound(port_id=port_id)
 
 
+def update_portbinding_instance_id(port_id, instance_id):
+    """Updates port binding for the instance ID"""
+    LOG.debug("db update_portbinding_instance_id() called")
+    session = db.get_session()
+    try:
+        port_binding = session.query(ucs_models.PortBinding).\
+          filter_by(port_id=port_id).\
+          one()
+        port_binding.instance_id = instance_id
+        session.merge(port_binding)
+        session.flush()
+        return port_binding
+    except exc.NoResultFound:
+        raise c_exc.PortVnicNotFound(port_id=port_id)
+
+
+def update_portbinding_vif_id(port_id, vif_id):
+    """Updates port binding for the VIF ID"""
+    LOG.debug("db update_portbinding_vif_id() called")
+    session = db.get_session()
+    try:
+        port_binding = session.query(ucs_models.PortBinding).\
+          filter_by(port_id=port_id).\
+          one()
+        port_binding.vif_id = vif_id
+        session.merge(port_binding)
+        session.flush()
+        return port_binding
+    except exc.NoResultFound:
+        raise c_exc.PortVnicNotFound(port_id=port_id)
+
+
 def get_portbinding_dn(blade_intf_dn):
     """Lists a port binding"""
     LOG.debug("get_portbinding_dn() called")

=== modified file 'quantum/plugins/cisco/l2network_plugin.py'
--- quantum/plugins/cisco/l2network_plugin.py	2011-08-31 04:06:34 +0000
+++ quantum/plugins/cisco/l2network_plugin.py	2011-10-07 03:38:42 +0000
@@ -20,7 +20,7 @@
 """
 
 import inspect
-import logging as LOG
+import logging
 import re
 
 from quantum.common import exceptions as exc
@@ -35,8 +35,7 @@
 from quantum.plugins.cisco.db import api as db
 from quantum.plugins.cisco.db import l2network_db as cdb
 
-LOG.basicConfig(level=LOG.WARN)
-LOG.getLogger(const.LOGGER_COMPONENT_NAME)
+LOG = logging.getLogger(__name__)
 
 
 class L2Network(QuantumPluginBase):
@@ -246,35 +245,50 @@
     def plug_interface(self, tenant_id, net_id, port_id,
                        remote_interface_id):
         """
-        Attaches a remote interface to the specified port on the
+        Provides connectivity to a remote interface to the
         specified Virtual Network.
         """
         LOG.debug("plug_interface() called\n")
         network = db.network_get(net_id)
         port = db.port_get(net_id, port_id)
         attachment_id = port[const.INTERFACEID]
-        if attachment_id and remote_interface_id != attachment_id:
+        if attachment_id == None:
+            raise cexc.InvalidAttach(port_id=port_id, net_id=net_id,
+                                    att_id=remote_interface_id)
+        attachment_id = attachment_id[:const.UUID_LENGTH]
+        remote_interface_id = remote_interface_id[:const.UUID_LENGTH]
+        if remote_interface_id != attachment_id:
+            LOG.debug("Existing attachment_id:%s, remote_interface_id:%s" % \
+                      (attachment_id, remote_interface_id))
             raise exc.PortInUse(port_id=port_id, net_id=net_id,
                                 att_id=attachment_id)
         self._invoke_device_plugins(self._func_name(), [tenant_id,
                                                         net_id, port_id,
-                                                        remote_interface_id])
-        if attachment_id == None:
-            db.port_set_attachment(net_id, port_id, remote_interface_id)
+                                                        attachment_id])
+        db.port_unset_attachment(net_id, port_id)
+        db.port_set_attachment(net_id, port_id, attachment_id)
         #Note: The remote_interface_id gets associated with the port
         # when the VM is instantiated. The plug interface call results
         # in putting the port on the VLAN associated with this network
 
     def unplug_interface(self, tenant_id, net_id, port_id):
         """
-        Detaches a remote interface from the specified port on the
+        Removes connectivity of a remote interface to the
         specified Virtual Network.
         """
         LOG.debug("unplug_interface() called\n")
         network = db.network_get(net_id)
+        port = db.port_get(net_id, port_id)
+        attachment_id = port[const.INTERFACEID]
+        if attachment_id == None:
+            raise exc.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]
+        attachment_id = attachment_id + const.UNPLUGGED
         db.port_unset_attachment(net_id, port_id)
+        db.port_set_attachment(net_id, port_id, attachment_id)
 
     """
     Extension API implementation
@@ -473,13 +487,22 @@
 
     def associate_port(self, tenant_id, instance_id, instance_desc):
         """
-        Get the portprofile name and the device namei for the dynamic vnic
+        Get the portprofile name and the device name for the dynamic vnic
         """
         LOG.debug("associate_port() called\n")
         return self._invoke_device_plugins(self._func_name(), [tenant_id,
                                                                instance_id,
                                                                instance_desc])
 
+    def detach_port(self, tenant_id, instance_id, instance_desc):
+        """
+        Remove the association of the VIF with the dynamic vnic
+        """
+        LOG.debug("detach_port() called\n")
+        return self._invoke_device_plugins(self._func_name(), [tenant_id,
+                                                               instance_id,
+                                                               instance_desc])
+
     def create_multiport(self, tenant_id, net_id_list, port_state, ports_desc):
         """
         Creates multiple ports on the specified Virtual Network.

=== modified file 'quantum/plugins/cisco/models/l2network_multi_blade.py'
--- quantum/plugins/cisco/models/l2network_multi_blade.py	2011-01-08 00:44:09 +0000
+++ quantum/plugins/cisco/models/l2network_multi_blade.py	2011-10-07 03:38:42 +0000
@@ -21,7 +21,7 @@
 
 from copy import deepcopy
 import inspect
-import logging as LOG
+import logging
 import platform
 
 from quantum.common import exceptions as exc
@@ -31,8 +31,7 @@
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.common import cisco_exceptions as cexc
 
-LOG.basicConfig(level=LOG.WARN)
-LOG.getLogger(__name__)
+LOG = logging.getLogger(__name__)
 
 
 class L2NetworkMultiBlade(L2NetworkModelBase):
@@ -182,12 +181,20 @@
 
     def associate_port(self, args):
         """
-        Get the portprofile name and the device namei for the dynamic vnic
+        Get the portprofile name and the device name for the dynamic vnic
         """
         LOG.debug("associate_port() called\n")
         return self._invoke_inventory(const.UCS_PLUGIN, self._func_name(),
                                       args)
 
+    def detach_port(self, args):
+        """
+        Remove the association of the VIF with the dynamic vnic
+        """
+        LOG.debug("detach_port() called\n")
+        return self._invoke_plugin_per_device(const.UCS_PLUGIN,
+                                              self._func_name(), args)
+
     def create_multiport(self, args):
         """Support for extension  API call"""
         self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),

=== modified file 'quantum/plugins/cisco/models/l2network_single_blade.py'
--- quantum/plugins/cisco/models/l2network_single_blade.py	2011-08-30 23:12:49 +0000
+++ quantum/plugins/cisco/models/l2network_single_blade.py	2011-10-07 03:38:42 +0000
@@ -21,7 +21,7 @@
 
 from copy import deepcopy
 import inspect
-import logging as LOG
+import logging
 import platform
 
 from quantum.common import exceptions as exc
@@ -31,8 +31,7 @@
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.common import cisco_exceptions as cexc
 
-LOG.basicConfig(level=LOG.WARN)
-LOG.getLogger(__name__)
+LOG = logging.getLogger(__name__)
 
 
 class L2NetworkSingleBlade(L2NetworkModelBase):
@@ -163,6 +162,13 @@
         return self._invoke_inventory(const.UCS_PLUGIN, self._func_name(),
                                       args)
 
+    def detach_port(self, args):
+        """
+        Remove the association of the VIF with the dynamic vnic
+        """
+        LOG.debug("detach_port() called\n")
+        return self._invoke_plugin_per_device(const.UCS_PLUGIN,self._func_name(), args)
+
     def create_multiport(self, args):
         """Support for extension  API call"""
         self._invoke_plugin_per_device(const.UCS_PLUGIN, self._func_name(),

=== modified file 'quantum/plugins/cisco/nova/vifdirect.py'
--- quantum/plugins/cisco/nova/vifdirect.py	2011-08-28 05:55:08 +0000
+++ quantum/plugins/cisco/nova/vifdirect.py	2011-10-07 03:38:42 +0000
@@ -45,7 +45,8 @@
         '/extensions/csco/tenants/{tenant_id}'
 TENANT_ID = 'nova'
 CSCO_EXT_NAME = 'Cisco Nova Tenant'
-ACTION = '/associate_port'
+ASSOCIATE_ACTION = '/associate_port'
+DETACH_ACTION = '/detach_port'
 
 
 class Libvirt802dot1QbhDriver(VIFDriver):
@@ -70,7 +71,7 @@
                   % CSCO_EXT_NAME)
         raise excp.ServiceUnavailable()
 
-    def _get_configurations(self, instance, network, mapping):
+    def _update_configurations(self, instance, network, mapping, action):
         """Gets the device name and the profile name from Quantum"""
 
         instance_id = instance['id']
@@ -88,26 +89,31 @@
 
         client = Client(HOST, PORT, USE_SSL, format='json', tenant=TENANT_ID,
                         action_prefix=ACTION_PREFIX_CSCO)
-        request_url = "/novatenants/" + project_id + ACTION
+        request_url = "/novatenants/" + project_id + action
         data = client.do_request('PUT', request_url, body=instance_data_dict)
 
-        device = data['vif_desc']['device']
-        portprofile = data['vif_desc']['portprofile']
-        LOG.debug(_("Quantum provided the device: %s") % device)
-        LOG.debug(_("Quantum provided the portprofile: %s") % portprofile)
-        mac_id = mapping['mac'].replace(':', '')
-
-        result = {
-            'id': mac_id,
-            'mac_address': mapping['mac'],
-            'device_name': device,
-            'profile_name': portprofile,
-        }
-
-        return result
+        if action == ASSOCIATE_ACTION:
+            device = data['vif_desc']['device']
+            portprofile = data['vif_desc']['portprofile']
+            LOG.debug(_("Quantum provided the device: %s") % device)
+            LOG.debug(_("Quantum provided the portprofile: %s") % portprofile)
+            mac_id = mapping['mac'].replace(':', '')
+
+            result = {
+                'id': mac_id,
+                'mac_address': mapping['mac'],
+                'device_name': device,
+                'profile_name': portprofile,
+            }
+
+            return result
+        else:
+            return data
 
     def plug(self, instance, network, mapping):
-        return self._get_configurations(instance, network, mapping)
+        return self._update_configurations(instance, network, mapping,
+                                           ASSOCIATE_ACTION)
 
     def unplug(self, instance, network, mapping):
-        pass
+        self._update_configurations(instance, network, mapping,
+                                    DETACH_ACTION)

=== modified file 'quantum/plugins/cisco/segmentation/l2network_vlan_mgr.py'
--- quantum/plugins/cisco/segmentation/l2network_vlan_mgr.py	2011-08-20 09:51:59 +0000
+++ quantum/plugins/cisco/segmentation/l2network_vlan_mgr.py	2011-10-07 03:38:42 +0000
@@ -19,15 +19,14 @@
 #
 """
 
-import logging as LOG
+import logging
 
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.db import l2network_db as cdb
 from quantum.plugins.cisco.l2network_segmentation_base \
         import L2NetworkSegmentationMgrBase
 
-LOG.basicConfig(level=LOG.WARN)
-LOG.getLogger(const.LOGGER_COMPONENT_NAME)
+LOG = logging.getLogger(__name__)
 
 
 class L2NetworkVLANMgr(L2NetworkSegmentationMgrBase):

=== modified file 'quantum/plugins/cisco/ucs/cisco_ucs_inventory.py'
--- quantum/plugins/cisco/ucs/cisco_ucs_inventory.py	2011-08-30 23:12:49 +0000
+++ quantum/plugins/cisco/ucs/cisco_ucs_inventory.py	2011-10-07 03:38:42 +0000
@@ -19,7 +19,7 @@
 #
 """
 from copy import deepcopy
-import logging as LOG
+import logging
 
 from quantum.common import exceptions as exc
 from quantum.plugins.cisco.l2device_inventory_base \
@@ -34,8 +34,7 @@
         import cisco_ucs_inventory_configuration as conf
 from quantum.plugins.cisco.ucs import cisco_ucs_network_driver
 
-LOG.basicConfig(level=LOG.WARN)
-LOG.getLogger(__name__)
+LOG = logging.getLogger(__name__)
 
 """
 The _inventory data strcuture contains a nested disctioary:
@@ -337,7 +336,8 @@
                     port_id = port_binding[const.PORTID]
                     udb.update_portbinding(port_id, instance_id=instance_id,
                                            vif_id=vif_id)
-                    db.port_set_attachment_by_id(port_id, vif_id)
+                    db.port_set_attachment_by_id(port_id, vif_id +
+                                                 const.UNPLUGGED)
                     device_name = blade_intf_data[blade_intf]\
                             [const.BLADE_INTF_RHEL_DEVICE_NAME]
                     profile_name = port_binding[const.PORTPROFILENAME]
@@ -355,9 +355,10 @@
                  tenant_id)
         return None
 
-    def _disassociate_vifid_from_port(self, tenant_id, port_id):
+    def _disassociate_vifid_from_port(self, tenant_id, instance_id, vif_id):
         """
-        Return the device name for a reserved interface
+        Disassociate a VIF-ID from a port, this happens when a
+        VM is destroyed
         """
         for ucsm_ip in self._inventory_state.keys():
             ucsm = self._inventory_state[ucsm_ip]
@@ -371,21 +372,27 @@
                            const.BLADE_INTF_RESERVED and \
                            blade_intf_data[blade_intf]\
                            [const.TENANTID] == tenant_id and \
-                           blade_intf_data[blade_intf][const.PORTID] == \
-                           port_id:
-                            vif_id = blade_intf_data[blade_intf][const.VIF_ID]
+                           blade_intf_data[blade_intf][const.INSTANCE_ID] == \
+                           instance_id and \
+                           blade_intf_data[blade_intf][const.VIF_ID]\
+                           [:const.UUID_LENGTH] == vif_id:
                             blade_intf_data[blade_intf][const.VIF_ID] = \
                                     None
                             blade_intf_data[blade_intf][const.INSTANCE_ID] = \
                                     None
+                            port_binding = udb.get_portbinding_dn(blade_intf)
+                            port_id = port_binding[const.PORTID]
                             udb.update_portbinding(port_id, instance_id=None,
                                                    vif_id=None)
+                            db.port_unset_attachment_by_id(port_id)
                             LOG.debug("Disassociated VIF-ID: %s " \
                                       "from port: %s" \
                                       "in UCS inventory state for blade: %s" %
                                       (vif_id, port_id,
                                        blade_intf_data[blade_intf]))
-                            return
+                            device_params = {const.DEVICE_IP: [ucsm_ip],
+                                             const.PORTID: port_id}
+                            return device_params
         LOG.warn("Disassociating VIF-ID in UCS inventory failed. " \
                  "Could not find a reserved dynamic nic for tenant: %s" %
                  tenant_id)
@@ -664,9 +671,6 @@
         on which a dynamic vnic was reserved for this port
         """
         LOG.debug("unplug_interface() called\n")
-        tenant_id = args[0]
-        port_id = args[2]
-        self._disassociate_vifid_from_port(tenant_id, port_id)
         return self._get_blade_for_port(args)
 
     def schedule_host(self, args):
@@ -689,9 +693,24 @@
         vif_id = args[2][const.VIF_ID]
         vif_info = self._get_instance_port(tenant_id, instance_id, vif_id)
         vif_desc = {const.VIF_DESC: vif_info}
+
         LOG.debug("vif_desc is: %s" % vif_desc)
         return vif_desc
 
+    def detach_port(self, args):
+        """
+        Remove the VIF-ID and instance name association
+        with the port
+        """
+        LOG.debug("detach_port() called\n")
+        instance_id = args[1]
+        tenant_id = args[2][const.PROJECT_ID]
+        vif_id = args[2][const.VIF_ID]
+        device_params = self._disassociate_vifid_from_port(tenant_id,
+                                                           instance_id,
+                                                           vif_id)
+        return device_params
+
     def create_multiport(self, args):
         """
         Create multiple ports for a VM

=== modified file 'quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py'
--- quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py	2011-09-01 23:48:17 +0000
+++ quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py	2011-10-07 03:38:42 +0000
@@ -24,16 +24,14 @@
 """
 
 import httplib
-import logging as LOG
+import logging
 from xml.etree import ElementTree as et
 
 from quantum.plugins.cisco.common import cisco_exceptions as cexc
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.ucs import cisco_getvif as gvif
 
-
-LOG.basicConfig(level=LOG.WARN)
-LOG.getLogger(const.LOGGER_COMPONENT_NAME)
+LOG = logging.getLogger(__name__)
 
 COOKIE_VALUE = "cookie_placeholder"
 PROFILE_NAME = "profilename_placeholder"

=== modified file 'quantum/plugins/cisco/ucs/cisco_ucs_plugin.py'
--- quantum/plugins/cisco/ucs/cisco_ucs_plugin.py	2011-09-08 06:29:55 +0000
+++ quantum/plugins/cisco/ucs/cisco_ucs_plugin.py	2011-10-07 03:38:42 +0000
@@ -19,7 +19,7 @@
 #
 """
 
-import logging as LOG
+import logging
 
 from quantum.common import exceptions as exc
 from quantum.common import utils
@@ -33,8 +33,7 @@
 from quantum.plugins.cisco.l2device_plugin_base import L2DevicePluginBase
 from quantum.plugins.cisco.ucs import cisco_ucs_configuration as conf
 
-LOG.basicConfig(level=LOG.WARN)
-LOG.getLogger(const.LOGGER_COMPONENT_NAME)
+LOG = logging.getLogger(__name__)
 
 
 class UCSVICPlugin(L2DevicePluginBase):
@@ -255,6 +254,49 @@
         return udb.update_portbinding(port_id, vlan_name=new_vlan_name,
                                       vlan_id=conf.DEFAULT_VLAN_ID)
 
+    def create_multiport(self, tenant_id, net_id_list, ports_num, port_id_list,
+                     **kwargs):
+        """
+        Creates a port on the specified Virtual Network.
+        """
+        LOG.debug("UCSVICPlugin:create_multiport() called\n")
+        self._set_ucsm(kwargs[const.DEVICE_IP])
+        qos = None
+        ucs_inventory = kwargs[const.UCS_INVENTORY]
+        least_rsvd_blade_dict = kwargs[const.LEAST_RSVD_BLADE_DICT]
+        chassis_id = least_rsvd_blade_dict[const.LEAST_RSVD_BLADE_CHASSIS]
+        blade_id = least_rsvd_blade_dict[const.LEAST_RSVD_BLADE_ID]
+        blade_data_dict = least_rsvd_blade_dict[const.LEAST_RSVD_BLADE_DATA]
+        port_binding_list = []
+        for port_id, net_id in zip(port_id_list, net_id_list):
+            new_port_profile = \
+                    self._create_port_profile(tenant_id, net_id, port_id,
+                                              conf.DEFAULT_VLAN_NAME,
+                                              conf.DEFAULT_VLAN_ID)
+            profile_name = new_port_profile[const.PROFILE_NAME]
+            rsvd_nic_dict = ucs_inventory.\
+                    reserve_blade_interface(self._ucsm_ip, chassis_id,
+                                            blade_id, blade_data_dict,
+                                            tenant_id, port_id,
+                                            profile_name)
+            port_binding = udb.update_portbinding(port_id,
+                                           portprofile_name=profile_name,
+                                           vlan_name=conf.DEFAULT_VLAN_NAME,
+                                           vlan_id=conf.DEFAULT_VLAN_ID,
+                                           qos=qos)
+            port_binding_list.append(port_binding)
+        return port_binding_list
+
+
+    def detach_port(self, tenant_id, instance_id, instance_desc, **kwargs):
+        """
+        Remove the association of the VIF with the dynamic vnic
+        """
+        LOG.debug("detach_port() called\n")
+        port_id = kwargs[const.PORTID]
+        kwargs.pop(const.PORTID)
+        return self.unplug_interface(tenant_id, None, port_id, **kwargs)
+
     def _get_profile_name(self, port_id):
         """Returns the port profile name based on the port UUID"""
         profile_name = conf.PROFILE_NAME_PREFIX \
@@ -296,36 +338,3 @@
         self._ucsm_ip = ucsm_ip
         self._ucsm_username = cred.Store.getUsername(conf.UCSM_IP_ADDRESS)
         self._ucsm_password = cred.Store.getPassword(conf.UCSM_IP_ADDRESS)
-
-    def create_multiport(self, tenant_id, net_id_list, ports_num, port_id_list,
-                     **kwargs):
-        """
-        Creates a port on the specified Virtual Network.
-        """
-        LOG.debug("UCSVICPlugin:create_multiport() called\n")
-        self._set_ucsm(kwargs[const.DEVICE_IP])
-        qos = None
-        ucs_inventory = kwargs[const.UCS_INVENTORY]
-        least_rsvd_blade_dict = kwargs[const.LEAST_RSVD_BLADE_DICT]
-        chassis_id = least_rsvd_blade_dict[const.LEAST_RSVD_BLADE_CHASSIS]
-        blade_id = least_rsvd_blade_dict[const.LEAST_RSVD_BLADE_ID]
-        blade_data_dict = least_rsvd_blade_dict[const.LEAST_RSVD_BLADE_DATA]
-        port_binding_list = []
-        for port_id, net_id in zip(port_id_list, net_id_list):
-            new_port_profile = \
-                    self._create_port_profile(tenant_id, net_id, port_id,
-                                              conf.DEFAULT_VLAN_NAME,
-                                              conf.DEFAULT_VLAN_ID)
-            profile_name = new_port_profile[const.PROFILE_NAME]
-            rsvd_nic_dict = ucs_inventory.\
-                    reserve_blade_interface(self._ucsm_ip, chassis_id,
-                                            blade_id, blade_data_dict,
-                                            tenant_id, port_id,
-                                            profile_name)
-            port_binding = udb.update_portbinding(port_id,
-                                           portprofile_name=profile_name,
-                                           vlan_name=conf.DEFAULT_VLAN_NAME,
-                                           vlan_id=conf.DEFAULT_VLAN_ID,
-                                           qos=qos)
-            port_binding_list.append(port_binding)
-        return port_binding_list