From 638ab840d4ab171bcec06113a27c775be1684225 Mon Sep 17 00:00:00 2001
From: Michael7371 <40476797+Michael7371@users.noreply.github.com>
Date: Fri, 3 Nov 2023 12:06:40 -0600
Subject: [PATCH] removing extra changes

---
 .../its/jpo/ode/udp/generic/MessageType.java  | 11 ------
 .../its/jpo/ode/udp/generic/TypePayload.java  | 35 -------------------
 scripts/tests/asn1_decoder_input.py           | 19 ----------
 scripts/tests/udpsender_tim.py                |  4 +--
 4 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/MessageType.java
 delete mode 100644 jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/TypePayload.java
 delete mode 100644 scripts/tests/asn1_decoder_input.py

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/MessageType.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/MessageType.java
deleted file mode 100644
index c4fd24bd9..000000000
--- a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/MessageType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package us.dot.its.jpo.ode.udp.generic;
-
-public enum MessageType {
-    UNKNOWN,
-    BSM,
-    MAP, 
-    SPAT,
-    SRM,
-    SSM,
-    TIM
-}
\ No newline at end of file
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/TypePayload.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/TypePayload.java
deleted file mode 100644
index 16dbbde1d..000000000
--- a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/TypePayload.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package us.dot.its.jpo.ode.udp.generic;
-
-public class TypePayload {
-    
-    private MessageType type;
-    private byte[] payload;
-
-    public TypePayload(MessageType type, byte[] payload){
-        this.type = type;
-        this.payload = payload;
-    }
-
-    public MessageType getType() {
-        return type;
-    }
-
-    public void setType(MessageType type) {
-        this.type = type;
-    }
-
-    public byte[] getPayload() {
-        return payload;
-    }
-
-
-    public void setPayload(byte[] payload) {
-        this.payload = payload;
-    }
-
-
-    public String toString(){
-        return "{ \"type\":" + type + "\"payload\":" + payload + "}"; 
-    }
-
-}
\ No newline at end of file
diff --git a/scripts/tests/asn1_decoder_input.py b/scripts/tests/asn1_decoder_input.py
deleted file mode 100644
index 9a196afd5..000000000
--- a/scripts/tests/asn1_decoder_input.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import socket
-import time
-import os
-from kafka import KafkaProducer
-
-# Currently set to oim-dev environment's ODE
-KAFKA_BROKER = "172.29.11.116:9092"  # Replace with your Kafka broker address and port
-KAFKA_TOPIC = "topic.Asn1DecoderInput"  # Replace with the Kafka topic you want to publish to
-producer = KafkaProducer(bootstrap_servers=KAFKA_BROKER)
-
-# MESSAGE = "<OdeAsn1Data><metadata><bsmSource>EV</bsmSource><logFileName>bsmTx.gz</logFileName><recordType>bsmTx</recordType><securityResultCode>success</securityResultCode><receivedMessageDetails><locationData><latitude>40.5659199</latitude><longitude>-105.031773</longitude><elevation>1456.1</elevation><speed>0.28</speed><heading>268.275</heading></locationData><rxSource>NA</rxSource></receivedMessageDetails><encodings><encodings><elementName>root</elementName><elementType>Ieee1609Dot2Data</elementType><encodingRule>COER</encodingRule></encodings><encodings><elementName>unsecuredData</elementName><elementType>MessageFrame</elementType><encodingRule>UPER</encodingRule></encodings></encodings><payloadType>us.dot.its.jpo.ode.model.OdeAsn1Payload</payloadType><serialId><streamId>fffda5e3-f6fc-4007-9a19-8b1e53794754</streamId><bundleSize>16</bundleSize><bundleId>0</bundleId><recordId>7</recordId><serialNumber>7</serialNumber></serialId><odeReceivedAt>2023-09-18T23:18:26.489467Z</odeReceivedAt><schemaVersion>6</schemaVersion><maxDurationTime>0</maxDurationTime><recordGeneratedAt>2018-05-01T15:13:55.396Z</recordGeneratedAt><recordGeneratedBy>OBU</recordGeneratedBy><sanitized>false</sanitized><odePacketID/><odeTimStartDateTime/><originIp/></metadata><payload><dataType>us.dot.its.jpo.ode.model.OdeHexByteArray</dataType><data><bytes>0014465284a9ea8c4f2326e260f5965c652f25311414100070000000fdfa1fa1007fff80005a0fa0007cc040ff2b4037ef71fffc0fe6bc044afcbfffc0fe783e940e3bfffcfffec800400120000235da5fd7f72880afc46273f760137e80834179d2ce9abefb3aaddf73892ee65aba28109def53b15481d278542634a1d72d66c9c9d1eca86ef845f46ce16a9e755726247deb3cf024c3aa48532db346d3d50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</bytes></data></payload></OdeAsn1Data>"
-# MESSAGE = "<OdeAsn1Data><metadata><bsmSource>RV</bsmSource><logFileName/><recordType>bsmTx</recordType><securityResultCode>unknown</securityResultCode><receivedMessageDetails><locationData><latitude/><longitude/><elevation/><speed/><heading/></locationData><rxSource>RV</rxSource></receivedMessageDetails><encodings><encodings><elementName>root</elementName><elementType>Ieee1609Dot2Data</elementType><encodingRule>COER</encodingRule></encodings><encodings><elementName>unsecuredData</elementName><elementType>MessageFrame</elementType><encodingRule>UPER</encodingRule></encodings></encodings><payloadType>us.dot.its.jpo.ode.model.OdeAsn1Payload</payloadType><serialId><streamId>615961ac-58f1-42ac-98e1-8abbb0d3b131</streamId><bundleSize>1</bundleSize><bundleId>0</bundleId><recordId>0</recordId><serialNumber>0</serialNumber></serialId><odeReceivedAt>2023-09-19T17:07:30.847914Z</odeReceivedAt><schemaVersion>6</schemaVersion><maxDurationTime>0</maxDurationTime><recordGeneratedAt/><recordGeneratedBy/><sanitized>false</sanitized><odePacketID/><odeTimStartDateTime/><originIp>172.30.0.1</originIp></metadata><payload><dataType>us.dot.its.jpo.ode.model.OdeHexByteArray</dataType><data><bytes>0014464744A9EA8C6C8826E260F8965C653C253A1414100070000000FDFA1FA1007FFF80005A0FA0007CC040FF2E403B2F97FFFC0FE6EC047EFF1FFFC0FE7B3E974E5FFFFCFFFEC800400120000235DA5E0F396080AFC46273F760137E80837276D28AD605B71BA6F8F737702A2ABC0C566785DCC3DFAE23B414DE7144924C5FA5C4BDF2F389263EDB16E4108BDB930AA8F507C4E0418732E0805A707B6161</bytes></data></payload></OdeAsn1Data>"
-
-MESSAGE = "<OdeAsn1Data><metadata><bsmSource>EV</bsmSource><logFileName>bsmTx_2023-09-18T22%3A41%3A25.374_2229401004593.gz</logFileName><recordType>bsmTx</recordType><securityResultCode>unknown</securityResultCode><receivedMessageDetails><locationData><latitude>40.4740337</latitude><longitude>-104.9692039</longitude><elevation>1496.5</elevation><speed>0</speed><heading>0</heading></locationData><rxSource>NA</rxSource></receivedMessageDetails><encodings><encodings><elementName>unsecuredData</elementName><elementType>MessageFrame</elementType><encodingRule>UPER</encodingRule></encodings></encodings><payloadType>us.dot.its.jpo.ode.model.OdeAsn1Payload</payloadType><serialId><streamId>7074ba3c-042b-48a3-b88e-1e6a82cfe464</streamId><bundleSize>33</bundleSize><bundleId>0</bundleId><recordId>26</recordId><serialNumber>26</serialNumber></serialId><odeReceivedAt>2023-09-18T23:51:35.120811Z</odeReceivedAt><schemaVersion>6</schemaVersion><maxDurationTime>0</maxDurationTime><recordGeneratedAt>2023-09-18T22:45:45.625Z</recordGeneratedAt><recordGeneratedBy>OBU</recordGeneratedBy><sanitized>false</sanitized><odePacketID/><odeTimStartDateTime/><originIp/></metadata><payload><dataType>us.dot.its.jpo.ode.model.OdeHexByteArray</dataType><data><bytes>0014464744A9EA8C6C8826E260F8965C653C253A1414100070000000FDFA1FA1007FFF80005A0FA0007CC040FF2E403B2F97FFFC0FE6EC047EFF1FFFC0FE7B3E974E5FFFFCFFFEC800400120000235DA5E0F396080AFC46273F760137E80837276D28AD605B71BA6F8F737702A2ABC0C566785DCC3DFAE23B414DE7144924C5FA5C4BDF2F389263EDB16E4108BDB930AA8F507C4E0418732E0805A707B6161</bytes></data></payload></OdeAsn1Data>"
-
-
-MESSAGE_BYTES = MESSAGE.encode('utf-8')
-producer.send(KAFKA_TOPIC, value=MESSAGE_BYTES)
-producer.close()
diff --git a/scripts/tests/udpsender_tim.py b/scripts/tests/udpsender_tim.py
index 8664dac44..afc542385 100644
--- a/scripts/tests/udpsender_tim.py
+++ b/scripts/tests/udpsender_tim.py
@@ -3,9 +3,9 @@
 import os
 
 # Currently set to oim-dev environment's ODE
-UDP_IP = '172.29.11.116'
+UDP_IP = os.getenv('DOCKER_HOST_IP')
 UDP_PORT = 47900
-MESSAGE = "001f60201000000000019400db8082729b89a1665971a3ca2001fffe4fceb5e7b24828407e5371342ccb2e3479440001f46ffff00138b2e491d26e28042813d8e2cb8e9c89b89bc2e050a38b2e286ca6e258918141462cb874db9b8938d4108000ff306001830002362d8d9f68a000023630e7edf8a081010100030180c620fb90caad3b9c5082080e1ddc905e10168e39692100032514f26e83279c83010180034801090001260001808001838005008001f0408001828005008001304000041020407e800320409780050080012040000320409900018780032040958005000001e040818306658100e481d256635c1a7e4127ff2c1effb0d6a0fb5ca575514f12fb07d5788082b689719d4ecd2627e96cfa4efff0a8596c9a47a732999c143d78e01884f565db467f63bbdbf1c4511801c0eab66a5baa4d2e7d552c33dfea9c841f4eff4960af"
+MESSAGE = "005f498718cca69ec1a04600000100105d9b46ec5be401003a0103810040038081d4001f80d07016da410000000000000bbc2b0f775d9b0309c271431fa166ee0a27fff93f136b8205a0a107fb2ef979f4c5bfaeec97e4ad70c2fb36cd9730becdb355cc2fd2a7556b160b98b46ab98ae62c185fa55efb468d5b4000000004e2863f42cddc144ff7980040401262cdd7b809c509f5c62cdd35519c507b9062cdcee129c505cf262cdca5ff9c50432c62cdc5d3d9c502e3e62cdc13e79c501e9262cdbca2d9c5013ee62cdb80359c500e6a62cdb36299c500bc862cdaec1d9c50093c62cdaa2109c5006ea1080203091a859eeebb36006001830001aad27f4ff7580001aad355e39b5880a30029d6585009ef808332d8d9f80c3855151b38c772f765007967ec1170bcb7937f5cb880a25a52863493bcb87570dbcb5abc6bfb2faec606cfa34eb95a24790b2017366d3aabe7729e"
 
 print("UDP target IP:", UDP_IP)
 print("UDP target port:", UDP_PORT)