fix openstack integration

[plstackapi.git] / planetstack / core / models / role.py

diff --git a/planetstack/core/models/role.py b/planetstack/core/models/role.py
index b3611c1..f6c2f2c 100644 (file)
--- a/planetstack/core/models/role.py
+++ b/planetstack/core/models/role.py
@@ -6,17 +6,23 @@ from core.models import PlCoreBase
 class Role(PlCoreBase):
 
     #ROLE_CHOICES = (('admin', 'Admin'), ('pi', 'Principle Investigator'), ('user','User'))
-    role_id = models.CharField(max_length=256, unique=True)
+    role = models.CharField(null=True, blank=True,max_length=256, unique=True)
     role_type = models.CharField(max_length=80, unique=True)
 
     def __unicode__(self):  return u'%s' % (self.role_type)
 
 
     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)