Enhancing vs tests to mock platform specific flows

sonic-net · Sep 4, 2021 · a302e5d · a302e5d
1 parent f85322e
commit a302e5d
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 1 deletion.
diff --git a/vslib/SwitchMLNX2700.cpp b/vslib/SwitchMLNX2700.cpp
@@ -424,3 +424,16 @@ sai_status_t SwitchMLNX2700::warm_update_queues()
 
     return SAI_STATUS_SUCCESS;
 }
+
+sai_status_t SwitchMLNX2700::queryVxlanTunnelPeerModeCapability(
+                   _Inout_ sai_s32_list_t *enum_values_capability)
+{
+    if (enum_values_capability->count < 1)
+    {
+        return SAI_STATUS_BUFFER_OVERFLOW;
+    }
+
+    enum_values_capability->count = 1;
+    enum_values_capability->list[0] = SAI_TUNNEL_PEER_MODE_P2MP;
+    return SAI_STATUS_SUCCESS;
+}
diff --git a/vslib/SwitchMLNX2700.h b/vslib/SwitchMLNX2700.h
@@ -43,5 +43,10 @@ namespace saivs
                     _In_ sai_object_id_t bridge_id) override;
 
             virtual sai_status_t warm_update_queues() override;
+
+        protected:
+            virtual sai_status_t queryVxlanTunnelPeerModeCapability(
+                                      _Inout_ sai_s32_list_t *enum_values_capability) override;
+
     };
 }
diff --git a/vslib/SwitchStateBase.cpp b/vslib/SwitchStateBase.cpp
@@ -3296,3 +3296,30 @@ bool SwitchStateBase::dumpObject(
 
     return true;
 }
+
+sai_status_t SwitchStateBase::queryVxlanTunnelPeerModeCapability(
+                   _Inout_ sai_s32_list_t *enum_values_capability)
+{
+    if (enum_values_capability->count < 2)
+    {
+        return SAI_STATUS_BUFFER_OVERFLOW;
+    }
+
+    enum_values_capability->count = 2;
+    enum_values_capability->list[0] = SAI_TUNNEL_PEER_MODE_P2MP;
+    enum_values_capability->list[1] = SAI_TUNNEL_PEER_MODE_P2P;
+    return SAI_STATUS_SUCCESS;
+}
+
+sai_status_t SwitchStateBase::queryAttrEnumValuesCapability(
+                              _In_ sai_object_id_t switch_id,
+                              _In_ sai_object_type_t object_type,
+                              _In_ sai_attr_id_t attr_id,
+                              _Inout_ sai_s32_list_t *enum_values_capability)
+{
+    if (object_type == SAI_OBJECT_TYPE_TUNNEL && attr_id == SAI_TUNNEL_ATTR_PEER_MODE)
+    {
+        return queryVxlanTunnelPeerModeCapability(enum_values_capability);
+    }
+    return SAI_STATUS_NOT_SUPPORTED;
+}
diff --git a/vslib/SwitchStateBase.h b/vslib/SwitchStateBase.h
@@ -268,6 +268,12 @@ namespace saivs
                     _In_ sai_bulk_op_error_mode_t mode,
                     _Out_ sai_status_t *object_statuses);
 
+           virtual sai_status_t queryAttrEnumValuesCapability(
+                              _In_ sai_object_id_t switch_id,
+                              _In_ sai_object_type_t object_type,
+                              _In_ sai_attr_id_t attr_id,
+                             _Inout_ sai_s32_list_t *enum_values_capability);
+
         protected:
 
             virtual sai_status_t remove_internal(
@@ -633,6 +639,11 @@ namespace saivs
             constexpr static const int m_maxAclTables = 3;
             constexpr static const int m_maxAclTableGroups = 200;
 
+        protected:
+
+            virtual sai_status_t queryVxlanTunnelPeerModeCapability(
+                                      _Inout_ sai_s32_list_t *enum_values_capability);
+
         public: // TODO private
 
             std::set<FdbInfo> m_fdb_info_set;

diff --git a/vslib/VirtualSwitchSaiInterface.cpp b/vslib/VirtualSwitchSaiInterface.cpp
@@ -831,8 +831,27 @@ sai_status_t VirtualSwitchSaiInterface::queryAattributeEnumValuesCapability(
 
         return SAI_STATUS_SUCCESS;
     }
+    else if (object_type == SAI_OBJECT_TYPE_VLAN && (attr_id == SAI_VLAN_ATTR_UNKNOWN_UNICAST_FLOOD_CONTROL_TYPE ||
+                                                     attr_id == SAI_VLAN_ATTR_UNKNOWN_MULTICAST_FLOOD_CONTROL_TYPE ||
+                                                     attr_id == SAI_VLAN_ATTR_BROADCAST_FLOOD_CONTROL_TYPE))
+    {
+
+        if (enum_values_capability->count < 4)
+        {
+            return SAI_STATUS_BUFFER_OVERFLOW;
+        }
+
+        enum_values_capability->count = 4;
+        enum_values_capability->list[0] = SAI_VLAN_FLOOD_CONTROL_TYPE_ALL;
+        enum_values_capability->list[1] = SAI_VLAN_FLOOD_CONTROL_TYPE_NONE;
+        enum_values_capability->list[2] = SAI_VLAN_FLOOD_CONTROL_TYPE_L2MC_GROUP;
+        enum_values_capability->list[3] = SAI_VLAN_FLOOD_CONTROL_TYPE_COMBINED;
+
+        return SAI_STATUS_SUCCESS;
+    }
+    auto ss = m_switchStateMap.at(switch_id);
+    return ss->queryAttrEnumValuesCapability(switch_id, object_type, attr_id, enum_values_capability);
 
-    return SAI_STATUS_NOT_SUPPORTED;
 }
 
 sai_status_t VirtualSwitchSaiInterface::getStats(