[CORD-3216] Setting subscriber status to awaiting-auth when created by hippie-oss
Change-Id: I583cde246ef93fc1cde235a2ffb5348d8a00bc0c
diff --git a/.gitreview b/.gitreview
index fea3119..50961ed 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,3 +3,4 @@
port=29418
project=hippie-oss.git
defaultremote=origin
+defaultbranch=cord-6.0
diff --git a/VERSION b/VERSION
index 3eefcb9..7dea76e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0
+1.0.1
diff --git a/xos/synchronizer/config.yaml b/xos/synchronizer/config.yaml
index d85bf30..024989e 100644
--- a/xos/synchronizer/config.yaml
+++ b/xos/synchronizer/config.yaml
@@ -15,9 +15,6 @@
name: hippie-oss
-accessor:
- username: xosadmin@opencord.org
- password: "@/opt/xos/services/hippie-oss/credentials/xosadmin@opencord.org"
required_models:
- HippieOSSService
- HippieOSSServiceInstance
diff --git a/xos/synchronizer/hippie-oss-synchronizer.py b/xos/synchronizer/hippie-oss-synchronizer.py
index 46f6219..f9ea235 100755
--- a/xos/synchronizer/hippie-oss-synchronizer.py
+++ b/xos/synchronizer/hippie-oss-synchronizer.py
@@ -23,8 +23,13 @@
import sys
from xosconfig import Config
-config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/config.yaml')
-Config.init(config_file, 'synchronizer-config-schema.yaml')
+base_config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/config.yaml')
+mounted_config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/mounted_config.yaml')
+
+if os.path.isfile(mounted_config_file):
+ Config.init(base_config_file, 'synchronizer-config-schema.yaml', mounted_config_file)
+else:
+ Config.init(base_config_file, 'synchronizer-config-schema.yaml')
observer_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),"../../synchronizers/new_base")
sys.path.append(observer_path)
diff --git a/xos/synchronizer/model_policies/model_policy_hippieossserviceinstance.py b/xos/synchronizer/model_policies/model_policy_hippieossserviceinstance.py
index 5a380dd..16a4c3b 100644
--- a/xos/synchronizer/model_policies/model_policy_hippieossserviceinstance.py
+++ b/xos/synchronizer/model_policies/model_policy_hippieossserviceinstance.py
@@ -70,7 +70,7 @@
subscriber = RCORDSubscriber()
subscriber.onu_device = si.serial_number
- subscriber.status == "awaiting-auth"
+ subscriber.status = "awaiting-auth"
# If the OSS returns a c_tag use that one
if si.c_tag:
diff --git a/xos/unittest.cfg b/xos/unittest.cfg
index fe33100..3db2d53 100644
--- a/xos/unittest.cfg
+++ b/xos/unittest.cfg
@@ -1,5 +1,5 @@
[unittest]
-plugins=nose2-plugins.exclude
+plugins=nose2.plugins.junitxml
code-directories=synchronizer
model_policies
steps
@@ -10,4 +10,5 @@
always-on = True
coverage = synchronizer
coverage-report = term
-coverage-report = html
\ No newline at end of file
+coverage-report = html
+coverage-report = xml