Renamed SliceDeployments --> SliceDeployment
diff --git a/planetstack/ec2_observer/deleters/slice_deleter.py b/planetstack/ec2_observer/deleters/slice_deleter.py
index 90b58c3..e7c54e6 100644
--- a/planetstack/ec2_observer/deleters/slice_deleter.py
+++ b/planetstack/ec2_observer/deleters/slice_deleter.py
@@ -1,4 +1,4 @@
-from core.models import Slice, SliceDeployments, User
+from core.models import Slice, SliceDeployment, User
from observer.deleter import Deleter
from observer.deleters.slice_deployment_deleter import SliceDeploymentDeleter
from util.logger import Logger, logging
@@ -11,7 +11,7 @@
def call(self, pk):
slice = Slice.objects.get(pk=pk)
slice_deployment_deleter = SliceDeploymentDeleter()
- for slice_deployment in SliceDeployments.objects.filter(slice=slice):
+ for slice_deployment in SliceDeployment.objects.filter(slice=slice):
try:
slice_deployment_deleter(slice_deployment.id)
except:
diff --git a/planetstack/ec2_observer/deleters/slice_deployment_deleter.py b/planetstack/ec2_observer/deleters/slice_deployment_deleter.py
index 33e0836..31d26fb 100644
--- a/planetstack/ec2_observer/deleters/slice_deployment_deleter.py
+++ b/planetstack/ec2_observer/deleters/slice_deployment_deleter.py
@@ -1,12 +1,12 @@
-from core.models import Slice, SliceDeployments, User
+from core.models import Slice, SliceDeployment, User
from observer.deleter import Deleter
from openstack.driver import OpenStackDriver
class SliceDeploymentDeleter(Deleter):
- model='SliceDeployments'
+ model='SliceDeployment'
def call(self, pk):
- slice_deployment = SliceDeployments.objects.get(pk=pk)
+ slice_deployment = SliceDeployment.objects.get(pk=pk)
user = User.objects.get(id=slice_deployment.slice.creator.id)
driver = OpenStackDriver().admin_driver(deployment=slice_deployment.deployment.name)
client_driver = driver.client_driver(caller=user,
diff --git a/planetstack/ec2_observer/deleters/sliver_deleter.py b/planetstack/ec2_observer/deleters/sliver_deleter.py
index 097f0f7..732e535 100644
--- a/planetstack/ec2_observer/deleters/sliver_deleter.py
+++ b/planetstack/ec2_observer/deleters/sliver_deleter.py
@@ -1,4 +1,4 @@
-from core.models import Sliver, SliceDeployments
+from core.models import Sliver, SliceDeployment
from observer.deleter import Deleter
class SliverDeleter(Deleter):
diff --git a/planetstack/ec2_observer/steps/sync_slivers.py b/planetstack/ec2_observer/steps/sync_slivers.py
index a7b1dad..ed75438 100644
--- a/planetstack/ec2_observer/steps/sync_slivers.py
+++ b/planetstack/ec2_observer/steps/sync_slivers.py
@@ -30,7 +30,7 @@
my_slivers = []
for sliver in all_slivers:
- sd = SliceDeployments.objects.filter(Q(slice=sliver.slice))
+ sd = SliceDeployment.objects.filter(Q(slice=sliver.slice))
if (sd):
if (sd.deployment.name=='Amazon EC2'):
my_slivers.append(sliver)