[ovs-dev] [PATCH 4/8] User-Space MPLS actions and matches

Isaku Yamahata yamahata at valinux.co.jp
Mon Oct 29 14:52:23 UTC 2012


I needed the following patch to pass unit tests.

>From 55e62f64c984accf578a3ae8e1b315b7752c7ebe Mon Sep 17 00:00:00 2001
Message-Id: <55e62f64c984accf578a3ae8e1b315b7752c7ebe.1351522305.git.yamahata at valinux.co.jp>
From: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Mon, 29 Oct 2012 23:43:25 +0900
Subject: [PATCH] unittest/mpls: OF12 openflow dump-tables

fb1d6089402a4d108133bd39820bd0b345da0e9a adds OFPXMT12_OFB_MPLS_BOS so that
OFPXMT12_OFB_MAX is increased by one.
Thus OF12 dump-tables needs update.

Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
---
 tests/ofproto.at |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/ofproto.at b/tests/ofproto.at
index 3865fc5..95c2fa8 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -575,13 +575,13 @@ AT_CLEANUP
 AT_SETUP([ofproto - flow table configuration (OpenFlow 1.2)])
 OVS_VSWITCHD_START
 # Check the default configuration.
-(mid="wild=0xfffffffff, max=1000000,"
+(mid="wild=0x1fffffffff, max=1000000,"
  tail="
                lookup=0, matched=0
-               match=0xfffffffff, instructions=0x00000007, config=0x00000003
+               match=0x1fffffffff, instructions=0x00000007, config=0x00000003
                write_actions=0x00000000, apply_actions=0x00000000
-               write_setfields=0x0000000fffffffff
-               apply_setfields=0x0000000fffffffff
+               write_setfields=0x0000001fffffffff
+               apply_setfields=0x0000001fffffffff
                metadata_match=0xffffffffffffffff
                metadata_write=0xffffffffffffffff"
  echo "OFPST_TABLE reply (OF1.2) (xid=0x2): 255 tables
@@ -607,9 +607,9 @@ AT_CHECK(
 # Check that the configuration was updated.
 mv expout orig-expout
 (echo "OFPST_TABLE reply (OF1.2) (xid=0x2): 255 tables
-  0: main    : wild=0xfffffffff, max=1000000, active=0"
+  0: main    : wild=0x1fffffffff, max=1000000, active=0"
  tail -n +3 orig-expout | head -7
- echo "  1: table1  : wild=0xfffffffff, max=  1024, active=0"
+ echo "  1: table1  : wild=0x1fffffffff, max=  1024, active=0"
  tail -n +11 orig-expout) > expout
 AT_CHECK([ovs-ofctl --allowed-ofp-versions OpenFlow12 dump-tables br0], [0], [expout])
 OVS_VSWITCHD_STOP
-- 
1.7.10.4
-- 
yamahata



More information about the dev mailing list