2024.05.05-16:09

slankdev · May 5, 2024 · b294f37 · b294f37
1 parent 6780999
commit b294f37
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 1 deletion.
diff --git a/pkg/vtyang/agent_test.go b/pkg/vtyang/agent_test.go
@@ -143,6 +143,7 @@ func TestBasicEvalCli01(t *testing.T) {
 			"eval-cli values items item2",
 			"eval-cli values items item2 hoge",
 			"eval-cli values items item2 hoge fuga",
+			"eval-cli values items item2 hoge fuga des",
 		},
 	})
 }

diff --git a/pkg/vtyang/commands.go b/pkg/vtyang/commands.go
@@ -146,17 +146,19 @@ func installCommandsDefault(mode CliMode) {
 	})
 
 	installCommandNoCompletion(mode, "eval-cli", func(args []string) {
-		xpath, val, err := ParseXPathArgs2(dbm, args[1:], true)
+		xpath, val, tail, err := ParseXPathCli(dbm, args[1:], []string{}, true)
 		if err != nil {
 			fmt.Fprintf(stdout, "Error: %s\n", err.Error())
 			return
 		}
 		out, err := json.MarshalIndent(struct {
 			XPath XPath
 			Value *DBValue `json:",omitempty"`
+			Tail  []string `json:",omitempty"`
 		}{
 			XPath: xpath,
 			Value: val,
+			Tail:  tail,
 		}, "", "  ")
 		if err != nil {
 			fmt.Fprintf(stdout, "Error: %s\n", err.Error())

diff --git a/pkg/vtyang/testdata/output/TestBasicEvalCli01.txt b/pkg/vtyang/testdata/output/TestBasicEvalCli01.txt
@@ -166,3 +166,62 @@
     ]
   }
 }
+{
+  "XPath": {
+    "Words": [
+      {
+        "Module": "main",
+        "Word": "values",
+        "Keys": null,
+        "Dbtype": "container",
+        "Dbvaluetype": 0
+      },
+      {
+        "Module": "main",
+        "Word": "items",
+        "Keys": null,
+        "Dbtype": "container",
+        "Dbvaluetype": 0
+      },
+      {
+        "Module": "main",
+        "Word": "item2",
+        "Keys": {
+          "name": {
+            "Type": 18,
+            "Int8": 0,
+            "Int16": 0,
+            "Int32": 0,
+            "Int64": 0,
+            "Uint8": 0,
+            "Uint16": 0,
+            "Uint32": 0,
+            "Uint64": 0,
+            "String": "hoge",
+            "Boolean": false,
+            "Decimal64": 0
+          },
+          "type": {
+            "Type": 18,
+            "Int8": 0,
+            "Int16": 0,
+            "Int32": 0,
+            "Int64": 0,
+            "Uint8": 0,
+            "Uint16": 0,
+            "Uint32": 0,
+            "Uint64": 0,
+            "String": "fuga",
+            "Boolean": false,
+            "Decimal64": 0
+          }
+        },
+        "Dbtype": "list",
+        "Dbvaluetype": 0
+      }
+    ]
+  },
+  "Tail": [
+    "des"
+  ]
+}
diff --git a/pkg/vtyang/xpath.go b/pkg/vtyang/xpath.go
@@ -615,6 +615,19 @@ func ParseXPathArgsLongestMatches(dbm *DatabaseManager,
 	return &xpath, fullmatch, nil
 }
 
+func ParseXPathCli(dbm *DatabaseManager, args []string, tail []string, setmode bool,
+) (XPath, *DBValue, []string, error) {
+	if len(args) == 0 {
+		return XPath{}, nil, tail, nil
+	}
+	xpath, val, err := ParseXPathArgs2(dbm, args, setmode)
+	if err != nil {
+		tail = append(tail, args[len(args)-1])
+		return ParseXPathCli(dbm, args[:len(args)-1], tail, setmode)
+	}
+	return xpath, val, tail, nil
+}
+
 func ParseXPathArgs2(dbm *DatabaseManager, args []string, setmode bool) (XPath, *DBValue, error) {
 	var xpath XPath
 	var val *DBValue