Fixed import issues
diff --git a/planetstack/observer/backend.py b/planetstack/observer/backend.py
new file mode 100644
index 0000000..d8ae306
--- /dev/null
+++ b/planetstack/observer/backend.py
@@ -0,0 +1,17 @@
+import threading
+from observer.event_loop import PlanetStackObserver
+from observer.event_manager import EventListener
+
+class Backend:
+
+ def run(self):
+ # start the openstack observer
+ observer = PlanetStackObserver()
+ observer_thread = threading.Thread(target=observer.run)
+ observer_thread.start()
+
+ # start event listene
+ event_manager = EventListener(wake_up=observer.wake_up)
+ event_manager_thread = threading.Thread(target=event_manager.run)
+ event_manager_thread.start()
+
diff --git a/planetstack/observer/event_loop.py b/planetstack/observer/event_loop.py
index 649918b..6803398 100644
--- a/planetstack/observer/event_loop.py
+++ b/planetstack/observer/event_loop.py
@@ -11,6 +11,7 @@
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 @@
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/observer/event_manager.py b/planetstack/observer/event_manager.py
new file mode 100644
index 0000000..ab50f66
--- /dev/null
+++ b/planetstack/observer/event_manager.py
@@ -0,0 +1,135 @@
+import threading
+import requests, json
+
+from core.models import *
+#from openstack.manager import OpenStackManager
+from planetstack.config import Config
+
+import os
+import base64
+from fofum import Fofum
+
+# decorator that marks dispatachable event methods
+def event(func):
+ setattr(func, 'event', func.__name__)
+ return func
+
+class EventHandler:
+ # This code is currently not in use.
+ def __init__(self):
+ pass #self.manager = OpenStackManager()
+
+ @staticmethod
+ def get_events():
+ events = []
+ for name in dir(EventHandler):
+ attribute = getattr(EventHandler, name)
+ if hasattr(attribute, 'event'):
+ events.append(getattr(attribute, 'event'))
+ return events
+
+ def dispatch(self, event, *args, **kwds):
+ if hasattr(self, event):
+ return getattr(self, event)(*args, **kwds)
+
+
+ @event
+ def save_site(self, id):
+ sites = Site.objects.filter(id=id)
+ if sites:
+ self.manager.save_site(sites[0])
+
+ @event
+ def delete_site(self, tenant_id):
+ self.manager.driver.delete_tenant(tenant_id)
+
+ @event
+ def save_site_privilege(self, id):
+ site_privileges = SitePrivilege.objects.filter(id=id)
+ if site_privileges:
+ site_priv = self.manager.save_site_privilege(site_privileges[0])
+
+ @event
+ def delete_site_privilege(self, kuser_id, tenant_id, role_type):
+ self.manager.driver.delete_user_role(kuser_id, tenant_id, role_type)
+
+ @event
+ def save_slice(self, id):
+ slices = Slice.objects.filter(id=id)
+ if slices:
+ self.manager.save_slice(slices[0])
+
+ @event
+ def delete_slice(self, tenant_id, network_id, router_id, subnet_id):
+ self.manager._delete_slice(tenant_id, network_id, router_id, subnet_id)
+
+ @event
+ def save_user(self, id):
+ users = User.objects.filter(id=id)
+ if users:
+ self.manager.save_user(users[0])
+
+ @event
+ def delete_user(self, kuser_id):
+ self.manager.driver.delete_user(kuser_id)
+
+ @event
+ def save_sliver(self, id):
+ slivers = Sliver.objects.filter(id=id)
+ if slivers:
+ self.manager.save_sliver(slivers[0])
+
+ @event
+ def delete_sliver(self, instance_id):
+ self.manager.destroy_instance(instance_id)
+
+
+class EventSender:
+ def __init__(self,user=None,clientid=None):
+ try:
+ clid = Config().feefie_client_id
+ user = Config().feefie_client_user
+ except:
+ clid = 'planetstack_core_team'
+ user = 'pl'
+
+ self.fofum = Fofum(user=user)
+ self.fofum.make(clid)
+
+ def fire(self):
+ self.fofum.fire()
+
+class EventListener:
+ def __init__(self,wake_up=None):
+ self.handler = EventHandler()
+ self.wake_up = wake_up
+
+ def handle_event(self, payload):
+ payload_dict = json.loads(payload)
+
+ # The code below will come back when we optimize the observer syncs
+ # into 'small' and 'big' syncs.
+
+ #event = payload_dict['event']
+ #ctx = payload_dict['ctx']
+ #self.handler.dispatch(event,**ctx)
+
+ if (self.wake_up):
+ self.wake_up()
+
+
+ def run(self):
+ # This is our unique client id, to be used when firing and receiving events
+ # It needs to be generated once and placed in the config file
+
+ try:
+ clid = Config().feefie_client_id
+ user = Config().feefie_client_user
+ except:
+ clid = 'planetstack_core_team'
+ user = 'pl'
+
+ f = Fofum(user=user)
+
+ listener_thread = threading.Thread(target=f.listen_for_event,args=(clid,self.handle_event))
+ listener_thread.start()