change directory structure

tinynetwork · Dec 29, 2019 · 482300a · 482300a
1 parent 70c2f96
commit 482300a
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 14 deletions.
diff --git a/cmd/build.go b/cmd/build.go
@@ -4,7 +4,7 @@ package cmd
 import (
 	"log"
 
-	"github.com/ak1ra24/tn/shell"
+	"github.com/ak1ra24/tn/internal/pkg/shell"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/conf.go b/cmd/conf.go
@@ -4,7 +4,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/ak1ra24/tn/shell"
+	"github.com/ak1ra24/tn/internal/pkg/shell"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/down.go b/cmd/down.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ak1ra24/tn/shell"
+	"github.com/ak1ra24/tn/internal/pkg/shell"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/ps.go b/cmd/ps.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/ak1ra24/tn/shell"
+	"github.com/ak1ra24/tn/internal/pkg/shell"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/pull.go b/cmd/pull.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ak1ra24/tn/shell"
+	"github.com/ak1ra24/tn/internal/pkg/shell"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/reconf.go b/cmd/reconf.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/ak1ra24/tn/shell"
+	"github.com/ak1ra24/tn/internal/pkg/shell"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/reup.go b/cmd/reup.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/ak1ra24/tn/shell"
+	"github.com/ak1ra24/tn/internal/pkg/shell"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/ak1ra24/tn/shell"
-	"github.com/ak1ra24/tn/utils"
+	"github.com/ak1ra24/tn/internal/pkg/shell"
+	"github.com/ak1ra24/tn/internal/pkg/utils"
 	"github.com/spf13/cobra"
 
 	"github.com/spf13/viper"

diff --git a/cmd/test.go b/cmd/test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ak1ra24/tn/shell"
+	"github.com/ak1ra24/tn/internal/pkg/shell"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/up.go b/cmd/up.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/ak1ra24/tn/shell"
+	"github.com/ak1ra24/tn/internal/pkg/shell"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/upconf.go b/cmd/upconf.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/ak1ra24/tn/shell"
+	"github.com/ak1ra24/tn/internal/pkg/shell"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/version.go b/cmd/version.go
@@ -12,7 +12,8 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "show the tinet version",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("Tinet version 0.0.1")
+		version := "v0.0.0"
+		fmt.Printf("Tinet version %s\n", version)
 	},
 }
 

diff --git a/configs/spec_template.yaml b/configs/spec_template.yaml
@@ -0,0 +1,38 @@
+precmd:
+- cmds:
+  - cmd: ""
+preinit:
+- cmds:
+  - cmd: ""
+postinit:
+- cmds:
+  - cmd: ""
+postfini:
+- cmds:
+  - cmd: ""
+nodes:
+- name: ""
+  type: ""
+  net_base: ""
+  image: ""
+  interfaces:
+  - name: ""
+    type: ""
+    args: ""
+    addr: ""
+  sysctls: []
+switches:
+- name: ""
+  interfaces:
+  - name: ""
+    type: ""
+    args: ""
+    addr: ""
+node_configs:
+- name: ""
+  cmds:
+  - cmd: ""
+test:
+- name: ""
+  cmds:
+  - cmd: ""
diff --git a/shell/shell.go → internal/pkg/shell/shell.go b/shell/shell.go → internal/pkg/shell/shell.go
@@ -7,7 +7,7 @@ import (
 
 	l "github.com/sirupsen/logrus"
 
-	"github.com/ak1ra24/tn/utils"
+	"github.com/ak1ra24/tn/internal/pkg/utils"
 	"gopkg.in/yaml.v2"
 )
 

diff --git a/shell/shell_test.go → internal/pkg/shell/shell_test.go b/shell/shell_test.go → internal/pkg/shell/shell_test.go
diff --git a/utils/utils.go → internal/pkg/utils/utils.go b/utils/utils.go → internal/pkg/utils/utils.go
diff --git a/utils/utils_test.go → internal/pkg/utils/utils_test.go b/utils/utils_test.go → internal/pkg/utils/utils_test.go