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

Jump to bottom

refactor: Improve VPP handler versions and add VPP proxy support #1593

Merged
merged 11 commits into from
Jan 8, 2020
Merged

refactor: Improve VPP handler versions and add VPP proxy support #1593

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0a5320c
Use more specific VPP versions
ondrej-fabry Dec 13, 2019
72bccdd
Improve VPP handler versions and cleanup vppcalls packages
ondrej-fabry Dec 17, 2019
87c086f
Remove comments
ondrej-fabry Dec 17, 2019
0408f30
Fix logs and errors for telemetry
ondrej-fabry Dec 18, 2019
7a84513
Add VPP proxy support and make version resolution more robust
ondrej-fabry Dec 18, 2019
32abcbb
Refactor vpp package to simplify vpp.Client interface
ondrej-fabry Dec 19, 2019
50cd9f5
Rename vppmock_test.go
ondrej-fabry Dec 19, 2019
dcdada4
Print interface type in error log
ondrej-fabry Jan 7, 2020
1978811
Fix comment
ondrej-fabry Jan 7, 2020
bf90b3d
Print interface name string
ondrej-fabry Jan 7, 2020
6d4dbf2
Handle errors
ondrej-fabry Jan 7, 2020
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
47 changes: 9 additions & 38 deletions plugins/telemetry/vppcalls/telemetry_handler_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ import (

govppapi "git.fd.io/govpp.git/api"
log "github.com/ligato/cn-infra/logging"

"go.ligato.io/vpp-agent/v2/plugins/vpp"
)

var (
// FallbackToCli defines wether should telemetry handler
// fallback to parsing stats from CLI output.
FallbackToCli = true
FallbackToCli = false
)

// TelemetryVppAPI provides API for retrieving telemetry data from VPP.
Expand Down Expand Up @@ -181,44 +182,14 @@ func CompatibleTelemetryHandler(c vpp.Client) TelemetryVppAPI {
if c.StatsConnected() {
return NewTelemetryVppStats(c.Stats())
}
if !FallbackToCli {
log.Warnf("stats unavailable and fallback to CLI disabled for telemetry")
return nil
}

/*ctx := context.TODO()
ch, err := c.NewAPIChannel()
if err != nil {
log.Warnf("failed to create API channel: %v", err)
return nil
}
vpe := vppcalls.CompatibleHandler(c)
info, err := vpe.GetVersion(ctx)
if err != nil {
log.Warnf("retrieving VPP info failed: %v", err)
return nil
}
if ver := info.Release(); ver != "" {
log.Debug("telemetry checking release: ", ver)
if h, ok := Versions[ver]; ok {
if err := ch.CheckCompatiblity(h.Msgs...); err != nil {
log.Debugf("telemetry version %s not compatible: %v", ver, err)
}
log.Debug("telemetry found compatible release: ", ver)
return h.New(ch)
if FallbackToCli {
if v := Handler.FindCompatibleVersion(c); v != nil {
log.Debugf("falling back to parsing CLI output for telemetry")
return v.NewHandler(c).(TelemetryVppAPI)
}
// no compatible version found
return nil
ondrej-fabry marked this conversation as resolved.
Show resolved Hide resolved
}
for ver, h := range Versions {
if err := ch.CheckCompatiblity(h.Msgs...); err != nil {
log.Debugf("version %s not compatible: %v", ver, err)
continue
}
log.Debug("found compatible version: ", ver)
return h.New(ch)
}*/
if v := Handler.FindCompatibleVersion(c); v != nil {
return v.NewHandler(c).(TelemetryVppAPI)
}
// no compatible version found
log.Warnf("stats connection not available for telemetry")
return nil
}
2 changes: 1 addition & 1 deletion plugins/vpp/vppmock/vppmock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
. "github.com/onsi/gomega"
)

// TestCtx is a unit testing.
// TestCtx is a helper for unit testing.
// It wraps VppAdapter which is used instead of real VPP.
type TestCtx struct {
//*GomegaWithT
Expand Down