gobgp: merge cmd package into main

Make everything private.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

13 files changed, 14 insertions, 17 deletions

diff --git a/cmd/gobgp/cmd/bmp.go b/cmd/gobgp/bmp.go
index 8a58bbc5..1fbc0ae2 100644
--- a/cmd/gobgp/cmd/bmp.go
+++ b/cmd/gobgp/bmp.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"fmt"
diff --git a/cmd/gobgp/cmd/common.go b/cmd/gobgp/common.go
index eaa09dbe..b7a04f4b 100644
--- a/cmd/gobgp/cmd/common.go
+++ b/cmd/gobgp/common.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"bytes"
@@ -93,8 +93,6 @@ var neighborsOpts struct {
 }
 
 var mrtOpts struct {
-	OutputDir   string
-	FileFormat  string
 	Filename    string `long:"filename" description:"MRT file name"`
 	RecordCount int64  `long:"count" description:"Number of records to inject"`
 	RecordSkip  int64  `long:"skip" description:"Number of records to skip before injecting"`
diff --git a/cmd/gobgp/cmd/common_test.go b/cmd/gobgp/common_test.go
index 8a2ae0dc..c53e75e8 100644
--- a/cmd/gobgp/cmd/common_test.go
+++ b/cmd/gobgp/common_test.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"strings"
diff --git a/cmd/gobgp/cmd/global.go b/cmd/gobgp/global.go
index 43b8593b..76a87e99 100644
--- a/cmd/gobgp/cmd/global.go
+++ b/cmd/gobgp/global.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"encoding/json"
diff --git a/cmd/gobgp/cmd/global_test.go b/cmd/gobgp/global_test.go
index 468fdc69..8aacdc54 100644
--- a/cmd/gobgp/cmd/global_test.go
+++ b/cmd/gobgp/global_test.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"strings"
diff --git a/cmd/gobgp/main.go b/cmd/gobgp/main.go
index b3ae82f6..41f95ab2 100644
--- a/cmd/gobgp/main.go
+++ b/cmd/gobgp/main.go
@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/osrg/gobgp/cmd/gobgp/cmd"
 	"google.golang.org/grpc"
 )
 
@@ -31,5 +30,5 @@ func main() {
 		os.Exit(0)
 	}
 	grpc.EnableTracing = false
-	cmd.NewRootCmd().Execute()
+	newRootCmd().Execute()
 }
diff --git a/cmd/gobgp/cmd/monitor.go b/cmd/gobgp/monitor.go
index ebcd2c41..80bd2b8c 100644
--- a/cmd/gobgp/cmd/monitor.go
+++ b/cmd/gobgp/monitor.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"encoding/json"
diff --git a/cmd/gobgp/cmd/mrt.go b/cmd/gobgp/mrt.go
index 434741ea..ecae7bd0 100644
--- a/cmd/gobgp/cmd/mrt.go
+++ b/cmd/gobgp/mrt.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"fmt"
diff --git a/cmd/gobgp/cmd/neighbor.go b/cmd/gobgp/neighbor.go
index a4d878d6..d0499950 100644
--- a/cmd/gobgp/cmd/neighbor.go
+++ b/cmd/gobgp/neighbor.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"bytes"
diff --git a/cmd/gobgp/cmd/policy.go b/cmd/gobgp/policy.go
index 4f21dffa..03139c7b 100644
--- a/cmd/gobgp/cmd/policy.go
+++ b/cmd/gobgp/policy.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"bytes"
diff --git a/cmd/gobgp/cmd/root.go b/cmd/gobgp/root.go
index 3ff5e338..b8cfef1e 100644
--- a/cmd/gobgp/cmd/root.go
+++ b/cmd/gobgp/root.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"context"
@@ -42,7 +42,7 @@ var globalOpts struct {
 var client api.GobgpApiClient
 var ctx context.Context
 
-func NewRootCmd() *cobra.Command {
+func newRootCmd() *cobra.Command {
 	cobra.EnablePrefixMatching = true
 	var cancel context.CancelFunc
 	rootCmd := &cobra.Command{
diff --git a/cmd/gobgp/cmd/rpki.go b/cmd/gobgp/rpki.go
index 1f623f32..a2caf72a 100644
--- a/cmd/gobgp/cmd/rpki.go
+++ b/cmd/gobgp/rpki.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"fmt"
diff --git a/cmd/gobgp/cmd/vrf.go b/cmd/gobgp/vrf.go
index 8fd25d45..69ec571e 100644
--- a/cmd/gobgp/cmd/vrf.go
+++ b/cmd/gobgp/vrf.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package main
 
 import (
 	"encoding/json"