EOS SDK v2.22.5.2 (EOS 4.32.0F)

Makefile.am

@@ -3,6 +3,7 @@ lib_LTLIBRARIES = libeos.la
 AM_CXXFLAGS = -fvisibility=hidden
 AM_CXXFLAGS += $(EXTRA_CFLAGS)
 AM_CXXFLAGS += -Wextra -Wall -Wnon-virtual-dtor -Werror -Wno-unused-parameter -Wno-error=unused-value -fPIC -fPIE -fvisibility-inlines-hidden
+AM_CXXFLAGS += -DTRAFFIC_POLICY_ENABLED
 AM_LDFLAGS = -Wl,--no-undefined -fPIC -fPIE
 
 PUBLISHED_HEADER_FILES := $(wildcard eos/*.h) $(wildcard eos/inline/*.h) $(wildcard eos/types/*.h) $(wildcard eos/inline/types/*.h)

build.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 LANG=C
 export LANG
 unset DISPLAY
@@ -46,8 +46,8 @@ if $target_32b; then
    CFLAGS="$CFLAGS $CFLAGS_32B"
    CXXFLAGS="$CXXFLAGS $CXXFLAGS_32B"
    LDFLAGS="$LDFLAGS $LDFLAGS_32B"
-   configure_flags='--host=x86_64-pc-linux-gnu'
 fi
+configure_flags='--host=x86_64-pc-linux-gnu'
 
 sysroot=$($(which gcc) --print-sysroot) || sysroot = ""
 inst_prefix="--prefix=$sysroot/usr"

eos/types/ip_route.h

@@ -21,6 +21,7 @@ typedef uint32_t ip_route_metric_t;
 /** Valid range of 1 - (2^24)-1, set to 0 if unused. */
 typedef uint32_t vni_t;
 typedef uint32_t ip_via_metric_t;
+/** Valid range of 1 - (2^24)-1, set to 0 if unused. */
 typedef uint32_t ip_via_weight_t;
 
 /**

eos/version.h

@@ -24,7 +24,7 @@
 
 #include <eos/base.h>
 
-#define EOSSDK_VERSION "2.22.5.1"
+#define EOSSDK_VERSION "2.22.5.2"
 #define EOSSDK_MAJOR 2
 #define EOSSDK_MINOR 22
 #define EOSSDK_PATCH 5

examples/test/FibTestAgent.py

@@ -2,6 +2,7 @@
 # Arista Networks, Inc. Confidential and Proprietary.
 
 import EosSdkGenericTestLib
+from Toggles.IpLibToggleLib import toggleDeprecateRibdEnabled
 
 
 class FibTestAgent:
@@ -148,22 +149,35 @@ def verifyRoute( prefix, fecId, rtCounter, localPref=1,
 
          addIpRoute( '3.3.3.0/24', '2.2.2.2' )
          # check that the new route points to the new fec
-         getFecIdForPrefix( '3.3.3.0/24' )
-         verifyRoute( '3.3.3.0/24', fecId2, '1' )
+         fecId3 = getFecIdForPrefix( '3.3.3.0/24' )
+         if not toggleDeprecateRibdEnabled():
+            verifyRoute( '3.3.3.0/24', fecId2, '1' )
+         else:
+            # for multi-agent, fecs are not deduped.
+            assert fecId2 != fecId3
+            verifyRoute( '3.3.3.0/24', fecId3, '1' )
 
          # test that the deletion of the lower preference route results in
          # the fec + route changing for 2.2.2.0/24 and the fec for 3.3.3.0/24
          delIpRoute('2.2.2.0/24', '4.4.4.5', '2')
          verifyRoute( '2.2.2.0/24', fecId1, '3', localPref=10 )
-         verifyRoute( '3.3.3.0/24', fecId1, '2' )
+         if not toggleDeprecateRibdEnabled():
+            verifyRoute( '3.3.3.0/24', fecId1, '2' )
+         else:
+            # No effects for fec of 3.3.3.0 on multi-agent
+            verifyRoute( '3.3.3.0/24', fecId3, '1' )
 
          # delete the route 2.2.2.0/24 and ensure that 3.3.3.0/24 is del as well
          delIpRoute( '2.2.2.0/24' )
          verifyRoute( '2.2.2.0/24', fecId1, '0', present=False )
          # deleting 2.2.2.0/24 causes 3.3.3.0/24 to get deleted
-         verifyRoute( '3.3.3.0/24', fecId1, '0', present=False )
+         if not toggleDeprecateRibdEnabled():
+            verifyRoute( '3.3.3.0/24', fecId1, '0', present=False )
+         else:
+            verifyRoute( '3.3.3.0/24', fecId3, '0', present=False )
          # with all routes deleted the fec goes away
          verifyFec( fecId1, present=False )
+         verifyFec( fecId3, present=False )
 
          al.stop_agent()
          al.remove_agent()

version.m4

@@ -1,2 +1,2 @@
 m4_define([_NAME_],[EosSdk])
-m4_define([_VERSION_],[2.22.5.1])
+m4_define([_VERSION_],[2.22.5.2])