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

remove support for VPP 20.01 #1812

Merged
merged 5 commits into from
Aug 18, 2021
Merged

remove support for VPP 20.01 #1812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31629a6
WIP remove support for VPP 20.01
mhalaj1 Jul 27, 2021
bf38a98
modify go.mod to point to govpp fork
mhalaj1 Jul 28, 2021
acf6af4
minor fixes
mhalaj1 Aug 2, 2021
e164967
remove closing of stream in vpp_proxy example, since closing
mhalaj1 Aug 18, 2021
5bfba23
update dependency for GoVPP
mhalaj1 Aug 18, 2021
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
17 changes: 7 additions & 10 deletions examples/vpp_proxy/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020 Cisco and/or its affiliates.
// Copyright (c) 2021 Cisco and/or its affiliates.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -27,16 +27,13 @@ import (
"git.fd.io/govpp.git/proxy"

"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi"
"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2001"
"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2001/interfaces"
"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2001/vpe"
"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2009"
interfaces "go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2009/interface"
"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2009/vpe"
)

// TODO update example for VPP >=20.05
// (changed govpp's api.Channel for api.Connection in binapi NewServiceClient creation)

// VPP version used in the example.
const vppVersion = vpp2001.Version
const vppVersion = vpp2009.Version

var (
address = flag.String("addr", ":9191", "agent address")
Expand Down Expand Up @@ -100,9 +97,9 @@ func proxyBinapi(client *proxy.Client) {
log.Printf("Version: %+v", version)

// List interfaces
stream, err := interfaceSvc.DumpSwInterface(context.Background(), &interfaces.SwInterfaceDump{})
stream, err := interfaceSvc.SwInterfaceDump(context.Background(), &interfaces.SwInterfaceDump{})
if err != nil {
log.Fatalln("DumpSwInterface failed:", err)
log.Fatalln("SwInterfaceDump failed:", err)
}
log.Printf("dumping interfaces")
for {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module go.ligato.io/vpp-agent/v3
go 1.13

require (
git.fd.io/govpp.git v0.3.6-0.20210601140839-da95997338b7
git.fd.io/govpp.git v0.3.6-0.20210810100027-c0da1f2999a6
github.com/Shopify/sarama v1.20.1 // indirect
github.com/alecthomas/jsonschema v0.0.0-20200217214135-7152f22193c9
github.com/alicebob/miniredis v2.5.0+incompatible // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
git.fd.io/govpp.git v0.3.6-0.20210601140839-da95997338b7 h1:IPy+QyEmQxFbVRFolJ4ofP+ZLN4HfzmK+QCPycmaINc=
git.fd.io/govpp.git v0.3.6-0.20210601140839-da95997338b7/go.mod h1:OCVd4W8SH+666KRQoMj6PM+oipLDZAHhqMz9B1TGbgI=
git.fd.io/govpp.git v0.3.6-0.20210810100027-c0da1f2999a6 h1:dZPJ0JRnoHevxdXhonJG9MtkYD6qXitFMr7gAONwLks=
git.fd.io/govpp.git v0.3.6-0.20210810100027-c0da1f2999a6/go.mod h1:OCVd4W8SH+666KRQoMj6PM+oipLDZAHhqMz9B1TGbgI=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
Expand Down
3 changes: 1 addition & 2 deletions plugins/govppmux/plugin_impl_govppmux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2019 Cisco and/or its affiliates.
// Copyright (c) 2021 Cisco and/or its affiliates.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -41,7 +41,6 @@ import (
"go.ligato.io/vpp-agent/v3/plugins/vpp"
"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi"

_ "go.ligato.io/vpp-agent/v3/plugins/govppmux/vppcalls/vpp2001"
_ "go.ligato.io/vpp-agent/v3/plugins/govppmux/vppcalls/vpp2005"
_ "go.ligato.io/vpp-agent/v3/plugins/govppmux/vppcalls/vpp2009"
_ "go.ligato.io/vpp-agent/v3/plugins/govppmux/vppcalls/vpp2101"
Expand Down
166 changes: 0 additions & 166 deletions plugins/govppmux/vppcalls/vpp2001/vpe_vppcalls.go
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions plugins/govppmux/vppcalls/vpp2001/vppcalls_handler.go
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions plugins/telemetry/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2018 Cisco and/or its affiliates.
// Copyright (c) 2021 Cisco and/or its affiliates.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -39,7 +39,6 @@ import (
"go.ligato.io/vpp-agent/v3/plugins/vpp/ifplugin/ifaceidx"
"go.ligato.io/vpp-agent/v3/proto/ligato/configurator"

_ "go.ligato.io/vpp-agent/v3/plugins/telemetry/vppcalls/vpp2001"
_ "go.ligato.io/vpp-agent/v3/plugins/telemetry/vppcalls/vpp2005"
_ "go.ligato.io/vpp-agent/v3/plugins/telemetry/vppcalls/vpp2009"
_ "go.ligato.io/vpp-agent/v3/plugins/telemetry/vppcalls/vpp2101"
Expand Down
Loading