X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FSFC%2FVerifyPacket.py;h=a13c7601d5f1954bba03a5514d4b8aeba22584fb;hp=189301002cb56cd7bfd926c288b66cd04dd66a02;hb=5e7be479eacd4d1085cab152c35dcb6433a146ed;hpb=c70b9cd6c48d71208cf729ba335ff9753e94b694 diff --git a/resources/libraries/python/SFC/VerifyPacket.py b/resources/libraries/python/SFC/VerifyPacket.py index 189301002c..a13c7601d5 100644 --- a/resources/libraries/python/SFC/VerifyPacket.py +++ b/resources/libraries/python/SFC/VerifyPacket.py @@ -66,7 +66,6 @@ class VerifyPacket(object): :param payload_data: the payload data in the packet. :type payload_data: str - :returns: none :raises RuntimeError: If the vxlan protocol field verify fails. """ # get the vxlan packet and check it @@ -87,7 +86,6 @@ class VerifyPacket(object): :param test_type: the functional test type. :type payload_data: str :type test_type: str - :returns: none :raises RuntimeError: If the vxlangpe and nsh protocol field verify fails. """ @@ -106,9 +104,13 @@ 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)) + + if nsh_pkt.OAM != 0 and 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". @@ -167,7 +169,6 @@ class VerifyPacket(object): :type ether: scapy.Ether :type frame_size: Integer :type test_type: str - :returns: none :raises RuntimeError: If the packet field verify fails. """