summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjpnoel2013-06-24 09:47:52 +0200
committerJean-Philippe NOEL2013-06-25 10:57:51 +0200
commit4fcf43dd998c7ef5e6f3f459951fff82f3b43115 (patch)
tree2e3ba50f9b4795db3b1c231972933a5fa1db8577
parent574bc864734a30cf7706021614d5709563ecca08 (diff)
validation/test/P2MP_throughput/configs: update MSE500-500 configs, closes #4060
-rw-r--r--validation/test/P2MP_throughput/configs/MSE500-500_16_slaves.py8
-rw-r--r--validation/test/P2MP_throughput/configs/MSE500-500_32_slaves.py8
-rw-r--r--validation/test/P2MP_throughput/configs/MSE500-500_64_slaves.py36
3 files changed, 20 insertions, 32 deletions
diff --git a/validation/test/P2MP_throughput/configs/MSE500-500_16_slaves.py b/validation/test/P2MP_throughput/configs/MSE500-500_16_slaves.py
index 83c4c746c4..0b3817f5b2 100644
--- a/validation/test/P2MP_throughput/configs/MSE500-500_16_slaves.py
+++ b/validation/test/P2MP_throughput/configs/MSE500-500_16_slaves.py
@@ -4,12 +4,6 @@
"make_measurements":True,
"reports_directory":"eoc-drv-2.0.15/MSE500-500/16_slaves",
"sec_reports_directory":"eoc-drv-2.0.14/MSE500-500/16_slaves",
- "power_plugs_off":[(1, [3, 4, 5, 6, 7])],
+ "power_plugs_off":[(1, [4, 5, 6, 7, 8])],
"stas_nb":16,
- "ixia":{
- "results_path":"ixos/Results",
- "master_port":"1.3.1",
- "slave_port":"1.3.2",
- "min_vlan_id":43
- }
}
diff --git a/validation/test/P2MP_throughput/configs/MSE500-500_32_slaves.py b/validation/test/P2MP_throughput/configs/MSE500-500_32_slaves.py
index e3f72fd670..f72a4530ed 100644
--- a/validation/test/P2MP_throughput/configs/MSE500-500_32_slaves.py
+++ b/validation/test/P2MP_throughput/configs/MSE500-500_32_slaves.py
@@ -4,12 +4,6 @@
"make_measurements":True,
"reports_directory":"eoc-drv-2.0.15/MSE500-500/32_slaves",
"sec_reports_directory":"eoc-drv-2.0.14/MSE500-500/32_slaves",
- "power_plugs_off":[(1, [3, 4, 5])],
+ "power_plugs_off":[(1, [6, 7, 8])],
"stas_nb":32,
- "ixia":{
- "results_path":"ixos/Results",
- "master_port":"1.3.1",
- "slave_port":"1.3.2",
- "min_vlan_id":43
- }
}
diff --git a/validation/test/P2MP_throughput/configs/MSE500-500_64_slaves.py b/validation/test/P2MP_throughput/configs/MSE500-500_64_slaves.py
index 5a989ec161..662bf540a2 100644
--- a/validation/test/P2MP_throughput/configs/MSE500-500_64_slaves.py
+++ b/validation/test/P2MP_throughput/configs/MSE500-500_64_slaves.py
@@ -81,39 +81,39 @@
"plugs":
{
(1, 1, "master"): ("100", None, None, "msk500_eoc_master"),
- (1, 3, "slave_1"): ("1", None, None, "mcr510_eoc_slave"),
+ (1, 3, "slave_1"): ("1", None, None, "mcr500_eoc_slave"),
(1, 3, "slave_2"): ("2", None, None, "mcr510_eoc_slave"),
(1, 3, "slave_3"): ("3", None, None, "mcr510_eoc_slave"),
(1, 3, "slave_4"): ("4", None, None, "mcr510_eoc_slave"),
(1, 3, "slave_5"): ("5", None, None, "mcr510_eoc_slave"),
- (1, 5, "slave_6"): ("6", None, None, "mcr510_eoc_slave"),
- (1, 5, "slave_7"): ("7", None, None, "mcr510_eoc_slave"),
- (1, 5, "slave_8"): ("8", None, None, "mcr510_eoc_slave"),
+ (1, 3, "slave_6"): ("6", None, None, "mcr510_eoc_slave"),
+ (1, 3, "slave_7"): ("7", None, None, "mcr510_eoc_slave"),
+ (1, 3, "slave_8"): ("8", None, None, "mcr510_eoc_slave"),
(1, 3, "slave_9"): ("9", None, None, "mcr510_eoc_slave"),
(1, 3, "slave_10"): ("10", None, None, "mcr510_eoc_slave"),
(1, 3, "slave_11"): ("11", None, None, "mcr510_eoc_slave"),
(1, 3, "slave_12"): ("12", None, None, "mcr510_eoc_slave"),
- (1, 5, "slave_13"): ("13", None, None, "mcr510_eoc_slave"),
+ (1, 3, "slave_13"): ("13", None, None, "mcr510_eoc_slave"),
(1, 3, "slave_14"): ("14", None, None, "mcr510_eoc_slave"),
(1, 3, "slave_15"): ("15", None, None, "mcr510_eoc_slave"),
- (1, 5, "slave_16"): ("16", None, None, "mcr510_eoc_slave"),
- (1, 3, "slave_17"): ("17", None, None, "mcr510_eoc_slave"),
- (1, 3, "slave_18"): ("18", None, None, "mcr510_eoc_slave"),
- (1, 3, "slave_19"): ("19", None, None, "mcr510_eoc_slave"),
+ (1, 3, "slave_16"): ("16", None, None, "mcr510_eoc_slave"),
+ (1, 4, "slave_17"): ("17", None, None, "mcr510_eoc_slave"),
+ (1, 4, "slave_18"): ("18", None, None, "mcr510_eoc_slave"),
+ (1, 4, "slave_19"): ("19", None, None, "mcr510_eoc_slave"),
(1, 4, "slave_20"): ("20", None, None, "mcr510_eoc_slave"),
(1, 4, "slave_21"): ("21", None, None, "mcr510_eoc_slave"),
(1, 4, "slave_22"): ("22", None, None, "mcr510_eoc_slave"),
(1, 4, "slave_23"): ("23", None, None, "mcr510_eoc_slave"),
(1, 4, "slave_24"): ("24", None, None, "mcr510_eoc_slave"),
- (1, 3, "slave_25"): ("25", None, None, "mcr510_eoc_slave"),
- (1, 3, "slave_26"): ("26", None, None, "mcr510_eoc_slave"),
- (1, 3, "slave_27"): ("27", None, None, "mcr510_eoc_slave"),
- (1, 3, "slave_28"): ("28", None, None, "mcr510_eoc_slave"),
- (1, 3, "slave_29"): ("29", None, None, "mcr510_eoc_slave"),
- (1, 3, "slave_30"): ("30", None, None, "mcr510_eoc_slave"),
- (1, 3, "slave_31"): ("31", None, None, "mcr510_eoc_slave"),
- (1, 4, "slave_32"): ("32", None, None, "mcr510_eoc_slave"),
- (1, 8, "slave_33"): ("33", None, None, "mcr500_eoc_slave"),
+ (1, 4, "slave_25"): ("25", None, None, "mcr510_eoc_slave"),
+ (1, 4, "slave_26"): ("26", None, None, "mcr510_eoc_slave"),
+ (1, 5, "slave_27"): ("27", None, None, "mcr510_eoc_slave"),
+ (1, 5, "slave_28"): ("28", None, None, "mcr510_eoc_slave"),
+ (1, 5, "slave_29"): ("29", None, None, "mcr510_eoc_slave"),
+ (1, 5, "slave_30"): ("30", None, None, "mcr510_eoc_slave"),
+ (1, 5, "slave_31"): ("31", None, None, "mcr510_eoc_slave"),
+ (1, 5, "slave_32"): ("32", None, None, "mcr510_eoc_slave"),
+ (1, 8, "slave_33"): ("33", None, None, "mcr510_eoc_slave"),
(1, 8, "slave_34"): ("34", None, None, "mcr510_eoc_slave"),
(1, 8, "slave_35"): ("35", None, None, "mcr510_eoc_slave"),
(1, 8, "slave_36"): ("36", None, None, "mcr510_eoc_slave"),