From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Sat, 20 Aug 2011 18:53:43 +0000 (-0700)
Subject: Merging changes from cisco extensions.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7f0be06df2c3f0ac4904c3ea8fd3263a322dc47c;p=openstack-build%2Fneutron-build.git

Merging changes from cisco extensions.
---

7f0be06df2c3f0ac4904c3ea8fd3263a322dc47c
diff --cc quantum/plugins/cisco/l2network_plugin.py
index 892dd14cd,6a0f7a568..94aa07ab2
--- a/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