Skip to content

Commit

Permalink
Deletion of support for VPP 21.01 and 21.06 (ligato#1931)
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Béreš <daniel.beres@pantheon.tech>
  • Loading branch information
Giluerre authored May 26, 2023
1 parent 63ef115 commit 838a647
Show file tree
Hide file tree
Showing 477 changed files with 14 additions and 143,873 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ package binapi
import (
"go.ligato.io/vpp-agent/v3/examples/customize/custom_vpp_plugin/binapi/syslog"
"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi"
"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2106"
"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2210"
)

// This go generate directive will generate a binapi code for the VPP plugin syslog.
//go:generate binapi-generator --input-file=/usr/share/vpp/api/core/syslog.api.json

func init() {
// This adds syslog API messages for the compatibility check of VPP 20.05.
api := binapi.Versions[vpp2106.Version]
// This adds syslog API messages for the compatibility check of VPP 22.10.
api := binapi.Versions[vpp2210.Version]
api.Core.Add(syslog.AllMessages)
}
4 changes: 2 additions & 2 deletions examples/customize/custom_vpp_plugin/syslog/syslog_plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"go.ligato.io/vpp-agent/v3/plugins/kvscheduler"
kvs "go.ligato.io/vpp-agent/v3/plugins/kvscheduler/api"

// This blank import registers vppcalls implementation for VPP 20.05
_ "go.ligato.io/vpp-agent/v3/examples/customize/custom_vpp_plugin/syslog/vppcalls/vpp2106"
// This blank import registers vppcalls implementation for VPP 22.10
_ "go.ligato.io/vpp-agent/v3/examples/customize/custom_vpp_plugin/syslog/vppcalls/vpp2210"
)

// This go generate directive generates adapter code for conversion between
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package vpp2106
package vpp2210

import (
"context"
Expand All @@ -24,12 +24,12 @@ import (

"go.ligato.io/vpp-agent/v3/examples/customize/custom_vpp_plugin/binapi/syslog"
"go.ligato.io/vpp-agent/v3/examples/customize/custom_vpp_plugin/syslog/vppcalls"
"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2106"
"go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2210"
)

func init() {
// Register this handler implementation for VPP 20.05 in the vppcalls package.
vppcalls.AddHandlerVersion(vpp2106.Version, syslog.AllMessages(), NewHandler)
// Register this handler implementation for VPP 22.10 in the vppcalls package.
vppcalls.AddHandlerVersion(vpp2210.Version, syslog.AllMessages(), NewHandler)
}

const DefaultMaxMsgSize = 480
Expand Down
2 changes: 1 addition & 1 deletion examples/govpp_call/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"go.ligato.io/vpp-agent/v3/cmd/vpp-agent/app"
"go.ligato.io/vpp-agent/v3/plugins/govppmux"
l2Api "go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2101/l2"
l2Api "go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp2210/l2"
l2 "go.ligato.io/vpp-agent/v3/proto/ligato/vpp/l2"
)

Expand Down
8 changes: 4 additions & 4 deletions examples/vpp_proxy/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ import (
"go.fd.io/govpp/proxy"

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

// VPP version used in the example.
const vppVersion = vpp2106.Version
const vppVersion = vpp2210.Version

var (
address = flag.String("addr", ":9191", "agent address")
Expand Down
2 changes: 0 additions & 2 deletions plugins/govppmux/plugin_impl_govppmux.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +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/vpp2101"
_ "go.ligato.io/vpp-agent/v3/plugins/govppmux/vppcalls/vpp2106"
_ "go.ligato.io/vpp-agent/v3/plugins/govppmux/vppcalls/vpp2202"
_ "go.ligato.io/vpp-agent/v3/plugins/govppmux/vppcalls/vpp2210"
)
Expand Down
169 changes: 0 additions & 169 deletions plugins/govppmux/vppcalls/vpp2101/vpe_vppcalls.go

This file was deleted.

43 changes: 0 additions & 43 deletions plugins/govppmux/vppcalls/vpp2101/vppcalls_handler.go

This file was deleted.

Loading

0 comments on commit 838a647

Please sign in to comment.