OpenFlow spec describes "DSCP values that do not encode a drop
precedence are not modified".
Diffserv Assured Forwarding described in rfc2597(+rfc3260) has
DSCP values which encodes "drop precedence".
I think we'd better test OFPMBT_DSCP_REMARK works on AF21 -> AF22
rating, for example.
---
.../switch/of13/meter/02_DSCP_REMARK_00_KBPS_00_1M.json | 16 ++++++++--------
.../switch/of13/meter/02_DSCP_REMARK_00_KBPS_01_10M.json | 16 ++++++++--------
.../of13/meter/02_DSCP_REMARK_00_KBPS_02_100M.json | 16 ++++++++--------
.../of13/meter/02_DSCP_REMARK_01_PKTPS_00_100.json | 16 ++++++++--------
.../of13/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json | 16 ++++++++--------
.../of13/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json | 16 ++++++++--------
.../switch/of14/meter/02_DSCP_REMARK_00_KBPS_00_1M.json | 16 ++++++++--------
.../switch/of14/meter/02_DSCP_REMARK_00_KBPS_01_10M.json | 16 ++++++++--------
.../of14/meter/02_DSCP_REMARK_00_KBPS_02_100M.json | 16 ++++++++--------
.../of14/meter/02_DSCP_REMARK_01_PKTPS_00_100.json | 16 ++++++++--------
.../of14/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json | 16 ++++++++--------
.../of14/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json | 16 ++++++++--------
12 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_00_1M.json
b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_00_1M.json
index c3e5fe2..699f1d5 100644
--- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_00_1M.json
+++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_00_1M.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_00_KBPS_00_1M",
{
-
"description":"2Mbps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:1Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"2Mbps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:1Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -58,7 +58,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -86,7 +86,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -111,7 +111,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -124,7 +124,7 @@
]
},
{
-
"description":"2Mbps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:1Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"2Mbps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:1Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -181,7 +181,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -209,7 +209,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -234,7 +234,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_01_10M.json
b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_01_10M.json
index 5bf32c0..594abd7 100644
--- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_01_10M.json
+++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_01_10M.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_00_KBPS_01_10M",
{
-
"description":"20Mbps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:10Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"20Mbps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:10Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -58,7 +58,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -86,7 +86,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -111,7 +111,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -124,7 +124,7 @@
]
},
{
-
"description":"20Mbps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:10Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"20Mbps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:10Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -181,7 +181,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -209,7 +209,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":18
}
}
]
@@ -234,7 +234,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":20
}
}
]
diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_02_100M.json
b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_02_100M.json
index 6732620..8c56cc1 100644
--- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_02_100M.json
+++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_02_100M.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_00_KBPS_02_100M",
{
-
"description":"200Mbps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:100Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"200Mbps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:100Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -58,7 +58,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -86,7 +86,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -111,7 +111,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -124,7 +124,7 @@
]
},
{
-
"description":"200Mbps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:100Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"200Mbps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:100Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -181,7 +181,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -209,7 +209,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -234,7 +234,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_00_100.json
b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_00_100.json
index 131c73f..39e4d4a 100644
--- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_00_100.json
+++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_00_100.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_01_PKTPS_00_100",
{
-
"description":"200pktps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:100pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"200pktps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:100pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -59,7 +59,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -87,7 +87,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -112,7 +112,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -125,7 +125,7 @@
]
},
{
-
"description":"200pktps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:100pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"200pktps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:100pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -183,7 +183,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -211,7 +211,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -236,7 +236,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json
b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json
index b3008ea..40be81a 100644
--- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json
+++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_01_PKTPS_01_1000",
{
-
"description":"2000pktps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:1000pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"2000pktps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:1000pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -59,7 +59,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -87,7 +87,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -112,7 +112,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -125,7 +125,7 @@
]
},
{
-
"description":"2000pktps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:1000pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"2000pktps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:1000pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -183,7 +183,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -211,7 +211,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -236,7 +236,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json
b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json
index ff4dee4..cb61099 100644
--- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json
+++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_01_PKTPS_02_10000",
{
-
"description":"20000pktps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:10000pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"20000pktps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:10000pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -59,7 +59,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -87,7 +87,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -112,7 +112,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -125,7 +125,7 @@
]
},
{
-
"description":"20000pktps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:10000pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"20000pktps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:10000pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -183,7 +183,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -211,7 +211,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -236,7 +236,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
diff --git a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_00_1M.json
b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_00_1M.json
index c3e5fe2..699f1d5 100644
--- a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_00_1M.json
+++ b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_00_1M.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_00_KBPS_00_1M",
{
-
"description":"2Mbps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:1Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"2Mbps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:1Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -58,7 +58,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -86,7 +86,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -111,7 +111,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -124,7 +124,7 @@
]
},
{
-
"description":"2Mbps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:1Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"2Mbps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:1Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -181,7 +181,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -209,7 +209,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -234,7 +234,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
diff --git a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_01_10M.json
b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_01_10M.json
index 5bf32c0..594abd7 100644
--- a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_01_10M.json
+++ b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_01_10M.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_00_KBPS_01_10M",
{
-
"description":"20Mbps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:10Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"20Mbps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:10Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -58,7 +58,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -86,7 +86,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -111,7 +111,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -124,7 +124,7 @@
]
},
{
-
"description":"20Mbps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:10Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"20Mbps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:10Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -181,7 +181,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -209,7 +209,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":18
}
}
]
@@ -234,7 +234,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":20
}
}
]
diff --git a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_02_100M.json
b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_02_100M.json
index 6732620..8c56cc1 100644
--- a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_02_100M.json
+++ b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_00_KBPS_02_100M.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_00_KBPS_02_100M",
{
-
"description":"200Mbps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:100Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"200Mbps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:100Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -58,7 +58,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -86,7 +86,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -111,7 +111,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -124,7 +124,7 @@
]
},
{
-
"description":"200Mbps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:100Mbps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"200Mbps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:100Mbps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -181,7 +181,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -209,7 +209,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -234,7 +234,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
diff --git a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_00_100.json
b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_00_100.json
index 131c73f..39e4d4a 100644
--- a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_00_100.json
+++ b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_00_100.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_01_PKTPS_00_100",
{
-
"description":"200pktps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:100pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"200pktps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:100pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -59,7 +59,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -87,7 +87,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -112,7 +112,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -125,7 +125,7 @@
]
},
{
-
"description":"200pktps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:100pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"200pktps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:100pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -183,7 +183,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -211,7 +211,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -236,7 +236,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
diff --git a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json
b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json
index b3008ea..40be81a 100644
--- a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json
+++ b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_01_PKTPS_01_1000",
{
-
"description":"2000pktps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:1000pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"2000pktps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:1000pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -59,7 +59,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -87,7 +87,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -112,7 +112,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -125,7 +125,7 @@
]
},
{
-
"description":"2000pktps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:1000pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"2000pktps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:1000pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -183,7 +183,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -211,7 +211,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -236,7 +236,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
diff --git a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json
b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json
index ff4dee4..cb61099 100644
--- a/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json
+++ b/ryu/tests/switch/of14/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json
@@ -1,7 +1,7 @@
[
"meter: 02_DSCP_REMARK_01_PKTPS_02_10000",
{
-
"description":"20000pktps(ethernet/ipv4(dscp=24)/tcp)-->'in_port=1,actions=meter:10000pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"20000pktps(ethernet/ipv4(dscp=18)/tcp)-->'in_port=1,actions=meter:10000pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -59,7 +59,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=2048)",
- "ipv4(proto=6, tos=96)",
+ "ipv4(proto=6, tos=72)",
"tcp()",
"str('\\x11' * (1500 - 54))"
],
@@ -87,7 +87,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -112,7 +112,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
@@ -125,7 +125,7 @@
]
},
{
-
"description":"20000pktps(ethernet/ipv6(dscp=24)/tcp)-->'in_port=1,actions=meter:10000pktps(dscp_remark:ip_dscp=16),output:2'",
+
"description":"20000pktps(ethernet/ipv6(dscp=18)/tcp)-->'in_port=1,actions=meter:10000pktps(dscp_remark:ip_dscp=20),output:2'",
"prerequisite":[
{
"OFPMeterMod":{
@@ -183,7 +183,7 @@
"packets":{
"data":[
"ethernet(dst='22:22:22:22:22:22',
src='12:11:11:11:11:11', ethertype=34525)",
- "ipv6(nxt=6, traffic_class=96)",
+ "ipv6(nxt=6, traffic_class=72)",
"tcp()",
"str('\\x11' * (1500 - 74))"
],
@@ -211,7 +211,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":24
+ "value":20
}
}
]
@@ -236,7 +236,7 @@
{
"OXMTlv":{
"field":"ip_dscp",
- "value":16
+ "value":18
}
}
]
--
2.0.0
------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
