remaining references to util.logger updated
diff --git a/xos/synchronizers/base/SyncInstanceUsingAnsible.py b/xos/synchronizers/base/SyncInstanceUsingAnsible.py
index aafbd85..335932f 100644
--- a/xos/synchronizers/base/SyncInstanceUsingAnsible.py
+++ b/xos/synchronizers/base/SyncInstanceUsingAnsible.py
@@ -9,7 +9,7 @@
from synchronizers.base.syncstep import SyncStep
from synchronizers.base.ansible import run_template_ssh
from core.models import Service, Slice, ControllerSlice, ControllerUser
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
logger = Logger(level=logging.INFO)
diff --git a/xos/synchronizers/base/SyncSliverUsingAnsible.py b/xos/synchronizers/base/SyncSliverUsingAnsible.py
index a76b300..c64e5ea 100644
--- a/xos/synchronizers/base/SyncSliverUsingAnsible.py
+++ b/xos/synchronizers/base/SyncSliverUsingAnsible.py
@@ -9,7 +9,7 @@
from synchronizers.base.syncstep import SyncStep
from synchronizers.base.ansible import run_template_ssh
from core.models import Service, Slice
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
logger = Logger(level=logging.INFO)
diff --git a/xos/synchronizers/base/backend.py b/xos/synchronizers/base/backend.py
index 107ba2c..0bf3e48 100644
--- a/xos/synchronizers/base/backend.py
+++ b/xos/synchronizers/base/backend.py
@@ -4,7 +4,7 @@
import time
from synchronizers.base.event_loop import XOSObserver
from synchronizers.base.event_manager import EventListener
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
from model_policy import run_policy
from xos.config import Config
diff --git a/xos/synchronizers/base/error_mapper.py b/xos/synchronizers/base/error_mapper.py
index 3039a56..9eb878d 100644
--- a/xos/synchronizers/base/error_mapper.py
+++ b/xos/synchronizers/base/error_mapper.py
@@ -1,5 +1,5 @@
from xos.config import Config
-from util.logger import Logger, logging, logger
+from xos.logger import Logger, logging, logger
class ErrorMapper:
def __init__(self, error_map_file):
diff --git a/xos/synchronizers/base/event_loop.py b/xos/synchronizers/base/event_loop.py
index 85c7257..a3848f2 100644
--- a/xos/synchronizers/base/event_loop.py
+++ b/xos/synchronizers/base/event_loop.py
@@ -19,7 +19,7 @@
from django.db import reset_queries
#from openstack.manager import OpenStackManager
from openstack.driver import OpenStackDriver
-from util.logger import Logger, logging, logger
+from xos.logger import Logger, logging, logger
#from timeout import timeout
from xos.config import Config, XOS_DIR
from observer.steps import *
diff --git a/xos/synchronizers/base/steps/sync_container.py b/xos/synchronizers/base/steps/sync_container.py
index 29fe3e0..a837d0f 100644
--- a/xos/synchronizers/base/steps/sync_container.py
+++ b/xos/synchronizers/base/steps/sync_container.py
@@ -11,7 +11,7 @@
from synchronizers.base.ansible import run_template_ssh
from core.models import Service, Slice, Instance
from services.onos.models import ONOSService, ONOSApp
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
# hpclibrary will be in steps/..
parentdir = os.path.join(os.path.dirname(__file__),"..")
diff --git a/xos/synchronizers/base/syncstep-portal.py b/xos/synchronizers/base/syncstep-portal.py
index 7cc9b7f..c547a3f 100644
--- a/xos/synchronizers/base/syncstep-portal.py
+++ b/xos/synchronizers/base/syncstep-portal.py
@@ -2,7 +2,7 @@
import base64
from datetime import datetime
from xos.config import Config
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
from observer.steps import *
from django.db.models import F, Q
from core.models import *
diff --git a/xos/synchronizers/base/syncstep.py b/xos/synchronizers/base/syncstep.py
index 342e43f..9d95577 100644
--- a/xos/synchronizers/base/syncstep.py
+++ b/xos/synchronizers/base/syncstep.py
@@ -2,7 +2,7 @@
import base64
from datetime import datetime
from xos.config import Config
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
from observer.steps import *
from django.db.models import F, Q
from core.models import *
diff --git a/xos/synchronizers/ec2/backend.py b/xos/synchronizers/ec2/backend.py
index 1a2545d..7288e61 100644
--- a/xos/synchronizers/ec2/backend.py
+++ b/xos/synchronizers/ec2/backend.py
@@ -2,7 +2,7 @@
import time
from ec2_observer.event_loop import XOSObserver
from ec2_observer.event_manager import EventListener
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
logger = Logger(level=logging.INFO)
diff --git a/xos/synchronizers/ec2/deleters/network_deleter.py b/xos/synchronizers/ec2/deleters/network_deleter.py
index afbc3cd..aa9ef59 100644
--- a/xos/synchronizers/ec2/deleters/network_deleter.py
+++ b/xos/synchronizers/ec2/deleters/network_deleter.py
@@ -1,7 +1,7 @@
from core.models import Network, NetworkDeployments
from synchronizers.base.deleter import Deleter
from synchronizers.base.deleters.network_deployment_deleter import NetworkDeploymentDeleter
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
logger = Logger(level=logging.INFO)
diff --git a/xos/synchronizers/ec2/deleters/slice_deleter.py b/xos/synchronizers/ec2/deleters/slice_deleter.py
index 30628b9..49bf692 100644
--- a/xos/synchronizers/ec2/deleters/slice_deleter.py
+++ b/xos/synchronizers/ec2/deleters/slice_deleter.py
@@ -1,7 +1,7 @@
from core.models import Slice, SliceDeployments, User
from synchronizers.base.deleter import Deleter
from synchronizers.base.deleters.slice_deployment_deleter import SliceDeploymentsDeleter
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
logger = Logger(level=logging.INFO)
diff --git a/xos/synchronizers/ec2/ec2_backend.py b/xos/synchronizers/ec2/ec2_backend.py
index a26ddfd..7edf63c 100644
--- a/xos/synchronizers/ec2/ec2_backend.py
+++ b/xos/synchronizers/ec2/ec2_backend.py
@@ -2,7 +2,7 @@
import time
from ec2_observer.event_loop import XOSObserver
from ec2_observer.event_manager import EventListener
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
logger = Logger(level=logging.INFO)
diff --git a/xos/synchronizers/ec2/error_mapper.py b/xos/synchronizers/ec2/error_mapper.py
index 3039a56..9eb878d 100644
--- a/xos/synchronizers/ec2/error_mapper.py
+++ b/xos/synchronizers/ec2/error_mapper.py
@@ -1,5 +1,5 @@
from xos.config import Config
-from util.logger import Logger, logging, logger
+from xos.logger import Logger, logging, logger
class ErrorMapper:
def __init__(self, error_map_file):
diff --git a/xos/synchronizers/ec2/event_loop.py b/xos/synchronizers/ec2/event_loop.py
index fb91ee8..3f0e30c 100644
--- a/xos/synchronizers/ec2/event_loop.py
+++ b/xos/synchronizers/ec2/event_loop.py
@@ -14,7 +14,7 @@
from django.db.models import F, Q
#from openstack.manager import OpenStackManager
from openstack.driver import OpenStackDriver
-from util.logger import Logger, logging, logger
+from xos.logger import Logger, logging, logger
#from timeout import timeout
from xos.config import Config, XOS_DIR
from observer.steps import *
diff --git a/xos/synchronizers/ec2/steps/sync_instances.py b/xos/synchronizers/ec2/steps/sync_instances.py
index 3dc5f0e..fc11e05 100644
--- a/xos/synchronizers/ec2/steps/sync_instances.py
+++ b/xos/synchronizers/ec2/steps/sync_instances.py
@@ -7,7 +7,7 @@
from core.models.instance import Instance
from core.models.slice import SlicePrivilege, SliceDeployments
from core.models.network import Network, NetworkSlice, NetworkDeployments
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
from ec2_observer.awslib import *
from core.models.site import *
from core.models.slice import *
diff --git a/xos/synchronizers/ec2/syncstep.py b/xos/synchronizers/ec2/syncstep.py
index e15e719..1d6862e 100644
--- a/xos/synchronizers/ec2/syncstep.py
+++ b/xos/synchronizers/ec2/syncstep.py
@@ -5,7 +5,7 @@
from django.db.models import F, Q
from xos.config import Config
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
from observer.steps import *
logger = Logger(level=logging.INFO)
diff --git a/xos/synchronizers/openstack/backend.py b/xos/synchronizers/openstack/backend.py
index ec22f79..5f11d46 100644
--- a/xos/synchronizers/openstack/backend.py
+++ b/xos/synchronizers/openstack/backend.py
@@ -4,7 +4,7 @@
import time
from synchronizers.base.event_loop import XOSObserver
from synchronizers.base.event_manager import EventListener
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
from synchronizers.model_policy import run_policy
from xos.config import Config
diff --git a/xos/synchronizers/openstack/error_mapper.py b/xos/synchronizers/openstack/error_mapper.py
index 3039a56..9eb878d 100644
--- a/xos/synchronizers/openstack/error_mapper.py
+++ b/xos/synchronizers/openstack/error_mapper.py
@@ -1,5 +1,5 @@
from xos.config import Config
-from util.logger import Logger, logging, logger
+from xos.logger import Logger, logging, logger
class ErrorMapper:
def __init__(self, error_map_file):
diff --git a/xos/synchronizers/openstack/event_loop.py b/xos/synchronizers/openstack/event_loop.py
index 85c7257..a3848f2 100644
--- a/xos/synchronizers/openstack/event_loop.py
+++ b/xos/synchronizers/openstack/event_loop.py
@@ -19,7 +19,7 @@
from django.db import reset_queries
#from openstack.manager import OpenStackManager
from openstack.driver import OpenStackDriver
-from util.logger import Logger, logging, logger
+from xos.logger import Logger, logging, logger
#from timeout import timeout
from xos.config import Config, XOS_DIR
from observer.steps import *
diff --git a/xos/synchronizers/openstack/steps/sync_container.py b/xos/synchronizers/openstack/steps/sync_container.py
index 29fe3e0..a837d0f 100644
--- a/xos/synchronizers/openstack/steps/sync_container.py
+++ b/xos/synchronizers/openstack/steps/sync_container.py
@@ -11,7 +11,7 @@
from synchronizers.base.ansible import run_template_ssh
from core.models import Service, Slice, Instance
from services.onos.models import ONOSService, ONOSApp
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
# hpclibrary will be in steps/..
parentdir = os.path.join(os.path.dirname(__file__),"..")
diff --git a/xos/synchronizers/openstack/syncstep.py b/xos/synchronizers/openstack/syncstep.py
index 342e43f..9d95577 100644
--- a/xos/synchronizers/openstack/syncstep.py
+++ b/xos/synchronizers/openstack/syncstep.py
@@ -2,7 +2,7 @@
import base64
from datetime import datetime
from xos.config import Config
-from util.logger import Logger, logging
+from xos.logger import Logger, logging
from observer.steps import *
from django.db.models import F, Q
from core.models import *
diff --git a/xos/synchronizers/openstack/xos-synchronizer.py b/xos/synchronizers/openstack/xos-synchronizer.py
index b40cbe7..5ca55e5 100644
--- a/xos/synchronizers/openstack/xos-synchronizer.py
+++ b/xos/synchronizers/openstack/xos-synchronizer.py
@@ -5,7 +5,7 @@
from synchronizers.base.backend import Backend
from xos.config import Config, DEFAULT_CONFIG_FN
from core.models import Instance
-from util.logger import Logger, logging, logger
+from xos.logger import Logger, logging, logger
from django.db import ProgrammingError
import time