projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New feature: Support rooted descriptors and descriptors under project
[osm/SO.git]
/
common
/
python
/
rift
/
mano
/
tosca_translator
/
rwmano
/
syntax
/
mano_template.py
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
d263e6f
..
5300eba
100644
(file)
--- 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')
try:
import gi
gi.require_version('RwYang', '1.0')
- gi.require_version('RwNsdYang', '1.0')
- gi.require_version('NsdYang', '1.0')
+ gi.require_version('Rw
Project
NsdYang', '1.0')
+ gi.require_version('
Project
NsdYang', '1.0')
- from gi.repository import NsdYang
- from gi.repository import RwNsdYang
+ from gi.repository import
ProjectNsdYang as
NsdYang
+ from gi.repository import Rw
ProjectNsdYang as Rw
NsdYang
from gi.repository import RwYang
except ImportError:
pass
from gi.repository import RwYang
except ImportError:
pass
@@
-61,7
+61,7
@@
class ManoTemplate(object):
if use_gi:
try:
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']
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(
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(),
)
)
xpath=param.get_xpath(),
)
)