Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
diff --git a/planetstack/core/models/slice.py b/planetstack/core/models/slice.py
index 128d605..1f29f0e 100644
--- a/planetstack/core/models/slice.py
+++ b/planetstack/core/models/slice.py
@@ -93,13 +93,13 @@
nets = Network.objects.filter(slices=self)
nets.delete()
# delete slice deployments
- slice_deployments = SliceDeploymentss.objects.filter(slice=self)
+ slice_deployments = SliceDeployments.objects.filter(slice=self)
slice_deployments.delete()
# delete slice privilege
slice_privileges = SlicePrivilege.objects.filter(slice=self)
slice_privileges.delete()
# continue with normal delete
- super(SliceAdmin, self).delete(*args, **kwds)
+ super(Slice, self).delete(*args, **kwds)
class SliceRole(PlCoreBase):
diff --git a/planetstack/openstack_observer/steps/sync_slice_deployments.py b/planetstack/openstack_observer/steps/sync_slice_deployments.py
index 97196d6..4c358d7 100644
--- a/planetstack/openstack_observer/steps/sync_slice_deployments.py
+++ b/planetstack/openstack_observer/steps/sync_slice_deployments.py
@@ -65,7 +65,7 @@
'tenant': slice_deployment.slice.name,
'tenant_description': slice_deployment.slice.description,
'roles':roles,
- 'name':deployment_user.email,
+ 'name':deployment_user.user.email,
'max_instances':max_instances}
res = run_template('sync_slice_deployments.yaml', tenant_fields)