Reran chuckmove after adjusting '*'
diff --git a/xos/core/models/plcorebase.py b/xos/core/models/plcorebase.py
index 220b35c..5c0d7ab 100644
--- a/xos/core/models/plcorebase.py
+++ b/xos/core/models/plcorebase.py
@@ -15,7 +15,7 @@
try:
# This is a no-op if observer_disabled is set to 1 in the config file
- from observer import *
+ from synchronizers.base import *
except:
print >> sys.stderr, "import of observer failed! printing traceback and disabling observer:"
import traceback
diff --git a/xos/core/models/user.py b/xos/core/models/user.py
index bb6ad88..0b8e3af 100644
--- a/xos/core/models/user.py
+++ b/xos/core/models/user.py
@@ -20,7 +20,7 @@
# ------ from plcorebase.py ------
try:
# This is a no-op if observer_disabled is set to 1 in the config file
- from observer import *
+ from synchronizers.base import *
except:
print >> sys.stderr, "import of observer failed! printing traceback and disabling observer:"
import traceback
diff --git a/xos/synchronizers/base/event_loop.py b/xos/synchronizers/base/event_loop.py
index a3848f2..d1ef6da 100644
--- a/xos/synchronizers/base/event_loop.py
+++ b/xos/synchronizers/base/event_loop.py
@@ -22,10 +22,10 @@
from xos.logger import Logger, logging, logger
#from timeout import timeout
from xos.config import Config, XOS_DIR
-from observer.steps import *
+from synchronizers.base.steps import *
from syncstep import SyncStep
from toposort import toposort
-from observer.error_mapper import *
+from synchronizers.base.error_mapper import *
from openstack_observer.openstacksyncstep import OpenStackSyncStep
from synchronizers.base.steps.sync_object import SyncObject
diff --git a/xos/synchronizers/base/steps/sync_container.py b/xos/synchronizers/base/steps/sync_container.py
index a837d0f..3db5a52 100644
--- a/xos/synchronizers/base/steps/sync_container.py
+++ b/xos/synchronizers/base/steps/sync_container.py
@@ -7,7 +7,7 @@
from django.db.models import F, Q
from xos.config import Config
from observers.base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
-from observer.syncstep import SyncStep, DeferredException
+from synchronizers.base.syncstep import SyncStep, DeferredException
from synchronizers.base.ansible import run_template_ssh
from core.models import Service, Slice, Instance
from services.onos.models import ONOSService, ONOSApp
diff --git a/xos/synchronizers/base/steps/sync_controller_images.py b/xos/synchronizers/base/steps/sync_controller_images.py
index 89dc8ae..c1e5136 100644
--- a/xos/synchronizers/base/steps/sync_controller_images.py
+++ b/xos/synchronizers/base/steps/sync_controller_images.py
@@ -4,11 +4,11 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models import Controller
from core.models import Image, ControllerImages
from xos.logger import observer_logger as logger
-from observer.ansible import *
+from synchronizers.base.ansible import *
import json
class SyncControllerImages(OpenStackSyncStep):
diff --git a/xos/synchronizers/base/steps/sync_controller_networks.py b/xos/synchronizers/base/steps/sync_controller_networks.py
index 6f80757..990cb87 100644
--- a/xos/synchronizers/base/steps/sync_controller_networks.py
+++ b/xos/synchronizers/base/steps/sync_controller_networks.py
@@ -5,12 +5,12 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models.network import *
from core.models.slice import *
from core.models.instance import Instance
from xos.logger import observer_logger as logger
-from observer.ansible import *
+from synchronizers.base.ansible import *
from openstack.driver import OpenStackDriver
from xos.config import Config
import json
diff --git a/xos/synchronizers/base/steps/sync_controller_site_privileges.py b/xos/synchronizers/base/steps/sync_controller_site_privileges.py
index 640f161..59919fe 100644
--- a/xos/synchronizers/base/steps/sync_controller_site_privileges.py
+++ b/xos/synchronizers/base/steps/sync_controller_site_privileges.py
@@ -4,12 +4,12 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models.site import Controller, SitePrivilege
from core.models.user import User
from core.models.controlleruser import ControllerUser, ControllerSitePrivilege
from xos.logger import observer_logger as logger
-from observer.ansible import *
+from synchronizers.base.ansible import *
import json
class SyncControllerSitePrivileges(OpenStackSyncStep):
diff --git a/xos/synchronizers/base/steps/sync_controller_sites.py b/xos/synchronizers/base/steps/sync_controller_sites.py
index fcc85b1..bb9a566 100644
--- a/xos/synchronizers/base/steps/sync_controller_sites.py
+++ b/xos/synchronizers/base/steps/sync_controller_sites.py
@@ -4,8 +4,8 @@
from xos.config import Config
from openstack_observer.openstacksyncstep import OpenStackSyncStep
from core.models.site import *
-from observer.syncstep import *
-from observer.ansible import *
+from synchronizers.base.syncstep import *
+from synchronizers.base.ansible import *
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/base/steps/sync_controller_slice_privileges.py b/xos/synchronizers/base/steps/sync_controller_slice_privileges.py
index 452aec0..b78e4a0 100644
--- a/xos/synchronizers/base/steps/sync_controller_slice_privileges.py
+++ b/xos/synchronizers/base/steps/sync_controller_slice_privileges.py
@@ -4,11 +4,11 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models.slice import Controller, SlicePrivilege
from core.models.user import User
from core.models.controlleruser import ControllerUser, ControllerSlicePrivilege
-from observer.ansible import *
+from synchronizers.base.ansible import *
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/base/steps/sync_controller_slices.py b/xos/synchronizers/base/steps/sync_controller_slices.py
index 4c82eb6..97d8c29 100644
--- a/xos/synchronizers/base/steps/sync_controller_slices.py
+++ b/xos/synchronizers/base/steps/sync_controller_slices.py
@@ -5,9 +5,9 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models import *
-from observer.ansible import *
+from synchronizers.base.ansible import *
from openstack.driver import OpenStackDriver
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/base/steps/sync_controller_users.py b/xos/synchronizers/base/steps/sync_controller_users.py
index cfab4f5..9af48e5 100644
--- a/xos/synchronizers/base/steps/sync_controller_users.py
+++ b/xos/synchronizers/base/steps/sync_controller_users.py
@@ -4,11 +4,11 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models.site import Controller, SiteDeployment, SiteDeployment
from core.models.user import User
from core.models.controlleruser import ControllerUser
-from observer.ansible import *
+from synchronizers.base.ansible import *
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/base/steps/sync_instances.py b/xos/synchronizers/base/steps/sync_instances.py
index 5e0cc64..335ca4a 100644
--- a/xos/synchronizers/base/steps/sync_instances.py
+++ b/xos/synchronizers/base/steps/sync_instances.py
@@ -8,8 +8,8 @@
from core.models.instance import Instance
from core.models.slice import Slice, SlicePrivilege, ControllerSlice
from core.models.network import Network, NetworkSlice, ControllerNetwork
-from observer.ansible import *
-from observer.syncstep import *
+from synchronizers.base.ansible import *
+from synchronizers.base.syncstep import *
from xos.logger import observer_logger as logger
def escape(s):
diff --git a/xos/synchronizers/base/steps/sync_object.py b/xos/synchronizers/base/steps/sync_object.py
index 1e07cd2..a6a939f 100644
--- a/xos/synchronizers/base/steps/sync_object.py
+++ b/xos/synchronizers/base/steps/sync_object.py
@@ -4,9 +4,9 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models import *
-from observer.ansible import *
+from synchronizers.base.ansible import *
from openstack.driver import OpenStackDriver
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/base/syncstep-portal.py b/xos/synchronizers/base/syncstep-portal.py
index c547a3f..66ec1af 100644
--- a/xos/synchronizers/base/syncstep-portal.py
+++ b/xos/synchronizers/base/syncstep-portal.py
@@ -3,7 +3,7 @@
from datetime import datetime
from xos.config import Config
from xos.logger import Logger, logging
-from observer.steps import *
+from synchronizers.base.steps import *
from django.db.models import F, Q
from core.models import *
from django.db import reset_queries
diff --git a/xos/synchronizers/base/syncstep.py b/xos/synchronizers/base/syncstep.py
index 9d95577..bdab8f3 100644
--- a/xos/synchronizers/base/syncstep.py
+++ b/xos/synchronizers/base/syncstep.py
@@ -3,11 +3,11 @@
from datetime import datetime
from xos.config import Config
from xos.logger import Logger, logging
-from observer.steps import *
+from synchronizers.base.steps import *
from django.db.models import F, Q
from core.models import *
from django.db import reset_queries
-from observer.ansible import *
+from synchronizers.base.ansible import *
from generate.dependency_walker import *
from time import time
diff --git a/xos/synchronizers/ec2/event_loop.py b/xos/synchronizers/ec2/event_loop.py
index 3f0e30c..cfeb212 100644
--- a/xos/synchronizers/ec2/event_loop.py
+++ b/xos/synchronizers/ec2/event_loop.py
@@ -17,10 +17,10 @@
from xos.logger import Logger, logging, logger
#from timeout import timeout
from xos.config import Config, XOS_DIR
-from observer.steps import *
+from synchronizers.base.steps import *
from syncstep import SyncStep
from toposort import toposort
-from observer.error_mapper import *
+from synchronizers.base.error_mapper import *
debug_mode = False
diff --git a/xos/synchronizers/ec2/syncstep.py b/xos/synchronizers/ec2/syncstep.py
index 1d6862e..3cba48b 100644
--- a/xos/synchronizers/ec2/syncstep.py
+++ b/xos/synchronizers/ec2/syncstep.py
@@ -6,7 +6,7 @@
from xos.config import Config
from xos.logger import Logger, logging
-from observer.steps import *
+from synchronizers.base.steps import *
logger = Logger(level=logging.INFO)
diff --git a/xos/synchronizers/openstack/event_loop.py b/xos/synchronizers/openstack/event_loop.py
index a3848f2..d1ef6da 100644
--- a/xos/synchronizers/openstack/event_loop.py
+++ b/xos/synchronizers/openstack/event_loop.py
@@ -22,10 +22,10 @@
from xos.logger import Logger, logging, logger
#from timeout import timeout
from xos.config import Config, XOS_DIR
-from observer.steps import *
+from synchronizers.base.steps import *
from syncstep import SyncStep
from toposort import toposort
-from observer.error_mapper import *
+from synchronizers.base.error_mapper import *
from openstack_observer.openstacksyncstep import OpenStackSyncStep
from synchronizers.base.steps.sync_object import SyncObject
diff --git a/xos/synchronizers/openstack/steps/sync_container.py b/xos/synchronizers/openstack/steps/sync_container.py
index a837d0f..3db5a52 100644
--- a/xos/synchronizers/openstack/steps/sync_container.py
+++ b/xos/synchronizers/openstack/steps/sync_container.py
@@ -7,7 +7,7 @@
from django.db.models import F, Q
from xos.config import Config
from observers.base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
-from observer.syncstep import SyncStep, DeferredException
+from synchronizers.base.syncstep import SyncStep, DeferredException
from synchronizers.base.ansible import run_template_ssh
from core.models import Service, Slice, Instance
from services.onos.models import ONOSService, ONOSApp
diff --git a/xos/synchronizers/openstack/steps/sync_controller_images.py b/xos/synchronizers/openstack/steps/sync_controller_images.py
index 89dc8ae..c1e5136 100644
--- a/xos/synchronizers/openstack/steps/sync_controller_images.py
+++ b/xos/synchronizers/openstack/steps/sync_controller_images.py
@@ -4,11 +4,11 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models import Controller
from core.models import Image, ControllerImages
from xos.logger import observer_logger as logger
-from observer.ansible import *
+from synchronizers.base.ansible import *
import json
class SyncControllerImages(OpenStackSyncStep):
diff --git a/xos/synchronizers/openstack/steps/sync_controller_networks.py b/xos/synchronizers/openstack/steps/sync_controller_networks.py
index 6f80757..990cb87 100644
--- a/xos/synchronizers/openstack/steps/sync_controller_networks.py
+++ b/xos/synchronizers/openstack/steps/sync_controller_networks.py
@@ -5,12 +5,12 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models.network import *
from core.models.slice import *
from core.models.instance import Instance
from xos.logger import observer_logger as logger
-from observer.ansible import *
+from synchronizers.base.ansible import *
from openstack.driver import OpenStackDriver
from xos.config import Config
import json
diff --git a/xos/synchronizers/openstack/steps/sync_controller_site_privileges.py b/xos/synchronizers/openstack/steps/sync_controller_site_privileges.py
index 640f161..59919fe 100644
--- a/xos/synchronizers/openstack/steps/sync_controller_site_privileges.py
+++ b/xos/synchronizers/openstack/steps/sync_controller_site_privileges.py
@@ -4,12 +4,12 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models.site import Controller, SitePrivilege
from core.models.user import User
from core.models.controlleruser import ControllerUser, ControllerSitePrivilege
from xos.logger import observer_logger as logger
-from observer.ansible import *
+from synchronizers.base.ansible import *
import json
class SyncControllerSitePrivileges(OpenStackSyncStep):
diff --git a/xos/synchronizers/openstack/steps/sync_controller_sites.py b/xos/synchronizers/openstack/steps/sync_controller_sites.py
index fcc85b1..bb9a566 100644
--- a/xos/synchronizers/openstack/steps/sync_controller_sites.py
+++ b/xos/synchronizers/openstack/steps/sync_controller_sites.py
@@ -4,8 +4,8 @@
from xos.config import Config
from openstack_observer.openstacksyncstep import OpenStackSyncStep
from core.models.site import *
-from observer.syncstep import *
-from observer.ansible import *
+from synchronizers.base.syncstep import *
+from synchronizers.base.ansible import *
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/openstack/steps/sync_controller_slice_privileges.py b/xos/synchronizers/openstack/steps/sync_controller_slice_privileges.py
index 452aec0..b78e4a0 100644
--- a/xos/synchronizers/openstack/steps/sync_controller_slice_privileges.py
+++ b/xos/synchronizers/openstack/steps/sync_controller_slice_privileges.py
@@ -4,11 +4,11 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models.slice import Controller, SlicePrivilege
from core.models.user import User
from core.models.controlleruser import ControllerUser, ControllerSlicePrivilege
-from observer.ansible import *
+from synchronizers.base.ansible import *
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/openstack/steps/sync_controller_slices.py b/xos/synchronizers/openstack/steps/sync_controller_slices.py
index 4c82eb6..97d8c29 100644
--- a/xos/synchronizers/openstack/steps/sync_controller_slices.py
+++ b/xos/synchronizers/openstack/steps/sync_controller_slices.py
@@ -5,9 +5,9 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models import *
-from observer.ansible import *
+from synchronizers.base.ansible import *
from openstack.driver import OpenStackDriver
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/openstack/steps/sync_controller_users.py b/xos/synchronizers/openstack/steps/sync_controller_users.py
index cfab4f5..9af48e5 100644
--- a/xos/synchronizers/openstack/steps/sync_controller_users.py
+++ b/xos/synchronizers/openstack/steps/sync_controller_users.py
@@ -4,11 +4,11 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models.site import Controller, SiteDeployment, SiteDeployment
from core.models.user import User
from core.models.controlleruser import ControllerUser
-from observer.ansible import *
+from synchronizers.base.ansible import *
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/openstack/steps/sync_instances.py b/xos/synchronizers/openstack/steps/sync_instances.py
index 5e0cc64..335ca4a 100644
--- a/xos/synchronizers/openstack/steps/sync_instances.py
+++ b/xos/synchronizers/openstack/steps/sync_instances.py
@@ -8,8 +8,8 @@
from core.models.instance import Instance
from core.models.slice import Slice, SlicePrivilege, ControllerSlice
from core.models.network import Network, NetworkSlice, ControllerNetwork
-from observer.ansible import *
-from observer.syncstep import *
+from synchronizers.base.ansible import *
+from synchronizers.base.syncstep import *
from xos.logger import observer_logger as logger
def escape(s):
diff --git a/xos/synchronizers/openstack/steps/sync_object.py b/xos/synchronizers/openstack/steps/sync_object.py
index 1e07cd2..a6a939f 100644
--- a/xos/synchronizers/openstack/steps/sync_object.py
+++ b/xos/synchronizers/openstack/steps/sync_object.py
@@ -4,9 +4,9 @@
from django.db.models import F, Q
from xos.config import Config
from synchronizers.base.openstacksyncstep import OpenStackSyncStep
-from observer.syncstep import *
+from synchronizers.base.syncstep import *
from core.models import *
-from observer.ansible import *
+from synchronizers.base.ansible import *
from openstack.driver import OpenStackDriver
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/openstack/syncstep.py b/xos/synchronizers/openstack/syncstep.py
index 9d95577..bdab8f3 100644
--- a/xos/synchronizers/openstack/syncstep.py
+++ b/xos/synchronizers/openstack/syncstep.py
@@ -3,11 +3,11 @@
from datetime import datetime
from xos.config import Config
from xos.logger import Logger, logging
-from observer.steps import *
+from synchronizers.base.steps import *
from django.db.models import F, Q
from core.models import *
from django.db import reset_queries
-from observer.ansible import *
+from synchronizers.base.ansible import *
from generate.dependency_walker import *
from time import time