parser & printer CHANGE xpath1.0 type correct handling

Also test included.
Fixes #402

Author: michalvasko

src/parser.c

@@ -1462,6 +1462,7 @@ lyp_parse_value(struct lys_type *type, const char **value_, struct lyxml_elem *x
                 int store, int dflt)
 {
     struct lys_type *ret = NULL, *t;
+    struct lys_tpdf *tpdf;
     int c, len, found = 0, hidden;
     unsigned int i, j;
     int64_t num;
@@ -1898,6 +1899,26 @@ lyp_parse_value(struct lys_type *type, const char **value_, struct lyxml_elem *x
             goto cleanup;
         }
 
+        /* special handling of ietf-yang-types xpath1.0 */
+        for (tpdf = type->der;
+             tpdf->module && strcmp(tpdf->name, "xpath1.0") && strcmp(tpdf->module->name, "ietf-yang-types");
+             tpdf = tpdf->type.der);
+        if (tpdf->module && xml) {
+            /* convert value into the json format */
+            value = transform_xml2json(type->parent->module->ctx, value, xml, 1, 1, 0);
+            if (!value) {
+                /* invalid instance-identifier format */
+                LOGVAL(LYE_INVAL, LY_VLOG_LYD, contextnode, *value_, itemname);
+                goto cleanup;
+            }
+
+            if (value != *value_) {
+                /* update the changed value */
+                lydict_remove(type->parent->module->ctx, *value_);
+                *value_ = value;
+            }
+        }
+
         if (store) {
             /* store the result */
             val->string = value;

src/printer_xml.c

@@ -261,6 +261,7 @@ xml_print_leaf(struct lyout *out, int level, const struct lyd_node *node, int to
 {
     const struct lyd_node_leaf_list *leaf = (struct lyd_node_leaf_list *)node, *iter;
     const struct lys_type *type;
+    struct lys_tpdf *tpdf;
     const char *ns, *mod_name;
     const char **prefs, **nss;
     const char *xml_expr;
@@ -287,8 +288,24 @@ xml_print_leaf(struct lyout *out, int level, const struct lyd_node *node, int to
     datatype = leaf->value_type & LY_DATA_TYPE_MASK;
 printvalue:
     switch (datatype) {
-    case LY_TYPE_BINARY:
     case LY_TYPE_STRING:
+        type = lyd_leaf_type((struct lyd_node_leaf_list *)leaf);
+        if (!type) {
+            /* error */
+            ly_print(out, "\"(!error!)\"");
+            return EXIT_FAILURE;
+        }
+        for (tpdf = type->der;
+             tpdf->module && strcmp(tpdf->name, "xpath1.0") && strcmp(tpdf->module->name, "ietf-yang-types");
+             tpdf = tpdf->type.der);
+        /* special handling of ietf-yang-types xpath1.0 */
+        if (tpdf->module) {
+            /* avoid code duplication - use instance-identifier printer which gets necessary namespaces to print */
+            datatype = LY_TYPE_INST;
+            goto printvalue;
+        }
+        /* fallthrough */
+    case LY_TYPE_BINARY:
     case LY_TYPE_BITS:
     case LY_TYPE_ENUM:
     case LY_TYPE_BOOL:

tests/CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8.12)
 set(CMAKE_MACOSX_RPATH TRUE)
 
 set(api_tests test_libyang test_tree_schema test_xml test_dict test_tree_data test_tree_data_dup test_tree_data_merge test_xpath test_xpath_1.1 test_diff)
-set(data_tests test_data_initialization test_leafref_remove test_instid_remove test_keys test_autodel test_when test_when_1.1 test_must_1.1 test_defaults test_emptycont test_unique test_mandatory test_json test_parse_print test_values test_metadata)
+set(data_tests test_data_initialization test_leafref_remove test_instid_remove test_keys test_autodel test_when test_when_1.1 test_must_1.1 test_defaults test_emptycont test_unique test_mandatory test_json test_parse_print test_values test_metadata test_yangtypes_xpath)
 set(schema_yin_tests test_print_transform)
 set(schema_tests test_ietf test_augment test_deviation test_refine test_typedef test_import test_include test_feature test_conformance test_leaflist test_extensions test_status)
 set(conformance_tests test_sec6_1_1 test_sec6_2 test_sec5_1 test_sec5_5 test_sec6_1_3 test_sec6_2_1 test_sec7_1 test_sec7_2 test_sec7_3 test_sec7_3_1 test_sec7_3_4 test_sec7_5_2 test_sec7_5_4 test_sec7_5_5 test_sec7_6_2 test_sec7_6_3 test_sec7_6_4 test_sec7_6_5 test_sec7_7_2 test_sec7_7_3 test_sec7_7_4 test_sec7_7_5 test_sec7_8_1 test_sec7_8_2 test_sec7_8_3 test_sec7_9_1 test_sec7_9_2 test_sec7_9_3 test_sec7_9_4 test_sec7_10 test_sec7_11 test_sec7_12_1 test_sec7_12_2 test_sec7_13_1 test_sec7_13_2 test_sec7_13_3 test_sec7_14 test_sec7_15 test_sec7_16_1 test_sec7_16_2 test_sec7_18_1 test_sec7_18_2 test_sec7_18_3_1 test_sec7_18_3_2 test_sec7_19_1 test_sec7_19_2 test_sec7_19_5 test_sec9_2 test_sec9_3 test_sec9_4_4 test_sec9_4_6 test_sec9_5 test_sec9_6 test_sec9_7 test_sec9_8 test_sec9_9 test_sec9_10 test_sec9_11 test_sec9_12 test_sec9_13)

tests/data/files/nacm.xml

@@ -0,0 +1,15 @@
+<nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
+    <rule-list>
+        <name>test-list</name>
+        <rule>
+            <name>test-rule</name>
+            <path xmlns:a="urn:all">/a:cont1/a:leaf3</path>
+            <action>deny</action>
+        </rule>
+    </rule-list>
+</nacm>
+<cont1 xmlns="urn:all">
+    <list1>
+        <leaf18>aa</leaf18>
+    </list1>
+</cont1>

tests/data/test_yangtypes_xpath.c

@@ -0,0 +1,97 @@
+/**
+ * @file test_yangtypes_xpath.c
+ * @author Michal Vasko <[email protected]>
+ * @brief Cmocka tests for resolving ietf-yang-types type xpath1.0.
+ *
+ * Copyright (c) 2017 CESNET, z.s.p.o.
+ *
+ * This source code is licensed under BSD 3-Clause License (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://opensource.org/licenses/BSD-3-Clause
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include "tests/config.h"
+#include "libyang.h"
+
+struct state {
+    struct ly_ctx *ctx;
+    struct lyd_node *dt;
+    char *xml;
+};
+
+static int
+setup_f(void **state)
+{
+    struct state *st;
+
+    (*state) = st = calloc(1, sizeof *st);
+    if (!st) {
+        fprintf(stderr, "Memory allocation error");
+        return -1;
+    }
+
+    /* libyang context */
+    st->ctx = ly_ctx_new(NULL, 0);
+    if (!st->ctx) {
+        fprintf(stderr, "Failed to create context.\n");
+        goto error;
+    }
+
+    return 0;
+
+error:
+    ly_ctx_destroy(st->ctx, NULL);
+    free(st);
+    (*state) = NULL;
+
+    return -1;
+}
+
+static int
+teardown_f(void **state)
+{
+    struct state *st = (*state);
+
+    lyd_free_withsiblings(st->dt);
+    ly_ctx_destroy(st->ctx, NULL);
+    free(st->xml);
+    free(st);
+    (*state) = NULL;
+
+    return 0;
+}
+
+static void
+test_acm_yangtypes_xpath(void **state)
+{
+    struct state *st = (struct state *)*state;
+
+    /* schema */
+    assert_ptr_not_equal(lys_parse_path(st->ctx, TESTS_DIR"/schema/yang/ietf/ietf-netconf-acm.yang", LYS_IN_YANG), NULL);
+    assert_ptr_not_equal(lys_parse_path(st->ctx, TESTS_DIR"/data/files/all.yang", LYS_IN_YANG), NULL);
+
+    /* data */
+    st->dt = lyd_parse_path(st->ctx, TESTS_DIR"/data/files/nacm.xml", LYD_XML, LYD_OPT_CONFIG /*DATA_NO_YANGLIB*/);
+    assert_ptr_not_equal(st->dt, NULL);
+
+    assert_string_equal(((struct lyd_node_leaf_list *)st->dt->child->child->next->child->next)->value_str, "/all:cont1/leaf3");
+
+    lyd_print_mem(&(st->xml), st->dt, LYD_XML, 0);
+    assert_string_equal(st->xml, "<nacm xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-acm\"><rule-list><name>test-list</name><rule><name>test-rule</name><path xmlns:all_mod=\"urn:all\">/all_mod:cont1/all_mod:leaf3</path><action>deny</action></rule></rule-list></nacm>");
+}
+
+int main(void)
+{
+    const struct CMUnitTest tests[] = {
+                    cmocka_unit_test_setup_teardown(test_acm_yangtypes_xpath, setup_f, teardown_f),
+    };
+
+    return cmocka_run_group_tests(tests, NULL, NULL);
+}