commit 0553f281ee5404658e660cd59090d8d10b5432cf
author Tony Mack <tmack@paris.CS.Princeton.EDU> Mon Jun 10 22:54:50 2013 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Mon Jun 10 22:54:50 2013 -0400
tree 5a8b1a4255e04497a1665b14f5904489fdf8a0a0
parent 5cbadf87a3d8f0b749c19b2b41be248d8ffb763c

observer for sites, slices and users

planetstack/openstack/observer.py

diff --git a/planetstack/openstack/observer.py b/planetstack/openstack/observer.py
index ef09a11..02b0b9c 100644
--- a/planetstack/openstack/observer.py
+++ b/planetstack/openstack/observer.py
@@ -1,4 +1,5 @@
 import time
+import traceback
 from datetime import datetime
 from core.models import *
 from django.db.models import F, Q
@@ -8,7 +9,21 @@
 class OpenStackObserver:
     
     def __init__(self):
-        self.manager = OpenStackManager() 
+        self.manager = OpenStackManager()
+
+    def run(self):
+        if not self.manager.enabled or not self.manager.has_openstack:
+            return
+        while True:
+            try:
+                #self.sync_roles()
+                self.sync_tenants()
+                self.sync_users()
+                #self.sync_user_tenant_roles()
+                #self.sync_slivers()
+                time.sleep(7)
+            except:
+                traceback.print_exc() 
 
     def sync_tenants(self):
         """
@@ -50,7 +65,8 @@
             if tenant.name == 'admin': 
                 continue
             if tenant.name not in site_dict and tenant.name not in slice_dict:
-                print "delete " + tenant.name
+                #print "delete " + tenant.name
+                pass
                 #self.manager.driver.delete_tenant(tenant.id)
 
 
@@ -74,7 +90,7 @@
             user_dict[user.kuser_id] = user
 
         # delete keystone users that don't have a user record
-        user = self.manager.driver.shell.keystone.users.findall()
+        users = self.manager.driver.shell.keystone.users.findall()
         for user in users:
             if user.name == 'admin':
                 continue

planetstack/openstack/siteagent.py

diff --git a/planetstack/openstack/siteagent.py b/planetstack/openstack/siteagent.py
deleted file mode 100644
index a57fa0b..0000000
--- a/planetstack/openstack/siteagent.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import os
-import sys
-#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
-import time
-from core.models.site import Site
-from openstack.manager import OpenStackManager    
-
-class SiteAgent:
-    def run(self):
-        manager = OpenStackManager()
-        # exit if openstack is disable or unavailable
-        if manager.enabled and manager.has_openstack:
-            # fill in null tenant ids 
-            sites = Site.objects.filter(tenant_id__in=[None, ''])
-            for site in sites:
-                # calling save() on the model should force the tenant_id to be set
-                site.os_manager = manager
-                site.save() 
-                                        
-if __name__ == '__main__':
-    SiteAgent().run()
-