Update device-services configuration

Signed-off-by: Cherry Wang <[email protected]>
cherrycl · May 27, 2021 · c5a22b4 · c5a22b4
1 parent 8f771ee
commit c5a22b4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 176 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ TAF-Common/*
 TAF/utils/scripts/docker/*.yml*
 TAF/utils/scripts/docker/docker-compose*yaml*
 TAF/utils/scripts/docker/common.env
+TAF/config/*/configuration.toml
diff --git a/TAF/config/device-modbus/configuration.toml b/TAF/config/device-modbus/configuration.toml
diff --git a/TAF/config/device-virtual/configuration.py b/TAF/config/device-virtual/configuration.py
@@ -6,7 +6,7 @@
 
 SECURITY_SERVICE_NEEDED = os.getenv("SECURITY_SERVICE_NEEDED")
 if SECURITY_SERVICE_NEEDED == 'true':
-    SERVICE_PORT = "8443/virtualdevice"
+    SERVICE_PORT = "8443/device-virtual"
 else:
     SERVICE_PORT = 59900
 

diff --git a/TAF/config/device-virtual/configuration.toml b/TAF/config/device-virtual/configuration.toml
diff --git a/TAF/testCaseModules/keywords/system-agent/systemAgentAPI.robot b/TAF/testCaseModules/keywords/system-agent/systemAgentAPI.robot
@@ -2,4 +2,4 @@
 Resource  TAF/testCaseModules/keywords/common/commonKeywords.robot
 
 *** Variables ***
-${systemAgentUrl}  http://${BASE_URL}:${SYS_MGMT_AGENT_PORT}
+${systemAgentUrl}  ${URI_SCHEME}://${BASE_URL}:${SYS_MGMT_AGENT_PORT}
diff --git a/TAF/utils/scripts/docker/deploy-edgex.sh b/TAF/utils/scripts/docker/deploy-edgex.sh
@@ -15,6 +15,17 @@ if [ "$TEST_STRATEGY" = "PerformanceMetrics" ]; then
           ${COMPOSE_IMAGE} -f "${WORK_DIR}/TAF/utils/scripts/docker/docker-compose${APPSERVICE}.yaml" up -d
   sleep 5
 else
+  for PROFILE in device-virtual device-modbus; do
+    docker run --rm -v ${WORK_DIR}:${WORK_DIR}:rw,z -w ${WORK_DIR} -v /var/run/docker.sock:/var/run/docker.sock \
+           --security-opt label:disable --env CONF_DIR=${CONF_DIR} --env WORK_DIR=${WORK_DIR} ${COMPOSE_IMAGE} -f \
+           "${WORK_DIR}/TAF/utils/scripts/docker/docker-compose.yaml" up --no-start --no-deps ${PROFILE}
+
+    # copy device service default configuration in the res to TAF/config/{service}/res
+    docker cp edgex-${PROFILE}:/res/configuration.toml ${WORK_DIR}/TAF/config/${PROFILE}
+    sed -i '/DevicesDir/d' ${WORK_DIR}/TAF/config/${PROFILE}/configuration.toml
+    sed -i "s/ProfilesDir.*/ProfilesDir = '\\$CONF_DIR'/g" ${WORK_DIR}/TAF/config/${PROFILE}/configuration.toml
+
+  done
 
   docker run --rm -v ${WORK_DIR}:${WORK_DIR}:rw,z -w ${WORK_DIR} -v /var/run/docker.sock:/var/run/docker.sock \
           --env-file ${WORK_DIR}/TAF/utils/scripts/docker/common-taf.env \