From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 8 Oct 2013 02:53:37 +0000 (-0400)
Subject: planetstack/core/models/role.py
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cfa2708e8e33e699d7087dca462e0f4dc25e04d9;p=plstackapi.git

planetstack/core/models/role.py

add missing 'role' field. cleanup
---

diff --git a/planetstack/core/models/role.py b/planetstack/core/models/role.py
index 234868e..6b0e7a6 100644
--- a/planetstack/core/models/role.py
+++ b/planetstack/core/models/role.py
@@ -8,6 +8,7 @@ from django.contrib.contenttypes import generic
 class Role(PlCoreBase):
 
     role_type = models.CharField(max_length=80, verbose_name="Name")
+    role = models.CharField(max_length=80, verbose_name="Keystone role id")
     description = models.CharField(max_length=120, verbose_name="Description")
     content_type = models.ForeignKey(ContentType, verbose_name="Role Scope")
 
@@ -15,16 +16,8 @@ class Role(PlCoreBase):
 
 
     def save(self, *args, **kwds):
-        if not hasattr(self, 'os_manager'):
-            from openstack.manager import OpenStackManager
-            setattr(self, 'os_manager', OpenStackManager())
-        self.os_manager.save_role(self)
         super(Role, self).save(*args, **kwds)
     
     def delete(self, *args, **kwds):
-        if not hasattr(self, 'os_manager'):
-            from openstack.manager import OpenStackManager
-            setattr(self, 'os_manager', OpenStackManager())
-        self.os_manager.delete_role(self)   
         super(Role, self).delete(*args, **kwds)