Fixed GitHub issue CiscoDevNet#997

ygorelik · May 26, 2020 · 259c120 · 259c120
1 parent a2799a5
commit 259c120
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 11 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,4 @@
-### 2020-05-31 version 0.8.5
+### 2020-06-30 version 0.8.5
 
 #### New features and enhancements
   * Develop utility function to clone Entity instance ([#967](https://github.com/CiscoDevNet/ydk-gen/issues/967))
@@ -10,7 +10,8 @@
   * YDK fails create bundle package when package name contains '.' ([#978](https://github.com/CiscoDevNet/ydk-gen/issues/978))
   * python bundle generator must escape 'async' as variable name ([#980](https://github.com/CiscoDevNet/ydk-gen/issues/980))
   * YDK fails instantiate some of the generated bundle classes ([#983](https://github.com/CiscoDevNet/ydk-gen/issues/983))
-  * python generated bundle class fails instantiate when model contains leaf 'logger' ([#996](https://github.com/CiscoDevNet/ydk-gen/issues/996))
+  * Python generated bundle class fails instantiate when model contains leaf 'logger' ([#996](https://github.com/CiscoDevNet/ydk-gen/issues/996))
+  * C++ YList class fails to process key values when its name contains '-' character ([#997](https://github.com/CiscoDevNet/ydk-gen/issues/997))
 
 #### Bundle improvements
   * Updated cisco-ios-xe bundle to support Cisco IOS XE 16.9.3 due to bug in Python generated code

diff --git a/sdk/cpp/CHANGES.md b/sdk/cpp/CHANGES.md
@@ -1,13 +1,15 @@
-### 2019-11-14 version 0.8.4.post1
+### 2020-06-30 version 0.8.5
 
 #### New features and enhancements
   * Added Entity class member function to clone entity object
   * Added shortcut operator to set `yfilter` value in YLeaf and YLeafList class instances
+  * Develop utility function to clone Entity instance ([#967](https://github.com/CiscoDevNet/ydk-gen/issues/967))
 
 #### Resolved GitHub issues
   * Fix jsonSubtreeCodec only serializing up to 4B numbers
   * Fixed bug in extracting module name from namespace
   * gNMI set RPC fails when JSON payload is formatted string
+  * C++ YList class fails to process key values when its name contains '-' character ([#997](https://github.com/CiscoDevNet/ydk-gen/issues/997))
 
 ### 2019-10-15 version 0.8.4
 

diff --git a/sdk/cpp/core/tests/models/ydktest-sanity@2015-11-17.yang b/sdk/cpp/core/tests/models/ydktest-sanity@2015-11-17.yang
@@ -678,8 +678,8 @@ module ydktest-sanity {
 
   grouping enum-list {
     list enum-list {
-        key "name";
-        leaf name {
+        key "key-name";
+        leaf key-name {
             type Ydk-Enum-test;
         }
     }

diff --git a/sdk/cpp/tests/test_sanity_types.cpp b/sdk/cpp/tests/test_sanity_types.cpp
@@ -779,6 +779,65 @@ TEST_CASE("test_ylist_two_keys") {
 	REQUIRE("f2" == count);
 }
 
+TEST_CASE("test_types_enum_list")
+{
+    ydk::path::Repository repo{TEST_HOME};
+    NetconfServiceProvider provider{repo, "127.0.0.1", "admin", "admin", 12022};
+    CrudService crud{};
+
+    //DELETE
+    auto r_1 = make_unique<ydktest_sanity::Runner>();
+    bool reply = crud.delete_(provider, *r_1);
+    REQUIRE(reply);
+
+    //CREATE
+    auto enum_list_elem1 = make_shared<ydktest_sanity::Runner::EnumList>();
+    auto enum_list_elem2 = make_shared<ydktest_sanity::Runner::EnumList>();
+    enum_list_elem1->key_name = ydktest_sanity::YdkEnumTest::local;
+    enum_list_elem2->key_name = ydktest_sanity::YdkEnumTest::remote;
+    r_1->enum_list.append(enum_list_elem1);
+    r_1->enum_list.append(enum_list_elem2);
+
+    auto keys = r_1->enum_list.keys();
+    REQUIRE(vector_to_string(keys) == "\"local\", \"remote\"");
+
+    reply = crud.create(provider, *r_1);
+    REQUIRE(reply);
+
+    //READ
+    auto filter = make_unique<ydktest_sanity::Runner>();
+    auto r_read = crud.read(provider, *filter);
+    REQUIRE(r_read!=nullptr);
+    ydktest_sanity::Runner * r_2 = dynamic_cast<ydktest_sanity::Runner*>(r_read.get());
+    auto read_keys = r_2->enum_list.keys();
+    REQUIRE(read_keys == keys);
+}
+
+TEST_CASE("test_ylist_two_keys_read") {
+    NetconfServiceProvider provider{"127.0.0.1", "admin", "admin", 12022};
+    CrudService crud{};
+
+    // CREATE
+    auto runner = make_unique<ydktest_sanity::Runner>();
+    auto l1 = make_shared<ydktest_sanity::Runner::TwoKeyList> (); l1->first = "act"; l1->second = 11;
+    auto l2 = make_shared<ydktest_sanity::Runner::TwoKeyList> (); l2->first = "act"; l2->second = 22;
+    runner->two_key_list.extend({l1, l2});
+    crud.create(provider, *runner);
+
+    // READ
+    auto filter = ydktest_sanity::Runner();
+    auto read_entity = crud.read(provider, filter);
+    REQUIRE(read_entity != nullptr);
+
+    auto read_runner = dynamic_cast<ydktest_sanity::Runner*>(read_entity.get());
+    REQUIRE(read_runner->two_key_list.len() == 2);
+
+    //DELETE
+    auto r_1 = make_unique<ydktest_sanity::Runner>();
+    bool reply = crud.delete_(provider, *r_1);
+    REQUIRE(reply);
+}
+
 TEST_CASE("test_ylist_no_keys") {
 	auto runner = ydktest_sanity::Runner();
 	auto t1 = make_shared<ydktest_sanity::Runner::NoKeyList> (); t1->test = "t1";

diff --git a/sdk/go/CHANGES.md b/sdk/go/CHANGES.md
@@ -1,4 +1,4 @@
-### 2019-11-20 version 0.8.4.post1
+### 2020-06-30 version 0.8.5
 
 #### New features and enhancements
   * Develop utility function to clone Entity instance ([#967](https://github.com/CiscoDevNet/ydk-gen/issues/967))

diff --git a/sdk/go/core/tests/types_core_test.go b/sdk/go/core/tests/types_core_test.go
@@ -172,9 +172,9 @@ func (suite *CoreTypesTestSuite) TestIdentityList() {
 
 func (suite *CoreTypesTestSuite) TestEnumList() {
 	runner := ysanity.Runner{}
-	i1 := ysanity.Runner_EnumList{Name: ysanity.YdkEnumTest_none}
-	i2 := ysanity.Runner_EnumList{Name: ysanity.YdkEnumTest_local}
-	i3 := ysanity.Runner_EnumList{Name: ysanity.YdkEnumTest_remote}
+	i1 := ysanity.Runner_EnumList{KeyName: ysanity.YdkEnumTest_none}
+	i2 := ysanity.Runner_EnumList{KeyName: ysanity.YdkEnumTest_local}
+	i3 := ysanity.Runner_EnumList{KeyName: ysanity.YdkEnumTest_remote}
 	runner.EnumList = []*ysanity.Runner_EnumList{&i1, &i2, &i3}
 
 	ldataKeys := ylist.Keys(runner.EnumList)

diff --git a/sdk/python/CHANGES.md b/sdk/python/CHANGES.md
@@ -1,4 +1,4 @@
-### 2020-02-15 version 0.8.5
+### 2020-06-30 version 0.8.5
 
 #### New features and enhancements
   * Added Entity class member function to clone entity object

diff --git a/sdk/python/core/tests/test_sanity_types.py b/sdk/python/core/tests/test_sanity_types.py
@@ -288,6 +288,22 @@ def test_enum(self):
         self.assertEqual(runner, runner1)
         self.assertEqual(runner.ytypes.built_in_t.enum_value, runner1.ytypes.built_in_t.enum_value)
 
+    def test_enum_list(self):
+        runner = Runner()
+        el1 = Runner.EnumList()
+        el1.key_name = YdkEnumTest.local
+        el2 = Runner.EnumList()
+        el2.key_name = YdkEnumTest.remote
+        runner.enum_list.extend([el1, el2])
+        print(runner.enum_list.keys())
+        self.crud.create(self.ncc, runner)
+
+        # Read into Runner1
+        runner1 = self.crud.read(self.ncc, Runner())
+
+        # Compare runners
+        self.assertEqual(runner, runner1)
+
     def test_union(self):
         runner = Runner()
         runner.ytypes.built_in_t.younion = YdkEnumTest.none

diff --git a/ydkgen/printer/cpp/class_constructor_printer.py b/ydkgen/printer/cpp/class_constructor_printer.py
@@ -125,7 +125,7 @@ def _print_class_inits(self, clazz, leafs, children):
                     for key in key_props:
                         if key_str.__len__() > 0:
                             key_str += ', '
-                        key_str += '"%s"' % key.name
+                        key_str += '"%s"' % key.stmt.arg   # key.name
                     init_stmts.append('%s(this, {%s})' % (child.name,  key_str))
             else:
                 if (child.stmt.search_one('presence') is None):