Merge pick up, tweaked role/site/plcore_base or os_manager path when OpenStack not...

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

diff --git a/plstackapi/core/models/role.py b/planetstack/core/models/role.py
similarity index 58%
rename from plstackapi/core/models/role.py
rename to planetstack/core/models/role.py
index 41bfd62..e7d31b9 100644 (file)
--- a/plstackapi/core/models/role.py
+++ b/planetstack/core/models/role.py
@@ -1,7 +1,8 @@
 import os
 import datetime
 from django.db import models
-from plstackapi.core.models import PlCoreBase
+from core.models import PlCoreBase
+from openstack.manager import OpenStackManager
 
 class Role(PlCoreBase):
 
@@ -13,10 +14,14 @@ class Role(PlCoreBase):
 
 
     def save(self, *args, **kwds):
-        self.os_manager.save_role(self)
+        if not hasattr(self, 'os_manager'):
+            setattr(self, 'os_manager', OpenStackManager())
+            self.os_manager.save_role(self)
         super(Role, self).save(*args, **kwds)
     
     def delete(self, *args, **kwds):
-        self.os_manager.delete_role(self)   
+        if not hasattr(self, 'os_manager'):
+            setattr(self, 'os_manager', OpenStackManager())
+            self.os_manager.delete_role(self)   
         super(Role, self).delete(*args, **kwds)