Merge c863c3a into 9d40216

Gopkg.toml

@@ -4,13 +4,15 @@
 # for detailed Gopkg.toml documentation.
 
 required = [
-    "git.fd.io/govpp.git/cmd/binapi-generator",
-    "github.com/gogo/protobuf/protoc-gen-gogo",
-    "github.com/opencontainers/runc"
+    "github.com/gogo/protobuf/protoc-gen-gogo"
 ]
 
 # Constraints
 
+[[constraint]]
+  branch = "stable/1901"
+  name = "github.com/ligato/vpp-binapi"
+
 [[constraint]]
   branch = "dev"
   name = "github.com/ligato/cn-infra"
@@ -75,10 +77,6 @@ required = [
   name = "google.golang.org/grpc"
   version = "1.14.0"
 
-[[constraint]]
-  name = "github.com/opencontainers/runc"
-  version = "v1.0.0-rc5"
-
 # Overrides
 
 [[override]]
@@ -103,6 +101,10 @@ required = [
   go-tests = true
   unused-packages = true
 
+  [[prune.project]]
+    name = "github.com/ligato/vpp-binapi"
+    unused-packages = false
+
   [[prune.project]]
     name = "github.com/ligato/cn-infra"
     unused-packages = false

docker/dev/Dockerfile

@@ -13,20 +13,15 @@ ARG VPP_COMMIT
 
 RUN git clone ${VPP_REPO_URL} /opt/vpp \
  && cd /opt/vpp \
- && git checkout ${VPP_COMMIT}
+ && git checkout -q ${VPP_COMMIT}
 
 COPY scripts/genjsonapi.sh /opt/genjsonapi.sh
-RUN /opt/genjsonapi.sh
+RUN APIDIR=/usr/share/vpp/api /opt/genjsonapi.sh
 
 WORKDIR /go/src/github.com/ligato/vpp-agent
+COPY vendor/github.com/ligato/vpp-binapi/vppapi vppapi
 
-COPY plugins/vpp/binapi plugins/vpp/binapi
-COPY vendor vendor
-COPY Makefile vpp.env ./
-
-RUN cp -r plugins/vpp/binapi /tmp/orig_binapi \
- && make generate-binapi \
- && diff -r plugins/vpp/binapi /tmp/orig_binapi
+RUN diff -r vppapi /usr/share/vpp/api
 
 FROM ${BASE_IMG} as dev-stage
 

examples/govpp_call/main.go

@@ -15,6 +15,7 @@
 package main
 
 import (
+	"log"
 	"time"
 
 	govppapi "git.fd.io/govpp.git/api"
@@ -26,9 +27,8 @@ import (
 	"github.com/ligato/cn-infra/utils/safeclose"
 	"github.com/ligato/vpp-agent/plugins/govppmux"
 	"github.com/ligato/vpp-agent/plugins/vpp"
-	l2Api "github.com/ligato/vpp-agent/plugins/vpp/binapi/l2"
 	"github.com/ligato/vpp-agent/plugins/vpp/model/l2"
-	"log"
+	l2Api "github.com/ligato/vpp-binapi/binapi/l2"
 )
 
 // *************************************************************************

plugins/configurator/dump.go

@@ -221,7 +221,7 @@ func (svc *dumpService) DumpARPs() ([]*vpp_l3.ARPEntry, error) {
 
 // DumpPunt reads VPP Punt socket registrations and returns them as an *PuntResponse.
 func (svc *dumpService) DumpPunt() (punts []*vpp_punt.ToHost, err error) {
-	dump, err := svc.puntHandler.DumpPuntRegisteredSockets()
+	dump, err := svc.puntHandler.DumpRegisteredPuntSockets()
 	if err != nil {
 		return nil, err
 	}

plugins/govppmux/vppcalls/acl_vppcalls.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	govppapi "git.fd.io/govpp.git/api"
-	aclapi "github.com/ligato/vpp-agent/plugins/vpp/binapi/acl"
+	aclapi "github.com/ligato/vpp-binapi/binapi/acl"
 )
 
 // GetACLPluginVersion retrieves ACL plugin version.
@@ -33,4 +33,4 @@ func GetACLPluginVersion(ch govppapi.Channel) (string, error) {
 	version := fmt.Sprintf("%d.%d", reply.Major, reply.Minor)
 
 	return version, nil
-}
+}