From 96c3dce9de1aded53c1e4bf098817fc59692eb64 Mon Sep 17 00:00:00 2001 From: Rastislav Szabo Date: Thu, 4 May 2017 12:35:04 +0200 Subject: fixed import paths Signed-off-by: Rastislav Szabo --- adapter/mock/mock_adapter.go | 6 +++--- adapter/vppapiclient/empty_adapter.go | 2 +- adapter/vppapiclient/vppapiclient_adapter.go | 2 +- api/api_test.go | 16 ++++++++-------- binapi_generator/generator.go | 2 +- core/bin_api/vpe/vpe.go | 2 +- core/core.go | 6 +++--- core/core_test.go | 8 ++++---- core/msg_codec.go | 2 +- core/notifications.go | 2 +- examples/bin_api/acl/acl.go | 2 +- examples/bin_api/af_packet/af_packet.go | 2 +- examples/bin_api/interfaces/interfaces.go | 2 +- examples/bin_api/ip/ip.go | 2 +- examples/bin_api/memif/memif.go | 2 +- examples/bin_api/tap/tap.go | 2 +- examples/bin_api/uflow/uflow.go | 2 +- examples/example_client.go | 14 +++++++------- examples/examples | Bin 3001869 -> 3006225 bytes glide.yaml | 2 +- govpp.go | 6 +++--- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/adapter/mock/mock_adapter.go b/adapter/mock/mock_adapter.go index cc3be07..556d396 100644 --- a/adapter/mock/mock_adapter.go +++ b/adapter/mock/mock_adapter.go @@ -24,9 +24,9 @@ import ( "github.com/lunixbochs/struc" - "gerrit.fd.io/r/govpp/adapter" - "gerrit.fd.io/r/govpp/adapter/mock/binapi_reflect" - "gerrit.fd.io/r/govpp/api" + "gerrit.fd.io/r/govpp.git/adapter" + "gerrit.fd.io/r/govpp.git/adapter/mock/binapi_reflect" + "gerrit.fd.io/r/govpp.git/api" ) // VppAdapter represents a mock VPP adapter that can be used for unit/integration testing instead of the vppapiclient adapter. diff --git a/adapter/vppapiclient/empty_adapter.go b/adapter/vppapiclient/empty_adapter.go index 2701c87..2145efe 100644 --- a/adapter/vppapiclient/empty_adapter.go +++ b/adapter/vppapiclient/empty_adapter.go @@ -22,7 +22,7 @@ package vppapiclient import ( - "gerrit.fd.io/r/govpp/adapter" + "gerrit.fd.io/r/govpp.git/adapter" ) type vppAPIClientAdapter struct{} diff --git a/adapter/vppapiclient/vppapiclient_adapter.go b/adapter/vppapiclient/vppapiclient_adapter.go index 9340f58..82c820e 100644 --- a/adapter/vppapiclient/vppapiclient_adapter.go +++ b/adapter/vppapiclient/vppapiclient_adapter.go @@ -82,7 +82,7 @@ import ( "reflect" "unsafe" - "gerrit.fd.io/r/govpp/adapter" + "gerrit.fd.io/r/govpp.git/adapter" ) // vppAPIClientAdapter is the opaque context of the adapter. diff --git a/api/api_test.go b/api/api_test.go index 15d706d..13aec7f 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -18,14 +18,14 @@ import ( "testing" "time" - "gerrit.fd.io/r/govpp" - "gerrit.fd.io/r/govpp/adapter/mock" - "gerrit.fd.io/r/govpp/api" - "gerrit.fd.io/r/govpp/core" - "gerrit.fd.io/r/govpp/core/bin_api/vpe" - "gerrit.fd.io/r/govpp/examples/bin_api/interfaces" - "gerrit.fd.io/r/govpp/examples/bin_api/memif" - "gerrit.fd.io/r/govpp/examples/bin_api/tap" + "gerrit.fd.io/r/govpp.git" + "gerrit.fd.io/r/govpp.git/adapter/mock" + "gerrit.fd.io/r/govpp.git/api" + "gerrit.fd.io/r/govpp.git/core" + "gerrit.fd.io/r/govpp.git/core/bin_api/vpe" + "gerrit.fd.io/r/govpp.git/examples/bin_api/interfaces" + "gerrit.fd.io/r/govpp.git/examples/bin_api/memif" + "gerrit.fd.io/r/govpp.git/examples/bin_api/tap" . "github.com/onsi/gomega" ) diff --git a/binapi_generator/generator.go b/binapi_generator/generator.go index 0a66b37..537a4d4 100644 --- a/binapi_generator/generator.go +++ b/binapi_generator/generator.go @@ -43,7 +43,7 @@ const ( ) const ( - apiImportPath = "gerrit.fd.io/r/govpp/api" // import path of the govpp API + apiImportPath = "gerrit.fd.io/r/govpp.git/api" // import path of the govpp API inputFileExt = ".json" // filename extension of files that should be processed as the input ) diff --git a/core/bin_api/vpe/vpe.go b/core/bin_api/vpe/vpe.go index e93f808..8ebfae0 100644 --- a/core/bin_api/vpe/vpe.go +++ b/core/bin_api/vpe/vpe.go @@ -2,7 +2,7 @@ // DO NOT EDIT. Generated from '/usr/share/vpp/api/vpe.api.json' on Thu, 27 Apr 2017 11:34:11 CEST. package vpe -import "gerrit.fd.io/r/govpp/api" +import "gerrit.fd.io/r/govpp.git/api" // VlApiVersion contains version of the API. const VlAPIVersion = 0xd3bcc288 diff --git a/core/core.go b/core/core.go index e11a30f..930831d 100644 --- a/core/core.go +++ b/core/core.go @@ -25,9 +25,9 @@ import ( logger "github.com/Sirupsen/logrus" - "gerrit.fd.io/r/govpp/adapter" - "gerrit.fd.io/r/govpp/api" - "gerrit.fd.io/r/govpp/core/bin_api/vpe" + "gerrit.fd.io/r/govpp.git/adapter" + "gerrit.fd.io/r/govpp.git/api" + "gerrit.fd.io/r/govpp.git/core/bin_api/vpe" ) const ( diff --git a/core/core_test.go b/core/core_test.go index c95ef04..9159b13 100644 --- a/core/core_test.go +++ b/core/core_test.go @@ -17,10 +17,10 @@ package core import ( "testing" - "gerrit.fd.io/r/govpp/adapter/mock" - "gerrit.fd.io/r/govpp/api" - "gerrit.fd.io/r/govpp/core/bin_api/vpe" - "gerrit.fd.io/r/govpp/examples/bin_api/interfaces" + "gerrit.fd.io/r/govpp.git/adapter/mock" + "gerrit.fd.io/r/govpp.git/api" + "gerrit.fd.io/r/govpp.git/core/bin_api/vpe" + "gerrit.fd.io/r/govpp.git/examples/bin_api/interfaces" . "github.com/onsi/gomega" ) diff --git a/core/msg_codec.go b/core/msg_codec.go index 1543f3d..95f6170 100644 --- a/core/msg_codec.go +++ b/core/msg_codec.go @@ -23,7 +23,7 @@ import ( logger "github.com/Sirupsen/logrus" "github.com/lunixbochs/struc" - "gerrit.fd.io/r/govpp/api" + "gerrit.fd.io/r/govpp.git/api" ) // MsgCodec provides encoding and decoding functionality of `api.Message` structs into/from diff --git a/core/notifications.go b/core/notifications.go index b44eb1a..c23e610 100644 --- a/core/notifications.go +++ b/core/notifications.go @@ -20,7 +20,7 @@ import ( logger "github.com/Sirupsen/logrus" - "gerrit.fd.io/r/govpp/api" + "gerrit.fd.io/r/govpp.git/api" ) // processNotifSubscribeRequest processes a notification subscribe request. diff --git a/examples/bin_api/acl/acl.go b/examples/bin_api/acl/acl.go index 89b3805..34300fc 100644 --- a/examples/bin_api/acl/acl.go +++ b/examples/bin_api/acl/acl.go @@ -2,7 +2,7 @@ // DO NOT EDIT. Generated from 'bin_api/acl.api.json' on Fri, 21 Apr 2017 17:10:06 CEST. package acl -import "gerrit.fd.io/r/govpp/api" +import "gerrit.fd.io/r/govpp.git/api" // VlApiVersion contains version of the API. const VlAPIVersion = 0x3cd02d84 diff --git a/examples/bin_api/af_packet/af_packet.go b/examples/bin_api/af_packet/af_packet.go index 4b89e76..a00b060 100644 --- a/examples/bin_api/af_packet/af_packet.go +++ b/examples/bin_api/af_packet/af_packet.go @@ -2,7 +2,7 @@ // DO NOT EDIT. Generated from 'bin_api/af_packet.api.json' on Fri, 21 Apr 2017 17:10:06 CEST. package af_packet -import "gerrit.fd.io/r/govpp/api" +import "gerrit.fd.io/r/govpp.git/api" // VlApiVersion contains version of the API. const VlAPIVersion = 0x4ca71f33 diff --git a/examples/bin_api/interfaces/interfaces.go b/examples/bin_api/interfaces/interfaces.go index b0424f0..e452ceb 100644 --- a/examples/bin_api/interfaces/interfaces.go +++ b/examples/bin_api/interfaces/interfaces.go @@ -2,7 +2,7 @@ // DO NOT EDIT. Generated from 'bin_api/interface.api.json' on Fri, 21 Apr 2017 17:10:06 CEST. package interfaces -import "gerrit.fd.io/r/govpp/api" +import "gerrit.fd.io/r/govpp.git/api" // VlApiVersion contains version of the API. const VlAPIVersion = 0x6857f668 diff --git a/examples/bin_api/ip/ip.go b/examples/bin_api/ip/ip.go index 7c2a80c..4d0d27a 100644 --- a/examples/bin_api/ip/ip.go +++ b/examples/bin_api/ip/ip.go @@ -2,7 +2,7 @@ // DO NOT EDIT. Generated from 'bin_api/ip.api.json' on Fri, 21 Apr 2017 17:10:06 CEST. package ip -import "gerrit.fd.io/r/govpp/api" +import "gerrit.fd.io/r/govpp.git/api" // VlApiVersion contains version of the API. const VlAPIVersion = 0x6a819870 diff --git a/examples/bin_api/memif/memif.go b/examples/bin_api/memif/memif.go index 2800edc..703e852 100644 --- a/examples/bin_api/memif/memif.go +++ b/examples/bin_api/memif/memif.go @@ -2,7 +2,7 @@ // DO NOT EDIT. Generated from 'bin_api/memif.api.json' on Fri, 21 Apr 2017 17:10:06 CEST. package memif -import "gerrit.fd.io/r/govpp/api" +import "gerrit.fd.io/r/govpp.git/api" // VlApiVersion contains version of the API. const VlAPIVersion = 0xadb63e82 diff --git a/examples/bin_api/tap/tap.go b/examples/bin_api/tap/tap.go index 4d892ac..778db91 100644 --- a/examples/bin_api/tap/tap.go +++ b/examples/bin_api/tap/tap.go @@ -2,7 +2,7 @@ // DO NOT EDIT. Generated from 'bin_api/tap.api.json' on Fri, 21 Apr 2017 17:10:06 CEST. package tap -import "gerrit.fd.io/r/govpp/api" +import "gerrit.fd.io/r/govpp.git/api" // VlApiVersion contains version of the API. const VlAPIVersion = 0x1aedb9f2 diff --git a/examples/bin_api/uflow/uflow.go b/examples/bin_api/uflow/uflow.go index ecf1674..7e5f50e 100644 --- a/examples/bin_api/uflow/uflow.go +++ b/examples/bin_api/uflow/uflow.go @@ -2,7 +2,7 @@ // DO NOT EDIT. Generated from 'bin_api/uflow.api.json' on Fri, 21 Apr 2017 17:10:06 CEST. package uflow -import "gerrit.fd.io/r/govpp/api" +import "gerrit.fd.io/r/govpp.git/api" // VlApiVersion contains version of the API. const VlAPIVersion = 0x85909300 diff --git a/examples/example_client.go b/examples/example_client.go index fd858ee..3004780 100644 --- a/examples/example_client.go +++ b/examples/example_client.go @@ -24,13 +24,13 @@ import ( "os" "os/signal" - "gerrit.fd.io/r/govpp" - "gerrit.fd.io/r/govpp/api" - "gerrit.fd.io/r/govpp/api/ifcounters" - "gerrit.fd.io/r/govpp/core/bin_api/vpe" - "gerrit.fd.io/r/govpp/examples/bin_api/acl" - "gerrit.fd.io/r/govpp/examples/bin_api/interfaces" - "gerrit.fd.io/r/govpp/examples/bin_api/tap" + "gerrit.fd.io/r/govpp.git" + "gerrit.fd.io/r/govpp.git/api" + "gerrit.fd.io/r/govpp.git/api/ifcounters" + "gerrit.fd.io/r/govpp.git/core/bin_api/vpe" + "gerrit.fd.io/r/govpp.git/examples/bin_api/acl" + "gerrit.fd.io/r/govpp.git/examples/bin_api/interfaces" + "gerrit.fd.io/r/govpp.git/examples/bin_api/tap" ) func main() { diff --git a/examples/examples b/examples/examples index 30dde52..b02014f 100755 Binary files a/examples/examples and b/examples/examples differ diff --git a/glide.yaml b/glide.yaml index 73c4a3f..d79102f 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: gerrit.fd.io/r/govpp +package: gerrit.fd.io/r/govpp.git import: - package: github.com/Sirupsen/logrus version: v0.11.5 diff --git a/govpp.go b/govpp.go index f0ced41..82ee5f8 100644 --- a/govpp.go +++ b/govpp.go @@ -15,9 +15,9 @@ package govpp import ( - "gerrit.fd.io/r/govpp/adapter" - "gerrit.fd.io/r/govpp/adapter/vppapiclient" - "gerrit.fd.io/r/govpp/core" + "gerrit.fd.io/r/govpp.git/adapter" + "gerrit.fd.io/r/govpp.git/adapter/vppapiclient" + "gerrit.fd.io/r/govpp.git/core" ) var vppAdapter adapter.VppAdapter // VPP Adapter that will be used in the subsequent Connect calls -- cgit 1.2.3-korg