commit 7ab0221025b40522238720c3ca0092e55ec3608c
author Scott Baker <smbaker@gmail.com> Wed Jun 29 14:12:15 2016 -0700
committer Scott Baker <smbaker@gmail.com> Wed Jun 29 14:22:44 2016 -0700
tree 5910d436d9535110ff40b57ee4fd77176efead29
parent d1545d3227c924a6a23f446d514f79a7d9f53019

remove temporary rm action in makefile
fix references to vtn configuration
make sure test_standalone keys are not created as root

Change-Id: Ie6ebff81c26137b35fe1c73cbadc8dc7a925e28a

test-standalone/Makefile

diff --git a/test-standalone/Makefile b/test-standalone/Makefile
index 39d9e41..42e21f7 100644
--- a/test-standalone/Makefile
+++ b/test-standalone/Makefile
@@ -58,12 +58,12 @@
 onboarding:
 	echo "[ONBOARDING]"
 	bash ../common/wait_for_onboarding_ready.sh 9998 xos
-	sudo bash -c "echo somekey > key_import/vsg_rsa"
-	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 bash -c "echo somekey > key_import/onos_rsa"
-	sudo bash -c "echo somekey > key_import/onos_rsa.pub"
+	bash -c "echo somekey > key_import/vsg_rsa"
+	bash -c "echo somekey > key_import/vsg_rsa.pub"
+	bash -c "echo somekey > key_import/volt_rsa"
+	bash -c "echo somekey > key_import/volt_rsa.pub"
+	bash -c "echo somekey > key_import/onos_rsa"
+	bash -c "echo somekey > key_import/onos_rsa.pub"
 	sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None - < ../common/disable-onboarding.yaml
 	sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None - < $(SERVICE_DIR)/vrouter/xos/vrouter-onboard.yaml
 	sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None - < $(SERVICE_DIR)/olt/xos/volt-onboard.yaml

test-standalone/docker-compose-bootstrap.yml

diff --git a/test-standalone/docker-compose-bootstrap.yml b/test-standalone/docker-compose-bootstrap.yml
index 857db96..5e51f60 100644
--- a/test-standalone/docker-compose-bootstrap.yml
+++ b/test-standalone/docker-compose-bootstrap.yml
@@ -12,7 +12,7 @@
         - xos_db
     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
+      - ../cord-pod/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
       - ../../xos_services:/opt/xos_services
 
 xos_synchronizer_onboarding: