Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
diff --git a/opencloud.spec b/opencloud.spec
index 5831006..f56e858 100644
--- a/opencloud.spec
+++ b/opencloud.spec
@@ -1,7 +1,7 @@
Summary: OpenCloud core services
Name: opencloud
-Version: 1.0.26
-Release: 7
+Version: 1.0.27
+Release: 3
License: GPL+
Group: Development/Tools
Source0: %{_tmppath}/%{name}-%{version}.tar.gz
diff --git a/planetstack/core/models/slice.py b/planetstack/core/models/slice.py
index 12c278b..7915d42 100644
--- a/planetstack/core/models/slice.py
+++ b/planetstack/core/models/slice.py
@@ -42,7 +42,8 @@
def save(self, *args, **kwds):
site = Site.objects.get(id=self.site.id)
- if not self.name.startswith(site.login_base):
+ # allow preexisting slices to keep their original name for now
+ if not self.id and not self.name.startswith(site.login_base):
raise ValidationError('slice name must begin with %s' % site.login_base)
if self.serviceClass is None:
diff --git a/planetstack/core/models/sliver.py b/planetstack/core/models/sliver.py
index ec7f266..c694a1e 100644
--- a/planetstack/core/models/sliver.py
+++ b/planetstack/core/models/sliver.py
@@ -59,8 +59,7 @@
return u'unsaved-sliver'
def save(self, *args, **kwds):
- if not self.name:
- self.name = self.slice.name
+ self.name = self.slice.slicename
if not self.creator and hasattr(self, 'caller'):
self.creator = self.caller
self.deploymentNetwork = self.node.deployment
diff --git a/planetstack/openstack_observer/steps/sync_user_deployments.py b/planetstack/openstack_observer/steps/sync_user_deployments.py
index 43ca260..0c28392 100644
--- a/planetstack/openstack_observer/steps/sync_user_deployments.py
+++ b/planetstack/openstack_observer/steps/sync_user_deployments.py
@@ -73,7 +73,7 @@
user_deployment.save()
def delete_record(self, user_deployment):
- if user_deployment.user.kuser_id:
+ if user_deployment.kuser_id:
driver = self.driver.admin_driver(deployment=user_deployment.deployment.name)
- driver.delete_user(user_deployment.user.kuser_id)
+ driver.delete_user(user_deployment.kuser_id)