commit e4c2800b04d01e49a6cf2aba25a77a0705965bd1
author Scott Baker <smbaker@gmail.com> Wed Feb 28 14:42:48 2018 -0800
committer Scott Baker <scottb@onlab.us> Thu Mar 01 23:53:56 2018 +0000
tree 0f664eaa31385cb7d69cb560e77b308301bfe472
parent 6a8d2b8593391f85c14b6b8693ee387a5164226c

CORD-2753 fix exception when model has no default owner

Change-Id: Ia349197c812f7e1885d1d79b95cadd57060cdafc

xos/core/models/serviceinstance.py

diff --git a/xos/core/models/serviceinstance.py b/xos/core/models/serviceinstance.py
index 00714f2..ac1cd08 100644
--- a/xos/core/models/serviceinstance.py
+++ b/xos/core/models/serviceinstance.py
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from django.db.models.fields import NOT_PROVIDED
 from xos.exceptions import *
 from serviceinstance_decl import *
 
@@ -90,7 +91,8 @@
 
             # TODO: Delete this after all services have been migrated away from using field defaults
 
-            if (not self.owner_id) and (self._meta.get_field("owner").default):
+            if (not self.owner_id) and (self._meta.get_field("owner").default) and \
+                    (self._meta.get_field("owner").default!=NOT_PROVIDED):
                 self.owner = Service.objects.get(id = self._meta.get_field("owner").default)
 
         # If the model has a Creator and it's not specified, then attempt to default to the Caller. Caller is