resolve merge conflicts
diff --git a/xos/configurations/common/Makefile.services b/xos/configurations/common/Makefile.services
new file mode 100644
index 0000000..6a5cb06
--- /dev/null
+++ b/xos/configurations/common/Makefile.services
@@ -0,0 +1,49 @@
+services: /opt/xos_services \
+ /opt/xos_services/exampleservice \
+ /opt/xos_services/olt \
+ /opt/xos_services/vsg \
+ /opt/xos_services/vtn \
+ /opt/xos_services/vrouter \
+ /opt/xos_services/vtr \
+ /opt/xos_services/onos-service \
+ /opt/xos_services/fabric
+
+/opt/xos_services:
+ mkdir -p /opt/xos_services
+
+/opt/xos_services/exampleservice:
+ git -C /opt/xos_services clone https://gerrit.opencord.org/p/exampleservice.git
+
+/opt/xos_services/olt:
+ git -C /opt/xos_services clone https://gerrit.opencord.org/p/olt.git
+
+/opt/xos_services/vsg:
+ git -C /opt/xos_services clone https://gerrit.opencord.org/p/vsg.git
+
+/opt/xos_services/vtn:
+ git -C /opt/xos_services clone https://gerrit.opencord.org/p/vtn.git
+
+/opt/xos_services/vrouter:
+ git -C /opt/xos_services clone https://gerrit.opencord.org/p/vrouter.git
+
+/opt/xos_services/vtr:
+ git -C /opt/xos_services clone https://gerrit.opencord.org/p/vtr.git
+
+/opt/xos_services/onos-service:
+ git -C /opt/xos_services clone https://gerrit.opencord.org/p/onos-service.git
+
+/opt/xos_services/fabric:
+ git -C /opt/xos_services clone https://gerrit.opencord.org/p/fabric.git
+
+cleanup:
+ rm -rf /opt/xos_services/*
+
+update:
+ git -C /opt/xos_services/exampleservice pull
+ git -C /opt/xos_services/olt pull
+ git -C /opt/xos_services/vsg pull
+ git -C /opt/xos_services/vtn pull
+ git -C /opt/xos_services/vrouter pull
+ git -C /opt/xos_services/vtr pull
+ git -C /opt/xos_services/onos-service pull
+ git -C /opt/xos_services/fabric pull
diff --git a/xos/configurations/cord-pod/Makefile b/xos/configurations/cord-pod/Makefile
index 1d5f68c..3a1f6bf 100644
--- a/xos/configurations/cord-pod/Makefile
+++ b/xos/configurations/cord-pod/Makefile
@@ -4,7 +4,7 @@
DOCKER_PROJECT=cordpod
.PHONY: xos
-xos: prereqs bootstrap onboarding podconfig
+xos: prereqs bootstrap download_services onboarding podconfig
prereqs:
sudo make -f ../common/Makefile.prereqs
@@ -16,6 +16,12 @@
bash ../common/wait_for_xos_port.sh 81
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run -e CONFIG_DIR=$(CONFIG_DIR) xos_bootstrap_ui python /opt/xos/tosca/run.py none /opt/xos/configurations/cord-pod/xos.yaml
+download_services:
+ sudo make -f ../common/Makefile.services
+
+update_services:
+ sudo make -f ../common/Makefile.services update
+
onboarding:
echo "[ONBOARDING]"
# on-board any services here
@@ -27,13 +33,13 @@
sudo cp id_rsa.pub key_import/volt_rsa.pub
sudo cp id_rsa key_import/onos_rsa
sudo cp id_rsa key_import/onos_rsa.pub
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vrouter/vrouter-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/volt/volt-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vsg/vsg-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vtn/vtn-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/onos/onos-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/fabric/fabric-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vtr/vtr-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/vrouter/xos/vrouter-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/olt/xos/volt-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/vsg/xos/vsg-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/vtn/xos/vtn-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/onos-service/xos/onos-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/fabric/xos/\fabric-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/vtr/xos/vtr-onboard.yaml
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/configurations/cord-pod/synchronizers.yaml
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/configurations/common/enable-onboarding.yaml
bash ../common/wait_for_onboarding_ready.sh 81 services/vrouter
diff --git a/xos/configurations/cord-pod/docker-compose-bootstrap.yml b/xos/configurations/cord-pod/docker-compose-bootstrap.yml
index 93ccb71..1bc3e66 100644
--- a/xos/configurations/cord-pod/docker-compose-bootstrap.yml
+++ b/xos/configurations/cord-pod/docker-compose-bootstrap.yml
@@ -16,6 +16,7 @@
- /var/run/docker.sock:/var/run/docker.sock
- ./key_import:/opt/xos/key_import:ro
- ./onboarding-docker-compose:/opt/xos/synchronizers/onboarding/docker-compose
+ - /opt/xos_services:/opt/xos_services
log_driver: "json-file"
log_opt:
max-size: "100k"
@@ -52,6 +53,7 @@
- ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
- ./xos_cord_config:/opt/xos/xos_configuration/xos_cord_config:ro
- ../vtn/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
+ - /opt/xos_services:/opt/xos_services
log_driver: "json-file"
log_opt:
max-size: "100k"
diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index 3e3e22e..842cb82 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -6,11 +6,17 @@
XOS_BOOTSTRAP_PORT=9998
XOS_UI_PORT=9999
-frontend: prereqs bootstrap onboarding frontendconfig
+frontend: prereqs bootstrap download_services onboarding frontendconfig
prereqs:
sudo make -f ../common/Makefile.prereqs
+download_services:
+ sudo make -f ../common/Makefile.services
+
+update_services:
+ sudo make -f ../common/Makefile.services update
+
bootstrap:
echo "[BOOTSTRAP]"
sudo rm -f onboarding-docker-compose/docker-compose.yml
@@ -73,9 +79,9 @@
sudo bash -c "echo somekey > key_import/vsg_rsa.pub"
sudo bash -c "echo somekey > key_import/volt_rsa"
sudo bash -c "echo somekey > key_import/volt_rsa.pub"
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vrouter/vrouter-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) run xos_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/volt/volt-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) run xos_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vsg/vsg-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/vrouter/xos/vrouter-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/olt/xos/volt-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/vsg/xos/vsg-onboard.yaml
bash ../common/wait_for_onboarding_ready.sh 9998 services/vrouter
bash ../common/wait_for_onboarding_ready.sh 9998 services/volt
bash ../common/wait_for_onboarding_ready.sh 9998 services/vsg
@@ -95,5 +101,6 @@
# fake keys are fine
sudo bash -c "echo somekey > key_import/exampleservice_rsa"
sudo bash -c "echo somekey > key_import/exampleservice_rsa.pub"
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) run xos_ui python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/onboard/exampleservice/exampleservice-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos_services/exampleservice/xos/exampleservice-onboard.yaml
+ bash ../common/wait_for_onboarding_ready.sh 9998 services/exampleservice
bash ../common/wait_for_onboarding_ready.sh 9998 xos
diff --git a/xos/configurations/frontend/docker-compose-bootstrap.yml b/xos/configurations/frontend/docker-compose-bootstrap.yml
index 00a43f3..d0b360f 100644
--- a/xos/configurations/frontend/docker-compose-bootstrap.yml
+++ b/xos/configurations/frontend/docker-compose-bootstrap.yml
@@ -13,6 +13,7 @@
volumes:
- ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config
- ../vtn/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
+ - /opt/xos_services:/opt/xos_services
xos_synchronizer_onboarding:
image: xosproject/xos-synchronizer-onboarding
@@ -24,10 +25,10 @@
links:
- xos_db
volumes:
-# - .:/root/setup:ro
- /var/run/docker.sock:/var/run/docker.sock
- ./key_import:/opt/xos/key_import:ro
- ./onboarding-docker-compose:/opt/xos/synchronizers/onboarding/docker-compose
+ - /opt/xos_services:/opt/xos_services
log_driver: "json-file"
log_opt:
max-size: "100k"
diff --git a/xos/configurations/test-standalone/Makefile b/xos/configurations/test-standalone/Makefile
index 0df6de8..52045cd 100644
--- a/xos/configurations/test-standalone/Makefile
+++ b/xos/configurations/test-standalone/Makefile
@@ -25,7 +25,7 @@
sudo docker exec -i teststandalone_xos_ui_1 bash -c "cd /opt/xos/tests/api; npm install --production"
sudo docker exec teststandalone_xos_ui_1 pip install dredd_hooks
-xos: prereqs bootstrap onboarding
+xos: prereqs bootstrap download_services onboarding
prereqs:
sudo make -f ../common/Makefile.prereqs
@@ -37,6 +37,12 @@
bash ../common/wait_for_xos_port.sh 9998
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run -e CONFIG_DIR=$(CONFIG_DIR) xos_bootstrap_ui python /opt/xos/tosca/run.py none /opt/xos/configurations/test-standalone/xos.yaml
+download_services:
+ make -f ../common/Makefile.services
+
+update_services:
+ make -f ../common/Makefile.services update
+
onboarding:
echo "[ONBOARDING]"
bash ../common/wait_for_onboarding_ready.sh 9998 xos
@@ -47,11 +53,10 @@
sudo bash -c "echo somekey > key_import/onos_rsa"
sudo bash -c "echo somekey > key_import/onos_rsa.pub"
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/configurations/common/disable-onboarding.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vrouter/vrouter-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/volt/volt-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vsg/vsg-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vtr/vtr-onboard.yaml
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/onos/onos-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/vrouter/xos/vrouter-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/volt/xos/volt-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/vsg/xos/vsg-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos_services/vtr/xos/vtr-onboard.yaml
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/configurations/common/enable-onboarding.yaml
bash ../common/wait_for_onboarding_ready.sh 9998 services/vrouter
bash ../common/wait_for_onboarding_ready.sh 9998 services/volt
diff --git a/xos/configurations/test-standalone/docker-compose-bootstrap.yml b/xos/configurations/test-standalone/docker-compose-bootstrap.yml
index 00a43f3..d0b360f 100644
--- a/xos/configurations/test-standalone/docker-compose-bootstrap.yml
+++ b/xos/configurations/test-standalone/docker-compose-bootstrap.yml
@@ -13,6 +13,7 @@
volumes:
- ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config
- ../vtn/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
+ - /opt/xos_services:/opt/xos_services
xos_synchronizer_onboarding:
image: xosproject/xos-synchronizer-onboarding
@@ -24,10 +25,10 @@
links:
- xos_db
volumes:
-# - .:/root/setup:ro
- /var/run/docker.sock:/var/run/docker.sock
- ./key_import:/opt/xos/key_import:ro
- ./onboarding-docker-compose:/opt/xos/synchronizers/onboarding/docker-compose
+ - /opt/xos_services:/opt/xos_services
log_driver: "json-file"
log_opt:
max-size: "100k"
diff --git a/xos/onboard/exampleservice/admin.py b/xos/onboard/exampleservice-old/admin.py
similarity index 100%
rename from xos/onboard/exampleservice/admin.py
rename to xos/onboard/exampleservice-old/admin.py
diff --git a/xos/onboard/exampleservice/api/service/exampleservice.py b/xos/onboard/exampleservice-old/api/service/exampleservice.py
similarity index 100%
rename from xos/onboard/exampleservice/api/service/exampleservice.py
rename to xos/onboard/exampleservice-old/api/service/exampleservice.py
diff --git a/xos/onboard/exampleservice/api/tenant/exampletenant.py b/xos/onboard/exampleservice-old/api/tenant/exampletenant.py
similarity index 100%
rename from xos/onboard/exampleservice/api/tenant/exampletenant.py
rename to xos/onboard/exampleservice-old/api/tenant/exampletenant.py
diff --git a/xos/onboard/exampleservice/exampleservice-onboard-longform.yaml b/xos/onboard/exampleservice-old/exampleservice-onboard-longform.yaml
similarity index 100%
rename from xos/onboard/exampleservice/exampleservice-onboard-longform.yaml
rename to xos/onboard/exampleservice-old/exampleservice-onboard-longform.yaml
diff --git a/xos/onboard/exampleservice/exampleservice-onboard.yaml b/xos/onboard/exampleservice-old/exampleservice-onboard.yaml
similarity index 100%
rename from xos/onboard/exampleservice/exampleservice-onboard.yaml
rename to xos/onboard/exampleservice-old/exampleservice-onboard.yaml
diff --git a/xos/onboard/exampleservice/exampleservice.m4 b/xos/onboard/exampleservice-old/exampleservice.m4
similarity index 100%
rename from xos/onboard/exampleservice/exampleservice.m4
rename to xos/onboard/exampleservice-old/exampleservice.m4
diff --git a/xos/onboard/exampleservice/exampleservice.yaml b/xos/onboard/exampleservice-old/exampleservice.yaml
similarity index 100%
rename from xos/onboard/exampleservice/exampleservice.yaml
rename to xos/onboard/exampleservice-old/exampleservice.yaml
diff --git a/xos/onboard/exampleservice/macros.m4 b/xos/onboard/exampleservice-old/macros.m4
similarity index 100%
rename from xos/onboard/exampleservice/macros.m4
rename to xos/onboard/exampleservice-old/macros.m4
diff --git a/xos/onboard/exampleservice/make_synchronizer_manifest.sh b/xos/onboard/exampleservice-old/make_synchronizer_manifest.sh
similarity index 100%
rename from xos/onboard/exampleservice/make_synchronizer_manifest.sh
rename to xos/onboard/exampleservice-old/make_synchronizer_manifest.sh
diff --git a/xos/onboard/exampleservice/models.py b/xos/onboard/exampleservice-old/models.py
similarity index 100%
rename from xos/onboard/exampleservice/models.py
rename to xos/onboard/exampleservice-old/models.py
diff --git a/xos/onboard/exampleservice/synchronizer/exampleservice-synchronizer.py b/xos/onboard/exampleservice-old/synchronizer/exampleservice-synchronizer.py
similarity index 100%
rename from xos/onboard/exampleservice/synchronizer/exampleservice-synchronizer.py
rename to xos/onboard/exampleservice-old/synchronizer/exampleservice-synchronizer.py
diff --git a/xos/onboard/exampleservice/synchronizer/exampleservice_config b/xos/onboard/exampleservice-old/synchronizer/exampleservice_config
similarity index 100%
rename from xos/onboard/exampleservice/synchronizer/exampleservice_config
rename to xos/onboard/exampleservice-old/synchronizer/exampleservice_config
diff --git a/xos/onboard/exampleservice/synchronizer/manifest b/xos/onboard/exampleservice-old/synchronizer/manifest
similarity index 100%
rename from xos/onboard/exampleservice/synchronizer/manifest
rename to xos/onboard/exampleservice-old/synchronizer/manifest
diff --git a/xos/onboard/exampleservice/synchronizer/model-deps b/xos/onboard/exampleservice-old/synchronizer/model-deps
similarity index 100%
rename from xos/onboard/exampleservice/synchronizer/model-deps
rename to xos/onboard/exampleservice-old/synchronizer/model-deps
diff --git a/xos/onboard/exampleservice/synchronizer/run.sh b/xos/onboard/exampleservice-old/synchronizer/run.sh
similarity index 100%
rename from xos/onboard/exampleservice/synchronizer/run.sh
rename to xos/onboard/exampleservice-old/synchronizer/run.sh
diff --git a/xos/onboard/exampleservice/synchronizer/steps/exampletenant_playbook.yaml b/xos/onboard/exampleservice-old/synchronizer/steps/exampletenant_playbook.yaml
similarity index 100%
rename from xos/onboard/exampleservice/synchronizer/steps/exampletenant_playbook.yaml
rename to xos/onboard/exampleservice-old/synchronizer/steps/exampletenant_playbook.yaml
diff --git a/xos/onboard/exampleservice/synchronizer/steps/roles/create_index/tasks/main.yml b/xos/onboard/exampleservice-old/synchronizer/steps/roles/create_index/tasks/main.yml
similarity index 100%
rename from xos/onboard/exampleservice/synchronizer/steps/roles/create_index/tasks/main.yml
rename to xos/onboard/exampleservice-old/synchronizer/steps/roles/create_index/tasks/main.yml
diff --git a/xos/onboard/exampleservice/synchronizer/steps/roles/create_index/templates/index.html.j2 b/xos/onboard/exampleservice-old/synchronizer/steps/roles/create_index/templates/index.html.j2
similarity index 100%
rename from xos/onboard/exampleservice/synchronizer/steps/roles/create_index/templates/index.html.j2
rename to xos/onboard/exampleservice-old/synchronizer/steps/roles/create_index/templates/index.html.j2
diff --git a/xos/onboard/exampleservice/synchronizer/steps/roles/install_apache/tasks/main.yml b/xos/onboard/exampleservice-old/synchronizer/steps/roles/install_apache/tasks/main.yml
similarity index 100%
rename from xos/onboard/exampleservice/synchronizer/steps/roles/install_apache/tasks/main.yml
rename to xos/onboard/exampleservice-old/synchronizer/steps/roles/install_apache/tasks/main.yml
diff --git a/xos/onboard/exampleservice/synchronizer/steps/sync_exampletenant.py b/xos/onboard/exampleservice-old/synchronizer/steps/sync_exampletenant.py
similarity index 100%
rename from xos/onboard/exampleservice/synchronizer/steps/sync_exampletenant.py
rename to xos/onboard/exampleservice-old/synchronizer/steps/sync_exampletenant.py
diff --git a/xos/onboard/exampleservice/tosca/resources/exampleservice.py b/xos/onboard/exampleservice-old/tosca/resources/exampleservice.py
similarity index 100%
rename from xos/onboard/exampleservice/tosca/resources/exampleservice.py
rename to xos/onboard/exampleservice-old/tosca/resources/exampleservice.py
diff --git a/xos/onboard/exampleservice/tosca/resources/exampletenant.py b/xos/onboard/exampleservice-old/tosca/resources/exampletenant.py
similarity index 100%
rename from xos/onboard/exampleservice/tosca/resources/exampletenant.py
rename to xos/onboard/exampleservice-old/tosca/resources/exampletenant.py
diff --git a/xos/onboard/fabric/admin.py b/xos/onboard/fabric-old/admin.py
similarity index 100%
rename from xos/onboard/fabric/admin.py
rename to xos/onboard/fabric-old/admin.py
diff --git a/xos/onboard/fabric/fabric-onboard.yaml b/xos/onboard/fabric-old/fabric-onboard.yaml
similarity index 100%
rename from xos/onboard/fabric/fabric-onboard.yaml
rename to xos/onboard/fabric-old/fabric-onboard.yaml
diff --git a/xos/onboard/fabric/models.py b/xos/onboard/fabric-old/models.py
similarity index 100%
rename from xos/onboard/fabric/models.py
rename to xos/onboard/fabric-old/models.py
diff --git a/xos/onboard/fabric/synchronizer/fabric-synchronizer.py b/xos/onboard/fabric-old/synchronizer/fabric-synchronizer.py
similarity index 100%
rename from xos/onboard/fabric/synchronizer/fabric-synchronizer.py
rename to xos/onboard/fabric-old/synchronizer/fabric-synchronizer.py
diff --git a/xos/onboard/fabric/synchronizer/fabric_synchronizer_config b/xos/onboard/fabric-old/synchronizer/fabric_synchronizer_config
similarity index 100%
rename from xos/onboard/fabric/synchronizer/fabric_synchronizer_config
rename to xos/onboard/fabric-old/synchronizer/fabric_synchronizer_config
diff --git a/xos/onboard/fabric/synchronizer/manifest b/xos/onboard/fabric-old/synchronizer/manifest
similarity index 100%
rename from xos/onboard/fabric/synchronizer/manifest
rename to xos/onboard/fabric-old/synchronizer/manifest
diff --git a/xos/onboard/fabric/synchronizer/model-deps b/xos/onboard/fabric-old/synchronizer/model-deps
similarity index 100%
rename from xos/onboard/fabric/synchronizer/model-deps
rename to xos/onboard/fabric-old/synchronizer/model-deps
diff --git a/xos/onboard/fabric/synchronizer/run.sh b/xos/onboard/fabric-old/synchronizer/run.sh
similarity index 100%
rename from xos/onboard/fabric/synchronizer/run.sh
rename to xos/onboard/fabric-old/synchronizer/run.sh
diff --git a/xos/onboard/fabric/synchronizer/start.sh b/xos/onboard/fabric-old/synchronizer/start.sh
similarity index 100%
rename from xos/onboard/fabric/synchronizer/start.sh
rename to xos/onboard/fabric-old/synchronizer/start.sh
diff --git a/xos/onboard/fabric/synchronizer/steps/sync_host.yaml b/xos/onboard/fabric-old/synchronizer/steps/sync_host.yaml
similarity index 100%
rename from xos/onboard/fabric/synchronizer/steps/sync_host.yaml
rename to xos/onboard/fabric-old/synchronizer/steps/sync_host.yaml
diff --git a/xos/onboard/fabric/synchronizer/steps/sync_vroutertenant.py b/xos/onboard/fabric-old/synchronizer/steps/sync_vroutertenant.py
similarity index 100%
rename from xos/onboard/fabric/synchronizer/steps/sync_vroutertenant.py
rename to xos/onboard/fabric-old/synchronizer/steps/sync_vroutertenant.py
diff --git a/xos/onboard/fabric/synchronizer/stop.sh b/xos/onboard/fabric-old/synchronizer/stop.sh
similarity index 100%
rename from xos/onboard/fabric/synchronizer/stop.sh
rename to xos/onboard/fabric-old/synchronizer/stop.sh
diff --git a/xos/onboard/fabric/templates/fabricadmin.html b/xos/onboard/fabric-old/templates/fabricadmin.html
similarity index 100%
rename from xos/onboard/fabric/templates/fabricadmin.html
rename to xos/onboard/fabric-old/templates/fabricadmin.html
diff --git a/xos/onboard/fabric/tosca/resources/fabricservice.py b/xos/onboard/fabric-old/tosca/resources/fabricservice.py
similarity index 100%
rename from xos/onboard/fabric/tosca/resources/fabricservice.py
rename to xos/onboard/fabric-old/tosca/resources/fabricservice.py
diff --git a/xos/onboard/onos/admin.py b/xos/onboard/onos-old/admin.py
similarity index 100%
rename from xos/onboard/onos/admin.py
rename to xos/onboard/onos-old/admin.py
diff --git a/xos/onboard/onos/api/service/onos.py b/xos/onboard/onos-old/api/service/onos.py
similarity index 100%
rename from xos/onboard/onos/api/service/onos.py
rename to xos/onboard/onos-old/api/service/onos.py
diff --git a/xos/onboard/onos/api/tenant/onos/app.py b/xos/onboard/onos-old/api/tenant/onos/app.py
similarity index 100%
rename from xos/onboard/onos/api/tenant/onos/app.py
rename to xos/onboard/onos-old/api/tenant/onos/app.py
diff --git a/xos/onboard/onos/models.py b/xos/onboard/onos-old/models.py
similarity index 100%
rename from xos/onboard/onos/models.py
rename to xos/onboard/onos-old/models.py
diff --git a/xos/onboard/onos/onos-onboard.yaml b/xos/onboard/onos-old/onos-onboard.yaml
similarity index 100%
rename from xos/onboard/onos/onos-onboard.yaml
rename to xos/onboard/onos-old/onos-onboard.yaml
diff --git a/xos/onboard/onos/synchronizer/manifest b/xos/onboard/onos-old/synchronizer/manifest
similarity index 100%
rename from xos/onboard/onos/synchronizer/manifest
rename to xos/onboard/onos-old/synchronizer/manifest
diff --git a/xos/onboard/onos/synchronizer/model-deps b/xos/onboard/onos-old/synchronizer/model-deps
similarity index 100%
rename from xos/onboard/onos/synchronizer/model-deps
rename to xos/onboard/onos-old/synchronizer/model-deps
diff --git a/xos/onboard/onos/synchronizer/onos-ext-notifier-1.0-SNAPSHOT.oar b/xos/onboard/onos-old/synchronizer/onos-ext-notifier-1.0-SNAPSHOT.oar
similarity index 100%
rename from xos/onboard/onos/synchronizer/onos-ext-notifier-1.0-SNAPSHOT.oar
rename to xos/onboard/onos-old/synchronizer/onos-ext-notifier-1.0-SNAPSHOT.oar
Binary files differ
diff --git a/xos/onboard/onos/synchronizer/onos-ext-volt-event-publisher-1.0-SNAPSHOT.oar b/xos/onboard/onos-old/synchronizer/onos-ext-volt-event-publisher-1.0-SNAPSHOT.oar
similarity index 100%
rename from xos/onboard/onos/synchronizer/onos-ext-volt-event-publisher-1.0-SNAPSHOT.oar
rename to xos/onboard/onos-old/synchronizer/onos-ext-volt-event-publisher-1.0-SNAPSHOT.oar
Binary files differ
diff --git a/xos/onboard/onos/synchronizer/onos-synchronizer.py b/xos/onboard/onos-old/synchronizer/onos-synchronizer.py
similarity index 100%
rename from xos/onboard/onos/synchronizer/onos-synchronizer.py
rename to xos/onboard/onos-old/synchronizer/onos-synchronizer.py
diff --git a/xos/onboard/onos/synchronizer/onos_synchronizer_config b/xos/onboard/onos-old/synchronizer/onos_synchronizer_config
similarity index 100%
rename from xos/onboard/onos/synchronizer/onos_synchronizer_config
rename to xos/onboard/onos-old/synchronizer/onos_synchronizer_config
diff --git a/xos/onboard/onos/synchronizer/run.sh b/xos/onboard/onos-old/synchronizer/run.sh
similarity index 100%
rename from xos/onboard/onos/synchronizer/run.sh
rename to xos/onboard/onos-old/synchronizer/run.sh
diff --git a/xos/onboard/onos/synchronizer/scripts/dockerip.sh b/xos/onboard/onos-old/synchronizer/scripts/dockerip.sh
similarity index 100%
rename from xos/onboard/onos/synchronizer/scripts/dockerip.sh
rename to xos/onboard/onos-old/synchronizer/scripts/dockerip.sh
diff --git a/xos/onboard/onos/synchronizer/start.sh b/xos/onboard/onos-old/synchronizer/start.sh
similarity index 100%
rename from xos/onboard/onos/synchronizer/start.sh
rename to xos/onboard/onos-old/synchronizer/start.sh
diff --git a/xos/onboard/onos/synchronizer/steps/sync_onosapp.py b/xos/onboard/onos-old/synchronizer/steps/sync_onosapp.py
similarity index 100%
rename from xos/onboard/onos/synchronizer/steps/sync_onosapp.py
rename to xos/onboard/onos-old/synchronizer/steps/sync_onosapp.py
diff --git a/xos/onboard/onos/synchronizer/steps/sync_onosapp.yaml b/xos/onboard/onos-old/synchronizer/steps/sync_onosapp.yaml
similarity index 100%
rename from xos/onboard/onos/synchronizer/steps/sync_onosapp.yaml
rename to xos/onboard/onos-old/synchronizer/steps/sync_onosapp.yaml
diff --git a/xos/onboard/onos/synchronizer/steps/sync_onosapp_nocontainer.yaml b/xos/onboard/onos-old/synchronizer/steps/sync_onosapp_nocontainer.yaml
similarity index 100%
rename from xos/onboard/onos/synchronizer/steps/sync_onosapp_nocontainer.yaml
rename to xos/onboard/onos-old/synchronizer/steps/sync_onosapp_nocontainer.yaml
diff --git a/xos/onboard/onos/synchronizer/steps/sync_onosservice.py b/xos/onboard/onos-old/synchronizer/steps/sync_onosservice.py
similarity index 100%
rename from xos/onboard/onos/synchronizer/steps/sync_onosservice.py
rename to xos/onboard/onos-old/synchronizer/steps/sync_onosservice.py
diff --git a/xos/onboard/onos/synchronizer/steps/sync_onosservice.yaml b/xos/onboard/onos-old/synchronizer/steps/sync_onosservice.yaml
similarity index 100%
rename from xos/onboard/onos/synchronizer/steps/sync_onosservice.yaml
rename to xos/onboard/onos-old/synchronizer/steps/sync_onosservice.yaml
diff --git a/xos/onboard/onos/synchronizer/stop.sh b/xos/onboard/onos-old/synchronizer/stop.sh
similarity index 100%
rename from xos/onboard/onos/synchronizer/stop.sh
rename to xos/onboard/onos-old/synchronizer/stop.sh
diff --git a/xos/onboard/onos/synchronizer/supervisor/onos-observer.conf b/xos/onboard/onos-old/synchronizer/supervisor/onos-observer.conf
similarity index 100%
rename from xos/onboard/onos/synchronizer/supervisor/onos-observer.conf
rename to xos/onboard/onos-old/synchronizer/supervisor/onos-observer.conf
diff --git a/xos/onboard/onos/templates/onosadmin.html b/xos/onboard/onos-old/templates/onosadmin.html
similarity index 100%
rename from xos/onboard/onos/templates/onosadmin.html
rename to xos/onboard/onos-old/templates/onosadmin.html
diff --git a/xos/onboard/onos/tosca/resources/onosapp.py b/xos/onboard/onos-old/tosca/resources/onosapp.py
similarity index 100%
rename from xos/onboard/onos/tosca/resources/onosapp.py
rename to xos/onboard/onos-old/tosca/resources/onosapp.py
diff --git a/xos/onboard/onos/tosca/resources/onosservice.py b/xos/onboard/onos-old/tosca/resources/onosservice.py
similarity index 100%
rename from xos/onboard/onos/tosca/resources/onosservice.py
rename to xos/onboard/onos-old/tosca/resources/onosservice.py
diff --git a/xos/onboard/volt/admin.py b/xos/onboard/volt-old/admin.py
similarity index 100%
rename from xos/onboard/volt/admin.py
rename to xos/onboard/volt-old/admin.py
diff --git a/xos/onboard/volt/api/tenant/cord/subscriber.py b/xos/onboard/volt-old/api/tenant/cord/subscriber.py
similarity index 100%
rename from xos/onboard/volt/api/tenant/cord/subscriber.py
rename to xos/onboard/volt-old/api/tenant/cord/subscriber.py
diff --git a/xos/onboard/volt/api/tenant/cord/volt.py b/xos/onboard/volt-old/api/tenant/cord/volt.py
similarity index 100%
rename from xos/onboard/volt/api/tenant/cord/volt.py
rename to xos/onboard/volt-old/api/tenant/cord/volt.py
diff --git a/xos/onboard/volt/models.py b/xos/onboard/volt-old/models.py
similarity index 100%
rename from xos/onboard/volt/models.py
rename to xos/onboard/volt-old/models.py
diff --git a/xos/onboard/volt/templates/voltadmin.html b/xos/onboard/volt-old/templates/voltadmin.html
similarity index 100%
rename from xos/onboard/volt/templates/voltadmin.html
rename to xos/onboard/volt-old/templates/voltadmin.html
diff --git a/xos/onboard/volt/tosca/resources/CORDSubscriber.py b/xos/onboard/volt-old/tosca/resources/CORDSubscriber.py
similarity index 100%
rename from xos/onboard/volt/tosca/resources/CORDSubscriber.py
rename to xos/onboard/volt-old/tosca/resources/CORDSubscriber.py
diff --git a/xos/onboard/volt/tosca/resources/CORDUser.py b/xos/onboard/volt-old/tosca/resources/CORDUser.py
similarity index 100%
rename from xos/onboard/volt/tosca/resources/CORDUser.py
rename to xos/onboard/volt-old/tosca/resources/CORDUser.py
diff --git a/xos/onboard/volt/tosca/resources/VOLTTenant.py b/xos/onboard/volt-old/tosca/resources/VOLTTenant.py
similarity index 100%
rename from xos/onboard/volt/tosca/resources/VOLTTenant.py
rename to xos/onboard/volt-old/tosca/resources/VOLTTenant.py
diff --git a/xos/onboard/volt/tosca/resources/accessagent.py b/xos/onboard/volt-old/tosca/resources/accessagent.py
similarity index 100%
rename from xos/onboard/volt/tosca/resources/accessagent.py
rename to xos/onboard/volt-old/tosca/resources/accessagent.py
diff --git a/xos/onboard/volt/tosca/resources/accessdevice.py b/xos/onboard/volt-old/tosca/resources/accessdevice.py
similarity index 100%
rename from xos/onboard/volt/tosca/resources/accessdevice.py
rename to xos/onboard/volt-old/tosca/resources/accessdevice.py
diff --git a/xos/onboard/volt/tosca/resources/voltdevice.py b/xos/onboard/volt-old/tosca/resources/voltdevice.py
similarity index 100%
rename from xos/onboard/volt/tosca/resources/voltdevice.py
rename to xos/onboard/volt-old/tosca/resources/voltdevice.py
diff --git a/xos/onboard/volt/tosca/resources/voltservice.py b/xos/onboard/volt-old/tosca/resources/voltservice.py
similarity index 100%
rename from xos/onboard/volt/tosca/resources/voltservice.py
rename to xos/onboard/volt-old/tosca/resources/voltservice.py
diff --git a/xos/onboard/volt/volt-onboard.yaml b/xos/onboard/volt-old/volt-onboard.yaml
similarity index 100%
rename from xos/onboard/volt/volt-onboard.yaml
rename to xos/onboard/volt-old/volt-onboard.yaml
diff --git a/xos/onboard/vrouter/admin.py b/xos/onboard/vrouter-old/admin.py
similarity index 100%
rename from xos/onboard/vrouter/admin.py
rename to xos/onboard/vrouter-old/admin.py
diff --git a/xos/onboard/vrouter/models.py b/xos/onboard/vrouter-old/models.py
similarity index 100%
rename from xos/onboard/vrouter/models.py
rename to xos/onboard/vrouter-old/models.py
diff --git a/xos/onboard/vrouter/templates/vrouteradmin.html b/xos/onboard/vrouter-old/templates/vrouteradmin.html
similarity index 100%
rename from xos/onboard/vrouter/templates/vrouteradmin.html
rename to xos/onboard/vrouter-old/templates/vrouteradmin.html
diff --git a/xos/onboard/vrouter/tosca/resources/vrouterservice.py b/xos/onboard/vrouter-old/tosca/resources/vrouterservice.py
similarity index 100%
rename from xos/onboard/vrouter/tosca/resources/vrouterservice.py
rename to xos/onboard/vrouter-old/tosca/resources/vrouterservice.py
diff --git a/xos/onboard/vrouter/vrouter-onboard.yaml b/xos/onboard/vrouter-old/vrouter-onboard.yaml
similarity index 100%
rename from xos/onboard/vrouter/vrouter-onboard.yaml
rename to xos/onboard/vrouter-old/vrouter-onboard.yaml
diff --git a/xos/onboard/vsg/admin.py b/xos/onboard/vsg-old/admin.py
similarity index 100%
rename from xos/onboard/vsg/admin.py
rename to xos/onboard/vsg-old/admin.py
diff --git a/xos/onboard/vsg/api/service/vsg/vsgservice.py b/xos/onboard/vsg-old/api/service/vsg/vsgservice.py
similarity index 100%
rename from xos/onboard/vsg/api/service/vsg/vsgservice.py
rename to xos/onboard/vsg-old/api/service/vsg/vsgservice.py
diff --git a/xos/onboard/vsg/api/tenant/cord/vsg.py b/xos/onboard/vsg-old/api/tenant/cord/vsg.py
similarity index 100%
rename from xos/onboard/vsg/api/tenant/cord/vsg.py
rename to xos/onboard/vsg-old/api/tenant/cord/vsg.py
diff --git a/xos/onboard/vsg/models.py b/xos/onboard/vsg-old/models.py
similarity index 100%
rename from xos/onboard/vsg/models.py
rename to xos/onboard/vsg-old/models.py
diff --git a/xos/onboard/vsg/synchronizer/broadbandshield.py b/xos/onboard/vsg-old/synchronizer/broadbandshield.py
similarity index 100%
rename from xos/onboard/vsg/synchronizer/broadbandshield.py
rename to xos/onboard/vsg-old/synchronizer/broadbandshield.py
diff --git a/xos/onboard/vsg/synchronizer/files/docker.list b/xos/onboard/vsg-old/synchronizer/files/docker.list
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/docker.list
rename to xos/onboard/vsg-old/synchronizer/files/docker.list
diff --git a/xos/onboard/vsg/synchronizer/files/etc/rc.local b/xos/onboard/vsg-old/synchronizer/files/etc/rc.local
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/etc/rc.local
rename to xos/onboard/vsg-old/synchronizer/files/etc/rc.local
diff --git a/xos/onboard/vsg/synchronizer/files/etc/service/message/run b/xos/onboard/vsg-old/synchronizer/files/etc/service/message/run
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/etc/service/message/run
rename to xos/onboard/vsg-old/synchronizer/files/etc/service/message/run
diff --git a/xos/onboard/vsg/synchronizer/files/etc/ufw/after.init b/xos/onboard/vsg-old/synchronizer/files/etc/ufw/after.init
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/etc/ufw/after.init
rename to xos/onboard/vsg-old/synchronizer/files/etc/ufw/after.init
diff --git a/xos/onboard/vsg/synchronizer/files/etc/ufw/after.rules b/xos/onboard/vsg-old/synchronizer/files/etc/ufw/after.rules
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/etc/ufw/after.rules
rename to xos/onboard/vsg-old/synchronizer/files/etc/ufw/after.rules
diff --git a/xos/onboard/vsg/synchronizer/files/etc/ufw/after6.rules b/xos/onboard/vsg-old/synchronizer/files/etc/ufw/after6.rules
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/etc/ufw/after6.rules
rename to xos/onboard/vsg-old/synchronizer/files/etc/ufw/after6.rules
diff --git a/xos/onboard/vsg/synchronizer/files/etc/ufw/applications.d/openssh-server b/xos/onboard/vsg-old/synchronizer/files/etc/ufw/applications.d/openssh-server
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/etc/ufw/applications.d/openssh-server
rename to xos/onboard/vsg-old/synchronizer/files/etc/ufw/applications.d/openssh-server
diff --git a/xos/onboard/vsg/synchronizer/files/etc/ufw/before.init b/xos/onboard/vsg-old/synchronizer/files/etc/ufw/before.init
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/etc/ufw/before.init
rename to xos/onboard/vsg-old/synchronizer/files/etc/ufw/before.init
diff --git a/xos/onboard/vsg/synchronizer/files/etc/ufw/before6.rules b/xos/onboard/vsg-old/synchronizer/files/etc/ufw/before6.rules
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/etc/ufw/before6.rules
rename to xos/onboard/vsg-old/synchronizer/files/etc/ufw/before6.rules
diff --git a/xos/onboard/vsg/synchronizer/files/etc/ufw/sysctl.conf b/xos/onboard/vsg-old/synchronizer/files/etc/ufw/sysctl.conf
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/etc/ufw/sysctl.conf
rename to xos/onboard/vsg-old/synchronizer/files/etc/ufw/sysctl.conf
diff --git a/xos/onboard/vsg/synchronizer/files/etc/ufw/ufw.conf b/xos/onboard/vsg-old/synchronizer/files/etc/ufw/ufw.conf
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/etc/ufw/ufw.conf
rename to xos/onboard/vsg-old/synchronizer/files/etc/ufw/ufw.conf
diff --git a/xos/onboard/vsg/synchronizer/files/vcpe.conf b/xos/onboard/vsg-old/synchronizer/files/vcpe.conf
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/vcpe.conf
rename to xos/onboard/vsg-old/synchronizer/files/vcpe.conf
diff --git a/xos/onboard/vsg/synchronizer/files/vcpe.dnsmasq b/xos/onboard/vsg-old/synchronizer/files/vcpe.dnsmasq
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/vcpe.dnsmasq
rename to xos/onboard/vsg-old/synchronizer/files/vcpe.dnsmasq
diff --git a/xos/onboard/vsg/synchronizer/files/vm-resolv.conf b/xos/onboard/vsg-old/synchronizer/files/vm-resolv.conf
similarity index 100%
rename from xos/onboard/vsg/synchronizer/files/vm-resolv.conf
rename to xos/onboard/vsg-old/synchronizer/files/vm-resolv.conf
diff --git a/xos/onboard/vsg/synchronizer/manifest b/xos/onboard/vsg-old/synchronizer/manifest
similarity index 100%
rename from xos/onboard/vsg/synchronizer/manifest
rename to xos/onboard/vsg-old/synchronizer/manifest
diff --git a/xos/onboard/vsg/synchronizer/model-deps b/xos/onboard/vsg-old/synchronizer/model-deps
similarity index 100%
rename from xos/onboard/vsg/synchronizer/model-deps
rename to xos/onboard/vsg-old/synchronizer/model-deps
diff --git a/xos/onboard/vsg/synchronizer/observer_ansible_test.py b/xos/onboard/vsg-old/synchronizer/observer_ansible_test.py
similarity index 100%
rename from xos/onboard/vsg/synchronizer/observer_ansible_test.py
rename to xos/onboard/vsg-old/synchronizer/observer_ansible_test.py
diff --git a/xos/onboard/vsg/synchronizer/run-vtn.sh b/xos/onboard/vsg-old/synchronizer/run-vtn.sh
similarity index 100%
rename from xos/onboard/vsg/synchronizer/run-vtn.sh
rename to xos/onboard/vsg-old/synchronizer/run-vtn.sh
diff --git a/xos/onboard/vsg/synchronizer/run.sh b/xos/onboard/vsg-old/synchronizer/run.sh
similarity index 100%
rename from xos/onboard/vsg/synchronizer/run.sh
rename to xos/onboard/vsg-old/synchronizer/run.sh
diff --git a/xos/onboard/vsg/synchronizer/start-bbs.sh b/xos/onboard/vsg-old/synchronizer/start-bbs.sh
similarity index 100%
rename from xos/onboard/vsg/synchronizer/start-bbs.sh
rename to xos/onboard/vsg-old/synchronizer/start-bbs.sh
diff --git a/xos/onboard/vsg/synchronizer/start.sh b/xos/onboard/vsg-old/synchronizer/start.sh
similarity index 100%
rename from xos/onboard/vsg/synchronizer/start.sh
rename to xos/onboard/vsg-old/synchronizer/start.sh
diff --git a/xos/onboard/vsg/synchronizer/steps/ansible_test/README b/xos/onboard/vsg-old/synchronizer/steps/ansible_test/README
similarity index 100%
rename from xos/onboard/vsg/synchronizer/steps/ansible_test/README
rename to xos/onboard/vsg-old/synchronizer/steps/ansible_test/README
diff --git a/xos/onboard/vsg/synchronizer/steps/ansible_test/inventory.txt b/xos/onboard/vsg-old/synchronizer/steps/ansible_test/inventory.txt
similarity index 100%
rename from xos/onboard/vsg/synchronizer/steps/ansible_test/inventory.txt
rename to xos/onboard/vsg-old/synchronizer/steps/ansible_test/inventory.txt
diff --git a/xos/onboard/vsg/synchronizer/steps/ansible_test/test.sh b/xos/onboard/vsg-old/synchronizer/steps/ansible_test/test.sh
similarity index 100%
rename from xos/onboard/vsg/synchronizer/steps/ansible_test/test.sh
rename to xos/onboard/vsg-old/synchronizer/steps/ansible_test/test.sh
diff --git a/xos/onboard/vsg/synchronizer/steps/ansible_test/test.yaml b/xos/onboard/vsg-old/synchronizer/steps/ansible_test/test.yaml
similarity index 100%
rename from xos/onboard/vsg/synchronizer/steps/ansible_test/test.yaml
rename to xos/onboard/vsg-old/synchronizer/steps/ansible_test/test.yaml
diff --git a/xos/onboard/vsg/synchronizer/steps/ansible_test/xos.py b/xos/onboard/vsg-old/synchronizer/steps/ansible_test/xos.py
similarity index 100%
rename from xos/onboard/vsg/synchronizer/steps/ansible_test/xos.py
rename to xos/onboard/vsg-old/synchronizer/steps/ansible_test/xos.py
diff --git a/xos/onboard/vsg/synchronizer/steps/sync_vcpetenant.py b/xos/onboard/vsg-old/synchronizer/steps/sync_vcpetenant.py
similarity index 100%
rename from xos/onboard/vsg/synchronizer/steps/sync_vcpetenant.py
rename to xos/onboard/vsg-old/synchronizer/steps/sync_vcpetenant.py
diff --git a/xos/onboard/vsg/synchronizer/steps/sync_vcpetenant.yaml b/xos/onboard/vsg-old/synchronizer/steps/sync_vcpetenant.yaml
similarity index 100%
rename from xos/onboard/vsg/synchronizer/steps/sync_vcpetenant.yaml
rename to xos/onboard/vsg-old/synchronizer/steps/sync_vcpetenant.yaml
diff --git a/xos/onboard/vsg/synchronizer/steps/sync_vcpetenant_new.yaml b/xos/onboard/vsg-old/synchronizer/steps/sync_vcpetenant_new.yaml
similarity index 100%
rename from xos/onboard/vsg/synchronizer/steps/sync_vcpetenant_new.yaml
rename to xos/onboard/vsg-old/synchronizer/steps/sync_vcpetenant_new.yaml
diff --git a/xos/onboard/vsg/synchronizer/steps/sync_vcpetenant_vtn.yaml b/xos/onboard/vsg-old/synchronizer/steps/sync_vcpetenant_vtn.yaml
similarity index 100%
rename from xos/onboard/vsg/synchronizer/steps/sync_vcpetenant_vtn.yaml
rename to xos/onboard/vsg-old/synchronizer/steps/sync_vcpetenant_vtn.yaml
diff --git a/xos/onboard/vsg/synchronizer/steps/test.yaml b/xos/onboard/vsg-old/synchronizer/steps/test.yaml
similarity index 100%
rename from xos/onboard/vsg/synchronizer/steps/test.yaml
rename to xos/onboard/vsg-old/synchronizer/steps/test.yaml
diff --git a/xos/onboard/vsg/synchronizer/stop.sh b/xos/onboard/vsg-old/synchronizer/stop.sh
similarity index 100%
rename from xos/onboard/vsg/synchronizer/stop.sh
rename to xos/onboard/vsg-old/synchronizer/stop.sh
diff --git a/xos/onboard/vsg/synchronizer/supervisor/vcpe-observer.conf b/xos/onboard/vsg-old/synchronizer/supervisor/vcpe-observer.conf
similarity index 100%
rename from xos/onboard/vsg/synchronizer/supervisor/vcpe-observer.conf
rename to xos/onboard/vsg-old/synchronizer/supervisor/vcpe-observer.conf
diff --git a/xos/onboard/vsg/synchronizer/templates/before.rules.j2 b/xos/onboard/vsg-old/synchronizer/templates/before.rules.j2
similarity index 100%
rename from xos/onboard/vsg/synchronizer/templates/before.rules.j2
rename to xos/onboard/vsg-old/synchronizer/templates/before.rules.j2
diff --git a/xos/onboard/vsg/synchronizer/templates/bwlimit.sh.j2 b/xos/onboard/vsg-old/synchronizer/templates/bwlimit.sh.j2
similarity index 100%
rename from xos/onboard/vsg/synchronizer/templates/bwlimit.sh.j2
rename to xos/onboard/vsg-old/synchronizer/templates/bwlimit.sh.j2
diff --git a/xos/onboard/vsg/synchronizer/templates/dnsmasq_safe_servers.j2 b/xos/onboard/vsg-old/synchronizer/templates/dnsmasq_safe_servers.j2
similarity index 100%
rename from xos/onboard/vsg/synchronizer/templates/dnsmasq_safe_servers.j2
rename to xos/onboard/vsg-old/synchronizer/templates/dnsmasq_safe_servers.j2
diff --git a/xos/onboard/vsg/synchronizer/templates/dnsmasq_servers.j2 b/xos/onboard/vsg-old/synchronizer/templates/dnsmasq_servers.j2
similarity index 100%
rename from xos/onboard/vsg/synchronizer/templates/dnsmasq_servers.j2
rename to xos/onboard/vsg-old/synchronizer/templates/dnsmasq_servers.j2
diff --git a/xos/onboard/vsg/synchronizer/templates/firewall_sample.j2 b/xos/onboard/vsg-old/synchronizer/templates/firewall_sample.j2
similarity index 100%
rename from xos/onboard/vsg/synchronizer/templates/firewall_sample.j2
rename to xos/onboard/vsg-old/synchronizer/templates/firewall_sample.j2
diff --git a/xos/onboard/vsg/synchronizer/templates/message.html.j2 b/xos/onboard/vsg-old/synchronizer/templates/message.html.j2
similarity index 100%
rename from xos/onboard/vsg/synchronizer/templates/message.html.j2
rename to xos/onboard/vsg-old/synchronizer/templates/message.html.j2
diff --git a/xos/onboard/vsg/synchronizer/templates/rc.local.j2 b/xos/onboard/vsg-old/synchronizer/templates/rc.local.j2
similarity index 100%
rename from xos/onboard/vsg/synchronizer/templates/rc.local.j2
rename to xos/onboard/vsg-old/synchronizer/templates/rc.local.j2
diff --git a/xos/onboard/vsg/synchronizer/templates/start-vcpe-vtn.sh.j2 b/xos/onboard/vsg-old/synchronizer/templates/start-vcpe-vtn.sh.j2
similarity index 100%
rename from xos/onboard/vsg/synchronizer/templates/start-vcpe-vtn.sh.j2
rename to xos/onboard/vsg-old/synchronizer/templates/start-vcpe-vtn.sh.j2
diff --git a/xos/onboard/vsg/synchronizer/templates/start-vcpe.sh.j2 b/xos/onboard/vsg-old/synchronizer/templates/start-vcpe.sh.j2
similarity index 100%
rename from xos/onboard/vsg/synchronizer/templates/start-vcpe.sh.j2
rename to xos/onboard/vsg-old/synchronizer/templates/start-vcpe.sh.j2
diff --git a/xos/onboard/vsg/synchronizer/templates/vcpe.conf.j2 b/xos/onboard/vsg-old/synchronizer/templates/vcpe.conf.j2
similarity index 100%
rename from xos/onboard/vsg/synchronizer/templates/vcpe.conf.j2
rename to xos/onboard/vsg-old/synchronizer/templates/vcpe.conf.j2
diff --git a/xos/onboard/vsg/synchronizer/templates/vlan_sample.j2 b/xos/onboard/vsg-old/synchronizer/templates/vlan_sample.j2
similarity index 100%
rename from xos/onboard/vsg/synchronizer/templates/vlan_sample.j2
rename to xos/onboard/vsg-old/synchronizer/templates/vlan_sample.j2
diff --git a/xos/onboard/vsg/synchronizer/vcpe-synchronizer.py b/xos/onboard/vsg-old/synchronizer/vcpe-synchronizer.py
similarity index 100%
rename from xos/onboard/vsg/synchronizer/vcpe-synchronizer.py
rename to xos/onboard/vsg-old/synchronizer/vcpe-synchronizer.py
diff --git a/xos/onboard/vsg/synchronizer/vcpe_stats_notifier.py b/xos/onboard/vsg-old/synchronizer/vcpe_stats_notifier.py
similarity index 100%
rename from xos/onboard/vsg/synchronizer/vcpe_stats_notifier.py
rename to xos/onboard/vsg-old/synchronizer/vcpe_stats_notifier.py
diff --git a/xos/onboard/vsg/synchronizer/vcpe_synchronizer_config b/xos/onboard/vsg-old/synchronizer/vcpe_synchronizer_config
similarity index 100%
rename from xos/onboard/vsg/synchronizer/vcpe_synchronizer_config
rename to xos/onboard/vsg-old/synchronizer/vcpe_synchronizer_config
diff --git a/xos/onboard/vsg/synchronizer/vtn_vcpe_synchronizer_config b/xos/onboard/vsg-old/synchronizer/vtn_vcpe_synchronizer_config
similarity index 100%
rename from xos/onboard/vsg/synchronizer/vtn_vcpe_synchronizer_config
rename to xos/onboard/vsg-old/synchronizer/vtn_vcpe_synchronizer_config
diff --git a/xos/onboard/vsg/templates/vcpeadmin.html b/xos/onboard/vsg-old/templates/vcpeadmin.html
similarity index 100%
rename from xos/onboard/vsg/templates/vcpeadmin.html
rename to xos/onboard/vsg-old/templates/vcpeadmin.html
diff --git a/xos/onboard/vsg/tosca/resources/vcpeservice.py b/xos/onboard/vsg-old/tosca/resources/vcpeservice.py
similarity index 100%
rename from xos/onboard/vsg/tosca/resources/vcpeservice.py
rename to xos/onboard/vsg-old/tosca/resources/vcpeservice.py
diff --git a/xos/onboard/vsg/vsg-onboard.yaml b/xos/onboard/vsg-old/vsg-onboard.yaml
similarity index 100%
rename from xos/onboard/vsg/vsg-onboard.yaml
rename to xos/onboard/vsg-old/vsg-onboard.yaml
diff --git a/xos/onboard/vtn/admin.py b/xos/onboard/vtn-old/admin.py
similarity index 100%
rename from xos/onboard/vtn/admin.py
rename to xos/onboard/vtn-old/admin.py
diff --git a/xos/onboard/vtn/api/service/vtn.py b/xos/onboard/vtn-old/api/service/vtn.py
similarity index 100%
rename from xos/onboard/vtn/api/service/vtn.py
rename to xos/onboard/vtn-old/api/service/vtn.py
diff --git a/xos/onboard/vtn/models.py b/xos/onboard/vtn-old/models.py
similarity index 100%
rename from xos/onboard/vtn/models.py
rename to xos/onboard/vtn-old/models.py
diff --git a/xos/onboard/vtn/synchronizer/manifest b/xos/onboard/vtn-old/synchronizer/manifest
similarity index 100%
rename from xos/onboard/vtn/synchronizer/manifest
rename to xos/onboard/vtn-old/synchronizer/manifest
diff --git a/xos/onboard/vtn/synchronizer/model-deps b/xos/onboard/vtn-old/synchronizer/model-deps
similarity index 100%
rename from xos/onboard/vtn/synchronizer/model-deps
rename to xos/onboard/vtn-old/synchronizer/model-deps
diff --git a/xos/onboard/vtn/synchronizer/run.sh b/xos/onboard/vtn-old/synchronizer/run.sh
similarity index 100%
rename from xos/onboard/vtn/synchronizer/run.sh
rename to xos/onboard/vtn-old/synchronizer/run.sh
diff --git a/xos/onboard/vtn/synchronizer/start.sh b/xos/onboard/vtn-old/synchronizer/start.sh
similarity index 100%
rename from xos/onboard/vtn/synchronizer/start.sh
rename to xos/onboard/vtn-old/synchronizer/start.sh
diff --git a/xos/onboard/vtn/synchronizer/steps/sync_port_addresses.py b/xos/onboard/vtn-old/synchronizer/steps/sync_port_addresses.py
similarity index 100%
rename from xos/onboard/vtn/synchronizer/steps/sync_port_addresses.py
rename to xos/onboard/vtn-old/synchronizer/steps/sync_port_addresses.py
diff --git a/xos/onboard/vtn/synchronizer/steps/sync_tenant.py b/xos/onboard/vtn-old/synchronizer/steps/sync_tenant.py
similarity index 100%
rename from xos/onboard/vtn/synchronizer/steps/sync_tenant.py
rename to xos/onboard/vtn-old/synchronizer/steps/sync_tenant.py
diff --git a/xos/onboard/vtn/synchronizer/stop.sh b/xos/onboard/vtn-old/synchronizer/stop.sh
similarity index 100%
rename from xos/onboard/vtn/synchronizer/stop.sh
rename to xos/onboard/vtn-old/synchronizer/stop.sh
diff --git a/xos/onboard/vtn/synchronizer/supervisor/vtn-observer.conf b/xos/onboard/vtn-old/synchronizer/supervisor/vtn-observer.conf
similarity index 100%
rename from xos/onboard/vtn/synchronizer/supervisor/vtn-observer.conf
rename to xos/onboard/vtn-old/synchronizer/supervisor/vtn-observer.conf
diff --git a/xos/onboard/vtn/synchronizer/vtn-synchronizer.py b/xos/onboard/vtn-old/synchronizer/vtn-synchronizer.py
similarity index 100%
rename from xos/onboard/vtn/synchronizer/vtn-synchronizer.py
rename to xos/onboard/vtn-old/synchronizer/vtn-synchronizer.py
diff --git a/xos/onboard/vtn/synchronizer/vtn_synchronizer_config b/xos/onboard/vtn-old/synchronizer/vtn_synchronizer_config
similarity index 100%
rename from xos/onboard/vtn/synchronizer/vtn_synchronizer_config
rename to xos/onboard/vtn-old/synchronizer/vtn_synchronizer_config
diff --git a/xos/onboard/vtn/templates/vtnadmin.html b/xos/onboard/vtn-old/templates/vtnadmin.html
similarity index 100%
rename from xos/onboard/vtn/templates/vtnadmin.html
rename to xos/onboard/vtn-old/templates/vtnadmin.html
diff --git a/xos/onboard/vtn/tosca/resources/vtnservice.py b/xos/onboard/vtn-old/tosca/resources/vtnservice.py
similarity index 100%
rename from xos/onboard/vtn/tosca/resources/vtnservice.py
rename to xos/onboard/vtn-old/tosca/resources/vtnservice.py
diff --git a/xos/onboard/vtn/vtn-onboard.yaml b/xos/onboard/vtn-old/vtn-onboard.yaml
similarity index 100%
rename from xos/onboard/vtn/vtn-onboard.yaml
rename to xos/onboard/vtn-old/vtn-onboard.yaml
diff --git a/xos/onboard/vtr/admin.py b/xos/onboard/vtr-old/admin.py
similarity index 100%
rename from xos/onboard/vtr/admin.py
rename to xos/onboard/vtr-old/admin.py
diff --git a/xos/onboard/vtr/api/tenant/truckroll.py b/xos/onboard/vtr-old/api/tenant/truckroll.py
similarity index 100%
rename from xos/onboard/vtr/api/tenant/truckroll.py
rename to xos/onboard/vtr-old/api/tenant/truckroll.py
diff --git a/xos/onboard/vtr/models.py b/xos/onboard/vtr-old/models.py
similarity index 100%
rename from xos/onboard/vtr/models.py
rename to xos/onboard/vtr-old/models.py
diff --git a/xos/onboard/vtr/synchronizer/files/run_tcpdump.sh b/xos/onboard/vtr-old/synchronizer/files/run_tcpdump.sh
similarity index 100%
rename from xos/onboard/vtr/synchronizer/files/run_tcpdump.sh
rename to xos/onboard/vtr-old/synchronizer/files/run_tcpdump.sh
diff --git a/xos/onboard/vtr/synchronizer/manifest b/xos/onboard/vtr-old/synchronizer/manifest
similarity index 100%
rename from xos/onboard/vtr/synchronizer/manifest
rename to xos/onboard/vtr-old/synchronizer/manifest
diff --git a/xos/onboard/vtn/synchronizer/model-deps b/xos/onboard/vtr-old/synchronizer/model-deps
similarity index 100%
copy from xos/onboard/vtn/synchronizer/model-deps
copy to xos/onboard/vtr-old/synchronizer/model-deps
diff --git a/xos/onboard/vtr/synchronizer/run-vtn.sh b/xos/onboard/vtr-old/synchronizer/run-vtn.sh
similarity index 100%
rename from xos/onboard/vtr/synchronizer/run-vtn.sh
rename to xos/onboard/vtr-old/synchronizer/run-vtn.sh
diff --git a/xos/onboard/vtr/synchronizer/run.sh b/xos/onboard/vtr-old/synchronizer/run.sh
similarity index 100%
rename from xos/onboard/vtr/synchronizer/run.sh
rename to xos/onboard/vtr-old/synchronizer/run.sh
diff --git a/xos/onboard/vtr/synchronizer/steps/sync_vtrtenant.py b/xos/onboard/vtr-old/synchronizer/steps/sync_vtrtenant.py
similarity index 100%
rename from xos/onboard/vtr/synchronizer/steps/sync_vtrtenant.py
rename to xos/onboard/vtr-old/synchronizer/steps/sync_vtrtenant.py
diff --git a/xos/onboard/vtr/synchronizer/steps/sync_vtrtenant.yaml b/xos/onboard/vtr-old/synchronizer/steps/sync_vtrtenant.yaml
similarity index 100%
rename from xos/onboard/vtr/synchronizer/steps/sync_vtrtenant.yaml
rename to xos/onboard/vtr-old/synchronizer/steps/sync_vtrtenant.yaml
diff --git a/xos/onboard/vtr/synchronizer/vtn_vtr_synchronizer_config b/xos/onboard/vtr-old/synchronizer/vtn_vtr_synchronizer_config
similarity index 100%
rename from xos/onboard/vtr/synchronizer/vtn_vtr_synchronizer_config
rename to xos/onboard/vtr-old/synchronizer/vtn_vtr_synchronizer_config
diff --git a/xos/onboard/vtr/synchronizer/vtr-synchronizer.py b/xos/onboard/vtr-old/synchronizer/vtr-synchronizer.py
similarity index 100%
rename from xos/onboard/vtr/synchronizer/vtr-synchronizer.py
rename to xos/onboard/vtr-old/synchronizer/vtr-synchronizer.py
diff --git a/xos/onboard/vtr/synchronizer/vtr_synchronizer_config b/xos/onboard/vtr-old/synchronizer/vtr_synchronizer_config
similarity index 100%
rename from xos/onboard/vtr/synchronizer/vtr_synchronizer_config
rename to xos/onboard/vtr-old/synchronizer/vtr_synchronizer_config
diff --git a/xos/onboard/vtr/templates/vtradmin.html b/xos/onboard/vtr-old/templates/vtradmin.html
similarity index 100%
rename from xos/onboard/vtr/templates/vtradmin.html
rename to xos/onboard/vtr-old/templates/vtradmin.html
diff --git a/xos/onboard/vtr/vtr-onboard.yaml b/xos/onboard/vtr-old/vtr-onboard.yaml
similarity index 100%
rename from xos/onboard/vtr/vtr-onboard.yaml
rename to xos/onboard/vtr-old/vtr-onboard.yaml
diff --git a/xos/onboard/vtr/synchronizer/model-deps b/xos/onboard/vtr/synchronizer/model-deps
deleted file mode 100644
index 0967ef4..0000000
--- a/xos/onboard/vtr/synchronizer/model-deps
+++ /dev/null
@@ -1 +0,0 @@
-{}