Fixed: [CLI Show config JSON with multiple top-level elements is broken](https://github.com/clicon/clixon/issues/381)
C API: Added skiptop parameter to xml2json_vec
This commit is contained in:
Olof hagsand
parent
097aeb0320
commit
83f71529d7
8 changed files with 94 additions and 40 deletions
|
|
@ -91,6 +91,7 @@ show("Show a particular state of the system"){
|
|||
}
|
||||
EOF
|
||||
|
||||
# Note: a b/71 entry added later in test
|
||||
cat <<EOF > $dir/startup_db
|
||||
<${DATASTORE_TOP}>
|
||||
<table xmlns="urn:example:clixon">
|
||||
|
|
@ -239,6 +240,7 @@ cat <<EOF > $fin
|
|||
edit table parameter b
|
||||
show config xml
|
||||
EOF
|
||||
|
||||
new "edit table parameter b; show"
|
||||
expectpart "$(cat $fin | $clixon_cli -f $cfg 2>&1)" 0 "/clixon-example:table/parameter=b/>" --not-- "<name>a</name><value>42</value>" '<table xmlns="urn:example:clixon">' "<parameter>"
|
||||
|
||||
|
|
@ -248,9 +250,19 @@ set value 71
|
|||
up
|
||||
show config xml
|
||||
EOF
|
||||
new "set value 71"
|
||||
new "add b = 71"
|
||||
expectpart "$(cat $fin | $clixon_cli -f $cfg 2>&1)" 0 "/clixon-example:table>" "<parameter><name>a</name><value>42</value></parameter><parameter><name>b</name><value>71</value></parameter>"
|
||||
|
||||
new "show top tree"
|
||||
expectpart "$(echo "show config xml" | $clixon_cli -f $cfg 2>&1)" 0 '<table xmlns="urn:example:clixon"><parameter><name>a</name><value>42</value></parameter><parameter><name>b</name><value>71</value></parameter></table>'
|
||||
|
||||
cat <<EOF > $fin
|
||||
up
|
||||
show config xml
|
||||
EOF
|
||||
new "up show"
|
||||
expectpart "$(cat $fin | $clixon_cli -f $cfg 2>&1)" 0 '<table xmlns="urn:example:clixon"><parameter><name>a</name><value>42</value></parameter><parameter><name>b</name><value>71</value></parameter></table>'
|
||||
|
||||
cat <<EOF > $fin
|
||||
edit table parameter a
|
||||
top
|
||||
|
|
@ -288,12 +300,22 @@ new "show state"
|
|||
expectpart "$(cat $fin | $clixon_cli -f $cfg 2>&1)" 0 "<parameter><name>a</name><value>42</value><stat>99</stat></parameter>"
|
||||
|
||||
# Show other formats
|
||||
cat <<EOF > $fin
|
||||
edit table parameter b
|
||||
set value 71
|
||||
EOF
|
||||
new "add b = 71"
|
||||
expectpart "$(cat $fin | $clixon_cli -f $cfg 2>&1)" 0
|
||||
|
||||
new "show top tree json"
|
||||
expectpart "$(echo "show config json" | $clixon_cli -f $cfg 2>&1)" 0 '{"clixon-example:table":{"parameter":\[{"name":"a","value":"42"},{"name":"b","value":"71"}\]}}'
|
||||
|
||||
cat <<EOF > $fin
|
||||
edit table
|
||||
show config json
|
||||
EOF
|
||||
new "show config json"
|
||||
expectpart "$(cat $fin | $clixon_cli -f $cfg 2>&1)" 0 '{"clixon-example:parameter":\[{"name":"a","value":"42"}\]}'
|
||||
expectpart "$(cat $fin | $clixon_cli -f $cfg 2>&1)" 0 '{"clixon-example:parameter":\[{"name":"a","value":"42"},{"name":"b","value":"71"}\]}'
|
||||
|
||||
cat <<EOF > $fin
|
||||
edit table
|
||||
|
|
|
|||
|
|
@ -60,6 +60,9 @@ module clixon-example {
|
|||
}
|
||||
}
|
||||
}
|
||||
container table2{
|
||||
presence true;
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
|
|
@ -110,7 +113,7 @@ fi
|
|||
new "wait backend"
|
||||
wait_backend
|
||||
|
||||
# Create two lists
|
||||
# Create two lists elements
|
||||
new "cli create list table x"
|
||||
expectpart "$($clixon_cli -1 -f $cfg -l o set table parameter x value 1)" 0 "^$"
|
||||
|
||||
|
|
@ -127,14 +130,19 @@ expectpart "$($clixon_cli -1 -f $cfg -l o set table parameter x array1 b)" 0 "^$
|
|||
new "cli commit"
|
||||
expectpart "$($clixon_cli -1 -f $cfg -l o commit)" 0 "^$"
|
||||
|
||||
# Create a second top-level element
|
||||
new "cli create list table2"
|
||||
expectpart "$($clixon_cli -1 -f $cfg -l o set table2)" 0 "^$"
|
||||
|
||||
# XML
|
||||
format=xml
|
||||
|
||||
new "cli check show config $format"
|
||||
X='<table xmlns="urn:example:clixon"><parameter><name>x</name><value>1</value><array1>a</array1><array1>b</array1></parameter><parameter><name>y</name><value>2</value></parameter></table>'
|
||||
X='<table xmlns="urn:example:clixon"><parameter><name>x</name><value>1</value><array1>a</array1><array1>b</array1></parameter><parameter><name>y</name><value>2</value></parameter></table><table2 xmlns="urn:example:clixon"/>'
|
||||
expectpart "$($clixon_cli -1 -f $cfg -l o show config $format)" 0 "^$X$"
|
||||
|
||||
new "cli check show auto $format table"
|
||||
X='<table xmlns="urn:example:clixon"><parameter><name>x</name><value>1</value><array1>a</array1><array1>b</array1></parameter><parameter><name>y</name><value>2</value></parameter></table>'
|
||||
expectpart "$($clixon_cli -1 -f $cfg -l o show auto $format table)" 0 "^$X$"
|
||||
|
||||
new "cli check show auto $format table parameter"
|
||||
|
|
@ -153,10 +161,11 @@ expectpart "$($clixon_cli -1 -f $cfg -l o show auto $format table parameter x ar
|
|||
format=json
|
||||
|
||||
new "cli check show config $format"
|
||||
X='{"clixon-example:table":{"parameter":\[{"name":"x","value":"1","array1":\["a","b"\]},{"name":"y","value":"2"}\]}}'
|
||||
X='{"clixon-example:table":{"parameter":\[{"name":"x","value":"1","array1":\["a","b"\]},{"name":"y","value":"2"}\]},"clixon-example:table2":{}}'
|
||||
expectpart "$($clixon_cli -1 -f $cfg -l o show config $format)" 0 "^$X$"
|
||||
|
||||
new "cli check show auto $format table"
|
||||
X='{"clixon-example:table":{"parameter":\[{"name":"x","value":"1","array1":\["a","b"\]},{"name":"y","value":"2"}\]}}'
|
||||
expectpart "$($clixon_cli -1 -f $cfg -l o show auto $format table)" 0 "^$X$"
|
||||
|
||||
new "cli check show auto $format table parameter"
|
||||
|
|
@ -207,10 +216,11 @@ format=netconf
|
|||
|
||||
# XXX netconf base capability 0, EOM framing
|
||||
new "cli check show config $format"
|
||||
X='<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="42"><edit-config><target><candidate/></target><config><table xmlns="urn:example:clixon"><parameter><name>x</name><value>1</value><array1>a</array1><array1>b</array1></parameter><parameter><name>y</name><value>2</value></parameter></table></config></edit-config></rpc>]]>]]>'
|
||||
X='<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="42"><edit-config><target><candidate/></target><config><table xmlns="urn:example:clixon"><parameter><name>x</name><value>1</value><array1>a</array1><array1>b</array1></parameter><parameter><name>y</name><value>2</value></parameter></table><table2 xmlns="urn:example:clixon"/></config></edit-config></rpc>]]>]]>'
|
||||
expectpart "$($clixon_cli -1 -f $cfg -l o show config $format)" 0 "^$X$"
|
||||
|
||||
new "cli check show auto $format table"
|
||||
X='<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="42"><edit-config><target><candidate/></target><config><table xmlns="urn:example:clixon"><parameter><name>x</name><value>1</value><array1>a</array1><array1>b</array1></parameter><parameter><name>y</name><value>2</value></parameter></table></config></edit-config></rpc>]]>]]>'
|
||||
expectpart "$($clixon_cli -1 -f $cfg -l o show auto $format table)" 0 "^$X$"
|
||||
|
||||
# XXX rest does not print whole NETCONF path to root, eg does not include "table"
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ new "json parse empty list to xml"
|
|||
expecteofx "$clixon_util_json" 0 '{"a":[]}' "<a/>"
|
||||
|
||||
new "json parse list json" # should be {"a":[0,1,2,3]}
|
||||
expecteofx "$clixon_util_json -j" 0 '{"a":[0,1,2,3]}' '{"a":"0"}{"a":"1"}{"a":"2"}{"a":"3"}'
|
||||
expecteofx "$clixon_util_json -j" 0 '{"a":[0,1,2,3]}' '{"a":"0"},{"a":"1"},{"a":"2"},{"a":"3"}'
|
||||
|
||||
# Multi-line JSON not pretty-print
|
||||
JSON='{"json:c":{"a":42,"s":"string"}}'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue