From 131280cc1d904599a057cd858d55c8345c58a4c9 Mon Sep 17 00:00:00 2001 From: richardyu-ms Date: Fri, 22 Apr 2022 06:11:18 +0000 Subject: [PATCH] remove a test method and remove a unused enum which might cause enum inconsistence between versions Signed-off-by: richardyu-ms --- inc/saiswitch.h | 10 ---------- meta/test.pm | 26 -------------------------- 2 files changed, 36 deletions(-) diff --git a/inc/saiswitch.h b/inc/saiswitch.h index 3b9d3542f..7f1a03c5c 100644 --- 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 index e36b48894..6e023ab03 100644 --- 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(); }