test suite reviews and discussions
 help / color / Atom feed
* [dts] [PATCH V1] tests/ddp_ppp_l2tp: change scapy/PPPoE sessionid
@ 2020-01-19  5:43 Chen,Bo
  2020-01-19  6:41 ` Chen, BoX C
  2020-01-19  8:34 ` Tu, Lijuan
  0 siblings, 2 replies; 3+ messages in thread
From: Chen,Bo @ 2020-01-19  5:43 UTC (permalink / raw)
  To: dts; +Cc: Chen,Bo

Change scapy/PPPoE session_id to sessionid

Signed-off-by: Chen,Bo <box.c.chen@intel.com>
---
 tests/TestSuite_ddp_ppp_l2tp.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/tests/TestSuite_ddp_ppp_l2tp.py b/tests/TestSuite_ddp_ppp_l2tp.py
index dc011e4..e5a1977 100644
--- a/tests/TestSuite_ddp_ppp_l2tp.py
+++ b/tests/TestSuite_ddp_ppp_l2tp.py
@@ -105,13 +105,13 @@ class TestDdpPppL2tp(TestCase):
             pkts = {'IPV4/L2TP': 'Ether(src="%s", dst="%s")/IP()/UDP(dport=1701, sport=1701)/L2TP(session_id=%s)/Raw("X"*20)'
                     % (src_mac, dst_mac, session_id)}
         if flowtype == 28:
-            pkts = {'PPPOE/IPV4/UDP': 'Ether()/PPPoE(session_id=%s)/PPP(proto=0x21)/IP(src="%s",dst="%s")/UDP(sport=%d,dport=%d)/Raw("X"*20)'
+            pkts = {'PPPOE/IPV4/UDP': 'Ether()/PPPoE(sessionid=%s)/PPP(proto=0x21)/IP(src="%s",dst="%s")/UDP(sport=%d,dport=%d)/Raw("X"*20)'
                     % (session_id, src_ip, dst_ip, sport, dport)}
         if flowtype == 29:
-            pkts = {'PPPOE/IPV6/UDP': 'Ether()/PPPoE(session_id=%s)/PPP(proto=0x57)/IPv6(src="%s",dst="%s")/UDP(sport=%d,dport=%d)/Raw("X"*20)'
+            pkts = {'PPPOE/IPV6/UDP': 'Ether()/PPPoE(sessionid=%s)/PPP(proto=0x57)/IPv6(src="%s",dst="%s")/UDP(sport=%d,dport=%d)/Raw("X"*20)'
                     % (session_id, src_ipv6, dst_ipv6, sport, dport)}
         if flowtype == 30:
-            pkts = {'PPPOE': 'Ether(src="%s", dst="%s")/PPPoE(session_id=%s)'
+            pkts = {'PPPOE': 'Ether(src="%s", dst="%s")/PPPoE(sessionid=%s)'
                     % (src_mac, dst_mac, session_id)}
         return pkts
 
@@ -128,11 +128,11 @@ class TestDdpPppL2tp(TestCase):
         if flowtype == 26:
             a = Ether(dst="3C:FD:FE:A3:A0:01", src="4C:FD:FE:A3:A0:01")/IP()/UDP(dport=1701, sport=1701)/L2TP(session_id=0x7)/Raw("X"*20)
         if flowtype == 28:
-            a = Ether()/PPPoE(session_id=0x7)/PPP(proto=0x21)/IP(dst="1.1.1.1", src="2.2.2.2")/UDP(dport=4000, sport=8000)/Raw("X"*20)
+            a = Ether()/PPPoE(sessionid=0x7)/PPP(proto=0x21)/IP(dst="1.1.1.1", src="2.2.2.2")/UDP(dport=4000, sport=8000)/Raw("X"*20)
         if flowtype == 29:
-            a = Ether()/PPPoE(session_id=0x7)/PPP(proto=0x57)/IPv6(dst="1001:0db8:85a3:0000:0000:8a2e:0370:0001", src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=4000, sport=8000)/Raw("X"*20)
+            a = Ether()/PPPoE(sessionid=0x7)/PPP(proto=0x57)/IPv6(dst="1001:0db8:85a3:0000:0000:8a2e:0370:0001", src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=4000, sport=8000)/Raw("X"*20)
         if flowtype == 30:
-            a = Ether(dst="3C:FD:FE:A3:A0:01", src="4C:FD:FE:A3:A0:01")/PPPoE(session_id=0x7)
+            a = Ether(dst="3C:FD:FE:A3:A0:01", src="4C:FD:FE:A3:A0:01")/PPPoE(sessionid=0x7)
         ba = bytearray(bytes(a))
         rawfile_src = '/tmp/test.raw'
         File = open("%s" % rawfile_src, "wb")
@@ -159,10 +159,8 @@ class TestDdpPppL2tp(TestCase):
             qnum = self.element_strip(out, pattern)
             ptypes = packet_type.split('/')
             if flowtype in [23, 24, 26]:
-                layerparams = ['L3_', 'TUNNEL_',
-                               'INNER_L3_', 'INNER_L4_']
-                endparams = ['_EXT_UNKNOWN', '',
-                             '_EXT_UNKNOWN', '']
+                layerparams = ['L3_', 'TUNNEL_']
+                endparams = ['_EXT_UNKNOWN', '']
             if flowtype in [28, 29, 30]:
                 layerparams = ['L2_ETHER_', 'L3_', 'L4_']
                 endparams = ['', '_EXT_UNKNOWN', '']
-- 
2.17.2


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dts] [PATCH V1] tests/ddp_ppp_l2tp: change scapy/PPPoE sessionid
  2020-01-19  5:43 [dts] [PATCH V1] tests/ddp_ppp_l2tp: change scapy/PPPoE sessionid Chen,Bo
@ 2020-01-19  6:41 ` Chen, BoX C
  2020-01-19  8:34 ` Tu, Lijuan
  1 sibling, 0 replies; 3+ messages in thread
From: Chen, BoX C @ 2020-01-19  6:41 UTC (permalink / raw)
  To: dts; +Cc: Chen, BoX C

[-- Attachment #1: Type: text/plain, Size: 4175 bytes --]

Tested-by: Chen, BoX C <box.c.chen@intel.com>


Regards,
Chen Bo


> -----Original Message-----
> From: Chen, BoX C
> Sent: January 19, 2020 13:43
> To: dts@dpdk.org
> Cc: Chen, BoX C <box.c.chen@intel.com>
> Subject: [dts][PATCH V1] tests/ddp_ppp_l2tp: change scapy/PPPoE sessionid
> 
> Change scapy/PPPoE session_id to sessionid
> 
> Signed-off-by: Chen,Bo <box.c.chen@intel.com>
> ---
>  tests/TestSuite_ddp_ppp_l2tp.py | 18 ++++++++----------
>  1 file changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/TestSuite_ddp_ppp_l2tp.py
> b/tests/TestSuite_ddp_ppp_l2tp.py index dc011e4..e5a1977 100644
> --- a/tests/TestSuite_ddp_ppp_l2tp.py
> +++ b/tests/TestSuite_ddp_ppp_l2tp.py
> @@ -105,13 +105,13 @@ class TestDdpPppL2tp(TestCase):
>              pkts = {'IPV4/L2TP': 'Ether(src="%s", dst="%s")/IP()/UDP(dport=1701,
> sport=1701)/L2TP(session_id=%s)/Raw("X"*20)'
>                      % (src_mac, dst_mac, session_id)}
>          if flowtype == 28:
> -            pkts = {'PPPOE/IPV4/UDP':
> 'Ether()/PPPoE(session_id=%s)/PPP(proto=0x21)/IP(src="%s",dst="%s")/UD
> P(sport=%d,dport=%d)/Raw("X"*20)'
> +            pkts = {'PPPOE/IPV4/UDP':
> 'Ether()/PPPoE(sessionid=%s)/PPP(proto=0x21)/IP(src="%s",dst="%s")/UDP
> (sport=%d,dport=%d)/Raw("X"*20)'
>                      % (session_id, src_ip, dst_ip, sport, dport)}
>          if flowtype == 29:
> -            pkts = {'PPPOE/IPV6/UDP':
> 'Ether()/PPPoE(session_id=%s)/PPP(proto=0x57)/IPv6(src="%s",dst="%s")/
> UDP(sport=%d,dport=%d)/Raw("X"*20)'
> +            pkts = {'PPPOE/IPV6/UDP':
> 'Ether()/PPPoE(sessionid=%s)/PPP(proto=0x57)/IPv6(src="%s",dst="%s")/U
> DP(sport=%d,dport=%d)/Raw("X"*20)'
>                      % (session_id, src_ipv6, dst_ipv6, sport, dport)}
>          if flowtype == 30:
> -            pkts = {'PPPOE': 'Ether(src="%s", dst="%s")/PPPoE(session_id=%s)'
> +            pkts = {'PPPOE': 'Ether(src="%s", dst="%s")/PPPoE(sessionid=%s)'
>                      % (src_mac, dst_mac, session_id)}
>          return pkts
> 
> @@ -128,11 +128,11 @@ class TestDdpPppL2tp(TestCase):
>          if flowtype == 26:
>              a = Ether(dst="3C:FD:FE:A3:A0:01",
> src="4C:FD:FE:A3:A0:01")/IP()/UDP(dport=1701,
> sport=1701)/L2TP(session_id=0x7)/Raw("X"*20)
>          if flowtype == 28:
> -            a = Ether()/PPPoE(session_id=0x7)/PPP(proto=0x21)/IP(dst="1.1.1.1",
> src="2.2.2.2")/UDP(dport=4000, sport=8000)/Raw("X"*20)
> +            a =
> + Ether()/PPPoE(sessionid=0x7)/PPP(proto=0x21)/IP(dst="1.1.1.1",
> + src="2.2.2.2")/UDP(dport=4000, sport=8000)/Raw("X"*20)
>          if flowtype == 29:
> -            a =
> Ether()/PPPoE(session_id=0x7)/PPP(proto=0x57)/IPv6(dst="1001:0db8:85a3:
> 0000:0000:8a2e:0370:0001",
> src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=4000,
> sport=8000)/Raw("X"*20)
> +            a =
> + Ether()/PPPoE(sessionid=0x7)/PPP(proto=0x57)/IPv6(dst="1001:0db8:85a3:
> + 0000:0000:8a2e:0370:0001",
> + src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=4000,
> + sport=8000)/Raw("X"*20)
>          if flowtype == 30:
> -            a = Ether(dst="3C:FD:FE:A3:A0:01",
> src="4C:FD:FE:A3:A0:01")/PPPoE(session_id=0x7)
> +            a = Ether(dst="3C:FD:FE:A3:A0:01",
> + src="4C:FD:FE:A3:A0:01")/PPPoE(sessionid=0x7)
>          ba = bytearray(bytes(a))
>          rawfile_src = '/tmp/test.raw'
>          File = open("%s" % rawfile_src, "wb") @@ -159,10 +159,8 @@ class
> TestDdpPppL2tp(TestCase):
>              qnum = self.element_strip(out, pattern)
>              ptypes = packet_type.split('/')
>              if flowtype in [23, 24, 26]:
> -                layerparams = ['L3_', 'TUNNEL_',
> -                               'INNER_L3_', 'INNER_L4_']
> -                endparams = ['_EXT_UNKNOWN', '',
> -                             '_EXT_UNKNOWN', '']
> +                layerparams = ['L3_', 'TUNNEL_']
> +                endparams = ['_EXT_UNKNOWN', '']
>              if flowtype in [28, 29, 30]:
>                  layerparams = ['L2_ETHER_', 'L3_', 'L4_']
>                  endparams = ['', '_EXT_UNKNOWN', '']
> --
> 2.17.2


[-- Attachment #2: TestDdpPppL2tp.log --]
[-- Type: application/octet-stream, Size: 646266 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dts] [PATCH V1] tests/ddp_ppp_l2tp: change scapy/PPPoE sessionid
  2020-01-19  5:43 [dts] [PATCH V1] tests/ddp_ppp_l2tp: change scapy/PPPoE sessionid Chen,Bo
  2020-01-19  6:41 ` Chen, BoX C
@ 2020-01-19  8:34 ` Tu, Lijuan
  1 sibling, 0 replies; 3+ messages in thread
From: Tu, Lijuan @ 2020-01-19  8:34 UTC (permalink / raw)
  To: Chen, BoX C, dts; +Cc: Chen, BoX C

applied

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Chen,Bo
> Sent: Sunday, January 19, 2020 1:43 PM
> To: dts@dpdk.org
> Cc: Chen, BoX C <box.c.chen@intel.com>
> Subject: [dts] [PATCH V1] tests/ddp_ppp_l2tp: change scapy/PPPoE sessionid
> 
> Change scapy/PPPoE session_id to sessionid
> 
> Signed-off-by: Chen,Bo <box.c.chen@intel.com>
> ---
>  tests/TestSuite_ddp_ppp_l2tp.py | 18 ++++++++----------
>  1 file changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/TestSuite_ddp_ppp_l2tp.py
> b/tests/TestSuite_ddp_ppp_l2tp.py index dc011e4..e5a1977 100644
> --- a/tests/TestSuite_ddp_ppp_l2tp.py
> +++ b/tests/TestSuite_ddp_ppp_l2tp.py
> @@ -105,13 +105,13 @@ class TestDdpPppL2tp(TestCase):
>              pkts = {'IPV4/L2TP': 'Ether(src="%s", dst="%s")/IP()/UDP(dport=1701,
> sport=1701)/L2TP(session_id=%s)/Raw("X"*20)'
>                      % (src_mac, dst_mac, session_id)}
>          if flowtype == 28:
> -            pkts = {'PPPOE/IPV4/UDP':
> 'Ether()/PPPoE(session_id=%s)/PPP(proto=0x21)/IP(src="%s",dst="%s")/UDP(
> sport=%d,dport=%d)/Raw("X"*20)'
> +            pkts = {'PPPOE/IPV4/UDP':
> 'Ether()/PPPoE(sessionid=%s)/PPP(proto=0x21)/IP(src="%s",dst="%s")/UDP(s
> port=%d,dport=%d)/Raw("X"*20)'
>                      % (session_id, src_ip, dst_ip, sport, dport)}
>          if flowtype == 29:
> -            pkts = {'PPPOE/IPV6/UDP':
> 'Ether()/PPPoE(session_id=%s)/PPP(proto=0x57)/IPv6(src="%s",dst="%s")/UD
> P(sport=%d,dport=%d)/Raw("X"*20)'
> +            pkts = {'PPPOE/IPV6/UDP':
> 'Ether()/PPPoE(sessionid=%s)/PPP(proto=0x57)/IPv6(src="%s",dst="%s")/UDP
> (sport=%d,dport=%d)/Raw("X"*20)'
>                      % (session_id, src_ipv6, dst_ipv6, sport, dport)}
>          if flowtype == 30:
> -            pkts = {'PPPOE': 'Ether(src="%s", dst="%s")/PPPoE(session_id=%s)'
> +            pkts = {'PPPOE': 'Ether(src="%s", dst="%s")/PPPoE(sessionid=%s)'
>                      % (src_mac, dst_mac, session_id)}
>          return pkts
> 
> @@ -128,11 +128,11 @@ class TestDdpPppL2tp(TestCase):
>          if flowtype == 26:
>              a = Ether(dst="3C:FD:FE:A3:A0:01",
> src="4C:FD:FE:A3:A0:01")/IP()/UDP(dport=1701,
> sport=1701)/L2TP(session_id=0x7)/Raw("X"*20)
>          if flowtype == 28:
> -            a = Ether()/PPPoE(session_id=0x7)/PPP(proto=0x21)/IP(dst="1.1.1.1",
> src="2.2.2.2")/UDP(dport=4000, sport=8000)/Raw("X"*20)
> +            a =
> + Ether()/PPPoE(sessionid=0x7)/PPP(proto=0x21)/IP(dst="1.1.1.1",
> + src="2.2.2.2")/UDP(dport=4000, sport=8000)/Raw("X"*20)
>          if flowtype == 29:
> -            a =
> Ether()/PPPoE(session_id=0x7)/PPP(proto=0x57)/IPv6(dst="1001:0db8:85a3:
> 0000:0000:8a2e:0370:0001",
> src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=4000,
> sport=8000)/Raw("X"*20)
> +            a =
> + Ether()/PPPoE(sessionid=0x7)/PPP(proto=0x57)/IPv6(dst="1001:0db8:85a3:
> + 0000:0000:8a2e:0370:0001",
> + src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=4000,
> + sport=8000)/Raw("X"*20)
>          if flowtype == 30:
> -            a = Ether(dst="3C:FD:FE:A3:A0:01",
> src="4C:FD:FE:A3:A0:01")/PPPoE(session_id=0x7)
> +            a = Ether(dst="3C:FD:FE:A3:A0:01",
> + src="4C:FD:FE:A3:A0:01")/PPPoE(sessionid=0x7)
>          ba = bytearray(bytes(a))
>          rawfile_src = '/tmp/test.raw'
>          File = open("%s" % rawfile_src, "wb") @@ -159,10 +159,8 @@ class
> TestDdpPppL2tp(TestCase):
>              qnum = self.element_strip(out, pattern)
>              ptypes = packet_type.split('/')
>              if flowtype in [23, 24, 26]:
> -                layerparams = ['L3_', 'TUNNEL_',
> -                               'INNER_L3_', 'INNER_L4_']
> -                endparams = ['_EXT_UNKNOWN', '',
> -                             '_EXT_UNKNOWN', '']
> +                layerparams = ['L3_', 'TUNNEL_']
> +                endparams = ['_EXT_UNKNOWN', '']
>              if flowtype in [28, 29, 30]:
>                  layerparams = ['L2_ETHER_', 'L3_', 'L4_']
>                  endparams = ['', '_EXT_UNKNOWN', '']
> --
> 2.17.2


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-19  5:43 [dts] [PATCH V1] tests/ddp_ppp_l2tp: change scapy/PPPoE sessionid Chen,Bo
2020-01-19  6:41 ` Chen, BoX C
2020-01-19  8:34 ` Tu, Lijuan

test suite reviews and discussions

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/dts/0 dts/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dts dts/ http://inbox.dpdk.org/dts \
		dts@dpdk.org
	public-inbox-index dts


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dts


AGPL code for this site: git clone https://public-inbox.org/ public-inbox