Merge "CORD-2476 migrate olt service to dynamic load"
diff --git a/xos/header.py b/xos/header.py
deleted file mode 120000
index 721b5c0..0000000
--- a/xos/header.py
+++ /dev/null
@@ -1 +0,0 @@
-attic/header.py
\ No newline at end of file
diff --git a/xos/attic/accessagent_model.py b/xos/synchronizer/models/attic/accessagent_model.py
similarity index 100%
rename from xos/attic/accessagent_model.py
rename to xos/synchronizer/models/attic/accessagent_model.py
diff --git a/xos/attic/accessdevice_model.py b/xos/synchronizer/models/attic/accessdevice_model.py
similarity index 100%
rename from xos/attic/accessdevice_model.py
rename to xos/synchronizer/models/attic/accessdevice_model.py
diff --git a/xos/attic/agentportmapping_model.py b/xos/synchronizer/models/attic/agentportmapping_model.py
similarity index 100%
rename from xos/attic/agentportmapping_model.py
rename to xos/synchronizer/models/attic/agentportmapping_model.py
diff --git a/xos/attic/header.py b/xos/synchronizer/models/attic/header.py
similarity index 100%
rename from xos/attic/header.py
rename to xos/synchronizer/models/attic/header.py
diff --git a/xos/attic/voltdevice_model.py b/xos/synchronizer/models/attic/voltdevice_model.py
similarity index 100%
rename from xos/attic/voltdevice_model.py
rename to xos/synchronizer/models/attic/voltdevice_model.py
diff --git a/xos/attic/volttenant_model.py b/xos/synchronizer/models/attic/volttenant_model.py
similarity index 100%
rename from xos/attic/volttenant_model.py
rename to xos/synchronizer/models/attic/volttenant_model.py
diff --git a/xos/volt.xproto b/xos/synchronizer/models/volt.xproto
similarity index 100%
rename from xos/volt.xproto
rename to xos/synchronizer/models/volt.xproto
diff --git a/xos/synchronizer/volt_config.yaml b/xos/synchronizer/volt_config.yaml
index fdcd31f..b11266a 100644
--- a/xos/synchronizer/volt_config.yaml
+++ b/xos/synchronizer/volt_config.yaml
@@ -18,5 +18,12 @@
accessor:
username: xosadmin@opencord.org
password: "@/opt/xos/services/volt/credentials/xosadmin@opencord.org"
+required_models:
+ - VOLTService
+ - VOLTTenant
+ - VSGService
+ - VSGServiceInstance
+ - ServiceInstanceLink
dependency_graph: "/opt/xos/synchronizers/volt/model-deps"
-model_policies_dir: "/opt/xos/synchronizers/volt/model_policies"
\ No newline at end of file
+model_policies_dir: "/opt/xos/synchronizers/volt/model_policies"
+models_dir: "/opt/xos/synchronizers/volt/models"
diff --git a/xos/volt-onboard.yaml b/xos/volt-onboard.yaml
index 2bb8c77..0450371 100644
--- a/xos/volt-onboard.yaml
+++ b/xos/volt-onboard.yaml
@@ -29,7 +29,6 @@
base_url: file:///opt/xos_services/olt-service/xos/
# The following will concatenate with base_url automatically, if
# base_url is non-null.
- xproto: ./
tosca_resource: tosca/resources/voltdevice.py, tosca/resources/voltservice.py, tosca/resources/CORDSubscriber.py, tosca/resources/CORDUser.py, tosca/resources/VOLTTenant.py, tosca/resources/accessagent.py, tosca/resources/accessdevice.py
private_key: file:///opt/xos/key_import/volt_rsa
public_key: file:///opt/xos/key_import/volt_rsa.pub