commit 4870d0ee29789b859931e4e2c73e13dcb29537d5
author Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com> Sat Sep 30 20:28:33 2017 -0400
committer Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com> Sat Sep 30 20:28:33 2017 -0400
tree 0a495a81e5150578976288ae9c302660d633c4a3
parent 6f1a3fe149e4a6b9803382cb299c902f4cf58ec9

update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try

Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>

common/rw_gen_package.py

diff --git a/common/rw_gen_package.py b/common/rw_gen_package.py
index 427e717..37ac7b6 100755
--- a/common/rw_gen_package.py
+++ b/common/rw_gen_package.py
@@ -25,24 +25,24 @@
 
 from gi.repository import (
     RwYang,
-    NsdYang,
-    RwNsdYang,
-    VnfdYang,
-    RwVnfdYang,
+    ProjectNsdYang as NsdYang,
+    RwProjectNsdYang as RwNsdYang,
+    ProjectVnfdYang as VnfdYang,
+    RwProjectVnfdYang as RwVnfdYang,
     VldYang,
     RwVldYang
 )
 
 def read_from_file(module_list, infile, input_format, descr_type):
-      model = RwYang.Model.create_libncx()
+      model = RwYang.Model.create_libyang()
       for module in module_list:
           model.load_module(module)
 
       descr = None
       if descr_type == "nsd":
-        descr = RwNsdYang.YangData_Nsd_NsdCatalog_Nsd()
+        descr = RwNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd()
       else:
-        descr = VnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd()
+        descr = VnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd()
 
       if input_format == 'json':
           json_str = open(infile).read()