X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=common%2Fpython%2Frift%2Fmano%2Ftosca_translator%2Frwmano%2Fsyntax%2Fmano_template.py;h=5300eba6c9fc32d30c91e433b224cbcaf78da8ac;hb=4f810f24007e506d87a0f17886ada38d0f82c554;hp=d263e6f01cb1302a47517e08d092ad80e30a91fa;hpb=255ff03a528a3090ce7f46f0a63b65da3e6f9bcf;p=osm%2FSO.git diff --git a/common/python/rift/mano/tosca_translator/rwmano/syntax/mano_template.py b/common/python/rift/mano/tosca_translator/rwmano/syntax/mano_template.py index d263e6f0..5300eba6 100644 --- a/common/python/rift/mano/tosca_translator/rwmano/syntax/mano_template.py +++ b/common/python/rift/mano/tosca_translator/rwmano/syntax/mano_template.py @@ -24,11 +24,11 @@ from rift.mano.tosca_translator.common.utils import dict_convert_values_to_str try: import gi gi.require_version('RwYang', '1.0') - gi.require_version('RwNsdYang', '1.0') - gi.require_version('NsdYang', '1.0') + gi.require_version('RwProjectNsdYang', '1.0') + gi.require_version('ProjectNsdYang', '1.0') - from gi.repository import NsdYang - from gi.repository import RwNsdYang + from gi.repository import ProjectNsdYang as NsdYang + from gi.repository import RwProjectNsdYang as RwNsdYang from gi.repository import RwYang except ImportError: pass @@ -61,7 +61,7 @@ class ManoTemplate(object): if use_gi: try: - nsd_cat = RwNsdYang.YangData_Nsd_NsdCatalog() + nsd_cat = RwNsdYang.YangData_RwProject_Project_NsdCatalog() nsd = nsd_cat.nsd.add() nsd.id = nsd_id nsd.name = self.metadata['name'] @@ -111,7 +111,7 @@ class ManoTemplate(object): if use_gi: for param in self.parameters: nsd.input_parameter_xpath.append( - NsdYang.YangData_Nsd_NsdCatalog_Nsd_InputParameterXpath( + NsdYang.YangData_RwProject_Project_NsdCatalog_Nsd_InputParameterXpath( xpath=param.get_xpath(), ) )