Skip to content

[vslib] Clean Sai interface include #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcudnik merged 1 commit into from
Aug 4, 2021
Merged

[vslib] Clean Sai interface include #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions vslib/inc/sai_vs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ extern "C" {
#include "saiextensions.h"
}

#include "Sai.h"
#include "SaiInterface.h"

#include "swss/logger.h"

#include <memory>

Expand Down Expand Up @@ -57,7 +59,7 @@ PRIVATE extern const sai_virtual_router_api_t vs_virtual_router_api;
PRIVATE extern const sai_vlan_api_t vs_vlan_api;
PRIVATE extern const sai_wred_api_t vs_wred_api;

PRIVATE extern std::shared_ptr<saivs::Sai> vs_sai;
PRIVATE extern std::shared_ptr<sairedis::SaiInterface> vs_sai;

// QUAD OID

Expand Down
2 changes: 0 additions & 2 deletions vslib/src/sai_vs_fdb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#include "sai_vs.h"

using namespace saivs;

static sai_status_t vs_flush_fdb_entries(
_In_ sai_object_id_t switch_id,
_In_ uint32_t attr_count,
Expand Down
5 changes: 2 additions & 3 deletions vslib/src/sai_vs_interfacequery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#include "sai_vs.h"
#include "Sai.h"

using namespace saivs;

std::shared_ptr<Sai> vs_sai = std::make_shared<Sai>();
std::shared_ptr<sairedis::SaiInterface> vs_sai = std::make_shared<saivs::Sai>();

sai_status_t sai_api_initialize(
_In_ uint64_t flags,
Expand Down