Merge lavida (7.6.0) branch into master

.devcontainer/devcontainer.json

@@ -35,7 +35,9 @@
 	// "forwardPorts": [],
 
 	// Uncomment the next line to run commands after the container is created - for example installing curl.
-	"postCreateCommand": "container/database.sh && container/library.sh && container/setup.sh && ldconfig"
+	"postCreateCommand": "container/database.sh && container/library.sh && container/setup.sh && ldconfig",
+
+	"shutdownAction": "stopCompose"
 
 	// Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
 	// "mounts": [

.devcontainer/docker-compose-vscode.yml

@@ -22,9 +22,11 @@ services:
       - TIME_SYNC_TOPIC=time_sync
       - TIME_SYNC_PORT=7575
       - SIM_V2X_PORT=5757
+      - SIM_INTERACTION_PORT=7576
       - V2X_PORT=8686
-      - INFRASTRUCTURE_ID=1
-      - KAFKA_BROKER_ADDRESS=127.0.0.1:9092
+      - INFRASTRUCTURE_ID=rsu_<J2735 MAP MESSAGE INTERSECTION ID>
+      - INFRASTRUCTURE_NAME=<RSU_NAME>
+      - SENSOR_JSON_FILE_PATH=/var/www/plugins/MAP/sensors.json
     secrets:
       - mysql_password
 
@@ -72,7 +74,7 @@ services:
       DOCKER_HOST_IP:  127.0.0.1
       KAFKA_ADVERTISED_HOST_NAME:  127.0.0.1
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_CREATE_TOPICS: "time_sync:1:1"
+      KAFKA_CREATE_TOPICS: "time_sync:1:1,modified_spat:1:1,v2xhub_scheduling_plan_sub:1:1,v2xhub_ssm_sub:1:1"
       KAFKA_LOG_DIRS: "/kafka/kafka-logs"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock

.github/workflows/sonar-scanner.yml

@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 0
           submodules: recursive
       - name:  Install sonar-scanner and build-wrapper
-        uses: sonarsource/sonarcloud-github-c-cpp@v1
+        uses: sonarsource/sonarcloud-github-c-cpp@v2
       - name: Run install_dependencies.sh script
         run: |
           scripts/install_dependencies.sh

.sonarqube/sonar-scanner.properties

@@ -55,7 +55,9 @@ sonar.modules=  PedestrianPlugin, \
   MessageReceiverPlugin, \
   CARMAStreetsPlugin, \
   ERVCloudForwardingPlugin, \
-  CDASimAdapter
+  CDASimAdapter, \
+  RSUHealthMonitorPlugin, \
+  TelematicBridgePlugin
 
 
 
@@ -82,6 +84,8 @@ TimPlugin.sonar.projectBaseDir                  =src/v2i-hub/TimPlugin
 CARMAStreetsPlugin.sonar.projectBaseDir         =src/v2i-hub/CARMAStreetsPlugin
 ERVCloudForwardingPlugin.sonar.projectBaseDir         =src/v2i-hub/ERVCloudForwardingPlugin
 CDASimAdapter.sonar.projectBaseDir         =src/v2i-hub/CDASimAdapter
+RSUHealthMonitorPlugin.sonar.projectBaseDir     =src/v2i-hub/RSUHealthMonitorPlugin
+TelematicBridgePlugin.sonar.projectBaseDir     =src/v2i-hub/TelematicBridgePlugin
 
 
 
@@ -117,7 +121,10 @@ CARMAStreetsPlugin.sonar.exclusions                  =test/**
 ERVCloudForwardingPlugin.sonar.sources          =src
 CDASimAdapter.sonar.sources          =src
 CDASimAdapter.sonar.exclusions                  =test/**
-
+RSUHealthMonitorPlugin.sonar.sources    =src
+RSUHealthMonitorPlugin.sonar.exclusions =test/**
+TelematicBridgePlugin.sonar.sources    =src
+TelematicBridgePlugin.sonar.exclusions =test/**
 
 # Tests
 # Note: For C++ setting this field does not cause test analysis to occur. It only allows the test source code to be evaluated.
@@ -145,3 +152,5 @@ SpatPlugin.sonar.tests=test
 CARMAStreetsPlugin.sonar.tests=test
 ERVCloudForwardingPlugin.sonar.tests=test
 CDASimAdapter.sonar.tests=test
+RSUHealthMonitorPlugin.sonar.tests=test
+TelematicBridgePlugin.sonar.tests=test

README.md

@@ -1,7 +1,11 @@
-| CicleCI Build Status | Sonar Code Quality |
+## Develop CI/CD Processes
+| V2X-Hub Docker Image Builds (x86 or AMD) | V2X-Hub Docker Image Builds (ARM) |  Sonar Code Quality |
+|----------------------|---------------------|---------------------|
+ [![Build Workflows](https://github.com/usdot-fhwa-OPS/V2X-Hub/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/usdot-fhwa-OPS/V2X-Hub/actions/workflows/build.yml)|[![CircleCI](https://dl.circleci.com/status-badge/img/gh/usdot-fhwa-OPS/V2X-Hub/tree/develop.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/usdot-fhwa-OPS/V2X-Hub/tree/develop)| [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=usdot-fhwa-ops_V2X-Hub&metric=alert_status)](https://sonarcloud.io/dashboard?id=usdot-fhwa-ops_V2X-Hub) |
+ ## Release CI/CD Processes
+| V2X-Hub Docker Image Builds (x86 or AMD) | V2X-Hub Docker Image Builds (ARM) | 
 |----------------------|---------------------|
-[![CircleCI](https://circleci.com/gh/usdot-fhwa-OPS/V2X-Hub.svg?style=svg)](https://circleci.com/gh/usdot-fhwa-OPS/V2X-Hub) | [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=usdot-fhwa-ops_V2X-Hub&metric=alert_status)](https://sonarcloud.io/dashboard?id=usdot-fhwa-ops_V2X-Hub) |
-
+ [![Build Workflows](https://github.com/usdot-fhwa-OPS/V2X-Hub/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/usdot-fhwa-OPS/V2X-Hub/actions/workflows/build.yml)|[![CircleCI](https://dl.circleci.com/status-badge/img/gh/usdot-fhwa-OPS/V2X-Hub/tree/master.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/usdot-fhwa-OPS/V2X-Hub/tree/master)|
 # Overview
 In order to bring infrastructure components into the Connected Vehicle architecture, you need software that will facilitate the exchange of data in a format that can be understood by both vehicles and infrastructure devices The V2X Hub, takes in data from vehicles via Basic Safety Messages (BSM) in a Society of Automotive Engineers (SAE) standard format and translates the data to a National Transportation Communications for ITS Protocol (NTCIP) that infrastructure components can understand.  And vice versa.   It translates Signal Phase and Timing (SPaT) data from NTCIP to SAE and sends it to the Roadside Unit (RSU) for broadcast to mobile devices, including vehicles. 
 

configuration/amd64/docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - mysql-datavolume:/var/lib/mysql
 
   php:
-    image: usdotfhwaops/php:7.5.1
+    image: usdotfhwaops/php:lavida
     container_name: php
     network_mode: host
     depends_on: 
@@ -30,21 +30,23 @@ services:
     tty: true
 
   v2xhub:
-    image: usdotfhwaops/v2xhubamd:7.5.1
+    image: usdotfhwaops/v2xhubamd:lavida
     container_name: v2xhub
     network_mode: host
     restart: always
     depends_on: 
       - db
     environment:
       - MYSQL_PASSWORD=/run/secrets/mysql_password
+      - INFRASTRUCTURE_ID=rsu_<J2735 MAP MESSAGE INTERSECTION ID>
+      - INFRASTRUCTURE_NAME=<RSU_NAME>
     secrets:
       - mysql_password
     volumes:
       - ./logs:/var/log/tmx
       - ./MAP:/var/www/plugins/MAP
   port_drayage_webservice:
-    image: usdotfhwaops/port-drayage-webservice:7.5.1
+    image: usdotfhwaops/port-drayage-webservice:lavida
     container_name: port_drayage_webservice
     network_mode: host
 secrets:

configuration/amd64/initialization.sh

@@ -1,12 +1,57 @@
 #!/bin/bash
+directory=$(pwd)
+mysqlDir="$directory/mysql"
+
+# update and upgrade commands to update linux OS
+sudo apt update -y && sudo apt upgrade -y
+
+#installing necessary and useful apps
+sudo apt-get install chromium-browser -y      #Chrome required for CARMA platform/V2X Hub UI(?)
+sudo apt install curl -y                      #Curl for downloading files over internet
+
+#install docker
+curl -L https://raw.githubusercontent.com/usdot-fhwa-stol/carma-platform/develop/engineering_tools/install-docker.sh | bash 
+
+#make passwords for mysql
+mkdir -p secrets && cd secrets
+
+#creates password files where user inputs password
+FILE1=mysql_root_password.txt
+FILE2=mysql_password.txt
+if test -f "$FILE1"; then
+    echo "$FILE1 exists."
+else
+    read -p "enter password for the mysql_root_password: " sql_root_pass
+    echo "$sql_root_pass" > sql_root_pass.txt
+    #remove endline characters from password files
+    tr -d '\n' <sql_root_pass.txt> mysql_root_password.txt && rm sql_root_pass.txt
+fi
+
+if test -f "$FILE2"; then
+    echo "$FILE2 exists."
+else
+    read -p "enter password for mysql_password: " sql_pass
+    echo "$sql_pass" > sql_pass.txt
+    #remove endline characters from password files
+    tr -d '\n' <sql_pass.txt> mysql_password.txt && rm sql_pass.txt
+fi
+
+#AMD64 initialzation
+cd $directory
 sudo apt-get -y remove docker docker-engine docker.io containerd runc
-sudo apt-get update
 sudo apt-get -y install apt-transport-https ca-certificates curl gnupg-agent software-properties-common
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-sudo apt-get update
 sudo apt-get -y install docker-ce docker-ce-cli containerd.io 
 sudo apt -y install python3-pip
 sudo pip3 install docker-compose
 sudo docker-compose pull
+sudo apt update -y && sudo apt upgrade -y
 sudo docker-compose up -d
+
+#create v2xhub user
+cd $mysqlDir
+./add_v2xhub_user.bash
+
+chromium-browser "http://127.0.0.1" > /dev/null 2>&1 &
+chromium-browser "https://127.0.0.1:19760" > /dev/null 2>&1 &

configuration/arm64/docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - mysql-datavolume:/var/lib/mysql
 
   php:
-    image: usdotfhwaops/php_arm:7.5.1
+    image: usdotfhwaops/php_arm:lavida
     container_name: php
     network_mode: host
     depends_on: 
@@ -30,7 +30,7 @@ services:
     tty: true
 
   v2xhub:
-    image: usdotfhwaops/v2xhubarm:7.5.1
+    image: usdotfhwaops/v2xhubarm:lavida
     container_name: v2xhub
     network_mode: host
     restart: always
@@ -44,7 +44,7 @@ services:
       - ./logs:/var/log/tmx
       - ./MAP:/var/www/plugins/MAP
   port_drayage_webservice:
-    image: usdotfhwaops/port-drayage-webservice_arm:7.5.1
+    image: usdotfhwaops/port-drayage-webservice_arm:lavida
     container_name: port_drayage_webservice
     network_mode: host
 secrets:

configuration/arm64/initialization.sh

@@ -1,13 +1,58 @@
 #!/bin/bash
+directory=$(pwd)
+mysqlDir="$directory/mysql"
+
+# update and upgrade commands to update linux OS
+sudo apt update -y && sudo apt upgrade -y
+
+#installing necessary and useful apps
+sudo apt-get install chromium-browser -y      #Chrome required for CARMA platform/V2X Hub UI(?)
+sudo apt install curl -y                      #Curl for downloading files over internet
+
+#install docker
+curl -L https://raw.githubusercontent.com/usdot-fhwa-stol/carma-platform/develop/engineering_tools/install-docker.sh | bash 
+
+#make passwords for mysql
+mkdir -p secrets && cd secrets
+
+#creates password files where user inputs password
+FILE1=mysql_root_password.txt
+FILE2=mysql_password.txt
+if test -f "$FILE1"; then
+    echo "$FILE1 exists."
+else
+    read -p "enter password for the mysql_root_password: " sql_root_pass
+    echo "$sql_root_pass" > sql_root_pass.txt
+    #remove endline characters from password files
+    tr -d '\n' <sql_root_pass.txt> mysql_root_password.txt && rm sql_root_pass.txt
+fi
+
+if test -f "$FILE2"; then
+    echo "$FILE2 exists."
+else
+    read -p "enter password for mysql_password: " sql_pass
+    echo "$sql_pass" > sql_pass.txt
+    #remove endline characters from password files
+    tr -d '\n' <sql_pass.txt> mysql_password.txt && rm sql_pass.txt
+fi
+
+#ARM initialization
+cd $directory
 sudo apt-get -y remove docker docker-engine docker.io containerd runc
-sudo apt-get update
 sudo apt-get -y install apt-transport-https ca-certificates curl gnupg-agent software-properties-common
 OS=$(lsb_release -i | awk 'FS=":" {print $3;}' | awk '{print tolower($0)}')
 arch=$(dpkg --print-architecture)
 curl -fsSL https://download.docker.com/linux/$OS/gpg | sudo apt-key add -
 sudo add-apt-repository "deb [arch=$arch] https://download.docker.com/linux/$OS $(lsb_release -cs) stable"
-sudo apt-get update
 sudo apt-get -y install docker-ce docker-ce-cli containerd.io docker-compose-plugin
 sudo apt -y install python3-pip
 sudo pip3 install docker-compose
+sudo apt update -y && sudo apt upgrade -y
 sudo docker-compose up -d
+
+#create v2xhub user
+cd $mysqlDir
+./add_v2xhub_user.bash
+
+chromium-browser "http://127.0.0.1" > /dev/null 2>&1 &
+chromium-browser "https://127.0.0.1:19760" > /dev/null 2>&1 &

ext/build.sh

@@ -3,14 +3,17 @@
 # exit on errors
 set -e
 
+# Find number of cores available
+numCPU=$(nproc)
+
 # An OPENAPI based Qt webservice is needed by the plugins for http requests processing. A custom generated code using OPENAPI framework is located in GitHub.
 pushd /tmp
 QHTTPENGINE_VERSION=1.0.1
 wget -O qhttpengine-${QHTTPENGINE_VERSION}.tar.gz https://github.com/nitroshare/qhttpengine/archive/refs/tags/${QHTTPENGINE_VERSION}.tar.gz
 tar xvf qhttpengine-${QHTTPENGINE_VERSION}.tar.gz
 cd qhttpengine-${QHTTPENGINE_VERSION}/
 cmake .
-make 
+make -j${numCPU}
 make install
 popd
 
@@ -20,7 +23,7 @@ wget -O date-${DATELIB_VERSION}.tar.gz https://github.com/HowardHinnant/date/arc
 tar xvf date-${DATELIB_VERSION}.tar.gz
 cd date-${DATELIB_VERSION}/
 cmake .
-make
+make -j${numCPU}
 make install
 popd
 
@@ -29,27 +32,43 @@ ldconfig
 # Server for the Qt webservice
 pushd server
 cmake .
-make
+make -j${numCPU}
 make install
 popd
 
 pushd ccserver
 cmake . 
-make
+make -j${numCPU}
 make install
 popd
 
 pushd pdclient
 cmake .
-make
+make -j${numCPU}
 make install
 popd
 
 # GPS Parser
 pushd /tmp
+if [ -d "NemaTode" ]; then
+    rm -r NemaTode
+fi
 git clone https://github.com/ckgt/NemaTode.git
 cd NemaTode
 cmake .
-make
+make -j${numCPU}
 make install
-popd
+popd
+
+# Nats C API
+pushd /tmp
+if [ -d "nats.c" ]; then
+    rm -r nats.c
+fi
+git clone https://github.com/nats-io/nats.c --branch v3.7.0
+cd nats.c
+cmake . -DNATS_BUILD_NO_SPIN=ON
+make -j${numCPU}
+make install
+popd
+

scripts/install_dependencies.sh

@@ -31,6 +31,9 @@ DEPENDENCIES="build-essential \
     wget \
     zip \
     zlib1g \
+    rapidjson-dev \
+    librapidxml-dev \
+    libprotobuf-c-dev \
     curl"
 
 # STOL library dependencies
@@ -41,9 +44,12 @@ LIBRARY_DEPENDENCIES=" \
 # install all things needed for deployment, always done
 apt-get install -y $DEPENDENCIES ${LIBRARY_DEPENDENCIES}
 
+numCPU=$(nproc)
+
 # install gtest
 cd /usr/src/googletest/
 mkdir -p build/
 cd build
 cmake ..
+make -j${numCPU}
 make install