EOS SDK v2.22.5 (EOS 4.31.1F)

aristanetworks · Dec 26, 2023 · 16c2a9b · 16c2a9b
1 parent ba0a8ac
commit 16c2a9b
Show file tree

Hide file tree

Showing 18 changed files with 2,937 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -40,7 +40,7 @@
 #-----------------------------------------------------------------------------------
 
 FROM centos:7
-ARG version=2.22.3
+ARG version=2.22.5
 ARG arch="m32"
 
 # Set eossdk version as label and environ variable.

diff --git a/EosSdk.i b/EosSdk.i
@@ -355,6 +355,7 @@ void throw_py_error(error const& err) {
 %template() std::pair<uint32_t, eos::acl_rule_eth_t>;
 %template() std::unordered_set<uint32_t>;
 %template() std::unordered_set<eos::ip_addr_t>;
+%template() std::unordered_set<std::string>;
 %template() std::map<eos::lldp_tlv_type_t, std::string>;
 %template() std::list<eos::lldp_management_address_t>;
 %template() std::vector<std::string>;

diff --git a/Includes.i b/Includes.i
@@ -19,7 +19,6 @@
 %include "eos/types/macsec.h"
 %include "eos/types/mpls.h"
 %include "eos/types/mpls_vrf_label.h"
-%include "eos/types/nexthop_group.h"
 %include "eos/types/structured_filter.h"
 %include "eos/types/vrf.h"
 %include "eos/types/subintf.h"
@@ -38,6 +37,8 @@
 %include "eos/types/mpls_route.h"
 %include "eos/types/neighbor_table.h"
 %include "eos/types/nexthop_group_tunnel.h"
+%include "eos/bfd.h"
+%include "eos/types/nexthop_group.h"
 %include "eos/acl.h"
 %include "eos/types/policy_map.h"
 %include "eos/ip_route.h"
@@ -78,13 +79,11 @@
 %include "eos/inline/types/macsec.h"
 %include "eos/inline/types/mpls.h"
 %include "eos/inline/types/mpls_vrf_label.h"
-%include "eos/inline/types/nexthop_group.h"
 %include "eos/inline/types/structured_filter.h"
 %include "eos/inline/types/vrf.h"
 %include "eos/sdk.h"
 %include "eos/vrf.h"
 %include "eos/xcvr.h"
-%include "eos/bfd.h"
 %include "eos/eth_intf.h"
 %include "eos/eth_phy_intf.h"
 %include "eos/inline/hardware_table.h"
@@ -96,7 +95,6 @@
 %include "eos/lldp.h"
 %include "eos/macsec.h"
 %include "eos/mlag.h"
-%include "eos/nexthop_group.h"
 %include "eos/subintf.h"
 %include "eos/system.h"
 %include "eos/aresolve.h"
@@ -112,7 +110,6 @@
 %include "eos/inline/lldp.h"
 %include "eos/inline/macsec.h"
 %include "eos/inline/mlag.h"
-%include "eos/inline/nexthop_group.h"
 %include "eos/inline/system.h"
 %include "eos/inline/types/aresolve.h"
 %include "eos/inline/types/bgp.h"
@@ -139,8 +136,11 @@
 %include "eos/inline/mpls_route.h"
 %include "eos/inline/neighbor_table.h"
 %include "eos/inline/nexthop_group_tunnel.h"
+%include "eos/inline/types/nexthop_group.h"
 %include "eos/inline/types/policy_map.h"
+%include "eos/nexthop_group.h"
 %include "eos/fib.h"
+%include "eos/inline/nexthop_group.h"
 %include "eos/inline/policy_map.h"
 %include "eos/inline/types/fib.h"
 %include "eos/inline/types/route_map.h"

diff --git a/SdkImpl.h b/SdkImpl.h
@@ -336,7 +336,6 @@ inline eth_phy_intf_mgr * sdk::SdkImpl::get_eth_phy_intf_mgr() {
 
 inline eth_phy_intf_counter_mgr * sdk::SdkImpl::get_eth_phy_intf_counter_mgr() {
    eos::print_profiles::add_profile("IntfMgrHelper");
-   eos::print_profiles::add_profile("eth_phy_intf");
    GET_NO_MOUNT_MGR(eth_phy_intf_counter)
 }
 
@@ -368,7 +367,8 @@ inline intf_mgr * sdk::SdkImpl::get_intf_mgr() {
 }
 
 inline intf_counter_mgr * sdk::SdkImpl::get_intf_counter_mgr() {
-   eos::print_profiles::add_profile("intf");
+   eos::print_profiles::add_profile( "IntfMgrHelper" );
+   eos::print_profiles::add_profile( "intf" );
    GET_NO_MOUNT_MGR(intf_counter)
 }
 

diff --git a/eos/inline/types/nexthop_group.h b/eos/inline/types/nexthop_group.h
@@ -280,6 +280,15 @@ void
 nexthop_group_entry_t::intf_is(intf_id_t const & intf) {
    pimpl->intf_is(intf);
 }
+sbfd_echo_session_key_t
+nexthop_group_entry_t::sbfd_session_key() const {
+   return pimpl->sbfd_session_key();
+}
+void
+nexthop_group_entry_t::sbfd_session_key_is(
+         sbfd_echo_session_key_t const & sbfd_session_key) {
+   pimpl->sbfd_session_key_is(sbfd_session_key);
+}
 std::string
 nexthop_group_entry_t::child_nexthop_group() const {
    return pimpl->child_nexthop_group();

diff --git a/eos/inline/types/nexthop_group_impl.h b/eos/inline/types/nexthop_group_impl.h
@@ -212,22 +212,25 @@ operator<<(std::ostream& os, const nexthop_group_entry_counter_impl_t& obj) {
 
 
 nexthop_group_entry_impl_t::nexthop_group_entry_impl_t() :
-      mpls_action_(), nexthop_(), intf_(), child_nexthop_group_() {
+      mpls_action_(), nexthop_(), intf_(), sbfd_session_key_(),
+      child_nexthop_group_() {
 }
 
 nexthop_group_entry_impl_t::nexthop_group_entry_impl_t(
          ip_addr_t const & nexthop) :
-      mpls_action_(), nexthop_(nexthop), intf_(), child_nexthop_group_() {
+      mpls_action_(), nexthop_(nexthop), intf_(), sbfd_session_key_(),
+      child_nexthop_group_() {
 }
 
 nexthop_group_entry_impl_t::nexthop_group_entry_impl_t(
          ip_addr_t const & nexthop, intf_id_t const & intf) :
-      mpls_action_(), nexthop_(nexthop), intf_(intf), child_nexthop_group_() {
+      mpls_action_(), nexthop_(nexthop), intf_(intf), sbfd_session_key_(),
+      child_nexthop_group_() {
 }
 
 nexthop_group_entry_impl_t::nexthop_group_entry_impl_t(
          std::string const & child_nexthop_group) :
-      mpls_action_(), nexthop_(), intf_(),
+      mpls_action_(), nexthop_(), intf_(), sbfd_session_key_(),
       child_nexthop_group_(child_nexthop_group) {
 }
 
@@ -274,6 +277,17 @@ nexthop_group_entry_impl_t::intf_is(intf_id_t const & intf) {
    intf_ = intf;
 }
 
+sbfd_echo_session_key_t
+nexthop_group_entry_impl_t::sbfd_session_key() const {
+   return sbfd_session_key_;
+}
+
+void
+nexthop_group_entry_impl_t::sbfd_session_key_is(
+         sbfd_echo_session_key_t const & sbfd_session_key) {
+   sbfd_session_key_ = sbfd_session_key;
+}
+
 std::string
 nexthop_group_entry_impl_t::child_nexthop_group() const {
    return child_nexthop_group_;
@@ -297,6 +311,7 @@ nexthop_group_entry_impl_t::operator==(nexthop_group_entry_impl_t const & other)
    return mpls_action_ == other.mpls_action_ &&
           nexthop_ == other.nexthop_ &&
           intf_ == other.intf_ &&
+          sbfd_session_key_ == other.sbfd_session_key_ &&
           child_nexthop_group_ == other.child_nexthop_group_;
 }
 
@@ -315,6 +330,8 @@ nexthop_group_entry_impl_t::operator<(nexthop_group_entry_impl_t const & other)
       return nexthop_ < other.nexthop_;
    } else if(intf_ != other.intf_) {
       return intf_ < other.intf_;
+   } else if(sbfd_session_key_ != other.sbfd_session_key_) {
+      return sbfd_session_key_ < other.sbfd_session_key_;
    } else if(child_nexthop_group_ != other.child_nexthop_group_) {
       return child_nexthop_group_ < other.child_nexthop_group_;
    }
@@ -333,6 +350,7 @@ nexthop_group_entry_impl_t::mix_me(hash_mix & h) const {
    h.mix(mpls_action_); // nexthop_group_mpls_action_t
    h.mix(nexthop_); // ip_addr_t
    h.mix(intf_); // intf_id_t
+   h.mix(sbfd_session_key_); // sbfd_echo_session_key_t
    h.mix(child_nexthop_group_); // std::string
 }
 
@@ -343,6 +361,7 @@ nexthop_group_entry_impl_t::to_string() const {
    ss << "mpls_action=" << mpls_action_;
    ss << ", nexthop=" << nexthop_;
    ss << ", intf=" << intf_;
+   ss << ", sbfd_session_key=" << sbfd_session_key_;
    ss << ", child_nexthop_group='" << child_nexthop_group_ << "'";
    ss << ")";
    return ss.str();

diff --git a/eos/types/nexthop_group.h b/eos/types/nexthop_group.h
@@ -4,6 +4,7 @@
 #ifndef EOS_TYPES_NEXTHOP_GROUP_H
 #define EOS_TYPES_NEXTHOP_GROUP_H
 
+#include <eos/bfd.h>
 #include <eos/hash_mix.h>
 #include <eos/panic.h>
 #include <eos/utility.h>
@@ -198,6 +199,11 @@ class EOS_SDK_PUBLIC nexthop_group_entry_t {
    /** Setter for 'intf'. */
    void intf_is(intf_id_t const & intf);
 
+   /** Getter for 'sbfd_session_key': the optional key to an sBFD session. */
+   sbfd_echo_session_key_t sbfd_session_key() const;
+   /** Setter for 'sbfd_session_key'. */
+   void sbfd_session_key_is(sbfd_echo_session_key_t const & sbfd_session_key);
+
    /** Getter for 'child_nexthop_group': the name of next level nexthop-group. */
    std::string child_nexthop_group() const;
    /** Setter for 'child_nexthop_group'. */

diff --git a/eos/types/nexthop_group_impl.h b/eos/types/nexthop_group_impl.h
@@ -4,6 +4,7 @@
 #ifndef EOS_TYPES_NEXTHOP_GROUP_IMPL_H
 #define EOS_TYPES_NEXTHOP_GROUP_IMPL_H
 
+#include <eos/bfd.h>
 #include <eos/hash_mix.h>
 #include <eos/panic.h>
 #include <eos/utility.h>
@@ -136,6 +137,11 @@ class EOS_SDK_PUBLIC nexthop_group_entry_impl_t {
    /** Setter for 'intf'. */
    void intf_is(intf_id_t const & intf);
 
+   /** Getter for 'sbfd_session_key': the optional key to an sBFD session. */
+   sbfd_echo_session_key_t sbfd_session_key() const;
+   /** Setter for 'sbfd_session_key'. */
+   void sbfd_session_key_is(sbfd_echo_session_key_t const & sbfd_session_key);
+
    /** Getter for 'child_nexthop_group': the name of next level nexthop-group. */
    std::string child_nexthop_group() const;
    /** Setter for 'child_nexthop_group'. */
@@ -161,6 +167,7 @@ class EOS_SDK_PUBLIC nexthop_group_entry_impl_t {
    nexthop_group_mpls_action_t mpls_action_;
    ip_addr_t nexthop_;
    intf_id_t intf_;
+   sbfd_echo_session_key_t sbfd_session_key_;
    std::string child_nexthop_group_;
 };
 

diff --git a/eos/version.h b/eos/version.h
@@ -24,10 +24,10 @@
 
 #include <eos/base.h>
 
-#define EOSSDK_VERSION "2.22.4"
+#define EOSSDK_VERSION "2.22.5"
 #define EOSSDK_MAJOR 2
 #define EOSSDK_MINOR 22
-#define EOSSDK_PATCH 4
+#define EOSSDK_PATCH 5
 
 namespace eos {
 

diff --git a/examples/EosThrift_constants.cpp b/examples/EosThrift_constants.cpp
diff --git a/examples/EosThrift_constants.h b/examples/EosThrift_constants.h
diff --git a/examples/EosThrift_types.cpp b/examples/EosThrift_types.cpp
diff --git a/examples/EosThrift_types.h b/examples/EosThrift_types.h