From 3122b37419385e0234e84778125fd91a3d0fc235 Mon Sep 17 00:00:00 2001 From: kcudnik Date: Mon, 16 Aug 2021 17:36:58 +0200 Subject: [PATCH] Update wred tests --- unittest/vslib/Makefile.am | 11 +- unittest/vslib/main.cpp | 11 +- unittest/vslib/main_libsaivs.cpp | 116 +++++++++++++++ unittest/vslib/test_sai_vs_wred.cpp | 23 +++ unittest/vslib/testslibsaivs | 210 ++++++++++++++++++++++++++++ 5 files changed, 361 insertions(+), 10 deletions(-) create mode 100644 unittest/vslib/main_libsaivs.cpp create mode 100644 unittest/vslib/test_sai_vs_wred.cpp create mode 100755 unittest/vslib/testslibsaivs diff --git a/unittest/vslib/Makefile.am b/unittest/vslib/Makefile.am index a5e50bc160cb..9559160a68a1 100644 --- a/unittest/vslib/Makefile.am +++ b/unittest/vslib/Makefile.am @@ -1,6 +1,6 @@ AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/meta -I$(top_srcdir)/vslib -bin_PROGRAMS = tests +bin_PROGRAMS = tests testslibsaivs LDADD_GTEST = -L/usr/src/gtest -lgtest -lgtest_main @@ -11,4 +11,11 @@ tests_SOURCES = \ tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) tests_LDADD = $(LDADD_GTEST) $(top_srcdir)/vslib/libSaiVS.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) -TESTS = tests +testslibsaivs_SOURCES = \ + main_libsaivs.cpp \ + test_sai_vs_wred.cpp + +testslibsaivs_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) +testslibsaivs_LDADD = $(LDADD_GTEST) -L$(top_srcdir)/vslib/.libs -lsaivs -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) + +TESTS = tests testslibsaivs diff --git a/unittest/vslib/main.cpp b/unittest/vslib/main.cpp index e4af24fa3869..28ae6003c7c6 100644 --- a/unittest/vslib/main.cpp +++ b/unittest/vslib/main.cpp @@ -1,19 +1,14 @@ #include -#include +#include "swss/logger.h" -class SwsscommonEnvironment: - public ::testing::Environment -{ - public: - void SetUp() override { } -}; +#include int main(int argc, char* argv[]) { testing::InitGoogleTest(&argc, argv); - const auto env = new SwsscommonEnvironment; + const auto env = new ::testing::Environment(); testing::AddGlobalTestEnvironment(env); diff --git a/unittest/vslib/main_libsaivs.cpp b/unittest/vslib/main_libsaivs.cpp new file mode 100644 index 000000000000..e83478491d6a --- /dev/null +++ b/unittest/vslib/main_libsaivs.cpp @@ -0,0 +1,116 @@ +#include + +#include "saivs.h" + +#include "swss/logger.h" + +#include + +static std::map g_profileMap; +static std::map::iterator g_profileIter; + +static const char* profile_get_value( + _In_ sai_switch_profile_id_t profile_id, + _In_ const char* variable) +{ + SWSS_LOG_ENTER(); + + if (variable == NULL) + { + SWSS_LOG_WARN("variable is null"); + return NULL; + } + + auto it = g_profileMap.find(variable); + + if (it == g_profileMap.end()) + { + SWSS_LOG_NOTICE("%s: NULL", variable); + return NULL; + } + + SWSS_LOG_NOTICE("%s: %s", variable, it->second.c_str()); + + return it->second.c_str(); +} + +static int profile_get_next_value( + _In_ sai_switch_profile_id_t profile_id, + _Out_ const char** variable, + _Out_ const char** value) +{ + SWSS_LOG_ENTER(); + + if (value == NULL) + { + SWSS_LOG_INFO("resetting profile map iterator"); + + g_profileIter = g_profileMap.begin(); + return 0; + } + + if (variable == NULL) + { + SWSS_LOG_WARN("variable is null"); + return -1; + } + + if (g_profileIter == g_profileMap.end()) + { + SWSS_LOG_INFO("iterator reached end"); + return -1; + } + + *variable = g_profileIter->first.c_str(); + *value = g_profileIter->second.c_str(); + + SWSS_LOG_INFO("key: %s:%s", *variable, *value); + + g_profileIter++; + + return 0; +} + +static sai_service_method_table_t test_services = { + profile_get_value, + profile_get_next_value +}; + +class VirtualSwitchEnvironment: + public ::testing::Environment +{ + public: + + virtual void SetUp() override + { + SWSS_LOG_ENTER(); + + g_profileMap[SAI_KEY_VS_SWITCH_TYPE] = SAI_VALUE_VS_SWITCH_TYPE_BCM56850; + + g_profileIter = g_profileMap.begin(); + + auto status = sai_api_initialize(0, (sai_service_method_table_t*)&test_services); + + EXPECT_EQ(status, SAI_STATUS_SUCCESS); + } + + virtual void TearDown() override + { + SWSS_LOG_ENTER(); + + auto status = sai_api_uninitialize(); + + EXPECT_EQ(status, SAI_STATUS_SUCCESS); + } +}; + +int main(int argc, char* argv[]) +{ + testing::InitGoogleTest(&argc, argv); + + const auto env = new VirtualSwitchEnvironment(); + + testing::AddGlobalTestEnvironment(env); + + return RUN_ALL_TESTS(); +} diff --git a/unittest/vslib/test_sai_vs_wred.cpp b/unittest/vslib/test_sai_vs_wred.cpp new file mode 100644 index 000000000000..55eee0de4d12 --- /dev/null +++ b/unittest/vslib/test_sai_vs_wred.cpp @@ -0,0 +1,23 @@ +#include + +extern "C" { +#include "sai.h" +} + +#include "swss/logger.h" + +TEST(libsaivs, wred) +{ + sai_wred_api_t *vs_wred_api = nullptr; + + sai_api_query(SAI_API_WRED, (void**)&vs_wred_api); + + EXPECT_NE(vs_wred_api, nullptr); + + sai_object_id_t id; + + EXPECT_NE(SAI_STATUS_SUCCESS, vs_wred_api->create_wred(&id,0,0,0)); + EXPECT_NE(SAI_STATUS_SUCCESS, vs_wred_api->remove_wred(0)); + EXPECT_NE(SAI_STATUS_SUCCESS, vs_wred_api->set_wred_attribute(0,0)); + EXPECT_NE(SAI_STATUS_SUCCESS, vs_wred_api->get_wred_attribute(0,0,0)); +} diff --git a/unittest/vslib/testslibsaivs b/unittest/vslib/testslibsaivs new file mode 100755 index 000000000000..80094c4b5426 --- /dev/null +++ b/unittest/vslib/testslibsaivs @@ -0,0 +1,210 @@ +#! /bin/bash + +# testslibsaivs - temporary wrapper script for .libs/testslibsaivs +# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-14 +# +# The testslibsaivs program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command="" + +# This environment variable determines our operation mode. +if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then + # install mode needs the following variables: + generated_by_libtool_version='2.4.6' + notinst_deplibs=' /home/kcudnik/sonic-sairedis/vslib/.libs/libsaivs.la /home/kcudnik/sonic-sairedis/meta/.libs/libsaimetadata.la /home/kcudnik/sonic-sairedis/meta/.libs/libsaimeta.la' +else + # When we are sourced in execute mode, $file and $ECHO are already set. + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + file="$0" + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + ECHO="printf %s\\n" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ that is used only on +# windows platforms, and (c) all begin with the string --lt- +# (application programs are unlikely to have options that match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's ../../libtool value, followed by no. +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=$0 + shift + for lt_opt + do + case "$lt_opt" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'` + test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=. + lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'` + cat "$lt_dump_D/$lt_dump_F" + exit 0 + ;; + --lt-*) + $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n "$lt_option_debug"; then + echo "testslibsaivs:testslibsaivs:$LINENO: libtool wrapper (GNU libtool) 2.4.6 Debian-2.4.6-14" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + $ECHO "testslibsaivs:testslibsaivs:$LINENO: newargv[$lt_dump_args_N]: $lt_arg" + lt_dump_args_N=`expr $lt_dump_args_N + 1` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ + + if test -n "$lt_option_debug"; then + $ECHO "testslibsaivs:testslibsaivs:$LINENO: newargv[0]: $progdir/$program" 1>&2 + func_lt_dump_args ${1+"$@"} 1>&2 + fi + exec "$progdir/$program" ${1+"$@"} + + $ECHO "$0: cannot exec $program $*" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from $@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + case " $* " in + *\ --lt-*) + for lt_wr_arg + do + case $lt_wr_arg in + --lt-*) ;; + *) set x "$@" "$lt_wr_arg"; shift;; + esac + shift + done ;; + esac + func_exec_program_core ${1+"$@"} +} + + # Parse options + func_parse_lt_options "$0" ${1+"$@"} + + # Find the directory that this script lives in. + thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'` + test "x$thisdir" = "x$file" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'` + while test -n "$file"; do + destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'` + + # If there was a directory component, then change thisdir. + if test "x$destdir" != "x$file"; then + case "$destdir" in + [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; + *) thisdir="$thisdir/$destdir" ;; + esac + fi + + file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'` + file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'` + done + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no + if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then + # special case for '.' + if test "$thisdir" = "."; then + thisdir=`pwd` + fi + # remove .libs from thisdir + case "$thisdir" in + *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;; + .libs ) thisdir=. ;; + esac + fi + + # Try to get the absolute directory name. + absdir=`cd "$thisdir" && pwd` + test -n "$absdir" && thisdir="$absdir" + + program='testslibsaivs' + progdir="$thisdir/.libs" + + + if test -f "$progdir/$program"; then + # Add our own library path to LD_LIBRARY_PATH + LD_LIBRARY_PATH="/home/kcudnik/sonic-sairedis/vslib/.libs:/home/kcudnik/lib:/home/kcudnik/sonic-sairedis/meta/.libs:$LD_LIBRARY_PATH" + + # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH + # The second colon is a workaround for a bug in BeOS R4 sed + LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'` + + export LD_LIBRARY_PATH + + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + # Run the actual program with our arguments. + func_exec_program ${1+"$@"} + fi + else + # The program doesn't exist. + $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2 + $ECHO "This script is just a wrapper for $program." 1>&2 + $ECHO "See the libtool documentation for more information." 1>&2 + exit 1 + fi +fi