Update makefile to support inet4.5 and update fingerprints

Unipisa · Apr 19, 2023 · 54d3f82 · 54d3f82
1 parent 9c2bf83
commit 54d3f82
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 37 deletions.
diff --git a/.project b/.project
@@ -3,7 +3,7 @@
 	<name>simu5G</name>
 	<comment></comment>
 	<projects>
-		<project>inet4.4</project>
+		<project>inet4.5</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ cleanall: checkmakefiles
 	@rm -f src/Makefile
 
 makefiles:
-	@cd src && opp_makemake --make-so -f --deep -o simu5g -O out -KINET_PROJ=../../inet4.4 -DINET_IMPORT -I. -I$$\(INET_PROJ\)/src -L$$\(INET_PROJ\)/src -lINET$$\(D\)
+	@cd src && opp_makemake --make-so -f --deep -o simu5g -O out -KINET_PROJ=../../inet4.5 -DINET_IMPORT -I. -I$$\(INET_PROJ\)/src -L$$\(INET_PROJ\)/src -lINET$$\(D\)
 
 checkmakefiles:
 	@if [ ! -f src/Makefile ]; then \

diff --git a/bin/simu5g b/bin/simu5g
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 SIMU5G_SRC=$SIMU5G_ROOT/src
-INET_SRC=`(cd $SIMU5G_ROOT/../inet4.4/src ; pwd)`
+INET_SRC=`(cd $SIMU5G_ROOT/../inet4.5/src ; pwd)`
 COMMAND_LINE_OPTIONS="-n $SIMU5G_ROOT/simulations:$SIMU5G_ROOT/emulation:$SIMU5G_SRC:$INET_SRC"
 
 if [ -f $SIMU5G_SRC/libsimu5g.so -o -f $SIMU5G_SRC/libsimu5g.dll -o -f $SIMU5G_SRC/libsimu5g.dylib ]; then

diff --git a/simulations/NR/mec/singleMecHost/omnetpp.ini b/simulations/NR/mec/singleMecHost/omnetpp.ini
@@ -127,6 +127,7 @@ network = simu5g.simulations.NR.mec.singleMecHost.singleMecHost
 
 #----------------------------------------
 
+
 ######################_ME Host Side_#####################
 # resources available
 *.mecHost.maxMECApps = 100												#max ME Apps to instantiate

diff --git a/tests/fingerprint/LTE/d2d_wResults.csv b/tests/fingerprint/LTE/d2d_wResults.csv
@@ -3,5 +3,5 @@
 /simulations/LTE/d2d/,              -f omnetpp.ini -c SinglePair-UDP-Infra -r 0,            5s,         117e-187d/tls, PASS,
 /simulations/LTE/d2d/,              -f omnetpp.ini -c MultiplePairs-UDP-D2D -r 0,           5s,         eb6d-d313/tls, PASS,
 /simulations/LTE/d2d/,              -f omnetpp.ini -c MultiplePairs-UDP-Infra -r 0,         5s,         afbf-b5b4/tls, PASS,
-/simulations/LTE/d2d/,              -f omnetpp.ini -c MultiplePairs-UDP-D2D-wReuse -r 0,    5s,         0da9-a8c8/tls, PASS,
+/simulations/LTE/d2d/,              -f omnetpp.ini -c MultiplePairs-UDP-D2D-wReuse -r 0,    5s,         af3a-f60c/tls, PASS,
 
diff --git a/tests/fingerprint/LTE/demo.csv b/tests/fingerprint/LTE/demo.csv
@@ -9,6 +9,6 @@
 /simulations/LTE/demo/,                  -f omnetpp.ini -c CBR-UL -r 5,            5s,              b9c2-4a46/tplx, PASS,
 /simulations/LTE/demo/,                  -f omnetpp.ini -c CBR-DL -r 0,            5s,              ff0b-b399/tplx, PASS,
 /simulations/LTE/demo/,                  -f omnetpp.ini -c CBR-DL -r 5,            5s,              b192-1883/tplx, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c SchedulersTest -r 0,    5s,              1cfc-5432/tplx, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c SchedulersTest -r 12,    5s,              2eb1-3fd3/tplx, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c SchedulersTest -r 0,    5s,              1f85-e190/tplx, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c SchedulersTest -r 12,    5s,              a1fb-ebbd/tplx, PASS,
 
diff --git a/tests/fingerprint/LTE/demo_wResults.csv b/tests/fingerprint/LTE/demo_wResults.csv
@@ -1,13 +1,13 @@
 # workingdir,                        args,                                     simtimelimit,    fingerprint
-/simulations/LTE/demo/,                  -f omnetpp.ini -c VideoStreaming -r 0,    5s,              bdad-be36/s, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c VoIP -r 0,              5s,              f315-46bd/s, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c VoIP_DL-UL -r 0,        5s,              21e4-a0b9/s, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c VoIP-DL -r 0,           5s,              eab3-21d0/s, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c VoIP-UL -r 0,           5s,              fa96-e8fd/s, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c CBR-UL -r 0,            5s,              2a34-c2bb/s, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c CBR-UL -r 5,            5s,              a948-2bd8/s, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c CBR-DL -r 0,            5s,              c5bf-ac7e/s, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c CBR-DL -r 5,            5s,              5b6d-a59b/s, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c SchedulersTest -r 0,    5s,              f1fa-f080/s, PASS,
-/simulations/LTE/demo/,                  -f omnetpp.ini -c SchedulersTest -r 12,    5s,              de53-4491/s, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c VideoStreaming -r 0,    5s,              458b-07c8/s, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c VoIP -r 0,              5s,              f506-567f/s, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c VoIP_DL-UL -r 0,        5s,              0276-7280/s, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c VoIP-DL -r 0,           5s,              4eab-3cc3/s, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c VoIP-UL -r 0,           5s,              1ed9-9f14/s, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c CBR-UL -r 0,            5s,              9384-8689/s, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c CBR-UL -r 5,            5s,              c8ab-e246/s, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c CBR-DL -r 0,            5s,              dc99-8f7e/s, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c CBR-DL -r 5,            5s,              86c1-2f02/s, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c SchedulersTest -r 0,    5s,              1280-8b89/s, PASS,
+/simulations/LTE/demo/,                  -f omnetpp.ini -c SchedulersTest -r 12,    5s,              7c00-7c41/s, PASS,
 
diff --git a/tests/fingerprint/LTE/x2.csv b/tests/fingerprint/LTE/x2.csv
@@ -1,4 +1,4 @@
 # workingdir,                            args,                                          simtimelimit,    fingerprint
-/simulations/LTE/x2/,                         -f omnetpp.ini -c X2-Mesh-balanced -r 0,      5s,              2344-fe98/tplx, PASS,
-/simulations/LTE/x2/,                         -f omnetpp.ini -c X2-Mesh-unbalanced -r 0,    5s,              82bf-c11e/tplx, PASS,
+/simulations/LTE/x2/,                         -f omnetpp.ini -c X2-Mesh-balanced -r 0,      5s,              c599-793b/tplx, PASS,
+/simulations/LTE/x2/,                         -f omnetpp.ini -c X2-Mesh-unbalanced -r 0,    5s,              48c7-49a5/tplx, PASS,
 
diff --git a/tests/fingerprint/NR/carrier_aggr.csv b/tests/fingerprint/NR/carrier_aggr.csv
@@ -2,4 +2,4 @@
 /simulations/NR/test_multiCarrier,        -f omnetpp.ini -c SingleCarrier-CBR-DL -r 0,       5s,              712b-da7d/tplx,PASS,
 /simulations/NR/test_multiCarrier,        -f omnetpp.ini -c SingleCarrier-CBR-UL -r 0,       5s,              0bc2-31f5/tplx,PASS,
 /simulations/NR/test_multiCarrier,        -f omnetpp.ini -c MultiCarrier-CBR-DL -r 0,        5s,              c13e-9dbb/tplx,PASS,
-/simulations/NR/test_multiCarrier,        -f omnetpp.ini -c MultiCarrier-CBR-UL -r 0,        5s,              3d4f-fcbd/tplx,PASS,
+/simulations/NR/test_multiCarrier,        -f omnetpp.ini -c MultiCarrier-CBR-UL -r 0,        5s,              f39a-2d9e/tplx,PASS,
diff --git a/tests/fingerprint/NR/carrier_aggr_wResults.csv b/tests/fingerprint/NR/carrier_aggr_wResults.csv
@@ -1,5 +1,5 @@
 # workingdir,                            args,                                                  simtimelimit,    fingerprint
-/simulations/NR/test_multiCarrier,        -f omnetpp.ini -c SingleCarrier-CBR-DL -r 0,       5s,              f5ea-c388/s,PASS,
-/simulations/NR/test_multiCarrier,        -f omnetpp.ini -c SingleCarrier-CBR-UL -r 0,       5s,              a03b-129b/s,PASS,
-/simulations/NR/test_multiCarrier,        -f omnetpp.ini -c MultiCarrier-CBR-DL -r 0,       5s,              163c-8845/s,PASS,
-/simulations/NR/test_multiCarrier,        -f omnetpp.ini -c MultiCarrier-CBR-UL -r 0,       5s,              7e01-12a0/s,PASS,
+/simulations/NR/test_multiCarrier,        -f omnetpp.ini -c SingleCarrier-CBR-DL -r 0,       5s,              17c3-cd4d/s,PASS,
+/simulations/NR/test_multiCarrier,        -f omnetpp.ini -c SingleCarrier-CBR-UL -r 0,       5s,              48a4-0bf9/s,PASS,
+/simulations/NR/test_multiCarrier,        -f omnetpp.ini -c MultiCarrier-CBR-DL -r 0,       5s,              558d-f0cf/s,PASS,
+/simulations/NR/test_multiCarrier,        -f omnetpp.ini -c MultiCarrier-CBR-UL -r 0,       5s,              72bf-d74b/s,PASS,
diff --git a/tests/fingerprint/NR/dual_connectivity_wResults.csv b/tests/fingerprint/NR/dual_connectivity_wResults.csv
@@ -1,9 +1,9 @@
 # workingdir,                            args,                                                  simtimelimit,    fingerprint
-/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-MasterOnly-DL -r 0,     5s,              1645-58be/s,PASS,
-/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-MasterOnly-UL -r 0,     5s,              44ca-803b/s,PASS,
-/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-SecondaryOnly-DL -r 0,  5s,              81e3-c878/s,PASS,
-/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-SecondaryOnly-UL -r 0,  5s,              e4be-4fe8/s,PASS,
-/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-MasterPlusSecondary-DL -r 0,  5s,        0b15-5ac0/s,PASS,
-/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-MasterPlusSecondary-UL -r 0,  5s,        1c0a-ad09/s,PASS,
-/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-SplitBearer-DL -r 0,    5s,              2224-6c50/s,PASS,
-/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-SplitBearer-UL -r 0,    5s,              6191-7150/s,PASS,
+/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-MasterOnly-DL -r 0,     5s,              c8cf-cec9/s,PASS,
+/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-MasterOnly-UL -r 0,     5s,              1263-ad74/s,PASS,
+/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-SecondaryOnly-DL -r 0,  5s,              9dc0-d972/s,PASS,
+/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-SecondaryOnly-UL -r 0,  5s,              721e-821e/s,PASS,
+/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-MasterPlusSecondary-DL -r 0,  5s,        4061-676e/s,PASS,
+/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-MasterPlusSecondary-UL -r 0,  5s,        41e5-c2de/s,PASS,
+/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-SplitBearer-DL -r 0,    5s,              cda0-79e3/s,PASS,
+/simulations/NR/dualConnectivity,        -f omnetpp.ini -c DualConn-SplitBearer-UL -r 0,    5s,              374c-6645/s,PASS,
diff --git a/tests/fingerprint/NR/nr_standalone_wResults.csv b/tests/fingerprint/NR/nr_standalone_wResults.csv
@@ -1,4 +1,4 @@
 # workingdir,                            args,                                                  simtimelimit,    fingerprint
-/simulations/NR/standalone,        -f omnetpp.ini -c VoIP-DL -r 0,                               5s,              36ff-d673/s,PASS,
-/simulations/NR/standalone,        -f omnetpp.ini -c VoIP-UL -r 0,                               5s,              6c2c-5fbe/s,PASS,
+/simulations/NR/standalone,        -f omnetpp.ini -c VoIP-DL -r 0,                               5s,              2ecf-a15b/s,PASS,
+/simulations/NR/standalone,        -f omnetpp.ini -c VoIP-UL -r 0,                               5s,              4ee7-c55b/s,PASS,
 
diff --git a/tests/fingerprint/mec/mec_wResults.csv b/tests/fingerprint/mec/mec_wResults.csv
@@ -1,4 +1,4 @@
 # workingdir,                            args,                                                  simtimelimit,    fingerprint,
-/simulations/NR/mec/singleMecHost,       -f omnetpp.ini -c SingleMec -r 0,       20s,              01d5-fbcc/s,PASS,
-/simulations/NR/mec/multiMecHost,        -f omnetpp.ini -c MultiMec -r 0,       20s,              3846-7943/s,PASS,
-/simulations/NR/mec/RNIDelay,            -f omnetpp.ini -c Test -r 0,       5s,              5c1d-c27c/s,PASS,
+/simulations/NR/mec/singleMecHost,       -f omnetpp.ini -c SingleMec -r 0,       20s,              00fa-fe39/s,PASS,
+/simulations/NR/mec/multiMecHost,        -f omnetpp.ini -c MultiMec -r 0,       20s,              ec73-2f97/s,PASS,
+/simulations/NR/mec/RNIDelay,            -f omnetpp.ini -c Test -r 0,       5s,              88fc-dbf8/s,PASS,