Merging changes from cisco extensions.

diff --cc quantum/plugins/cisco/l2network_plugin.py
index 892dd14cd2ec91b1f2ab8238ce616487d314a298,6a0f7a5686e3a2aabecb51cf9c4b7a436007d757..94aa07ab27f4c4d1a5b7800a5b7c2de438fa8693
--- 1/quantum/plugins/cisco/l2network_plugin.py
--- 2/quantum/plugins/cisco/l2network_plugin.py
+++ b/quantum/plugins/cisco/l2network_plugin.py
@@@ -45,14 -45,13 +45,12 @@@ class L2Network(QuantumPluginBase)
      _credentials = {}
  
      def __init__(self):
 -        self._vlan_counter = int(conf.VLAN_START) - 1
 -        self._model = utils.import_object(conf.MODEL_CLASS)
          cdb.initialize()
 -        # TODO (Sumit): The following should move to the segmentation module
 -        cdb.create_vlanids()
 +        self._model = utils.import_object(conf.MODEL_CLASS)
 +        self._vlan_mgr = utils.import_object(conf.MANAGER_CLASS)
-         # TODO (Sumit): The following should move to the segmentation module
-         #cdb.create_vlanids()
          self._qoslevels_counter = 0
          self._credentials_counter = 0
 +        LOG.debug("L2Network plugin initialization done successfully\n")
  
      """
      Core API implementation