Merge pull request #252 from pheller/filter-and-xml-encoding-fixes

Testing dependency fixes, Netconf XML declaration and filter logic fix

apps/netconf/netconf_rpc.c

@@ -178,11 +178,7 @@ netconf_get_config(clicon_handle h,
      /* ie <filter>...</filter> */
     if ((xfilter = xpath_first(xn, nsc, "%s%sfilter", prefix ? prefix : "", prefix ? ":" : "")) != NULL)
         ftype = xml_find_value(xfilter, "type");
-     if (xfilter == NULL || ftype == NULL || strcmp(ftype, "xpath")==0){
+    if (xfilter == NULL || ftype == NULL || strcmp(ftype, "subtree") == 0) {
-	 if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
-	     goto done;	
-     }
-     else if (strcmp(ftype, "subtree")==0){
         /* Get whole config first, then filter. This is suboptimal
          */
         if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
@@ -190,8 +186,11 @@ netconf_get_config(clicon_handle h,
         /* Now filter on whole tree */
         if (netconf_get_config_subtree(h, xfilter, xret) < 0)
             goto done;
+    } else if (strcmp(ftype, "xpath") == 0) {
+        if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0) {
+            goto done;
         }
-     else{
+    } else {
         clixon_xml_parse_va(YB_NONE, NULL, xret, NULL, "<rpc-reply xmlns=\"%s\"><rpc-error>"
                                                        "<error-tag>operation-failed</error-tag>"
                                                        "<error-type>applicatio</error-type>"
@@ -390,11 +389,7 @@ netconf_get(clicon_handle h,
        /* ie <filter>...</filter> */
     if ((xfilter = xpath_first(xn, nsc, "%s%sfilter", prefix ? prefix : "", prefix ? ":" : "")) != NULL)
         ftype = xml_find_value(xfilter, "type");
-     if (xfilter == NULL || ftype == NULL || strcmp(ftype, "xpath")==0){
+    if (xfilter == NULL || ftype == NULL || strcmp(ftype, "subtree") == 0) {
-	 if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
-	     goto done;	
-     }
-     else if (strcmp(ftype, "subtree")==0){
         /* Get whole config + state first, then filter. This is suboptimal
          */
         if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
@@ -402,8 +397,10 @@ netconf_get(clicon_handle h,
         /* Now filter on whole tree */
         if (netconf_get_config_subtree(h, xfilter, xret) < 0)
             goto done;
-     }
+    } else if (strcmp(ftype, "xpath") == 0) {
-     else{
+        if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
+            goto done;
+    } else {
         clixon_xml_parse_va(YB_NONE, NULL, xret, NULL, "<rpc-reply xmlns=\"%s\"><rpc-error>"
                                                        "<error-tag>operation-failed</error-tag>"
                                                        "<error-type>applicatio</error-type>"

lib/src/clixon_xml_parse.y

@@ -65,6 +65,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
 #include <stdlib.h>
 

test/test_netconf_filter.sh

@@ -68,6 +68,12 @@ expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><commit/></
 new "wrong filter type"
 expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><get><filter type='foo'><x xmlns='urn:example:filter'><y><a>1</a></y></x></filter></get></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><rpc-error><error-tag>operation-failed</error-tag><error-type>applicatio</error-type><error-severity>error</error-severity><error-message>filter type not supported</error-message><error-info>type</error-info></rpc-error></rpc-reply>]]>]]>$"
 
+new "get-config subtree one (subtree implicit)"
+expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><get-config><source><running/></source><filter><x xmlns='urn:example:filter'><y><a>1</a></y></x></filter></get-config></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><data><x xmlns=\"urn:example:filter\"><y><a>1</a><b>1</b></y></x></data></rpc-reply>]]>]]>$"
+
+new "get subtree one (subtree implicit)"
+expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><get><filter><x xmlns='urn:example:filter'><y><a>1</a></y></x></filter></get></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><data><x xmlns=\"urn:example:filter\"><y><a>1</a><b>1</b></y></x></data></rpc-reply>]]>]]>$"
+
 new "get-config subtree one"
 expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><get-config><source><running/></source><filter type='subtree'><x xmlns='urn:example:filter'><y><a>1</a></y></x></filter></get-config></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><data><x xmlns=\"urn:example:filter\"><y><a>1</a><b>1</b></y></x></data></rpc-reply>]]>]]>$"
 

test/test_netconf_hello.sh

@@ -58,6 +58,10 @@ wait_backend
 new "Netconf snd hello with xmldecl"
 expecteof "$clixon_netconf -qf $cfg" 0 "<?xml version=\"1.0\" encoding=\"UTF-8\"?><hello $DEFAULTNS><capabilities><capability>urn:ietf:params:netconf:base:1.1</capability></capabilities></hello>]]>]]>" '^$' '^$'
 
+# Hello, lowercase encoding
+new "Netconf snd hello with xmldecl (lowercase encoding)"
+expecteof "$clixon_netconf -qf $cfg" 0 "<?xml version=\"1.0\" encoding=\"utf-8\"?><hello $DEFAULTNS><capabilities><capability>urn:ietf:params:netconf:base:1.1</capability></capabilities></hello>]]>]]>" '^$' '^$'
+
 new "Netconf snd hello without xmldecl"
 expecteof "$clixon_netconf -qf $cfg" 0 "<hello $DEFAULTNS><capabilities><capability>urn:ietf:params:netconf:base:1.1</capability></capabilities></hello>]]>]]>" '^$' '^$'
 

test/vagrant/vagrant.sh

@@ -215,9 +215,7 @@ case $release in
 		;;
 	    native)
 #		$sshcmd sudo apt install -y libevent-2.1
-		$sshcmd sudo apt install -y libssl-dev
+		$sshcmd sudo apt install -y libevent-dev libssl-dev
-		$sshcmd sudo apt install -y libevent-dev # evhtp
-		$sshcmd sudo apt install -y libnghttp2-dev # nghttp2
 		;;
 	esac
 	;;