Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Dtel rev comments #8

Merged
shruthi9 merged 3 commits into from
Jul 13, 2018
Merged

Dtel rev comments #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42ca6ed
Address review comments
Jul 13, 2018
3f653dd
Merge branch 'bf-master' into dtel_rev_comments
Jul 13, 2018
6a96973
Fix for VS test
Jul 13, 2018
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
1 change: 1 addition & 0 deletions orchagent/orch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const char config_db_key_delimiter = '|';
#define MLNX_PLATFORM_SUBSTRING "mellanox"
#define BRCM_PLATFORM_SUBSTRING "broadcom"
#define BFN_PLATFORM_SUBSTRING "barefoot"
#define VS_PLATFORM_SUBSTRING "vs"

#define CONFIGDB_KEY_SEPARATOR "|"
#define DEFAULT_KEY_SEPARATOR ":"
Expand Down
2 changes: 1 addition & 1 deletion orchagent/orchdaemon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ bool OrchDaemon::init()
m_orchList = { switch_orch, gCrmOrch, gPortsOrch, intfs_orch, gNeighOrch, gRouteOrch, copp_orch, tunnel_decap_orch, qos_orch, gBufferOrch, mirror_orch };

bool initialize_dtel = false;
if (platform == BFN_PLATFORM_SUBSTRING)
if (platform == BFN_PLATFORM_SUBSTRING || platform == VS_PLATFORM_SUBSTRING)
{
sai_attr_capability_t capability;
capability.create_implemented = true;
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def __init__(self, dvs):
atbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_ACL_TABLE")
keys = atbl.getKeys()

assert len(keys) == 1
assert len(keys) == 3
self.default_acl_table = keys[0]

atbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_ACL_ENTRY")
Expand Down
7 changes: 7 additions & 0 deletions tests/test_dtel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
from swsscommon import swsscommon


import time
import re
import json
Expand Down Expand Up @@ -46,6 +48,7 @@ def test_DtelGlobalAttribs(self, dvs):

atbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_DTEL")
keys = atbl.getKeys()
assert len(keys) > 0

for k in keys:
(status, fvs) = atbl.get(k)
Expand Down Expand Up @@ -102,6 +105,7 @@ def test_DtelReportSessionAttribs(self, dvs):

atbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_DTEL_REPORT_SESSION")
keys = atbl.getKeys()
assert len(keys) > 0

for k in keys:
(status, fvs) = atbl.get(k)
Expand Down Expand Up @@ -143,6 +147,7 @@ def test_DtelINTSessionAttribs(self, dvs):

atbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_DTEL_INT_SESSION")
keys = atbl.getKeys()
assert len(keys) > 0

for k in keys:
(status, fvs) = atbl.get(k)
Expand Down Expand Up @@ -184,6 +189,7 @@ def test_DtelQueueReportAttribs(self, dvs):

atbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_DTEL_QUEUE_REPORT")
keys = atbl.getKeys()
assert len(keys) > 0

for k in keys:
(status, fvs) = atbl.get(k)
Expand Down Expand Up @@ -252,6 +258,7 @@ def test_DtelEventAttribs(self, dvs):

atbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_DTEL_EVENT")
keys = atbl.getKeys()
assert len(keys) > 0

for k in keys:
(status, fvs) = atbl.get(k)
Expand Down