Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(cell): add defaults to cell_config of barnim/tiergarten, adjusted…
Browse files Browse the repository at this point in the history
… tests
kschrab committed Feb 16, 2024
1 parent acdbf2f commit 1bad43e
Showing 4 changed files with 19 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
"networkConfigurationFile": "network.json",
"regionConfigurationFile": "regions.json"
"regionConfigurationFile": "regions.json",
"headerLengths": {
"udpHeader": "8 Bytes",
"tcpHeader": "20 Bytes",
"ipHeader": "20 Bytes",
"cellularHeader": "18 Bytes",
"ethernetHeader": "18 Bytes"
}
}
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"udpHeader": "8 Bytes",
"tcpHeader": "20 Bytes",
"ipHeader": "20 Bytes",
"cellularHeader": "26 Bytes",
"ethernetHeader": "38 Bytes"
"cellularHeader": "18 Bytes",
"ethernetHeader": "18 Bytes"
}
}
Original file line number Diff line number Diff line change
@@ -145,11 +145,11 @@ public void cellMessagesHandledInModules() throws Exception {
// send 150 uplink messages from veh_0 and veh_1 + 2*RoundTripMessage + 2*Messages for nack + 1*Nack-test = 305
LogAssert.contains(simulationRule, CELL_LOG, ".*ChainManager - \\[Upstream\\] Processed messages: 305.*");
/* received (26 rsu_0 + 30 rsu_1 + 30 rsu_2 + 150 self) messages from veh_0 = 236
and (150 broadcast + 2 region overlap) - (126 messages not sendable due to capacity limit) messages from veh_1 = 26
and (150 broadcast + 2 region overlap) - (120 messages not sendable due to capacity limit) messages from veh_1 = 32
and 2*RoundTripMessage = 2
and 2*Messages for nack test = 2
and 1*Nack-Test ==> total 267*/
LogAssert.contains(simulationRule, CELL_LOG, ".*ChainManager - \\[Downstream\\] Processed messages: 267.*");
LogAssert.contains(simulationRule, CELL_LOG, ".*ChainManager - \\[Downstream\\] Processed messages: 273.*");
}

@Test
@@ -180,11 +180,11 @@ public void applicationsCamReceptions() throws Exception {

// geo broadcast
// locate rsu_0 and rsu_1 in the same mbms broadcast region
assertOccurrences(RSU_0_RECEIVE_MSG_APP_CELL_LOG, ".*Received CAM from veh_1.*", 7);
assertOccurrences(RSU_0_RECEIVE_MSG_APP_CELL_LOG, ".*Received CAM from veh_1.*", 8);
// locate rsu_0 and rsu_1 in the same mbms broadcast region
assertOccurrences(RSU_1_RECEIVE_MSG_APP_CELL_LOG, ".*Received CAM from veh_1.*", 7);
assertOccurrences(RSU_1_RECEIVE_MSG_APP_CELL_LOG, ".*Received CAM from veh_1.*", 8);
// locate rsu_0 and rsu_2 in the same mbms broadcast region
assertOccurrences(RSU_2_RECEIVE_MSG_APP_CELL_LOG, ".*Received CAM from veh_1.*", 12);
assertOccurrences(RSU_2_RECEIVE_MSG_APP_CELL_LOG, ".*Received CAM from veh_1.*", 15);

// adhoc
// test pattern no interference with ad hoc rsus
@@ -210,8 +210,8 @@ public void roundTripMessageTakesRightAmountOfTime() throws Exception {
long timeOfSending = 310 * TIME.SECOND;
long delayTmcUpload = 50 * TIME.MILLI_SECOND;
long delayTmcDownload = 50 * TIME.MILLI_SECOND;
long delayVehUpload = 106 * TIME.MILLI_SECOND; //TODO check those values, are those random?
long delayVehDownload = 57 * TIME.MILLI_SECOND; //TODO check those values, are those random? if so, than its not ideal for a test
long delayVehUpload = 86 * TIME.MILLI_SECOND; //TODO check those values, are those random?
long delayVehDownload = 67 * TIME.MILLI_SECOND; //TODO check those values, are those random? if so, than its not ideal for a test

long timeFromTmcToVeh = delayTmcUpload + delayVehDownload;
long timeFromVehToTmc = delayVehUpload + delayTmcDownload;
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"udpHeader": "8 Bytes",
"tcpHeader": "20 Bytes",
"ipHeader": "20 Bytes",
"cellularHeader": "26 Bytes",
"ethernetHeader": "38 Bytes"
"cellularHeader": "18 Bytes",
"ethernetHeader": "18 Bytes"
}
}

0 comments on commit 1bad43e

Please sign in to comment.