summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMADA Hideki <yamada.hideki@po.ntts.co.jp>2013-04-25 20:25:56 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-04-28 08:13:55 +0900
commit84ef5c504631f352d00583f2aa81f51f48c6445a (patch)
tree8d044183de33d1b394792293f32b54d548ff67bd
parent78c0d632be3f8820014b9a308b5f751175070de5 (diff)
tests/integrated: Skip MPLS related test
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/tests/integrated/test_add_flow_v12_actions.py9
-rw-r--r--ryu/tests/integrated/test_add_flow_v12_matches.py2
2 files changed, 11 insertions, 0 deletions
diff --git a/ryu/tests/integrated/test_add_flow_v12_actions.py b/ryu/tests/integrated/test_add_flow_v12_actions.py
index 973373f3..7dbd0879 100644
--- a/ryu/tests/integrated/test_add_flow_v12_actions.py
+++ b/ryu/tests/integrated/test_add_flow_v12_actions.py
@@ -437,6 +437,7 @@ class RunTest(tester.TestFlowBase):
self.add_apply_actions(dp, actions)
def is_supported(self, t):
+ # Open vSwitch 1.10 does not support MPLS yet.
unsupported = [
'test_action_set_field_ip_proto',
'test_action_set_field_dl_type',
@@ -444,6 +445,14 @@ class RunTest(tester.TestFlowBase):
'test_action_set_field_ipv6',
'test_action_set_field_icmp',
'test_action_set_nw_ttl',
+ 'test_action_copy_ttl_in',
+ 'test_action_copy_ttl_out',
+ 'test_action_dec_mpls_ttl',
+ 'test_action_pop_mpls',
+ 'test_action_push_mpls',
+ 'test_action_set_field_mpls_label',
+ 'test_action_set_field_mpls_tc',
+ 'test_action_set_mpls_ttl'
]
for u in unsupported:
if t.find(u) != -1:
diff --git a/ryu/tests/integrated/test_add_flow_v12_matches.py b/ryu/tests/integrated/test_add_flow_v12_matches.py
index 27b38804..507a1a4c 100644
--- a/ryu/tests/integrated/test_add_flow_v12_matches.py
+++ b/ryu/tests/integrated/test_add_flow_v12_matches.py
@@ -1187,7 +1187,9 @@ class RunTest(tester.TestFlowBase):
self.add_matches(dp, match)
def is_supported(self, t):
+ # Open vSwitch 1.10 does not support MPLS yet.
unsupported = [
+ 'test_rule_set_mpls_label',
'test_rule_set_mpls_tc',
]
for u in unsupported: