commit 1b8a2ea713192ce8e6c551af481e19c9fee3e2fa
author Václav Kubernát <kubernat@cesnet.cz> Mon May 25 10:42:39 2020 +0200
committer Gerrit Code Review <gerrit@gerrit.cesnet.cz> Mon May 25 10:42:39 2020 +0200
tree 55d204b3f37cbab37e613b98ea8ae1cf237c6d08
parent abf5280c1df99cca06f4d852ad1e61cdd1487f06
parent 8dae89a3df756808a6fe55360d87cfaf93ce588a

Merge changes Ia9ba2193,I736bf655

* changes:
  Remove empty SECTION
  Fix leafTypeName returning names of primitive types

src/yang_schema.cpp

diff --git a/src/yang_schema.cpp b/src/yang_schema.cpp
index 6021cc5..132c25f 100644
--- a/src/yang_schema.cpp
+++ b/src/yang_schema.cpp
@@ -304,7 +304,7 @@
 std::optional<std::string> YangSchema::leafTypeName(const std::string& path) const
 {
     libyang::Schema_Node_Leaf leaf(getSchemaNode(path));
-    return leaf.type()->der().get() ? std::optional{leaf.type()->der()->name()} : std::nullopt;
+    return leaf.type()->der().get() && leaf.type()->der()->type()->der().get() ? std::optional{leaf.type()->der()->name()} : std::nullopt;
 }
 
 std::string YangSchema::leafrefPath(const std::string& leafrefPath) const

src/yang_schema.hpp

diff --git a/src/yang_schema.hpp b/src/yang_schema.hpp
index 2a93b07..a4c0b90 100644
--- a/src/yang_schema.hpp
+++ b/src/yang_schema.hpp
@@ -41,6 +41,7 @@
     const std::set<std::string> listKeys(const schemaPath_& location, const ModuleNodePair& node) const override;
     yang::TypeInfo leafType(const schemaPath_& location, const ModuleNodePair& node) const override;
     yang::TypeInfo leafType(const std::string& path) const override;
+    /** @brief If the leaf type is a typedef, returns the typedef name. */
     std::optional<std::string> leafTypeName(const std::string& path) const override;
     std::string leafrefPath(const std::string& leafrefPath) const override;
     std::set<ModuleNodePair> availableNodes(const boost::variant<dataPath_, schemaPath_, module_>& path, const Recursion recursion) const override;

tests/yang.cpp

diff --git a/tests/yang.cpp b/tests/yang.cpp
index 79bad71..3d42c5e 100644
--- a/tests/yang.cpp
+++ b/tests/yang.cpp
@@ -1184,8 +1184,10 @@
             REQUIRE(ys.defaultValue("/example-schema:leafInt32") == std::nullopt);
         }
 
-        SECTION("moduleNodes")
+        SECTION("leafTypeName")
         {
+            REQUIRE(ys.leafTypeName("/example-schema:leafEnumTypedefRestricted") == "enumTypedef");
+            REQUIRE(ys.leafTypeName("/example-schema:leafInt32") == std::nullopt);
         }
     }