Feature/time source

.github/workflows/deployment_test.yml

@@ -0,0 +1,59 @@
+on:
+    push:
+      branches:
+        - develop
+        - master
+        - "release/*"
+    pull_request:
+      types: [opened, synchronize, reopened]
+name: Deployment Test
+jobs:
+    deployment_test:
+        runs-on: ubuntu-latest
+        container:
+            image: ubuntu:22.04
+        defaults:
+            run:
+                shell: bash
+        steps:
+          - name: Install git
+            # Installing git for checkout action
+            run: |
+              apt update
+              export DEBIAN_FRONTEND=noninteractive
+              apt-get install -y git 
+          - name: Checkout
+            uses: actions/checkout@v4
+            with:
+              # Disabling shallow clone is recommended for improving relevancy of reporting
+              fetch-depth: 0
+              path: ${{ github.event.repository.name }}
+              submodules: recursive
+          - name: Move source code
+            run: mv $GITHUB_WORKSPACE/${{ github.event.repository.name }} /home/carma-cloud
+          - name: Install dependencies
+            run: |
+                cd /home/carma-cloud/scripts
+                ./install_dependencies.sh
+          - name: Build
+            run: |
+               cd /home/carma-cloud/scripts
+               ./build.sh
+          - name: Configure network and set privileges
+            run: |
+                echo -e '127.0.0.1\tcarmacloud' | tee -a /etc/hosts
+                groupadd tomcat
+                useradd -g tomcat -m tomcat
+                chmod g+r /opt/tomcat/conf/*
+                chmod -R o-rwx /opt/tomcat/webapps/*
+                chown -R root:tomcat /opt/tomcat
+                chown -R tomcat:tomcat /opt/tomcat/logs
+                chown -R tomcat:tomcat /opt/tomcat/temp
+                chown -R tomcat:tomcat /opt/tomcat/work
+          - name: Start Tomcat and verify deployment
+            run: |
+                /opt/tomcat/bin/catalina.sh start
+                sleep 10
+                if [[ `grep "startup in" /opt/tomcat/logs/catalina.out | wc -l` -ne "1" ]]; then exit 1; fi
+                if [[ `wget -O - http://carmacloud:8080 | grep "CARMAcloud Login" | wc -l` -ne "1" ]]; then exit 2; fi
+                if [[ `wget -O - --post-data="uname=ccadmin&pword=admin_testpw" http://carmacloud:8080/api/auth/login | grep "token" | wc -l` -ne "1" ]]; then exit 3; fi

.github/workflows/docker.yml

@@ -0,0 +1,9 @@
+name: Docker build
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  docker:
+    uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
+    with:
+      runner: ubuntu-latest

.github/workflows/dockerhub.yml

@@ -0,0 +1,17 @@
+name: Docker Hub build
+on:
+  push:
+    branches:
+      - develop
+      - master
+      - "release/*"
+    tags:
+      - "carma-system-*"
+jobs:
+  dockerhub:
+    uses: usdot-fhwa-stol/actions/.github/workflows/dockerhub.yml@main
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+    with:
+      runner: ubuntu-latest

Dockerfile

@@ -1,51 +1,15 @@
 FROM ubuntu:22.04
 # update package manager and install prerequisites
-RUN apt-get update -y && \
-	apt-get install -y build-essential cmake git wget pkg-config sqlite3 libcurl4-openssl-dev libsqlite3-dev libtiff5-dev
-# download geodesy projection library source
-WORKDIR /tmp
-RUN wget -q https://download.osgeo.org/proj/proj-9.3.0.tar.gz && \
-	tar -xzf proj-9.3.0.tar.gz && \
-	rm proj-9.3.0.tar.gz && \
-	mv proj-9.3.0 proj && \
-	mkdir -p proj/build
-# download openjdk
-RUN wget -q https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_linux-x64_bin.tar.gz && \
-	tar -xzf openjdk-21.0.1_linux-x64_bin.tar.gz && \
-	rm openjdk-21.0.1_linux-x64_bin.tar.gz && \
-	mv jdk-21.0.1 /opt/jdk
-# download apache tomcat
-RUN wget -q https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.83/bin/apache-tomcat-9.0.83.tar.gz && \
-	tar -xzf apache-tomcat-9.0.83.tar.gz && \
-	rm apache-tomcat-9.0.83.tar.gz && \
-	mv apache-tomcat-9.0.83 tomcat && \
-	sed -i 's/appBase="webapps"/appBase="webapps\/carmacloud"/g' tomcat/conf/server.xml && \
-	rm -r tomcat/webapps/*
+COPY scripts/install_dependencies.sh /home/carma-cloud/scripts/install_dependencies.sh
+RUN /home/carma-cloud/scripts/install_dependencies.sh
+COPY src /home/carma-cloud/src
+COPY lib /home/carma-cloud/lib
+COPY web /home/carma-cloud/web
+COPY osmbin /home/carma-cloud/osmbin
+COPY *.sh /home/carma-cloud/
+COPY scripts/build.sh /home/carma-cloud/scripts/build.sh
+
 # download carma-cloud source
-RUN git clone https://github.com/usdot-fhwa-stol/carma-cloud.git cc && \
-	rm cc/lib/libcs2cswrapper.so && \
-	mkdir -p tomcat/webapps/carmacloud/ROOT && \
-	mv cc/web/* tomcat/webapps/carmacloud/ROOT
-# compile geodesy projection library
-WORKDIR /tmp/proj/build
-RUN cmake .. && \
-	cmake --build . && \
-	cmake --build . --target install
-# compile jni projection library
-WORKDIR /tmp/cc/src/cc/geosrv
-RUN gcc -c -std=c11 -fPIC -Wall -I /opt/jdk/include/ -I /opt/jdk/include/linux/ -I /tmp/proj/src/ cs2cswrapper.c && \
-	gcc -shared -lproj cs2cswrapper.o -o libcs2cswrapper.so && \
-	mv *.so /usr/lib
-# compile carma-cloud java source and cleanup
-WORKDIR /tmp
-RUN find ./cc/src -name "*.java" > sources.txt && \
-	mkdir -p tomcat/webapps/carmacloud/ROOT/WEB-INF/classes && \
-	/opt/jdk/bin/javac -cp tomcat/lib/servlet-api.jar:cc/lib/commons-compress-1.18.jar:cc/lib/javax.json.jar:cc/lib/json-20210307.jar:cc/lib/keccakj.jar:cc/lib/log4j-api-2.16.0.jar:cc/lib/vector_tile.jar -d tomcat/webapps/carmacloud$
-	rm sources.txt && \
-	/opt/jdk/bin/java -cp tomcat/webapps/carmacloud/ROOT/WEB-INF/classes/:tomcat/lib/servlet-api.jar cc.ws.UserMgr ccadmin admin_testpw > tomcat/webapps/carmacloud/user.csv && \
-	echo "JAVA_HOME=/opt/jdk" > tomcat/bin/setenv.sh && \
-	mv tomcat /opt && \
-	rm -r proj && \
-	rm -r cc
-# start carma-cloud
-CMD /opt/tomcat/bin/catalina.sh start
+RUN /home/carma-cloud/scripts/build.sh
+ENTRYPOINT [ "/opt/tomcat/bin/catalina.sh", "run" ]
+

SendTimeSyncMessage.py

@@ -0,0 +1,18 @@
+import http.client
+import json
+import requests
+
+connection = http.client.HTTPConnection("localhost:8080")
+# headers = {'Content-type': 'application/json'}
+foo = {'timestep': 100, 'seq': 1}
+
+connection.request("POST", "/carmacloud/simulation/dumb", json.dumps(foo))
+x = requests.post("http://127.0.0.1:8080/carmacloud/simulation/dumb", json.dumps(foo))
+print(x)
+
+response = connection.getresponse()
+print(response.read().decode())
+
+connection.request("GET", '/api/rop/details')
+response = connection.getresponse()
+print(response.read().decode())

carma-cloud-config/log4j2.properties

@@ -0,0 +1,18 @@
+status = warn
+monitorInterval = 300
+
+appender.rolling.type = RollingFile
+appender.rolling.name = LogToRollingFile
+appender.rolling.fileName = /opt/tomcat/logs/carmacloud.log
+appender.rolling.filePattern = /opt/tomcat/logs/carmacloud-%d{yyyyMMdd}.log.gz
+appender.rolling.layout.type = PatternLayout
+appender.rolling.layout.pattern = [%-5level %d{HH:mm:ss.SSS} [%c{1}] - %msg%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 1
+appender.rolling.policies.time.modulate = false
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 366
+
+rootLogger.level = debug
+rootLogger.appenderRef.stdout.ref = LogToRollingFile