From: Fangyin Hu <fangyinx.hu@intel.com>
Date: Thu, 26 Oct 2017 09:21:38 +0000 (-0700)
Subject: Fix the NSH SFC functional test failed issue.
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=c6a49fe4456f4a96f12359adf27e3002a68ae541

Fix the NSH SFC functional test failed issue.

Change-Id: If118254b6479f7ffb3e0b4f81d3585b4b90cc92c
Signed-off-by: Fangyin Hu <fangyinx.hu@intel.com>
(cherry picked from commit 751a5aed2cac6bd7b87028eaf7eab1a8f87fface)
---

diff --git a/resources/libraries/python/SFC/VerifyPacket.py b/resources/libraries/python/SFC/VerifyPacket.py
index 84eb6aa0a2..90dfd375ca 100644
--- a/resources/libraries/python/SFC/VerifyPacket.py
+++ b/resources/libraries/python/SFC/VerifyPacket.py
@@ -110,8 +110,7 @@ class VerifyPacket(object):
             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:
+        if nsh_pkt.OAM != 0 and nsh_pkt.OAM != 1:
             raise RuntimeError("Unexpected NSH OAM: {0}".
                                format(nsh_pkt.OAM))