Disable show compare text

clicon · Jan 24, 2025 · 31a9a25 · 31a9a25
1 parent 3e47d8d
commit 31a9a25
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/src/controller_configure.cli b/src/controller_configure.cli
@@ -36,7 +36,7 @@ show("Show a particular state of the system"), @datamodelshow, cli_show_auto_mod
     @datamodelshow, cli_show_auto_devs("candidate", "pipe-xml-default", true, false, "explicit", "set ", true);
     compare("Compare candidate and running databases"), compare_dbs_rpc("running", "candidate", "default");{
        xml("Show comparison in xml"), compare_dbs_rpc("running", "candidate","xml");
-       text("Show comparison in text"), compare_dbs_rpc("running", "candidate", "text");
+#       text("Show comparison in text"), compare_dbs_rpc("running", "candidate", "text");
     }
 }
 save("Save candidate configuration to XML file") <filename:string>("Filename (local filename)"), save_config_file("candidate","filename", "xml");{

diff --git a/src/controller_operation.cli b/src/controller_operation.cli
@@ -28,7 +28,7 @@ processes("Process maintenace") services("Service daemon operation") {
 show("Show a particular state of the system"){
     compare("Compare candidate and running databases"), compare_dbs_rpc("running", "candidate", "default");{
        xml("Show comparison in xml"), compare_dbs_rpc("running", "candidate","xml");
-       text("Show comparison in text"), compare_dbs_rpc("running", "candidate", "text");
+#       text("Show comparison in text"), compare_dbs_rpc("running", "candidate", "text");
     }
     configuration("Show configuration"), cli_show_auto_mode("running", "default", true, false);{
        @|pipe_show, cli_show_auto_mode("running", "xml", true, false);

diff --git a/test/test-cli-order.sh b/test/test-cli-order.sh
@@ -69,8 +69,10 @@ expectpart "$($clixon_cli -1 -m configure -f $CFG delete devices device openconf
 new "show compare xml"
 expectpart "$($clixon_cli -1 -m configure -f $CFG show compare xml)" 0 "\-\ *<address>3.3.3.3</address>" --not-- "+" "1.1.1.1" "2.2.2.2"
 
-new "show compare curly"
-expectpart "$($clixon_cli -1 -m configure -f $CFG show compare text)" 0 "\-\ *server 3.3.3.3" --not-- "+" "1.1.1.1" "2.2.2.2"
+if false; then # Disabled in 1.3
+    new "show compare text"
+    expectpart "$($clixon_cli -1 -m configure -f $CFG show compare text)" 0 "\-\ *server 3.3.3.3" --not-- "+" "1.1.1.1" "2.2.2.2"
+fi
 
 new "commit 2"
 expectpart "$($clixon_cli -1 -m configure -f $CFG commit)" 0 ""

diff --git a/test/test-device-groups.sh b/test/test-device-groups.sh
@@ -309,7 +309,6 @@ expectpart "$($clixon_cli -1 -f $CFG -m configure apply template interfaces grou
 new "Verify compare"
 expectpart "$($clixon_cli -1 -f $CFG -m configure -o CLICON_CLI_OUTPUT_FORMAT=text show compare)" 0 "^+\ *interface z {" "^+\ *type ianaift:v35;" "^+\ *description \"Config of interface z,z and ianaift:v35 type\";" --not-- "^\-"
 
-
 new "connection close"
 expectpart "$($clixon_cli -1 -f $CFG -E $CFD connection close)" 0 "^$"
 

diff --git a/test/test-template.sh b/test/test-template.sh
@@ -214,8 +214,10 @@ fi
 new "Check description diff xml"
 expectpart "$($clixon_cli -1f $CFG show compare xml 2>&1)" 0 "^-\ *<description>Config of interface " "^+\ *<description>Changed description</description>"
 
-new "Check description diff text"
-expectpart "$($clixon_cli -1f $CFG show compare text 2>&1)" 0 "^-\ *description \"Config of interface" "^+\ *description \"Changed description\""
+if false; then # Disabled in 1.3
+    new "Check description diff text"
+    expectpart "$($clixon_cli -1f $CFG show compare text 2>&1)" 0 "^-\ *description \"Config of interface" "^+\ *description \"Changed description\""
+fi
 
 new "commit local"
 expectpart "$($clixon_cli -1f $CFG -m configure commit  2>&1)" 0 "^OK$"