commit d921e1cf5c53aecca19b4a33c824c6b50c228c05
author Scott Baker <smbaker@gmail.com> Mon Apr 20 14:24:29 2015 -0700
committer Scott Baker <smbaker@gmail.com> Mon Apr 20 14:24:29 2015 -0700
tree 65b35a0b9ff62ffbb7337ce3cf803e57f8150262
parent 9fa69b53ac8624f3061a6601af087c96f0078735

clarify exceptions

xos/cord/models.py

diff --git a/xos/cord/models.py b/xos/cord/models.py
index 66c135e..6fe605c 100644
--- a/xos/cord/models.py
+++ b/xos/cord/models.py
@@ -7,6 +7,7 @@
 from django.db.models import Q
 from operator import itemgetter, attrgetter, methodcaller
 import traceback
+from xos.exceptions import *
 
 """
 import os
@@ -105,7 +106,7 @@
         if self.vcpe is None:
             vcpeServices = VCPEService.get_service_objects().all()
             if not vcpeServices:
-                raise ConfigurationError("No VCPE Services available")
+                raise XOSConfigurationError("No VCPE Services available")
 
             vcpe = VCPETenant(provider_service = vcpeServices[0],
                               subscriber_tenant = self)
@@ -125,8 +126,10 @@
             self.vcpe = None
 
     def save(self, *args, **kwargs):
+        self.validate_unique_service_specific_id()
+
         if not getattr(self, "caller", None):
-            raise TypeError("VOLTTenant's self.caller was not set")
+            raise XOSProgrammingError("VOLTTenant's self.caller was not set")
         super(VOLTTenant, self).save(*args, **kwargs)
         self.manage_vcpe()
 
@@ -274,7 +277,7 @@
             self.sliver = None
         if self.sliver is None:
             if not self.provider_service.slices.count():
-                raise ConfigurationError("The VCPE service has no slicers")
+                raise XOSConfigurationError("The VCPE service has no slicers")
 
             node =self.pick_node()
             sliver = Sliver(slice = self.provider_service.slices.all()[0],
@@ -305,7 +308,7 @@
         if self.vbng is None:
             vbngServices = VBNGService.get_service_objects().all()
             if not vbngServices:
-                raise ConfigurationError("No VBNG Services available")
+                raise XOSConfigurationError("No VBNG Services available")
 
             vbng = VBNGTenant(provider_service = vbngServices[0],
                               subscriber_tenant = self)
@@ -326,7 +329,7 @@
 
     def save(self, *args, **kwargs):
         if not getattr(self, "caller", None):
-            raise TypeError("VCPETenant's self.caller was not set")
+            raise XOSProgrammingError("VCPETenant's self.caller was not set")
         super(VCPETenant, self).save(*args, **kwargs)
         self.manage_sliver()
         self.manage_vbng()