Merge pull request #16 from slankdev/work

pkg/vtyang: change -y <string> to -y <stringArray>
slankdev · May 3, 2024 · 1ad08fd · 1ad08fd
2 parents 37e38cc + 361cd1e
commit 1ad08fd
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/pkg/vtyang/agent.go b/pkg/vtyang/agent.go
@@ -14,7 +14,7 @@ type AgentOptsBackendMgmtd struct {
 
 type AgentOpts struct {
 	RuntimePath string
-	YangPath    string
+	YangPath    []string
 	LogFile     string
 	// BackendMgmtd
 	BackendMgmtd *AgentOptsBackendMgmtd

diff --git a/pkg/vtyang/agent_test.go b/pkg/vtyang/agent_test.go
@@ -447,7 +447,7 @@ func TestFilterDbWithModule(t *testing.T) {
 	// Initializing Agent
 	if err := InitAgent(AgentOpts{
 		RuntimePath: GlobalOptRunFilePath,
-		YangPath:    "./testdata/yang/frr_isisd_minimal",
+		YangPath:    []string{"./testdata/yang/frr_isisd_minimal"},
 		LogFile:     "/tmp/testlog.log",
 	}); err != nil {
 		t.Fatal(err)

diff --git a/pkg/vtyang/cobra.go b/pkg/vtyang/cobra.go
@@ -19,7 +19,7 @@ var (
 	GlobalOptEnableGrpc  bool
 	GlobalOptLogFile     string
 	GlobalOptRunFilePath string
-	GlobalOptYangPath    string
+	GlobalOptYangPath    []string
 	GlobalOptDumpCliTree string
 	GlobalOptCommands    []string
 	GlobalOptMgmtdSock   string
@@ -115,7 +115,7 @@ func NewCommand() *cobra.Command {
 	fs.BoolVar(&GlobalOptEnableGrpc, "grpc", false, "Enable gRPC server")
 	fs.StringVarP(&GlobalOptLogFile, "logfile", "l", "/tmp/vtyang.log", "Log file")
 	fs.StringVarP(&GlobalOptRunFilePath, "run", "r", "", "Runtime file path")
-	fs.StringVarP(&GlobalOptYangPath, "yang", "y", "", "Yang file path")
+	fs.StringArrayVarP(&GlobalOptYangPath, "yang", "y", []string{}, "Yang file path")
 	fs.StringArrayVarP(&GlobalOptCommands, "command", "c", []string{}, "")
 	fs.StringVar(&GlobalOptMgmtdSock, "mgmtd-sock", "", "/var/run/frr/mgmtd_fe.sock")
 

diff --git a/pkg/vtyang/commands.go b/pkg/vtyang/commands.go
@@ -855,27 +855,27 @@ func dumpCompletionTreeJson(root *CompletionNode) string {
 	return string(out)
 }
 
-func yangModulesPath(path string) (*yang.Modules, error) {
-	files, err := os.ReadDir(path)
-	if err != nil {
-		return nil, err
-	}
-
+func yangModulesPath(paths []string) (*yang.Modules, error) {
 	modules := yang.NewModules()
-	for _, file := range files {
-		if file.IsDir() {
-			continue
-		}
-		if !strings.HasSuffix(file.Name(), ".yang") {
-			continue
-		}
-		fullname := fmt.Sprintf("%s/%s", path, file.Name())
-		log.Printf("loading yang module '%s'\n", fullname)
-		if err := modules.Read(fullname); err != nil {
+	for _, path := range paths {
+		files, err := os.ReadDir(path)
+		if err != nil {
 			return nil, err
 		}
+		for _, file := range files {
+			if file.IsDir() {
+				continue
+			}
+			if !strings.HasSuffix(file.Name(), ".yang") {
+				continue
+			}
+			fullname := fmt.Sprintf("%s/%s", path, file.Name())
+			log.Printf("loading yang module '%s'\n", fullname)
+			if err := modules.Read(fullname); err != nil {
+				return nil, err
+			}
+		}
 	}
-
 	errs := modules.Process()
 	if len(errs) > 0 {
 		for _, err := range errs {

diff --git a/pkg/vtyang/common_test.go b/pkg/vtyang/common_test.go
@@ -50,7 +50,7 @@ func executeTestCase(t *testing.T, tc *TestCase) {
 	// Initializing Agent
 	if err := InitAgent(AgentOpts{
 		RuntimePath: tc.RuntimePath,
-		YangPath:    tc.YangPath,
+		YangPath:    []string{tc.YangPath},
 		LogFile:     tc.LogFile,
 	}); err != nil {
 		t.Fatal(err)

diff --git a/pkg/vtyang/database_test.go b/pkg/vtyang/database_test.go
@@ -80,7 +80,7 @@ func TestDBNodeGet(t *testing.T) {
 	dbm.LoadDatabaseFromData(&testDummyDBRoot)
 
 	var err error
-	yangmodules, err = yangModulesPath("./testdata/yang/accounting")
+	yangmodules, err = yangModulesPath([]string{"./testdata/yang/accounting"})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -114,7 +114,7 @@ func TestDBNodeCreate(t *testing.T) {
 	dbm.LoadDatabaseFromData(&testDummyDBRoot)
 
 	var err error
-	yangmodules, err = yangModulesPath("./testdata/yang/accounting")
+	yangmodules, err = yangModulesPath([]string{"./testdata/yang/accounting"})
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/pkg/vtyang/xpath_test.go b/pkg/vtyang/xpath_test.go
@@ -168,7 +168,7 @@ var xpathTestDBRoot = DBNode{
 
 func TestXPathParseCli(t *testing.T) {
 	var err error
-	yangmodules, err = yangModulesPath("./testdata/yang/accounting")
+	yangmodules, err = yangModulesPath([]string{"./testdata/yang/accounting"})
 	if err != nil {
 		t.Fatal(err)
 	}