From de75f05f3cb9a06766c47fabdf1bc16714b12bc1 Mon Sep 17 00:00:00 2001 From: Cheng Yuan <84340069+chengyuan0124@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:58:50 -0500 Subject: [PATCH 1/2] Update parameter name for common usage --- ns3_adapter/src/ns3_adapter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ns3_adapter/src/ns3_adapter.cpp b/ns3_adapter/src/ns3_adapter.cpp index f06178c..d204cd2 100644 --- a/ns3_adapter/src/ns3_adapter.cpp +++ b/ns3_adapter/src/ns3_adapter.cpp @@ -456,11 +456,11 @@ std::string NS3Adapter::compose_handshake_msg(const std::string& veh_id, const s rapidjson::Value idtextPart; idtextPart.SetString(veh_id.c_str(), allocator); - document.AddMember("carmaVehicleId", idtextPart, allocator); + document.AddMember("vehicleId", idtextPart, allocator); rapidjson::Value roletextPart; roletextPart.SetString(role_id.c_str(), allocator); - document.AddMember("carlaVehicleRole", roletextPart, allocator); + document.AddMember("vehicleRole", roletextPart, allocator); rapidjson::Value iptextPart; iptextPart.SetString(ip.c_str(), allocator); From c43960e927af4cf4b36bf33edc8892a7272aeff6 Mon Sep 17 00:00:00 2001 From: Cheng Yuan <84340069+chengyuan0124@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:00:32 -0500 Subject: [PATCH 2/2] update unit test since parameter name changed --- ns3_adapter/test/test_ns3_adapter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ns3_adapter/test/test_ns3_adapter.cpp b/ns3_adapter/test/test_ns3_adapter.cpp index 1ea2c30..4e71660 100644 --- a/ns3_adapter/test/test_ns3_adapter.cpp +++ b/ns3_adapter/test/test_ns3_adapter.cpp @@ -199,7 +199,7 @@ TEST(NS3AdapterTest, testcompose_handshake_msg) char* argv[] {c[0], c[1]}; NS3Adapter worker(argc,argv); std::string result = worker.compose_handshake_msg("default_id", "ego1", 2000, 2001, "127.0.0.1"); - EXPECT_EQ(result, "{\"carmaVehicleId\":\"default_id\",\"carlaVehicleRole\":\"ego1\",\"rxMessageIpAddress\":\"127.0.0.1\",\"rxMessagePort\":2000,\"rxTimeSyncPort\":2001}"); + EXPECT_EQ(result, "{\"vehicleId\":\"default_id\",\"vehicleRole\":\"ego1\",\"rxMessageIpAddress\":\"127.0.0.1\",\"rxMessagePort\":2000,\"rxTimeSyncPort\":2001}"); } TEST(NS3Adapter, testNS3ClientSSM)