refer to newer versions of cn_infra/vpp-agent

ligato · May 15, 2018 · c599743 · c599743
1 parent 28c24f5
commit c599743
Show file tree

Hide file tree

Showing 114 changed files with 416 additions and 19,378 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -43,11 +43,11 @@
 
 [[constraint]]
   name = "github.com/ligato/cn-infra"
-  version = "1.1"
+  version = "1.2"
 
 [[constraint]]
   name = "github.com/ligato/vpp-agent"
-  version = "1.2"
+  version = "1.3"
 
 [[constraint]]
   name = "github.com/namsral/flag"

diff --git a/plugins/controller/model/controller.pb.go b/plugins/controller/model/controller.pb.go
diff --git a/plugins/controller/model/controller.proto b/plugins/controller/model/controller.proto
@@ -230,6 +230,6 @@ message NetworkNode {
 // MetaDataType generic parms for all controller high level objects
 message MetaDataType {
     string name = 1;
-    repeated string labels = 2;
+    map<string,string> labels = 2;
 }
 
diff --git a/plugins/controller/vppagent/database.go b/plugins/controller/vppagent/database.go
@@ -21,7 +21,7 @@ import (
 	"github.com/ligato/vpp-agent/plugins/defaultplugins/common/model/interfaces"
 	"github.com/ligato/vpp-agent/plugins/defaultplugins/common/model/l2"
 	"github.com/ligato/vpp-agent/plugins/defaultplugins/common/model/l3"
-	linuxIntf "github.com/ligato/vpp-agent/plugins/linuxplugin/ifplugin/model/interfaces"
+	linuxIntf "github.com/ligato/vpp-agent/plugins/linuxplugin/common/model/interfaces"
 )
 
 // Types in the model were defined as strings for readability not enums with

diff --git a/plugins/controller/vppagent/keys.go b/plugins/controller/vppagent/keys.go
@@ -18,7 +18,7 @@ import (
 	"github.com/ligato/vpp-agent/plugins/defaultplugins/common/model/interfaces"
 	"github.com/ligato/vpp-agent/plugins/defaultplugins/common/model/l2"
 	"github.com/ligato/vpp-agent/plugins/defaultplugins/common/model/l3"
-	linuxIntf "github.com/ligato/vpp-agent/plugins/linuxplugin/ifplugin/model/interfaces"
+	linuxIntf "github.com/ligato/vpp-agent/plugins/linuxplugin/common/model/interfaces"
 	"net"
 	"strings"
 )

diff --git a/plugins/controller/vppagent/vpp_agent.go b/plugins/controller/vppagent/vpp_agent.go
@@ -28,7 +28,7 @@ import (
 	"github.com/ligato/vpp-agent/plugins/defaultplugins/common/model/interfaces"
 	"github.com/ligato/vpp-agent/plugins/defaultplugins/common/model/l2"
 	"github.com/ligato/vpp-agent/plugins/defaultplugins/common/model/l3"
-	linuxIntf "github.com/ligato/vpp-agent/plugins/linuxplugin/ifplugin/model/interfaces"
+	linuxIntf "github.com/ligato/vpp-agent/plugins/linuxplugin/common/model/interfaces"
 )
 
 var (

diff --git a/tests/gotests/itest/linuxtestdata/basic_data.go b/tests/gotests/itest/linuxtestdata/basic_data.go
@@ -1,7 +1,7 @@
 package linuxtestdata
 
 import (
-	"github.com/ligato/vpp-agent/plugins/linuxplugin/ifplugin/model/interfaces"
+	"github.com/ligato/vpp-agent/plugins/linuxplugin/common/model/interfaces"
 )
 
 // Agent1Veth01 are test data for VETH interface for agent1 test data

diff --git a/vendor/github.com/coreos/etcd/Documentation/README.md b/vendor/github.com/coreos/etcd/Documentation/README.md
diff --git a/vendor/github.com/coreos/etcd/cmd/etcd b/vendor/github.com/coreos/etcd/cmd/etcd
diff --git a/vendor/github.com/coreos/etcd/cmd/etcdctl b/vendor/github.com/coreos/etcd/cmd/etcdctl
diff --git a/vendor/github.com/coreos/etcd/cmd/tools b/vendor/github.com/coreos/etcd/cmd/tools
diff --git a/vendor/github.com/ligato/cn-infra/config/plugin_config.go b/vendor/github.com/ligato/cn-infra/config/plugin_config.go
diff --git a/vendor/github.com/ligato/cn-infra/db/keyval/etcdv3/README.md b/vendor/github.com/ligato/cn-infra/db/keyval/etcdv3/README.md
diff --git a/vendor/github.com/ligato/cn-infra/db/keyval/etcdv3/bytes_broker_impl.go b/vendor/github.com/ligato/cn-infra/db/keyval/etcdv3/bytes_broker_impl.go