Skip to content

Commit

Permalink
Merge branch 'develop' into tim_query_old
Browse files Browse the repository at this point in the history
  • Loading branch information
Schwartz-Matthew-bah committed Dec 14, 2017
2 parents ab65520 + 514db56 commit 43fea0e
Show file tree
Hide file tree
Showing 36 changed files with 786 additions and 599 deletions.
18 changes: 14 additions & 4 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
## ODE Release Notes ##
----------
### Sprint 28
- ODE-670 J2735TravelerInformationMessage.packetID needs to be BigInteger
see https://github.com/usdot-jpo-ode/jpo-ode/wiki/TIM-REST-Endpoint-Changes for interface changes.

### Sprint 27
- ODE-661 CVPEP Data Inconsistency for TIM Files
- ODE-657 Continue Supporting WyDOT issues
- ODE-591 ORNL - Further generalize encoding and decoding capability of asn1_codec module
### Sprint 26
- ODE-646 Sirius XM Requires ASD messages to be wrapped in IEEE 1698.2 Data
- ODE-645 Update Documentation for Metadata
- ODE-642 Address SDW and RSU flexibility
- ODE-632 ODE Error out on log files
### Sprint 25
- ODE-588 Free and Open Source ODE Minimum Viable Product
- ODE-615 ORNL Implement SDW TIM encoding
- ODE-587 Implement TIM data encoding through ASN.1 Encoder Module (AEM)
- ODE-596 Support receiving and publishing of Driver Alert Messages
- ODE-610 Update Documentation for Open Source ODE
- ODE-611 WyDOT deployment Support
- ODE-612 Unit testing for open source version of ODE
- ODE-613 SDW Sending of TIM Messages
- ODE-613 SDW Sending of TIM Messages using asn1_codec
- ODE-631 Add capability to disable output topics
### Sprint 24
- ODE-537 ASN1 CODEC Module development
Expand Down
2 changes: 1 addition & 1 deletion adm.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ group.id=0
acm.type=decode

# Path (relative or absolute) to the ACM error reporting XML template.
acm.error.template=/home/asn1_codec/config/Output.error.xml
acm.error.template=/asn1_codec/config/Output.error.xml

# Kafka topics for ASN.1 Parsing
asn1.j2735.topic.consumer=topic.Asn1DecoderInput
Expand Down
2 changes: 1 addition & 1 deletion aem.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ group.id=0
acm.type=encode

# Path (relative or absolute) to the ACM error reporting XML template.
acm.error.template=/home/asn1_codec/config/Output.error.xml
acm.error.template=/asn1_codec/config/Output.error.xml

# Kafka topics for ASN.1 Parsing
asn1.j2735.topic.consumer=topic.Asn1EncoderInput
Expand Down
134 changes: 134 additions & 0 deletions data/TIM_Message_Testing_Files/tim_path_multiRSU_hexCRC.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
{
"ode": {
"version": 2
},
"tim": {
"index": "13",
"msgCnt": "1",
"timeStamp": "2017-08-03T22:25:36.297Z",
"urlB": "null",
"packetID": "EC9C236B0000000000",
"dataframes": [
{
"startDateTime": "2017-08-02T22:25:00.000Z",
"durationTime": 1,
"sspTimRights": "0",
"frameType": "advisory",
"msgId": {
"roadSignID": {
"position": {
"latitude": "41.678473",
"longitude": "-108.782775",
"elevation": "917.1432"
},
"viewAngle": "1010101010101010",
"mutcdCode": "warning",
"crc": "ABCD"
}
},
"priority": "0",
"sspLocationRights": "3",
"regions": [
{
"name": "Testing TIM",
"regulatorID": "0",
"segmentID": "33",
"anchorPosition": {
"latitude": "41.2500807",
"longitude": "-111.0093847",
"elevation": "2020.6969900289998"
},
"laneWidth": "7",
"directionality": "3",
"closedPath": "false",
"description": "path",
"path": {
"scale": "0",
"type": "ll",
"nodes": [
{
"nodeLong": "0.0031024",
"nodeLat": "0.0014506",
"delta": "node-LL3"
},
{
"nodeLong": "0.0030974",
"nodeLat": "0.0014568",
"delta": "node-LL3"
},
{
"nodeLong": "0.0030983",
"nodeLat": "0.0014559",
"delta": "node-LL3"
},
{
"nodeLong": "0.0030980",
"nodeLat": "0.0014563",
"delta": "node-LL3"
},
{
"nodeLong": "0.0030982",
"nodeLat": "0.0014562",
"delta": "node-LL3"
}
]
},
"direction": "0000000000001010"
}
],
"sspMsgTypes": "2",
"sspMsgContent": "3",
"content": "Advisory",
"items": [
"513"
],
"url": "null"
}
]
},
"rsus": [
{
"rsuTarget": "127.0.0.1",
"rsuUsername": "user",
"rsuPassword": "password",
"rsuRetries": "0",
"rsuTimeout": "2000"
},{
"rsuTarget": "127.0.0.2",
"rsuUsername": "user",
"rsuPassword": "password",
"rsuRetries": "1",
"rsuTimeout": "1000"
},{
"rsuTarget": "127.0.0.3",
"rsuUsername": "user",
"rsuPassword": "password",
"rsuRetries": "1",
"rsuTimeout": "1000"
}
],
"snmp": {
"rsuid": "00000083",
"msgid": "31",
"mode": "1",
"channel": "178",
"interval": "2",
"deliverystart": "2017-06-01T17:47:11-05:00",
"deliverystop": "2018-01-01T17:47:11-05:15",
"enable": "1",
"status": "4"
},
"sdw": {
"ttl": "oneminute",
"serviceRegion": {
"nwCorner": {
"latitude": "44.998459",
"longitude": "-111.040817"
},
"seCorner": {
"latitude": "41.104674",
"longitude": "-104.111312"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
{
"ode": {
"version": 2
},
"tim": {
"index": "13",
"msgCnt": "1",
"timeStamp": "2017-08-03T22:25:36.297Z",
"urlB": "null",
"packetID": "EC9C236B0000000000",
"dataframes": [
{
"startDateTime": "2017-08-02T22:25:00.000Z",
"durationTime": 1,
"frameType": "1",
"sspTimRights": "0",
"msgID": "RoadSignID",
"position": {
"latitude": "41.678473",
"longitude": "-108.782775",
"elevation": "917.1432"
"frameType": "advisory",
"msgId": {
"roadSignID": {
"position": {
"latitude": "41.678473",
"longitude": "-108.782775",
"elevation": "917.1432"
},
"viewAngle": "1010101010101010",
"mutcdCode": "warning",
"crc": "0000000000000000"
}
},
"viewAngle": "1010101010101010",
"mutcd": "5",
"crc": "0000000000000000",
"priority": "0",
"sspLocationRights": "3",
"regions": [
Expand Down Expand Up @@ -98,5 +105,18 @@
"deliverystop": "2018-01-01T17:47:11-05:15",
"enable": "1",
"status": "4"
},
"sdw": {
"ttl": "oneminute",
"serviceRegion": {
"nwCorner": {
"latitude": "44.998459",
"longitude": "-111.040817"
},
"seCorner": {
"latitude": "41.104674",
"longitude": "-104.111312"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@
"index": "10",
"msgCnt": "13",
"timeStamp": "2017-03-13T01:07:11-05:00",
"packetID": "1",
"packetID": "EC9C236B0000000000",
"urlB": "null",
"dataframes": [
{
"sspTimRights": "0",
"frameType": "0",
"msgID": "RoadSignID",
"position": {
"latitude": "41.678473",
"longitude": "-108.782775",
"elevation": "917.1432"
"frameType": "advisory",
"msgId": {
"roadSignID": {
"position": {
"latitude": "41.678473",
"longitude": "-108.782775",
"elevation": "917.1432"
},
"viewAngle": "1010101010101010",
"mutcdCode": "warning",
"crc": "0000000000000000"
}
},
"viewAngle": "1010101010101010",
"mutcd": "5",
"crc": "0000000000000000",
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "22",
"priority": "0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@
"index": "10",
"msgCnt": "13",
"timeStamp": "2017-03-13T01:07:11-05:00",
"packetID": "1",
"packetID": "EC9C236B0000000000",
"urlB": "null",
"dataframes": [
{
"sspTimRights": "0",
"frameType": "0",
"msgID": "RoadSignID",
"position": {
"latitude": "41.678473",
"longitude": "-108.782775",
"elevation": "917.1432"
"frameType": "advisory",
"msgId": {
"roadSignID": {
"position": {
"latitude": "41.678473",
"longitude": "-108.782775",
"elevation": "917.1432"
},
"viewAngle": "1010101010101010",
"mutcdCode": "warning",
"crc": "0000000000000000"
}
},
"viewAngle": "1010101010101010",
"mutcd": "5",
"crc": "0000000000000000",
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "22",
"priority": "0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@
"index": "10",
"msgCnt": "13",
"timeStamp": "2017-03-13T01:07:11-05:00",
"packetID": "1",
"packetID": "EC9C236B0000000000",
"urlB": "null",
"dataframes": [
{
"sspTimRights": "0",
"frameType": "0",
"msgID": "RoadSignID",
"position": {
"latitude": "41.678473",
"longitude": "-108.782775",
"elevation": "917.1432"
"frameType": "advisory",
"msgId": {
"roadSignID": {
"position": {
"latitude": "41.678473",
"longitude": "-108.782775",
"elevation": "917.1432"
},
"viewAngle": "1010101010101010",
"mutcdCode": "warning",
"crc": "ABCD"
}
},
"viewAngle": "1010101010101010",
"mutcd": "5",
"crc": "4AFC",
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "22",
"priority": "0",
Expand Down
10 changes: 8 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ services:
KAFKA_DELETE_TOPIC_ENABLED: "true"
KAFKA_CLEANUP_POLICY: "delete" # delete old logs
KAFKA_LOG_RETENTION_HOURS: 2
KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 3000
KAFKA_RETENTION_MS: 7200000 # delete old logs after 2 hours
KAFKA_SEGMENT_MS: 7200000 # roll segment logs every 2 hours.
# This configuration controls the period of time after
Expand Down Expand Up @@ -66,7 +67,7 @@ services:
links:
- kafka
volumes:
- ${DOCKER_SHARED_VOLUME}:/asn1_codec
- ${DOCKER_SHARED_VOLUME}:/asn1_codec_share

aem:
build: ./asn1_codec
Expand All @@ -79,7 +80,7 @@ services:
links:
- kafka
volumes:
- ${DOCKER_SHARED_VOLUME}:/asn1_codec
- ${DOCKER_SHARED_VOLUME}:/asn1_codec_share

ppm_bsm:
build: ./jpo-cvdp
Expand All @@ -89,6 +90,8 @@ services:
PPM_CONFIG_FILE: ppmBsm.properties
volumes:
- ${DOCKER_SHARED_VOLUME}:/ppm_data
depends_on:
- kafka

ppm_tim:
build: ./jpo-cvdp
Expand All @@ -98,6 +101,9 @@ services:
PPM_CONFIG_FILE: ppmTim.properties
volumes:
- ${DOCKER_SHARED_VOLUME}:/ppm_data
depends_on:
- kafka

cvpep_bsm_s3dep:
build: ./jpo-s3-deposit
image: jpoode_s3dep:latest
Expand Down
2 changes: 1 addition & 1 deletion docker-run-adm.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker run -it -v %DOCKER_SHARED_VOLUME%:/asn1_codec -e DOCKER_HOST_IP=%DOCKER_HOST_IP% -e ACM_CONFIG_FILE=adm.properties jpoode_acm:latest %1
docker run -it -v %DOCKER_SHARED_VOLUME%:/asn1_codec_share -e DOCKER_HOST_IP=%DOCKER_HOST_IP% -e ACM_CONFIG_FILE=adm.properties jpoode_acm:latest %1
Loading

0 comments on commit 43fea0e

Please sign in to comment.