RoleAdmin and Role model work when openstack is disable

[plstackapi.git] / plstackapi / openstack / manager.py

diff --git a/plstackapi/openstack/manager.py b/plstackapi/openstack/manager.py
index eb76ff7..b4ad8d2 100644 (file)
--- a/plstackapi/openstack/manager.py
+++ b/plstackapi/openstack/manager.py
@@ -2,33 +2,52 @@ from plstackapi.planetstack import settings
 from django.core import management
 management.setup_environ(settings)
 from plstackapi.openstack.client import OpenStackClient
-
-
-class Manager:
-
-    def __init__(self):
+from plstackapi.openstack.driver import OpenStackDriver
+from plstackapi.planetstack.config import Config
+from plstackapi.core.models import * 
+
+def require_enabled(callable):
+    enabled = Config().api_nova_enabled
+    def wrapper(*args, **kwds):
+        if enabled:
+            return callable(*args, **kwds)
+        else:
+            return None
+    return wrapper
+
+
+class OpenStackManager:
+
+    def __init__(self, auth={}, caller=None):
+        self.client = None
+        if auth:
+            self.client = OpenStackClient(**auth)
         
-        self.client = OpenStackClient()
-
+        self.driver = OpenStackDriver(client=self.client) 
+        self.caller=None
+
+    @require_enabled
+    def save_role(self, role):
+        if not role.role_id:
+            keystone_role = self.driver.create_role(role.role_type)
+            role.role_id = keystone_role.id
+
+    @require_enabled
+    def delete_role(self, role):
+        if role.role_id:
+            self.driver.delete_role({'id': role.role_id})        
+                  
     def refresh_nodes(self):
         # collect local nodes
-        from plstackapi.core.models import Node
-        from plstackapi.core.models import DeploymentNetwork
-        from plstackapi.core.models import Site
         nodes = Node.objects.all()
         nodes_dict = {}
         for node in nodes:
             if 'viccidev10' not in node.name:
                 nodes_dict[node.name] = node 
         
-        deployment = DeploymentNetwork.objects.filter(name='VICCI')
+        deployment = DeploymentNetwork.objects.filter(name='VICCI')[0]
         login_bases = ['princeton', 'stanford', 'gt', 'uw', 'mpisws']
         sites = Site.objects.filter(login_base__in=login_bases)
-        nodes_per_site = len(nodes)/len(sites)
-        
-        def chunks(l, n):
-            return [l[i:i+n] for i in range(0, len(l), n)]
-
         # collect nova nodes:
         compute_nodes = self.client.nova.hypervisors.list()
 
@@ -37,54 +56,25 @@ class Manager:
             compute_nodes_dict[compute_node.hypervisor_hostname] = compute_node
 
         # add new nodes:
-        counter = 1
         new_node_names = set(compute_nodes_dict.keys()).difference(nodes_dict.keys())
-
-        def chunks(l, n):
-            return [l[i:i+n] for i in range(0, len(l), n)]
-
-        node_chunks = chunks(compute_nodes, nodes_per_site)
+        i = 0
+        max = len(sites)
         for name in new_node_names:
-            for 
-            node = Node(name=compute_nodes_dict[name].hypervisor_hostname)
+            if i == max:
+                i = 0
+            site = sites[i]
+            node = Node(name=compute_nodes_dict[name].hypervisor_hostname,
+                        site=site,
+                        deploymentNetwork=deployment)
             node.save()
+            i+=1
 
         # remove old nodes
         old_node_names = set(nodes_dict.keys()).difference(compute_nodes_dict.keys())
         Node.objects.filter(name__in=old_node_names).delete()
 
-    def refresh_flavors(self):
-        # collect local flavors
-        from plstackapi.core.models import Flavor
-        flavors = Flavor.objects.all()
-        flavors_dict = {}
-        for flavor in flavors:
-            flavors_dict[flavor.name] = flavor
-
-        # collect nova falvors
-        nova_flavors = self.client.nova.flavors.list()
-        nova_flavors_dict = {}
-        for nova_flavor in nova_flavors:
-            nova_flavors_dict[nova_flavor.name] = nova_flavor
-
-        # add new flavors 
-        new_flavor_names = set(nova_flavors_dict.keys()).difference(flavors_dict.keys())
-        for name in new_flavor_names:
-             
-            flavor = Flavor(flavor_id=nova_flavors_dict[name].id,
-                            name=nova_flavors_dict[name].name,
-                            memory_mb=nova_flavors_dict[name].ram,
-                            disk_gb=nova_flavors_dict[name].disk,   
-                            vcpus=nova_flavors_dict[name].vcpus)
-            flavor.save()
-
-        # remove old flavors
-        old_flavor_names = set(flavors_dict.keys()).difference(nova_flavors_dict.keys())
-        Flavor.objects.filter(name__in=old_flavor_names).delete()
-            
     def refresh_images(self):
         # collect local images
-        from plstackapi.core.models import Image
         images = Image.objects.all()
         images_dict = {}    
         for image in images:
@@ -108,3 +98,5 @@ class Manager:
         # remove old images
         old_image_names = set(images_dict.keys()).difference(glance_images_dict.keys())
         Image.objects.filter(name__in=old_image_names).delete()
+
+