From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Mon, 22 Dec 2014 16:25:31 +0000 (-0500)
Subject: Switched sync_controller_slices back to using the API instead of CLI
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bb4a9979f4af13f296b48e70e6f814549facc973;p=plstackapi.git

Switched sync_controller_slices back to using the API instead of CLI
---

diff --git a/planetstack/openstack_observer/steps/sync_controller_slices.py b/planetstack/openstack_observer/steps/sync_controller_slices.py
index 9b5957d..c6021ba 100644
--- a/planetstack/openstack_observer/steps/sync_controller_slices.py
+++ b/planetstack/openstack_observer/steps/sync_controller_slices.py
@@ -30,43 +30,46 @@ class SyncControllerSlices(OpenStackSyncStep):
             logger.info("controller %r has no admin_user, skipping" % controller_slice.controller)
             return
 
-	controller_users = ControllerUsers.objects.filter(user=controller_slice.slice.creator,
-                                                             controller=controller_slice.controller)            
-    	if not controller_users:
-	    raise Exception("slice createor %s has not accout at controller %s" % (controller_slice.slice.creator, controller_slice.controller.name))
-    	else:
-	    controller_user = controller_users[0]
-	    roles = ['admin']
-	    
-	pdb.set_trace()
-	max_instances=int(controller_slice.slice.max_slivers)
-	tenant_fields = {'endpoint':controller_slice.controller.auth_url,
-		         'admin_user': controller_slice.controller.admin_user,
-		         'admin_password': controller_slice.controller.admin_password,
-		         'admin_tenant': 'admin',
-		         'tenant': controller_slice.slice.name,
-		         'tenant_description': controller_slice.slice.description,
-			 'roles':roles,
-			 'name':controller_user.user.email,
-	                 'ansible_tag':'%s@%s'%(controller_slice.slice.name,controller_slice.controller.name),
-			 'max_instances':max_instances}
+        controller_users = ControllerUsers.objects.filter(user=controller_slice.slice.creator,
+                                                             controller=controller_slice.controller)
+        if not controller_users:
+            raise Exception("slice createor %s has not accout at controller %s" % (controller_slice.slice.creator, controller_slice.controller.name))
+        else:
+            controller_user = controller_users[0]
+            roles = ['admin']
+
+        pdb.set_trace()
+        max_instances=int(controller_slice.slice.max_slivers)
+        tenant_fields = {'endpoint':controller_slice.controller.auth_url,
+                         'admin_user': controller_slice.controller.admin_user,
+                         'admin_password': controller_slice.controller.admin_password,
+                         'admin_tenant': 'admin',
+                         'tenant': controller_slice.slice.name,
+                         'tenant_description': controller_slice.slice.description,
+                         'roles':roles,
+                         'name':controller_user.user.email,
+                         'ansible_tag':'%s@%s'%(controller_slice.slice.name,controller_slice.controller.name),
+                         'max_instances':max_instances}
+
+        res = run_template('sync_controller_slices.yaml', tenant_fields, path='controller_slices')
+        expected_num = len(roles)+1
+        if (len(res)!=expected_num):
+            raise Exception('Could not sync tenants for slice %s'%controller_slice.slice.name)
+        else:
+            tenant_id = res[0]['id']
+            if (not controller_slice.tenant_id):
+                try:
+                        driver = OpenStackDriver().client_driver(caller=controller_slice.controller.admin_user,
+                                                         tenant=controller_slice.controller.admin_tenant,
+                                                         controller=controller_network.controller)
+                        driver.shell.nova.quotas.update(tenant_id=controller_slice.slice.name, instances=int(controller_slice.slice.max_slivers))
+                except:
+                        logging.info('Could not update quota for %s'%controller_slice.slice.name)
+                        raise Exception('Could not update quota for %s'%controller_slice.slice.name)
+
+                controller_slice.tenant_id = tenant_id
+                controller_slice.save()
 
-	res = run_template('sync_controller_slices.yaml', tenant_fields, path='controller_slices')
-	expected_num = len(roles)+1
-	if (len(res)!=expected_num):
-	    raise Exception('Could not sync tenants for slice %s'%controller_slice.slice.name)
-	else:
-	    tenant_id = res[0]['id']
-	    if (not controller_slice.tenant_id):
-	        handle = os.popen('nova quota-update --instances %d %s'%(max_instances,tenant_id))
-		output = handle.read()
-		result = handle.close()
-		if (result):
-		    logging.info('Could not update quota for %s'%controller_slice.slice.name)
-		    raise Exception('Could not update quota for %s'%controller_slice.slice.name)
-		controller_slice.tenant_id = tenant_id
-		controller_slice.save()
-			
 
 
     def delete_record(self, controller_slice):
@@ -80,10 +83,9 @@ class SyncControllerSlices(OpenStackSyncStep):
             client_driver.delete_router_interface(controller_slice.router_id, controller_slice.subnet_id)
         if controller_slice.subnet_id:
             client_driver.delete_subnet(controller_slice.subnet_id)
-        if controller_slice.router_id:    
+        if controller_slice.router_id:
             client_driver.delete_router(controller_slice.router_id)
         if controller_slice.network_id:
             client_driver.delete_network(controller_slice.network_id)
         if controller_slice.tenant_id:
             driver.delete_tenant(controller_slice.tenant_id)
-