From b7b364ce32f88d983875b86fa9c886c7c5471c0c Mon Sep 17 00:00:00 2001 From: Fangyin Hu Date: Wed, 25 Oct 2017 21:47:04 -0700 Subject: Update the NSH protocol header fields Fix the NSH SFC functional test cases failed issues. Change-Id: I5d49b50a8c0958dc8db4bc10d6852f0cf4e77962 Signed-off-by: Fangyin Hu (cherry picked from commit eb9eec208b6e66bf585546ffe5a9554a48fe1208) --- resources/libraries/python/SFC/VerifyPacket.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'resources/libraries/python/SFC/VerifyPacket.py') diff --git a/resources/libraries/python/SFC/VerifyPacket.py b/resources/libraries/python/SFC/VerifyPacket.py index 189301002c..84eb6aa0a2 100644 --- a/resources/libraries/python/SFC/VerifyPacket.py +++ b/resources/libraries/python/SFC/VerifyPacket.py @@ -106,9 +106,14 @@ class VerifyPacket(object): # get the NSH packet and check it nsh_pkt = NSH(payload_data[8:32]) - if nsh_pkt.flags != sfccon.NSH_FLAGS: - raise RuntimeError("Unexpected NSH flags: {0}". - format(nsh_pkt.flags)) + if nsh_pkt.Version != 0: + raise RuntimeError("Unexpected NSH version: {0}". + format(nsh_pkt.Version)) + + print type(nsh_pkt.OAM) + if nsh_pkt.OAM != 0 or nsh_pkt.OAM != 1: + raise RuntimeError("Unexpected NSH OAM: {0}". + format(nsh_pkt.OAM)) if nsh_pkt.length != sfccon.NSH_HEADER_LENGTH: raise RuntimeError("NSH length {0} incorrect". -- cgit 1.2.3-korg