fix sync steps
diff --git a/xos/ec2_observer/syncstep.py b/xos/ec2_observer/syncstep.py
index 105daa6..173510f 100644
--- a/xos/ec2_observer/syncstep.py
+++ b/xos/ec2_observer/syncstep.py
@@ -18,7 +18,7 @@
dependencies list of names of models that must be synchronized first if the current model depends on them
"""
slow=False
- def get_prop(prop):
+ def get_prop(self, prop):
try:
sync_config_dir = Config().sync_config_dir
except:
@@ -48,7 +48,7 @@
# Steps should override it if they have their own logic
# for figuring out what objects are outstanding.
main_obj = self.provides[0]
- if (not deleted):
+ if (not deletion):
objs = main_obj.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
else:
objs = main_obj.deleted_objects.all()
diff --git a/xos/openstack/manager.py b/xos/openstack/manager.py
index 441a18e..42b1ef1 100644
--- a/xos/openstack/manager.py
+++ b/xos/openstack/manager.py
@@ -8,7 +8,7 @@
from netaddr import IPAddress, IPNetwork
from xos import settings
from django.core import management
-from core.models import *
+from core.models import *
from xos.config import Config
try:
from openstack.client import OpenStackClient
diff --git a/xos/openstack_observer/syncstep.py b/xos/openstack_observer/syncstep.py
index 9bafeff..77a8c17 100644
--- a/xos/openstack_observer/syncstep.py
+++ b/xos/openstack_observer/syncstep.py
@@ -36,7 +36,7 @@
dependencies list of names of models that must be synchronized first if the current model depends on them
"""
slow=False
- def get_prop(prop):
+ def get_prop(self, prop):
try:
sync_config_dir = Config().sync_config_dir
except: