Commit f6730db2 authored by Yann Garcia's avatar Yann Garcia
Browse files

Add ETSI ITS messages type

parent 95d7c0b0

go-apps/meep-vis/entrypoint.sh

+1 −1
Changes for go-apps/meep-vis/entrypoint.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 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. ETSI/V2X or AMQP queue name

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



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

go-apps/meep-vis/server/model_msg_type.go

+7 −0
Changes for go-apps/meep-vis/server/model_msg_type.go: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -41,4 +41,11 @@ const ( 
	EVCSN             MsgType = 11

	SAEM              MsgType = 12

	RTCMEM            MsgType = 13

	CPM               MsgType = 14

	IMZM              MsgType = 15

	VAM               MsgType = 16

	DSM               MsgType = 17

	MIM               MsgType = 18

	MVM               MsgType = 19

	MCM               MsgType = 20

)

go-apps/meep-vis/server/vis.go

+3 −32
Changes for go-apps/meep-vis/server/vis.go: 3 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -370,11 +370,11 @@ func Init() (err error) { 
	}

	log.Info("MEEP_LOCALITY: ", locality)



	// Get V2X brokers. E.g. mqtt://broker.emqx.io:1883 or amqp://ofriqrpk:e_vS3dw1zs2gb8CVlyzGwQZ8gCRoyTt5@lrat-01.rmq2.cloudamqp.com:5672

	// Get V2X brokers. E.g. mqtt://172.29.10.56:1883, mqtt://broker.emqx.io:1883 or amqp://ofriqrpk:e_vS3dw1zs2gb8CVlyzGwQZ8gCRoyTt5@lrat-01.rmq2.cloudamqp.com:5672

	v2x_broker := strings.TrimSpace(os.Getenv("MEEP_BROKER"))

	log.Info("MEEP_BROKER: ", v2x_broker)



	// Get V2X topic. E.g. ETSI/V2X or AMQP queue name

	// Get V2X topic. E.g. 3gpp/v2x/obu or AMQP queue name

	v2x_topic := strings.TrimSpace(os.Getenv("MEEP_TOPIC"))

	log.Info("MEEP_TOPIC: ", v2x_topic)
@@ -3221,7 +3221,7 @@ func checkMsgTypeValue(msgType []string) bool { 


	for _, msgTypeInt := range msgType {

		m := parseMsgTypeToInt(msgTypeInt)

		if m < int32(DENM) || m > int32(RTCMEM) {

		if m < int32(DENM) || m > int32(MCM) {

			log.Error("checkMsgTypeValue: Invalid MsgType: ", m)

			return false

		}
@@ -3279,33 +3279,4 @@ func parseMsgTypeToInt(msgType string) int32 { 
		return -1

	}

	return int32(m)

	// switch strings.ToUpper(msgType) {

	// case "DENM":

	// 	return int32(DENM)

	// case "CAM":

	// 	return int32(CAM)

	// case "POI":

	// 	return int32(POI)

	// case "SPATEM":

	// 	return int32(SPATEM)

	// case "MAPEM":

	// 	return int32(MAPEM)

	// case "IVIM":

	// 	return int32(IVIM)

	// case "EV_RSR":

	// 	return int32(EV_RSR)

	// case "TISTPGTRANSACTION":

	// 	return int32(TISTPGTRANSACTION)

	// case "SREM":

	// 	return int32(SREM)

	// case "SSEM":

	// 	return int32(SSEM)

	// case "EVCSN":

	// 	return int32(EVCSN)

	// case "SAEM":

	// 	return int32(SAEM)

	// case "RTCMEM":

	// 	return int32(RTCMEM)

	// }

	// return -1

}

go-apps/meep-vis/server/vis_test.go

+1 −1
Changes for go-apps/meep-vis/server/vis_test.go: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ const postgisTestHost = "localhost" 
const postgisTestPort = "30432"

const testScenarioName = "testScenario"

const v2xBrokerTest = "mqtt://broker.emqx.io:1883" // Or amqp://guest:guest@localhost:5672

const v2xTopicTest = "ETSI/V2X"

const v2xTopicTest = "3gpp/v2x/obu"



var poaListTest = []string{"zone1-poa-cell1", "zone1-poa-cell2"}

go-packages/meep-vis-traffic-mgr/simulator.go

+7 −0
Changes for go-packages/meep-vis-traffic-mgr/simulator.go: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -49,6 +49,13 @@ func (simu *message_broker_simu) Init(tm *TrafficMgr) (err error) { 
		EVCSN             int32 = 11

		SAEM              int32 = 12

		RTCMEM            int32 = 13

		CPM               int32 = 14

		IMZM              int32 = 15

		VAM               int32 = 16

		DSM               int32 = 17

		MIM               int32 = 18

		MVM               int32 = 19

		MCM               int32 = 20

	)

	simu.simulatedV2xMessages = map[int32][]byte{

		CAM: {