summaryrefslogtreecommitdiff
path: root/validation/test
diff options
context:
space:
mode:
authorJean-Philippe NOEL2012-09-13 17:53:12 +0200
committerJean-Philippe NOEL2012-10-05 09:46:02 +0200
commit00a7f3ab657e82b5a47b0047bd4d0a76b13facba (patch)
tree6afc64a491f8cce8c922ad5b70b1f1ff045ddf24 /validation/test
parenta8d2e1820fb2676677c99ec793f3130a00b84b1f (diff)
validation: improve the test bench description, refs #3363
Diffstat (limited to 'validation/test')
-rw-r--r--validation/test/P2P_throughput_report/P2P_throughput_report.py48
-rw-r--r--validation/test/P2P_throughput_report/P2P_throughput_report.rst13
2 files changed, 36 insertions, 25 deletions
diff --git a/validation/test/P2P_throughput_report/P2P_throughput_report.py b/validation/test/P2P_throughput_report/P2P_throughput_report.py
index 67dbe66c50..540c26011b 100644
--- a/validation/test/P2P_throughput_report/P2P_throughput_report.py
+++ b/validation/test/P2P_throughput_report/P2P_throughput_report.py
@@ -40,7 +40,7 @@ config = {
#True|False
#If True, the measurements are reset, made and then the report is generated
#If False, the report is generated from the previous measurements
- "make_measurements":True,
+ "make_measurements":False,
"attenuation":{
"values":numpy.arange(30, 100, 5).tolist(),
"duration_s":20,
@@ -99,23 +99,23 @@ config = {
# sweep time (seconds)) for "dynamic_jammer"
# and None otherwise)]
"fixtures":[
- ("UDP", "attenuation", None),
- ("TCP", "attenuation", None),
- ("UDP", "SNR", None),
- ("TCP", "SNR", None),
- ("UDP", "SJR", (13.5, None)),
- ("UDP", "SJR", (18.5, None)),
- ("UDP", "SJR", (23.5, None)),
- ("UDP", "SJR", (4, ("SINusoid", 1, 80))),
- ("UDP", "SJR", (15, ("SINusoid", 1, 80))),
- ("UDP", "SJR", (26, ("SINusoid", 1, 80))),
- ("UDP", "SJR", (27.345, ("SINusoid", 1, 80))),
- ("UDP", "frame_size", None),
- ("UDP", "dynamic_jammer", (10, 2, 30, 60)),
- ("UDP", "dynamic_jammer", (0, 2, 30, 60)),
- ("UDP", "dynamic_jammer", (-10, 2, 30, 60)),
- ("UDP", "dynamic_jammer", (-20, 2, 30, 60)),
- ("UDP", "dynamic_jammer", (-30, 2, 30, 60))
+# ("UDP", "attenuation", None),
+# ("TCP", "attenuation", None),
+# ("UDP", "SNR", None),
+# ("TCP", "SNR", None),
+# ("UDP", "SJR", (13.5, None)),
+# ("UDP", "SJR", (18.5, None)),
+# ("UDP", "SJR", (23.5, None)),
+# ("UDP", "SJR", (4, ("SINusoid", 1, 80))),
+# ("UDP", "SJR", (15, ("SINusoid", 1, 80))),
+# ("UDP", "SJR", (26, ("SINusoid", 1, 80))),
+# ("UDP", "SJR", (27.345, ("SINusoid", 1, 80))),
+# ("UDP", "frame_size", None),
+# ("UDP", "dynamic_jammer", (10, 2, 30, 60)),
+# ("UDP", "dynamic_jammer", (0, 2, 30, 60)),
+# ("UDP", "dynamic_jammer", (-10, 2, 30, 60)),
+# ("UDP", "dynamic_jammer", (-20, 2, 30, 60)),
+# ("UDP", "dynamic_jammer", (-30, 2, 30, 60))
],
#Duration after the channel modification during which we generate traffic
#to let the CE converge
@@ -276,7 +276,7 @@ def report():
"-o", file_prefix() + ".pdf"])
def build_test_bench_picture():
- fig_name = os.path.splitext(__file__)[0]
+ fig_name = os.path.splitext(os.path.basename(__file__))[0]
input_file = os.path.join(os.path.dirname(__file__), fig_name + ".dia")
reports_directory = get_reports_directory()
output_file = os.path.join(reports_directory, fig_name + ".eps")
@@ -734,6 +734,11 @@ def get_waveform_data(ppsd_dbm_per_hz, signal_band_mhz, noise_band_mhz,
signal_attenuation_db + \
waveform_attenuation_db)
+ if amn_attenuation_db == 0:
+ amn_presence = "absent"
+ else:
+ amn_presence = "present"
+
return {"ppsd_dbm_per_hz":ppsd_dbm_per_hz,
"par_db":par_db,
"signal_freq_min_mhz":signal_freq_min_mhz,
@@ -747,6 +752,7 @@ def get_waveform_data(ppsd_dbm_per_hz, signal_band_mhz, noise_band_mhz,
"signal_attenuation_db":signal_attenuation_db,
"sjr_attenuator_attenuation_db":sjr_attenuator_attenuation_db,
"amn_attenuation_db":amn_attenuation_db,
+ "amn_presence":amn_presence,
"waveform_attenuation_db":waveform_attenuation_db,
"snr_offset_db":snr_offset_db,
"sjr_offset_db":sjr_offset_db}
@@ -793,6 +799,7 @@ if __name__ == "__main__":
"signal_attenuation_db":10,
"sjr_attenuator_attenuation_db":17,
"amn_attenuation_db":6,
+ "amn_presence":"present",
"waveform_attenuation_db":10,
"snr_offset_db":11,
"sjr_offset_db":-9} == \
@@ -811,6 +818,7 @@ if __name__ == "__main__":
"signal_attenuation_db":10,
"sjr_attenuator_attenuation_db":17,
"amn_attenuation_db":0,
+ "amn_presence":"absent",
"waveform_attenuation_db":10,
"snr_offset_db":4,
"sjr_offset_db":-14} == \
@@ -892,4 +900,4 @@ if __name__ == "__main__":
assert False == test_check_config_aux(None, None, None, None, None, ["a_b_uni"], [1], "TCP", "dynamic_jammer", None)
assert True == test_check_config_aux(None, None, None, None, None, ["a_b_uni"], ["time"], "TCP", "dynamic_jammer", None)
-# report()
+ report()
diff --git a/validation/test/P2P_throughput_report/P2P_throughput_report.rst b/validation/test/P2P_throughput_report/P2P_throughput_report.rst
index 135a955a41..24bc2576e0 100644
--- a/validation/test/P2P_throughput_report/P2P_throughput_report.rst
+++ b/validation/test/P2P_throughput_report/P2P_throughput_report.rst
@@ -39,15 +39,18 @@ On the figure, the host A controls the attenuator and the noise generator but it
The attenuation of 10 dB on the noise generator is useful when the generator is off, in order to avoid any reflection.
-The purpose of the attenuation of N dB (typically 10 dB) on the output of each plug is to avoid any dazzling between the plugs.
+The purpose of the attenuation of N dB on the output of each plug is to avoid any dazzling between the plugs.
The AMN's are necessary only if the plugs are not EoC, i.e have no native output in coax.
Configuration
-------------
-* Start order: The host A is started first
-* Iperf version on the host A ({non_plc_ip_address_a}): {version_a}
-* Iperf version on the host B ({non_plc_ip_address_b}): {version_b}
+
+ * Start order: The host A is started first
+ * Iperf version on the host A ({non_plc_ip_address_a}): {version_a}
+ * Iperf version on the host B ({non_plc_ip_address_b}): {version_b}
+ * N = {signal_attenuation_db} dB
+ * AMNs are {amn_presence}
.. raw:: pdf
@@ -59,7 +62,7 @@ The earthing guidelines are the following:
* Separate the ground and the earth on the AMN's so that the signal does not radiate through the earth
* Connect the grounds of the AMN's with a coax without core
-* Use non-armed Ethernet cables to connect the plugs to the PC's
+* Use non-shielded Ethernet cables to connect the plugs to the PC's
* Connect the earth of the power strip to the T
Network settings