[dts] [PATCH] tests/TestSuite_nvgre : Enable CVL25G&100g NIC to support NVGRE case

[dts] [PATCH] tests/TestSuite_nvgre : Enable CVL25G&100g NIC to support NVGRE case

[zhiwei.he]

From: "zhiwei.he" <zhiwei.he@intel.com>

diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py
index d53a521..fe57c09 100644
--- a/tests/TestSuite_nvgre.py
+++ b/tests/TestSuite_nvgre.py
@@ -93,8 +93,8 @@ class NvgreTestConfig(object):
         self.outer_ip_dst = '192.168.1.2'
         self.outer_ip_invalid = 0
 
-        self.outer_ip6_src = 'N/A'
-        self.outer_ip6_dst = 'N/A'
+        self.outer_ip6_src = 'FE80:0:0:0:0:0:0:0'
+        self.outer_ip6_dst = 'FE80:0:0:0:0:0:0:1'
         self.outer_ip6_invalid = 0
         """
         gre info
@@ -150,8 +150,8 @@ class NvgreTestConfig(object):
         self.inner_ip_dst = '192.168.2.2'
         self.inner_ip_invalid = 0
 
-        self.inner_ip6_src = 'N/A'
-        self.inner_ip6_dst = 'N/A'
+        self.inner_ip6_src = 'FE80:0:0:0:0:0:0:0'
+        self.inner_ip6_dst = 'FE80:0:0:0:0:0:0:1'
         self.inner_ip6_invalid = 0
 
         self.inner_l4_type = 'UDP'
@@ -365,6 +365,8 @@ class TestNvgre(TestCase):
             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 NVGRE case" % self.nic)
         # Based on h/w type, choose how many ports to use
@@ -616,7 +618,45 @@ class TestNvgre(TestCase):
         # verify saved pcap checksum same to expected checksum
         for key in chksums_default:
             self.verify(chksums[key] == chksums_default[key], "%s not matched to %s" % (key, chksums_default[key]))
-
+    def test_nvgre_ipv6(self):
+        """
+        verify nvgre packet with ipv6
+        """
+        # check no nvgre packet
+        self.nvgre_detect(outer_l3_type = "IPv6", outer_ip_proto=0xFF)
+        # check nvgre + IPv6 inner packet
+        self.nvgre_detect(outer_l3_type = "IPv6", inner_l3_type="IPv6", inner_l4_type='None')
+        # check nvgre + TCP inner packet
+        self.nvgre_detect(outer_l3_type = "IPv6", inner_l3_type="IPv6", inner_l4_type='TCP')
+        # check nvgre + SCTP inner packet
+        self.nvgre_detect(outer_l3_type = "IPv6", inner_l3_type="IPv6", inner_l4_type='SCTP')
+        # check nvgre + UDP inner packet
+        self.nvgre_detect(outer_l3_type = "IPv6", inner_l3_type="IPv6", inner_l4_type='UDP')
+        # check nvgre + vlan outer packet
+        self.nvgre_detect(outer_l3_type = "IPv6", inner_l3_type="IPv6", outer_vlan=1)
+        # check vlan nvgre + vlan inner and outer packet
+        self.nvgre_detect(outer_l3_type = "IPv6", inner_l3_type="IPv6", outer_vlan=1, inner_vlan=1)
+
+    def test_nvgre_ipv6_checksum_offload(self):
+        # check nvgre packet + inner IPv6 + inner L4  invalid
+        self.nvgre_checksum(inner_l3_type = "IPv6", inner_l4_invalid=1)
+        # check nvgre packet + outer IPv6 + inner L4  invalid
+        self.nvgre_checksum(outer_l3_type = "IPv6", inner_l4_invalid=1)
+        # check nvgre packet + inner + outer ipv6 + inner L4  invalid
+        self.nvgre_checksum(outer_l3_type = "IPv6", inner_l3_type= "IPv6", inner_l4_invalid=1)
+        # check nvgre packet + inner IPv6 +  tcp checksum invalid
+        self.nvgre_checksum(inner_l3_type = "IPv6", inner_l4_invalid=1, inner_l4_type='TCP')
+        #check nvgre packet + inner IPv6 + sctp checksum invalid
+        self.nvgre_checksum(inner_l3_type = "IPv6", inner_l4_invalid=1, inner_l4_type='SCTP')
+        #check nvgre packet + inner IPv6 + UDP checksum invalid
+        self.nvgre_checksum(inner_l3_type = "IPv6", inner_l4_invalid=1, inner_l4_type='UDP')
+        # check vlan nvgre packet + inner vlan IPv6  + inner udp checksum invalid
+        self.nvgre_checksum(inner_l3_type = "IPv6", outer_vlan=1, inner_l4_invalid=1, inner_l4_type='UDP')
+        # check vlan nvgre packet + inner vlan IPv6 + inner tcp checksum invalid
+        self.nvgre_checksum(inner_l3_type = "IPv6", outer_vlan=1, inner_l4_invalid=1, inner_l4_type='TCP')
+        # check vlan nvgre packet + inner vlan IPv6 + inner sctp checksum invalid
+        self.nvgre_checksum(inner_l3_type = "IPv6", outer_vlan=1, inner_l4_invalid=1, inner_l4_type='SCTP')
+           
     def test_nvgre_ipv4(self):
         """
         verify nvgre packet with ipv4
-- 
1.8.3.1