[CORD-1360] Using new config
Change-Id: I949ebac5e3ef267b8da70c61e8cf4f9d1c654907
diff --git a/xos/synchronizer/steps/sync_onosapp.py b/xos/synchronizer/steps/sync_onosapp.py
index cba8290..ae9c5d7 100644
--- a/xos/synchronizer/steps/sync_onosapp.py
+++ b/xos/synchronizer/steps/sync_onosapp.py
@@ -7,7 +7,7 @@
import re
import json
from collections import OrderedDict
-from xos.config import Config
+from xosconfig import Config
from synchronizers.new_base.ansible_helper import run_template
from synchronizers.new_base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
from synchronizers.new_base.modelaccessor import *
@@ -58,12 +58,7 @@
return self.is_no_container(o)
def get_files_dir(self, o):
- if not hasattr(Config(), "observer_steps_dir"):
- # make steps_dir mandatory; there's no valid reason for it to not
- # be defined.
- raise Exception("observer_steps_dir is not defined in config file")
-
- step_dir = Config().observer_steps_dir
+ step_dir = Config.get("steps_dir")
return os.path.join(step_dir, "..", "files", str(self.get_onos_service(o).id), o.name)
diff --git a/xos/synchronizer/steps/sync_onosservice.py b/xos/synchronizer/steps/sync_onosservice.py
index e038949..c8abe57 100644
--- a/xos/synchronizer/steps/sync_onosservice.py
+++ b/xos/synchronizer/steps/sync_onosservice.py
@@ -4,7 +4,6 @@
import sys
import base64
import time
-from xos.config import Config
from synchronizers.new_base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
from synchronizers.new_base.modelaccessor import *
from xos.logger import Logger, logging