Commit 14ec45b2 authored by Yann Garcia's avatar Yann Garcia
Browse files

Enhance demo7; go-apps/meep-vis/entrypoint.sh

parent deb7c0c3

charts/meep-vis/values-template.yaml

+1 −1
Changes for charts/meep-vis/values-template.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ image: 
    MEEP_SANDBOX_NAME: {{.SandboxName}}

    MEEP_SVC_PATH: /vis/v2

    MEEP_HOST_URL: {{.HostUrl}}

    MEEP_BROKER: mqtt://meep-mosquitto:1883 #mqtt://broker.emqx.io:1883

    MEEP_BROKER: mqtt://meep-mosquitto:1883

    MEEP_TOPIC: 3gpp/v2x/obu

    MEEP_POA_LIST: poa-5g1

    {{- if .IsMepService }}

examples/demo7/Dockerfile

+1 −1
Changes for examples/demo7/Dockerfile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ FROM ubuntu:22.04 
COPY ./fsmsggen /fsmsggen

COPY ./entrypoint.sh /entrypoint.sh



RUN apt-get update && apt-get install -y curl libjson-c-dev libgps-dev libpcap-dev libssl-dev mosquitto-clients && chmod +x /entrypoint.sh && chmod +x /fsmsggen

RUN apt-get update && apt-get install -y curl gettext jq libjson-c-dev libgps-dev libpcap-dev libssl-dev mosquitto-clients && chmod +x /entrypoint.sh && chmod +x /fsmsggen



EXPOSE 1883

examples/demo7/entrypoint.sh

+37 −3
Changes for examples/demo7/entrypoint.sh: 37 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -17,11 +17,45 @@ 


# E.g. yann@yann-linux:~/frameworks/fsmsggen$ sudo ./build/x86_64-linux-gnu-d/fsmsggen --iface wlo1 --verbose --srcaddr 00:01:02:03:04:05 --no-sec true --cam-station-type passengerCar --cam-station-id 12345 --cam-no-sec --out ./out.pcap





set -e

set +vx



echo "MEEP_HOST_URL: ${MEEP_HOST_URL}"

echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}"

echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}"



echo "Waiting for MEC plateform started and stable..."

sleep 20 # Wait for MEC plateform started and stable

echo "Starting '/fsmsggen ${COMM} ${GLOBAL} ${SEC_MODE} ${COMM_MODE} ${BEACON} ${CAM} ${DENM} ${VERBOSE}'"

/fsmsggen ${COMM} ${GLOBAL} ${SEC_MODE} ${BEACON} ${CAM} ${DENM} ${VERBOSE}
 
 No newline at end of file
 


SERVICE_NAME="meep-mosquitto"

NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)

echo "NAMESPACE: ${NAMESPACE}"

TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)

echo "TOKEN: ${TOKEN}"

MOSQUITTO_NODE_PORT=$(curl -sSk \

  -H "Authorization: Bearer $TOKEN" \

  https://kubernetes.default.svc/api/v1/namespaces/$NAMESPACE/services/$SERVICE_NAME \

  | jq -r '.spec.ports[0].nodePort')

echo "External NodePort exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $MOSQUITTO_NODE_PORT"



MOSQUITTO_NODE_IP=$(curl -sSk \

  -H "Authorization: Bearer $TOKEN" \

  https://kubernetes.default.svc/api/v1/namespaces/$NAMESPACE/services/$SERVICE_NAME \

  | jq -r '.spec.clusterIP')

echo "External IP exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $MOSQUITTO_NODE_IP"



UU_IFACE="--brocker-address $MOSQUITTO_NODE_IP --brocker-port $MOSQUITTO_NODE_PORT"



echo "Environment variables set:"

echo "COMM: ${IFACE}"

echo "MODE: ${MODE}"

echo "UU_IFACE: ${UU_IFACE}"

echo "GLOBAL: ${GLOBAL}"

echo "SEC_MODE: ${SEC_MODE}"

echo "BEACON: ${BEACON}"

echo "CAM: ${CAM}"

echo "DENM: ${DENM}"

echo "VERBOSE: ${VERBOSE}"



echo "Starting '/fsmsggen ${IFACE} ${MODE} ${UU_IFACE} ${GLOBAL} ${SEC_MODE} ${BEACON} ${CAM} ${DENM} ${VERBOSE}'"

/fsmsggen ${IFACE} ${MODE} ${UU_IFACE} ${GLOBAL} ${SEC_MODE} ${BEACON} ${CAM} ${DENM} ${VERBOSE}
 
 No newline at end of file

go-apps/meep-vis/entrypoint.sh

+20 −2
Changes for go-apps/meep-vis/entrypoint.sh: 20 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -5,10 +5,19 @@ echo "MEEP_HOST_URL: ${MEEP_HOST_URL}" 
echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}"

echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}"

echo "MEEP_CODECOV: ${MEEP_CODECOV}"

echo "MEEP_BROKER: ${MEEP_BROKER}"     # E.g. mqtt://broker.emqx.io:1883 or amqp://ofriqrpk:e_vS3dw1zs2gb8CVlyzGwQZ8gCRoyTt5@lrat-01.rmq2.cloudamqp.com:5672

echo "MEEP_TOPIC: ${MEEP_TOPIC}"      # E.g. 3gpp/v2x/obu or AMQP queue name

echo "MEEP_POA_LIST: ${MEEP_POA_LIST}" # E.g. poa-5g1;poa-5g2



#SERVICE_NAME="meep-cloud-mosquitto"

#NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)

#TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)

#NODE_PORT_MEEP_CLOUD_MOSQUITTO=$(curl -sSk \

#  -H "Authorization: Bearer $TOKEN" \

#  https://kubernetes.default.svc/api/v1/namespaces/$NAMESPACE/services/$SERVICE_NAME \

#  | jq -r '.spec.ports[0].nodePort')

#echo "External NodePort exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $NODE_PORT_MEEP_CLOUD_MOSQUITTO"

#MEEP_BROCKER=mqtt://$SERVER_IP:$NODE_PORT_MEEP_CLOUD_MOSQUITTO

#echo "MEEP_BROCKER: ${MEEP_BROCKER}"



if [[ ! -z "${MEEP_MEP_NAME}" ]]; then

    svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}"

else
@@ -41,6 +50,15 @@ for file in /user-api/*; do 
    setBasepath "$file"

done



echo "MEEP_HOST_URL: ${MEEP_HOST_URL}"

echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}"

echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}"

echo "MEEP_CODECOV: ${MEEP_CODECOV}"

echo "MEEP_INSTANCE_ID: ${MEEP_INSTANCE_ID}"

echo "MEEP_BROKER: ${MEEP_BROKER}"     # E.g. mqtt://broker.emqx.io:1883 or amqp://ofriqrpk:e_vS3dw1zs2gb8CVlyzGwQZ8gCRoyTt5@lrat-01.rmq2.cloudamqp.com:5672

echo "MEEP_TOPIC: ${MEEP_TOPIC}"      # E.g. 3gpp/v2x/obu or AMQP queue name

echo "MEEP_POA_LIST: ${MEEP_POA_LIST}" # E.g. poa-5g1;poa-5g2



# Start service

currenttime=`date "+%Y%m%d-%H%M%S"`

filepath="/codecov/codecov-meep-vis-"