From 55599d71849b460a1b0a90e7406542162ba8efdc Mon Sep 17 00:00:00 2001 From: salvatore <> Date: Fri, 27 May 2011 00:52:11 +0100 Subject: [PATCH] networks api with final URL structure. No serialization yet --- bin/quantum | 1 + quantum/common/utils.py | 7 ++++--- quantum/manager.py | 7 ++++++- quantum/plugins.ini | 2 +- quantum/utils.py | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/bin/quantum b/bin/quantum index 9971e795a..0c4a5dd6c 100755 --- a/bin/quantum +++ b/bin/quantum @@ -56,6 +56,7 @@ if __name__ == '__main__': try: print "HERE-1" + print sys.path service = service.serve_wsgi(service.QuantumApiService, options=options, args=args) diff --git a/quantum/common/utils.py b/quantum/common/utils.py index 4acea9852..1317bc157 100644 --- a/quantum/common/utils.py +++ b/quantum/common/utils.py @@ -29,8 +29,8 @@ import socket import sys import ConfigParser -from quantum.common import exceptions as exception -from quantum.common import flags +import exceptions as exception +import flags from exceptions import ProcessExecutionError @@ -76,7 +76,7 @@ def import_class(import_str): #mod_str = os.path.join(FLAGS.state_path, mod_str) print "MODULE PATH:%s" %mod_str print "CUR DIR:%s" %os.getcwd() - __import__(mod_str) + __import__(mod_str, level=2) print "IO SONO QUI" return getattr(sys.modules[mod_str], class_str) except (ImportError, ValueError, AttributeError) as e: @@ -194,6 +194,7 @@ def parse_isotime(timestr): def getPluginFromConfig(file="config.ini"): print "FILE:%s" %os.path.join(FLAGS.state_path, file) + print "Globals:%s" %globals() Config = ConfigParser.ConfigParser() Config.read(os.path.join(FLAGS.state_path, file)) return Config.get("PLUGIN", "provider") diff --git a/quantum/manager.py b/quantum/manager.py index ed09f365c..69e78561a 100644 --- a/quantum/manager.py +++ b/quantum/manager.py @@ -23,7 +23,9 @@ plugin that concretely implement quantum_plugin_base class The caller should make sure that QuantumManager is a singleton. """ - +import gettext +gettext.install('quantum', unicode=1) + from common import utils from quantum_plugin_base import QuantumPluginBase @@ -45,6 +47,9 @@ class QuantumManager(object): def get_manager(self): return self.plugin + + + # TODO(somik): rmove the main class # Added for temporary testing purposes def main(): diff --git a/quantum/plugins.ini b/quantum/plugins.ini index 61c7694cd..e6dc080d4 100644 --- a/quantum/plugins.ini +++ b/quantum/plugins.ini @@ -1,3 +1,3 @@ [PLUGIN] # Quantum plugin provider module -provider = plugins.SamplePlugin.DummyDataPlugin +provider = quantum.plugins.SamplePlugin.DummyDataPlugin diff --git a/quantum/utils.py b/quantum/utils.py index c56631627..c14135d47 100644 --- a/quantum/utils.py +++ b/quantum/utils.py @@ -35,7 +35,7 @@ import sys import time import types -from quantum.common import exceptions as exception +from common import exceptions as exception def import_class(import_str): -- 2.45.2