follow Standard Go Project Layout

https://github.com/golang-standards/project-layout Now you can see clearly what are private and public library code. Signed-off-by: FUJITA Tomonori <[email protected]>
osrg · Jul 7, 2018 · c4775c4 · c4775c4
1 parent b307975
commit c4775c4
Show file tree

Hide file tree

Showing 111 changed files with 153 additions and 154 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,8 +3,8 @@
 *.a
 *.so
 *.pyc
-gobgp/gobgp
-gobgpd/gobgpd
+cmd/gobgp/gobgp
+cmd/gobgpd/gobgpd
 
 # Folders
 _obj

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -2,7 +2,7 @@
 # .goreleaser.yml
 # Build customization
 builds:
-  - main: ./gobgp/
+  - main: ./cmd/gobgp/
     binary: gobgp
     goos:
       - linux
@@ -12,7 +12,7 @@ builds:
       - arm
       - arm64
 
-  - main: ./gobgpd/
+  - main: ./cmd/gobgpd/
     binary: gobgpd
     goos:
       - linux

diff --git a/.travis.yml b/.travis.yml
@@ -9,13 +9,13 @@ _unittest: &_unittest
   <<: *_dep_ensure
   script:
     - go test $(go list ./... | grep -v '/vendor/') -timeout 120s
-    - if [ "$(go env GOARCH)" = "amd64" ]; then go test -race github.com/osrg/gobgp/packet/bgp -run ^Test_RaceCondition$; else echo 'skip'; fi
+    - if [ "$(go env GOARCH)" = "amd64" ]; then go test -race github.com/osrg/gobgp/pkg/packet/bgp -run ^Test_RaceCondition$; else echo 'skip'; fi
 
 _build: &_build
   <<: *_dep_ensure
   script:
-    - go build -o ./gobgp/gobgp   ./gobgp/
-    - go build -o ./gobgpd/gobgpd ./gobgpd/
+    - go build -o ./cmd/gobgp/gobgp   ./cmd/gobgp/
+    - go build -o ./cmd/gobgpd/gobgpd ./cmd/gobgpd/
 
 _node_js: &_node_js
   language: node_js
@@ -114,10 +114,10 @@ matrix:
         - test -z "$(go fmt $(go list ./... | grep -v '/vendor/'))"
         - test -z "$(go vet $(go list ./... | grep -v '/vendor/'))"
         - megacheck $(go list ./... | grep -v '/vendor/')
-    - <<: *_dep_ensure
-      env:
-        - DESCRIPTION="build_embeded_go.py"
-      script: python test/scenario_test/ci-scripts/build_embeded_go.py docs/sources/lib.md
+#    - <<: *_dep_ensure
+#      env:
+#        - DESCRIPTION="build_embeded_go.py"
+#      script: python test/scenario_test/ci-scripts/build_embeded_go.py docs/sources/lib.md
 #
 # Docker
 #

diff --git a/api/attribute.go b/api/attribute.go
@@ -22,9 +22,8 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 	log "github.com/sirupsen/logrus"
-
-	"github.com/osrg/gobgp/packet/bgp"
 )
 
 func NewOriginAttributeFromNative(a *bgp.PathAttributeOrigin) *OriginAttribute {

diff --git a/api/attribute_test.go b/api/attribute_test.go
@@ -19,10 +19,9 @@ import (
 	"net"
 	"testing"
 
-	"github.com/osrg/gobgp/packet/bgp"
-
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/api/capability.go b/api/capability.go
@@ -21,8 +21,7 @@ import (
 	proto "github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
-
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 )
 
 func NewMultiProtocolCapability(a *bgp.CapMultiProtocol) *MultiProtocolCapability {

diff --git a/api/capability_test.go b/api/capability_test.go
@@ -18,9 +18,8 @@ package gobgpapi
 import (
 	"testing"
 
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 	"github.com/stretchr/testify/assert"
-
-	"github.com/osrg/gobgp/packet/bgp"
 )
 
 func Test_MultiProtocolCapability(t *testing.T) {

diff --git a/api/util.go b/api/util.go
@@ -20,7 +20,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 )
 
 func getNLRI(family bgp.RouteFamily, buf []byte) (bgp.AddrPrefixInterface, error) {

diff --git a/gobgp/cmd/bmp.go → cmd/gobgp/cmd/bmp.go b/gobgp/cmd/bmp.go → cmd/gobgp/cmd/bmp.go
@@ -20,10 +20,9 @@ import (
 	"net"
 	"strconv"
 
+	"github.com/osrg/gobgp/internal/pkg/config"
+	"github.com/osrg/gobgp/pkg/packet/bmp"
 	"github.com/spf13/cobra"
-
-	"github.com/osrg/gobgp/config"
-	"github.com/osrg/gobgp/packet/bmp"
 )
 
 func modBmpServer(cmdType string, args []string) error {

diff --git a/gobgp/cmd/common.go → cmd/gobgp/cmd/common.go b/gobgp/cmd/common.go → cmd/gobgp/cmd/common.go
@@ -30,9 +30,9 @@ import (
 	"google.golang.org/grpc/credentials"
 
 	api "github.com/osrg/gobgp/api"
-	cli "github.com/osrg/gobgp/client"
-	"github.com/osrg/gobgp/config"
-	"github.com/osrg/gobgp/packet/bgp"
+	cli "github.com/osrg/gobgp/internal/pkg/client"
+	"github.com/osrg/gobgp/internal/pkg/config"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 )
 
 const (

diff --git a/gobgp/cmd/common_test.go → cmd/gobgp/cmd/common_test.go b/gobgp/cmd/common_test.go → cmd/gobgp/cmd/common_test.go
diff --git a/gobgp/cmd/global.go → cmd/gobgp/cmd/global.go b/gobgp/cmd/global.go → cmd/gobgp/cmd/global.go
@@ -28,9 +28,10 @@ import (
 	"github.com/spf13/cobra"
 
 	api "github.com/osrg/gobgp/api"
-	"github.com/osrg/gobgp/config"
-	"github.com/osrg/gobgp/packet/bgp"
-	"github.com/osrg/gobgp/table"
+	"github.com/osrg/gobgp/internal/pkg/config"
+	"github.com/osrg/gobgp/internal/pkg/table"
+
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 )
 
 type ExtCommType int

diff --git a/gobgp/cmd/global_test.go → cmd/gobgp/cmd/global_test.go b/gobgp/cmd/global_test.go → cmd/gobgp/cmd/global_test.go
@@ -19,9 +19,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 	"github.com/stretchr/testify/assert"
-
-	"github.com/osrg/gobgp/packet/bgp"
 )
 
 func Test_ParsePath(t *testing.T) {

diff --git a/gobgp/cmd/monitor.go → cmd/gobgp/cmd/monitor.go b/gobgp/cmd/monitor.go → cmd/gobgp/cmd/monitor.go
@@ -24,7 +24,7 @@ import (
 	"github.com/spf13/cobra"
 
 	api "github.com/osrg/gobgp/api"
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 )
 
 func makeMonitorRouteArgs(p *api.Path, showIdentifier bgp.BGPAddPathMode) []interface{} {

diff --git a/gobgp/cmd/mrt.go → cmd/gobgp/cmd/mrt.go b/gobgp/cmd/mrt.go → cmd/gobgp/cmd/mrt.go
@@ -25,8 +25,8 @@ import (
 	"github.com/spf13/cobra"
 
 	api "github.com/osrg/gobgp/api"
-	"github.com/osrg/gobgp/packet/bgp"
-	"github.com/osrg/gobgp/packet/mrt"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/mrt"
 )
 
 func injectMrt() error {

diff --git a/gobgp/cmd/neighbor.go → cmd/gobgp/cmd/neighbor.go b/gobgp/cmd/neighbor.go → cmd/gobgp/cmd/neighbor.go
@@ -27,10 +27,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/osrg/gobgp/config"
-	"github.com/osrg/gobgp/packet/bgp"
-
 	api "github.com/osrg/gobgp/api"
+	"github.com/osrg/gobgp/internal/pkg/config"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 )
 
 // used in showRoute() to determine the width of each column

diff --git a/gobgp/cmd/policy.go → cmd/gobgp/cmd/policy.go b/gobgp/cmd/policy.go → cmd/gobgp/cmd/policy.go
@@ -27,8 +27,8 @@ import (
 	"github.com/spf13/cobra"
 
 	api "github.com/osrg/gobgp/api"
-	"github.com/osrg/gobgp/config"
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/internal/pkg/config"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 )
 
 var (

diff --git a/gobgp/cmd/root.go → cmd/gobgp/cmd/root.go b/gobgp/cmd/root.go → cmd/gobgp/cmd/root.go
@@ -20,7 +20,7 @@ import (
 	"net/http"
 	_ "net/http/pprof"
 
-	cli "github.com/osrg/gobgp/client"
+	cli "github.com/osrg/gobgp/internal/pkg/client"
 	"github.com/spf13/cobra"
 )
 

diff --git a/gobgp/cmd/rpki.go → cmd/gobgp/cmd/rpki.go b/gobgp/cmd/rpki.go → cmd/gobgp/cmd/rpki.go
@@ -20,7 +20,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 	"github.com/spf13/cobra"
 )
 

diff --git a/gobgp/cmd/rpki_test.go → cmd/gobgp/cmd/rpki_test.go b/gobgp/cmd/rpki_test.go → cmd/gobgp/cmd/rpki_test.go
@@ -19,10 +19,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/osrg/gobgp/internal/pkg/config"
+	"github.com/osrg/gobgp/pkg/server"
 	"github.com/stretchr/testify/assert"
-
-	"github.com/osrg/gobgp/config"
-	"github.com/osrg/gobgp/server"
 )
 
 func TestShowRPKITable(test *testing.T) {

diff --git a/gobgp/cmd/vrf.go → cmd/gobgp/cmd/vrf.go b/gobgp/cmd/vrf.go → cmd/gobgp/cmd/vrf.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	api "github.com/osrg/gobgp/api"
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 
 	"github.com/golang/protobuf/ptypes/any"
 	"github.com/spf13/cobra"

diff --git a/gobgp/lib/lib.go → cmd/gobgp/lib/lib.go b/gobgp/lib/lib.go → cmd/gobgp/lib/lib.go
diff --git a/gobgp/lib/path.go → cmd/gobgp/lib/path.go b/gobgp/lib/path.go → cmd/gobgp/lib/path.go
@@ -36,8 +36,8 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/osrg/gobgp/gobgp/cmd"
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/cmd/gobgp/cmd"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 )
 
 //export get_route_family

diff --git a/gobgp/main.go → cmd/gobgp/main.go b/gobgp/main.go → cmd/gobgp/main.go
@@ -17,9 +17,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/osrg/gobgp/gobgp/cmd"
-	"google.golang.org/grpc"
 	"os"
+
+	"github.com/osrg/gobgp/cmd/gobgp/cmd"
+	"google.golang.org/grpc"
 )
 
 var version = "master"

diff --git a/gobgpd/main.go → cmd/gobgpd/main.go b/gobgpd/main.go → cmd/gobgpd/main.go
@@ -35,10 +35,10 @@ import (
 	"google.golang.org/grpc/credentials"
 
 	api "github.com/osrg/gobgp/api"
-	"github.com/osrg/gobgp/config"
-	"github.com/osrg/gobgp/packet/bgp"
-	"github.com/osrg/gobgp/server"
-	"github.com/osrg/gobgp/table"
+	"github.com/osrg/gobgp/internal/pkg/config"
+	"github.com/osrg/gobgp/internal/pkg/table"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
+	"github.com/osrg/gobgp/pkg/server"
 )
 
 var version = "master"

diff --git a/gobgpd/util.go → cmd/gobgpd/util.go b/gobgpd/util.go → cmd/gobgpd/util.go
diff --git a/gobgpd/util_windows.go → cmd/gobgpd/util_windows.go b/gobgpd/util_windows.go → cmd/gobgpd/util_windows.go
diff --git a/client/client.go → internal/pkg/client/client.go b/client/client.go → internal/pkg/client/client.go
@@ -27,9 +27,9 @@ import (
 	"google.golang.org/grpc"
 
 	api "github.com/osrg/gobgp/api"
-	"github.com/osrg/gobgp/config"
-	"github.com/osrg/gobgp/packet/bgp"
-	"github.com/osrg/gobgp/server"
+	"github.com/osrg/gobgp/internal/pkg/config"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
+	"github.com/osrg/gobgp/pkg/server"
 )
 
 type Client struct {

diff --git a/client/client_test.go → internal/pkg/client/client_test.go b/client/client_test.go → internal/pkg/client/client_test.go
@@ -19,8 +19,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/osrg/gobgp/config"
-	"github.com/osrg/gobgp/server"
+	"github.com/osrg/gobgp/internal/pkg/config"
+	"github.com/osrg/gobgp/pkg/server"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/config/bgp_configs.go → internal/pkg/config/bgp_configs.go b/config/bgp_configs.go → internal/pkg/config/bgp_configs.go
@@ -21,7 +21,7 @@ package config
 import (
 	"fmt"
 
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 )
 
 func mapkey(index int, name string) string {

diff --git a/config/bgp_configs_test.go → internal/pkg/config/bgp_configs_test.go b/config/bgp_configs_test.go → internal/pkg/config/bgp_configs_test.go
@@ -97,7 +97,7 @@ func TestConfigExample(t *testing.T) {
 	assert := assert.New(t)
 
 	_, f, _, _ := runtime.Caller(0)
-	fileMd := path.Join(path.Dir(f), "../docs/sources/configuration.md")
+	fileMd := path.Join(path.Dir(f), "../../../docs/sources/configuration.md")
 	fileToml := "/tmp/gobgpd.example.toml"
 	assert.NoError(extractTomlFromMarkdown(fileMd, fileToml))
 	defer os.Remove(fileToml)

diff --git a/config/default.go → internal/pkg/config/default.go b/config/default.go → internal/pkg/config/default.go
@@ -8,11 +8,10 @@ import (
 	"reflect"
 	"strconv"
 
+	"github.com/osrg/gobgp/pkg/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/bmp"
+	"github.com/osrg/gobgp/pkg/packet/rtr"
 	"github.com/spf13/viper"
-
-	"github.com/osrg/gobgp/packet/bgp"
-	"github.com/osrg/gobgp/packet/bmp"
-	"github.com/osrg/gobgp/packet/rtr"
 )
 
 const (

diff --git a/config/default_linux.go → internal/pkg/config/default_linux.go b/config/default_linux.go → internal/pkg/config/default_linux.go
diff --git a/config/default_nonlinux.go → internal/pkg/config/default_nonlinux.go b/config/default_nonlinux.go → internal/pkg/config/default_nonlinux.go
diff --git a/config/serve.go → internal/pkg/config/serve.go b/config/serve.go → internal/pkg/config/serve.go
diff --git a/config/util.go → internal/pkg/config/util.go b/config/util.go → internal/pkg/config/util.go
@@ -22,7 +22,7 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 )
 
 // Returns config file type by retrieving extension from the given path.

diff --git a/config/util_test.go → internal/pkg/config/util_test.go b/config/util_test.go → internal/pkg/config/util_test.go
diff --git a/table/adj.go → internal/pkg/table/adj.go b/table/adj.go → internal/pkg/table/adj.go
@@ -18,7 +18,7 @@ package table
 import (
 	"fmt"
 
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 )
 
 type AdjRib struct {

diff --git a/table/adj_test.go → internal/pkg/table/adj_test.go b/table/adj_test.go → internal/pkg/table/adj_test.go
@@ -19,7 +19,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
+
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/table/destination.go → internal/pkg/table/destination.go b/table/destination.go → internal/pkg/table/destination.go
@@ -23,10 +23,10 @@ import (
 	"net"
 	"sort"
 
-	log "github.com/sirupsen/logrus"
+	"github.com/osrg/gobgp/internal/pkg/config"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
 
-	"github.com/osrg/gobgp/config"
-	"github.com/osrg/gobgp/packet/bgp"
+	log "github.com/sirupsen/logrus"
 )
 
 var SelectionOptions config.RouteSelectionOptionsConfig

diff --git a/table/destination_test.go → internal/pkg/table/destination_test.go b/table/destination_test.go → internal/pkg/table/destination_test.go
@@ -22,7 +22,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/osrg/gobgp/packet/bgp"
+	"github.com/osrg/gobgp/pkg/packet/bgp"
+
 	"github.com/stretchr/testify/assert"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ import ( @@
     	"net"
     	"time"
-    	"github.com/osrg/gobgp/packet/bgp"
+    	"github.com/osrg/gobgp/pkg/packet/bgp"
     )
     func getNLRI(family bgp.RouteFamily, buf []byte) (bgp.AddrPrefixInterface, error) {
@@ Expand Down @@