Skip to content
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

Fix for bugs 96, 97 and 107 (Speed is not displaying properly) #109

Merged
merged 7 commits into from
Sep 11, 2019
Merged

Fix for bugs 96, 97 and 107 (Speed is not displaying properly) #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0a1d4b2
Fix for not showing description when description is configured as par…
Sep 6, 2019
d45ca09
Addressing the crash when max mtu is set as 9276. Currently supported…
Sep 9, 2019
89b7370
Merge branch 'master' of https://github.com/project-arlo/sonic-mgmt-f…
Sep 9, 2019
a28f38c
Merge branch 'master' of https://github.com/project-arlo/sonic-mgmt-f…
Sep 11, 2019
f066a71
Fix for bugs 96, 97 and 107
Sep 11, 2019
12a708d
Addressed the comment to sort the speed
Sep 11, 2019
2f0d6ec
Change MAX_MTU to 9216 in platform_dummy file as well, since it
Sep 11, 2019
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
2 changes: 1 addition & 1 deletion src/CLI/clitree/scripts/platform_dummy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<ENTITYNAME value="32">MAX_PORT_ID</ENTITYNAME>
<ENTITYNAME value="1">START_SUB_PORT_ID</ENTITYNAME>
<ENTITYNAME value="4">MAX_SUB_PORT_ID</ENTITYNAME>
<ENTITYNAME value="9276">MAX_MTU</ENTITYNAME>
<ENTITYNAME value="9216">MAX_MTU</ENTITYNAME>
</ENTITYLIST>
</PLATFORMMODULE>
300 changes: 148 additions & 152 deletions src/translib/intf_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,10 @@ const (
type Table int

const (
IF_TABLE_MAP Table = iota
PORT_STAT_MAP
IF_TABLE_MAP Table = iota
PORT_STAT_MAP
)


type IntfApp struct {
path *PathInfo
reqData []byte
Expand Down Expand Up @@ -359,29 +358,27 @@ func (app *IntfApp) processGet(dbs [db.MaxDB]*db.DB) (GetResponse, error) {
return GetResponse{Payload: payload, ErrSrc: AppErr}, err
}

/*Check if the request is for a specific attribute in Interfaces state COUNTERS container*/
counter_val := &ocbinds.OpenconfigInterfaces_Interfaces_Interface_State_Counters{}
ok, e = app.getSpecificCounterAttr(targetUriPath, ifKey, counter_val)
if ok {
if e != nil {
return GetResponse{Payload: payload, ErrSrc: AppErr}, e
}

payload, err = dumpIetfJson(counter_val, false)
if err == nil {
return GetResponse{Payload: payload}, err
} else {
return GetResponse{Payload: payload, ErrSrc: AppErr}, err
}
}

/*Check if the request is for a specific attribute in Interfaces state COUNTERS container*/
counter_val := &ocbinds.OpenconfigInterfaces_Interfaces_Interface_State_Counters{}
ok, e = app.getSpecificCounterAttr(targetUriPath, ifKey, counter_val)
if ok {
if e != nil {
return GetResponse{Payload: payload, ErrSrc: AppErr}, e
}

payload, err = dumpIetfJson(counter_val, false)
if err == nil {
return GetResponse{Payload: payload}, err
} else {
return GetResponse{Payload: payload, ErrSrc: AppErr}, err
}
}

/* Filling Interface IP info to internal DS */
err = app.convertDBIntfIPInfoToInternal(app.appDB, ifKey)
if err != nil {
return GetResponse{Payload: payload, ErrSrc: AppErr}, err
}
/* Filling Interface IP info to internal DS */
err = app.convertDBIntfIPInfoToInternal(app.appDB, ifKey)
if err != nil {
return GetResponse{Payload: payload, ErrSrc: AppErr}, err
}

/* Filling the tree with the info we have in Internal DS */
ygot.BuildEmptyTree(ifInfo)
Expand Down Expand Up @@ -547,141 +544,139 @@ func (app *IntfApp) getSpecificAttr(targetUriPath string, ifKey string, oc_val *
return true, e

default:
log.Infof(targetUriPath + " - Not an interface state attribute")
log.Infof(targetUriPath + " - Not an interface state attribute")
}
return false, nil
}

func (app *IntfApp) getSpecificCounterAttr(targetUriPath string, ifKey string, counter_val *ocbinds.OpenconfigInterfaces_Interfaces_Interface_State_Counters) (bool, error) {

var e error

switch targetUriPath {
case "/openconfig-interfaces:interfaces/interface/state/counters/in-octets":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_OCTETS", &counter_val.InOctets)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-unicast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_UCAST_PKTS", &counter_val.InUnicastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-broadcast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_BROADCAST_PKTS", &counter_val.InBroadcastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-multicast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS", &counter_val.InMulticastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-errors":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_ERRORS", &counter_val.InErrors)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-discards":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_DISCARDS", &counter_val.InDiscards)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-pkts":
var inNonUCastPkt, inUCastPkt *uint64
var in_pkts uint64

e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS", &inNonUCastPkt)
if e == nil {
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_UCAST_PKTS", &inUCastPkt)
if e != nil {
return true, e
}
in_pkts = *inUCastPkt + *inNonUCastPkt
counter_val.InPkts = &in_pkts
return true, e
} else {
return true, e
}

case "/openconfig-interfaces:interfaces/interface/state/counters/out-octets":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_OCTETS", &counter_val.OutOctets)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-unicast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_UCAST_PKTS", &counter_val.OutUnicastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-broadcast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_BROADCAST_PKTS", &counter_val.OutBroadcastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-multicast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_MULTICAST_PKTS", &counter_val.OutMulticastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-errors":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_ERRORS", &counter_val.OutErrors)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-discards":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_DISCARDS", &counter_val.OutDiscards)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-pkts":
var outNonUCastPkt, outUCastPkt *uint64
var out_pkts uint64

e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_NON_UCAST_PKTS", &outNonUCastPkt)
if e == nil {
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_UCAST_PKTS", &outUCastPkt)
if e != nil {
return true, e
}
out_pkts = *outUCastPkt + *outNonUCastPkt
counter_val.OutPkts = &out_pkts
return true, e
} else {
return true, e
}


default:
log.Infof(targetUriPath + " - Not an interface state counter attribute")
}
return false, nil
var e error

switch targetUriPath {
case "/openconfig-interfaces:interfaces/interface/state/counters/in-octets":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_OCTETS", &counter_val.InOctets)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-unicast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_UCAST_PKTS", &counter_val.InUnicastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-broadcast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_BROADCAST_PKTS", &counter_val.InBroadcastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-multicast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_MULTICAST_PKTS", &counter_val.InMulticastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-errors":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_ERRORS", &counter_val.InErrors)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-discards":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_DISCARDS", &counter_val.InDiscards)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/in-pkts":
var inNonUCastPkt, inUCastPkt *uint64
var in_pkts uint64

e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS", &inNonUCastPkt)
if e == nil {
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_IN_UCAST_PKTS", &inUCastPkt)
if e != nil {
return true, e
}
in_pkts = *inUCastPkt + *inNonUCastPkt
counter_val.InPkts = &in_pkts
return true, e
} else {
return true, e
}

case "/openconfig-interfaces:interfaces/interface/state/counters/out-octets":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_OCTETS", &counter_val.OutOctets)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-unicast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_UCAST_PKTS", &counter_val.OutUnicastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-broadcast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_BROADCAST_PKTS", &counter_val.OutBroadcastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-multicast-pkts":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_MULTICAST_PKTS", &counter_val.OutMulticastPkts)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-errors":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_ERRORS", &counter_val.OutErrors)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-discards":
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_DISCARDS", &counter_val.OutDiscards)
return true, e

case "/openconfig-interfaces:interfaces/interface/state/counters/out-pkts":
var outNonUCastPkt, outUCastPkt *uint64
var out_pkts uint64

e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_NON_UCAST_PKTS", &outNonUCastPkt)
if e == nil {
e = app.getCounters(ifKey, "SAI_PORT_STAT_IF_OUT_UCAST_PKTS", &outUCastPkt)
if e != nil {
return true, e
}
out_pkts = *outUCastPkt + *outNonUCastPkt
counter_val.OutPkts = &out_pkts
return true, e
} else {
return true, e
}

default:
log.Infof(targetUriPath + " - Not an interface state counter attribute")
}
return false, nil
}

func (app *IntfApp) getCounters( ifKey string, attr string, counter_val **uint64 ) error {
val, e := app.getIntfAttr(ifKey, attr, PORT_STAT_MAP)
if len(val) > 0 {
v, e := strconv.ParseUint(val, 10, 64)
if e == nil {
*counter_val = &v
return nil
}
}
return e
func (app *IntfApp) getCounters(ifKey string, attr string, counter_val **uint64) error {
val, e := app.getIntfAttr(ifKey, attr, PORT_STAT_MAP)
if len(val) > 0 {
v, e := strconv.ParseUint(val, 10, 64)
if e == nil {
*counter_val = &v
return nil
}
}
return e
}

func (app *IntfApp) getIntfAttr(ifName string, attr string, table Table) (string, error) {

var ok bool = false
var entry dbEntry
var ok bool = false
var entry dbEntry

if table == IF_TABLE_MAP {
entry, ok = app.ifTableMap[ifName];
} else if table == PORT_STAT_MAP {
entry, ok = app.portStatMap[ifName];
} else {
return "", errors.New("Unsupported table")
}
if table == IF_TABLE_MAP {
entry, ok = app.ifTableMap[ifName]
} else if table == PORT_STAT_MAP {
entry, ok = app.portStatMap[ifName]
} else {
return "", errors.New("Unsupported table")
}

if ok {
ifData := entry.entry
ifData := entry.entry

if val, ok := ifData.Field[attr]; ok {
return val, nil
}
if val, ok := ifData.Field[attr]; ok {
return val, nil
}
}
return "", errors.New("Attr " + attr + "doesn't exist in IF table Map!")
}


/*********** Translation Helper fn to convert DB Interface info to Internal DS ***********/
func (app *IntfApp) getPortOidMapForCounters(dbCl *db.DB) error {
var err error
Expand Down Expand Up @@ -849,21 +844,22 @@ func (app *IntfApp) convertInternalToOCIntfAttrInfo(ifName *string, ifInfo *ocbi
var speedEnum ocbinds.E_OpenconfigIfEthernet_ETHERNET_SPEED

switch speed {
case "40000":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_40GB
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_40GB
case "25000":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_25GB
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_25GB
case "10000":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_10GB
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_10GB
case "5000":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_5GB
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_5GB
case "2500":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_2500MB
case "1000":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_1GB
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_1GB
case "5000":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_5GB
case "10000":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_10GB
case "25000":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_25GB
case "40000":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_40GB
case "50000":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_50GB
case "100000":
speedEnum = ocbinds.OpenconfigIfEthernet_ETHERNET_SPEED_SPEED_100GB
default:
log.Infof("Not supported speed: %s!", speed)
}
Expand Down