Fixed import issues

diff --git a/planetstack/openstack/backend.py b/planetstack/observer/backend.py
similarity index 81%
rename from planetstack/openstack/backend.py
rename to planetstack/observer/backend.py
index 4e4b1e2..d8ae306 100644 (file)
--- a/planetstack/openstack/backend.py
+++ b/planetstack/observer/backend.py
@@ -1,6 +1,6 @@
 import threading
-from openstack.observer import PlanetStackObserver
-from openstack.event_manager import EventListener
+from observer.event_loop import PlanetStackObserver
+from observer.event_manager import EventListener
 
 class Backend:
     

diff --git a/planetstack/observer/event_loop.py b/planetstack/observer/event_loop.py
index 649918b..6803398 100644 (file)
--- a/planetstack/observer/event_loop.py
+++ b/planetstack/observer/event_loop.py
@@ -11,6 +11,7 @@ from django.db.models import F, Q
 from openstack.manager import OpenStackManager
 from util.logger import Logger, logging, logger
 #from timeout import timeout
+from planetstack.config import Config
 
 debug_mode = False
 
@@ -59,7 +60,6 @@ class PlanetStackObserver:
        sync_steps = ['SyncNetworks','SyncNetworkSlivers','SyncSites','SyncSitePrivileges','SyncSlices','SyncSliceMemberships','SyncSlivers','SyncSliverIps']
 
        def __init__(self):
-               self.manager = OpenStackManager()
                # The Condition object that gets signalled by Feefie events
                self.load_sync_steps()
                self.event_cond = threading.Condition()

diff --git a/planetstack/openstack/event_manager.py b/planetstack/observer/event_manager.py
similarity index 100%
rename from planetstack/openstack/event_manager.py
rename to planetstack/observer/event_manager.py

diff --git a/planetstack/planetstack-backend.py b/planetstack/planetstack-backend.py
old mode 100644 (file)
new mode 100755 (executable)
index 0270264..7d94b67
--- a/planetstack/planetstack-backend.py
+++ b/planetstack/planetstack-backend.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import os
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
-from openstack.backend import Backend 
+from observer.backend import Backend 
 
 if __name__ == '__main__':