remove a test method and remove a unused enum which might cause enum …

…inconsistence between versions
opencomputeproject · Apr 22, 2022 · 0d8da2d · 0d8da2d
1 parent 42d766b
commit 0d8da2d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 36 deletions.
diff --git a/inc/saiswitch.h b/inc/saiswitch.h
@@ -2429,16 +2429,6 @@ typedef enum _sai_switch_attr_t
      */
     SAI_SWITCH_ATTR_SUPPORTED_FAILOVER_MODE,
 
-    /**
-     * @brief Packet action when a packet ingress and gets routed back to same tunnel
-     * This enum is only available in v1.7.
-     *
-     * @type sai_packet_action_t
-     * @flags CREATE_AND_SET
-     * @default SAI_PACKET_ACTION_FORWARD
-     */
-    SAI_SWITCH_ATTR_TUNNEL_LOOPBACK_PACKET_ACTION = 186,
-
     /**
      * @brief Switch scoped Tunnel objects
      * Set to the same value as master branch.

diff --git a/meta/test.pm b/meta/test.pm
@@ -530,30 +530,6 @@ sub CreateStatEnumTest
     WriteTest "}";
 }
 
-sub EnumValueTest
-{
-    #
-    # Purpose is to check if enums with the same value on master when backport to other version
-    #
-
-    DefineTestName "enum_value_test";
-
-    WriteTest "{";
-    WriteTest "    int val = 0;";
-    # This is a enum which is only available in v1.7 branch.
-    WriteTest "    val = SAI_SWITCH_ATTR_TUNNEL_LOOPBACK_PACKET_ACTION;";
-    WriteTest "    TEST_ASSERT_TRUE(val == 186, \"enum SAI_SWITCH_ATTR_TUNNEL_LOOPBACK_PACKET_ACTION is not with value 186.\");";
-
-    WriteTest "    val = SAI_SWITCH_ATTR_TUNNEL_OBJECTS_LIST;";
-    WriteTest "    TEST_ASSERT_TRUE(val == 190, \"enum SAI_SWITCH_ATTR_TUNNEL_OBJECTS_LIST is not with value 190.\");";
-    WriteTest "    val = SAI_TUNNEL_ATTR_ENCAP_QOS_TC_AND_COLOR_TO_DSCP_MAP;";
-    WriteTest "    TEST_ASSERT_TRUE(val == 25, \"enum SAI_TUNNEL_ATTR_ENCAP_QOS_TC_AND_COLOR_TO_DSCP_MAP is not with value 25.\");";
-    WriteTest "    val = SAI_OBJECT_TYPE_SWITCH_TUNNEL;";
-    WriteTest "    TEST_ASSERT_TRUE(val == 95, \"enum SAI_OBJECT_TYPE_SWITCH_TUNNEL is not with value 95.\");";
-
-    WriteTest "}";
-}
-
 sub WriteTestHeader
 {
     #
@@ -622,8 +598,6 @@ sub CreateTests
 
     CreateStatEnumTest();
 
-    EnumValueTest();
-
     WriteTestMain();
 }