[dts] [PATCH] tests/TestSuite_vxlan: Enable CVL25Gand100g NIC to support VXLAN case

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces at dpdk.org] On Behalf Of zhiwei.he
> Sent: Thursday, August 29, 2019 1:46 PM
> To: dts at dpdk.org
> Cc: He, Zhiwei <zhiwei.he at intel.com>
> Subject: [dts] [PATCH] tests/TestSuite_vxlan: Enable CVL25Gand100g NIC to
> support VXLAN case
> 
> From: "zhiwei.he" <zhiwei.he at intel.com>
> 
> Signed-off-by: zhiwei.he <zhiwei.he at intel.com>
> ---
>  tests/TestSuite_vxlan.py | 76 +++++++++++++++++++++++++++++-----------------
> --
>  1 file changed, 46 insertions(+), 30 deletions(-)
> 
> diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py index
> ecc3f3a..3bc8071 100644
> --- a/tests/TestSuite_vxlan.py
> +++ b/tests/TestSuite_vxlan.py
> @@ -266,6 +266,8 @@ class TestVxlan(TestCase, IxiaPacketGenerator):
>              self.compile_switch = 'CONFIG_RTE_LIBRTE_I40E_INC_VECTOR'
>          elif self.nic in ["sageville", "sagepond"]:
>              self.compile_switch = 'CONFIG_RTE_IXGBE_INC_VECTOR'
> +        elif self.nic in ["columbiaville_25g","columbiaville_100g"]:
> +           print "CVL support default none VECTOR"
>          else:
>              self.verify(False, "%s not support this vxlan" % self.nic)
>          # Based on h/w type, choose how many ports to use @@ -533,13
> +535,17 @@ class TestVxlan(TestCase, IxiaPacketGenerator):
>          """
>          verify vxlan packet detection
>          """
> -        out = self.dut.send_expect("cat config/common_base", "]# ", 10)
> -        src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
> -        if src_vec_model == 'y':
> -            self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
> -                                + "%s=n/' config/common_base" % self.compile_switch,
> "# ", 30)
> -            self.dut.skip_setup = False
> -            self.dut.build_install_dpdk(self.target)
> +        if self.nic in ["columbiaville_25g","columbiaville_100g"]:
> +           print "CVL support default none VECTOR"
> +           src_vec_model = 'n'
> +        else:
> +           out = self.dut.send_expect("cat config/common_base", "]# ", 10)
> +           src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
> +           if src_vec_model == 'y':
> +              self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
> +                                  + "%s=n/' config/common_base" % self.compile_switch,
> "# ", 30)
> +              self.dut.skip_setup = False
> +              self.dut.build_install_dpdk(self.target)
> 
> 
>          pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \
> @@ -571,26 +577,33 @@ class TestVxlan(TestCase, IxiaPacketGenerator):
> 
>          out = self.dut.send_expect("stop", "testpmd>", 10)
>          self.dut.send_expect("quit", "#", 10)
> -
> -        out = self.dut.send_expect("cat config/common_base", "]# ", 10)
> -        dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
> -        if src_vec_model != dst_vec_model:
> -            self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
> -                                + "%s=%s/' config/common_base" % (self.compile_switch,
> src_vec_model), "# ", 30)
> -            self.dut.skip_setup = False
> -            self.dut.build_install_dpdk(self.target)
> +        if self.nic in ["columbiaville_25g","columbiaville_100g"]:
> +           print "CVL support default none VECTOR"
> +           src_vec_model = 'n'
> +        else:
> +           out = self.dut.send_expect("cat config/common_base", "]# ", 10)
> +           dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
> +           if src_vec_model != dst_vec_model:
> +              self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
> +                                  + "%s=%s/' config/common_base" %
> (self.compile_switch, src_vec_model), "# ", 30)
> +              self.dut.skip_setup = False
> +              self.dut.build_install_dpdk(self.target)
> 
>      def test_vxlan_ipv6_detect(self):
>          """
>          verify vxlan packet detection with ipv6 header
>          """
> -        out = self.dut.send_expect("cat config/common_base", "]# ", 10)
> -        src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
> -        if src_vec_model == 'y':
> -            self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
> -                                + "%s=n/' config/common_base" % self.compile_switch,
> "# ", 30)
> -            self.dut.skip_setup = False
> -            self.dut.build_install_dpdk(self.target)
> +        if self.nic in ["columbiaville_25g","columbiaville_100g"]:
> +           print "CVL support default none VECTOR"
> +           src_vec_model = 'n'
> +        else:
> +           out = self.dut.send_expect("cat config/common_base", "]# ", 10)
> +           src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
> +           if src_vec_model == 'y':
> +              self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
> +                                  + "%s=n/' config/common_base" % self.compile_switch,
> "# ", 30)
> +              self.dut.skip_setup = False
> +              self.dut.build_install_dpdk(self.target)
> 
>          pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \
>              "%(CHANNEL)d -- -i --disable-rss --rxq=4 --txq=4" + \ @@ -625,14
> +638,17 @@ class TestVxlan(TestCase, IxiaPacketGenerator):
> 
>          out = self.dut.send_expect("stop", "testpmd>", 10)
>          self.dut.send_expect("quit", "#", 10)
> -
> -        out = self.dut.send_expect("cat config/common_base", "]# ", 10)
> -        dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
> -        if src_vec_model != dst_vec_model:
> -            self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
> -                                + "%s=%s/' config/common_base" % (self.compile_switch,
> src_vec_model), "# ", 30)
> -            self.dut.skip_setup = False
> -            self.dut.build_install_dpdk(self.target)
> +        if self.nic in ["columbiaville_25g","columbiaville_100g"]:
> +           print "CVL support default none VECTOR"
> +           src_vec_model = 'n'
> +        else:
> +           out = self.dut.send_expect("cat config/common_base", "]# ", 10)
> +           dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
> +           if src_vec_model != dst_vec_model:
> +              self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
> +                                  + "%s=%s/' config/common_base" %
> (self.compile_switch, src_vec_model), "# ", 30)
> +              self.dut.skip_setup = False
> +              self.dut.build_install_dpdk(self.target)
> 
>      def test_vxlan_ipv4_checksum_offload(self):
>          """
> --
> 1.8.3.1