x/vmware-nsx
Code Issues Proposed changes

Fix merge indentation errors

Browse Source
This commit is contained in:
Somik Behera
2011-06-06 23:09:53 -07:00
parent ef3285903c
commit cf4e1eeff4
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
quantum/manager.py
View File

@@ -18,9 +18,8 @@
""" """
Quantum's Manager class is responsible for parsing a config file and Quantum's Manager class is responsible for parsing a config file and instantiating the correct
instantiating the correct plugin that concretely implement plugin that concretely implement quantum_plugin_base class
quantum_plugin_base class
The caller should make sure that QuantumManager is a singleton. The caller should make sure that QuantumManager is a singleton.
""" """
@@ -41,19 +40,12 @@ def find_config(basepath):
return None return None
class QuantumManager(object): class QuantumManager(object):
<<<<<<< TREE
def __init__(self, config=CONFIG_FILE):
self.configuration_file = CONFIG_FILE
plugin_location = utils.getPluginFromConfig(CONFIG_FILE)
=======
def __init__(self, config=None): def __init__(self, config=None):
if config == None: if config == None:
self.configuration_file = find_config(os.path.abspath(os.path.dirname(__file__))) self.configuration_file = find_config(os.path.abspath(os.path.dirname(__file__)))
else: else:
self.configuration_file = config self.configuration_file = config
plugin_location = utils.getPluginFromConfig(self.configuration_file) plugin_location = utils.getPluginFromConfig(self.configuration_file)
>>>>>>> MERGE-SOURCE
print "PLUGIN LOCATION:%s" % plugin_location print "PLUGIN LOCATION:%s" % plugin_location
plugin_klass = utils.import_class(plugin_location) plugin_klass = utils.import_class(plugin_location)
if not issubclass(plugin_klass, QuantumPluginBase): if not issubclass(plugin_klass, QuantumPluginBase):