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
/
tosca
/
tosca_nfv_vnf.py
diff --git
a/common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_nfv_vnf.py
b/common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_nfv_vnf.py
index
3e52967
..
29beca1
100644
(file)
--- a/
common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_nfv_vnf.py
+++ b/
common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_nfv_vnf.py
@@
-23,9
+23,9
@@
from toscaparser.common.exception import ValidationError
try:
import gi
try:
import gi
- gi.require_version('RwVnfdYang', '1.0')
+ gi.require_version('Rw
Project
VnfdYang', '1.0')
- from gi.repository import RwVnfdYang
+ from gi.repository import Rw
ProjectVnfdYang as Rw
VnfdYang
except ImportError:
pass
except ValueError:
except ImportError:
pass
except ValueError:
@@
-222,7
+222,7
@@
class ToscaNfvVnf(ManoResource):
format(self.name, self.properties))
def generate_yang_model_gi(self, nsd, vnfds):
format(self.name, self.properties))
def generate_yang_model_gi(self, nsd, vnfds):
- vnfd_cat = RwVnfdYang.YangData_
Vnfd
_VnfdCatalog()
+ vnfd_cat = RwVnfdYang.YangData_
RwProject_Project
_VnfdCatalog()
vnfd = vnfd_cat.vnfd.add()
props = convert_keys_to_python(self.properties)
try:
vnfd = vnfd_cat.vnfd.add()
props = convert_keys_to_python(self.properties)
try: