commit 4f810f24007e506d87a0f17886ada38d0f82c554
author Philip Joseph <philip.joseph@riftio.com> Tue Mar 07 23:09:10 2017 +0530
committer josephp <philip.joseph@riftio.com> Wed Mar 08 15:18:53 2017 +0100
tree dcc139a6b22419c8805119d3426d82090aee6bb2
parent 4ef8d408da3c354d3c12db89c4d395145e590dfc

New feature: Support rooted descriptors and descriptors under project

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>

models/openmano/src/openmano2rift.py

diff --git a/models/openmano/src/openmano2rift.py b/models/openmano/src/openmano2rift.py
index 88c549b..750115c 100755
--- a/models/openmano/src/openmano2rift.py
+++ b/models/openmano/src/openmano2rift.py
@@ -28,13 +28,13 @@
 
 import gi
 gi.require_version('RwYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
-gi.require_version('RwNsdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
+gi.require_version('RwProjectNsdYang', '1.0')
 gi.require_version('RwProjectYang', '1.0')
 from gi.repository import (
     RwYang,
-    RwVnfdYang,
-    RwNsdYang,
+    RwProjectVnfdYang as RwVnfdYang,
+    RwProjectNsdYang as RwNsdYang,
     RwProjectYang,
     )
 
@@ -169,7 +169,7 @@
                         if topo_node['type'] == 'VNF':
                             cpref = vld.vnfd_connection_point_ref.add()
                             cpref.from_dict(dict(
-                                member_vnf_index_ref=str(vnf_member_index_dict[node_key]),
+                                member_vnf_index_ref=vnf_member_index_dict[node_key],
                                 vnfd_id_ref=self.get_vnfd_id(vnf_list, topo_node['VNF model']),
                                 #vnfd_id_ref=topo_node['VNF model'],
                                 vnfd_connection_point_ref=node[node_key],
@@ -469,8 +469,9 @@
     vnf_list = create_vnfs_from_yaml_files(args.yaml_file_hdls)
     ns_list = create_ns_from_yaml_files(args.yaml_file_hdls, vnf_list)
 
+    # TODO (Philip): Relook at the model generation
     writer = DescriptorFileWriter(
-        module_list=['rw-project', 'nsd', 'rw-nsd', 'vnfd', 'rw-vnfd'],
+        module_list=['rw-project', 'project-nsd', 'rw-project-nsd', 'project-vnfd', 'rw-project-vnfd'],
         output_dir=args.outdir,
         output_format=args.format,
         )