projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to use rw-project definition from platform
[osm/SO.git]
/
common
/
rw_gen_package.py
diff --git
a/common/rw_gen_package.py
b/common/rw_gen_package.py
index
427e717
..
1feb5de
100755
(executable)
--- a/
common/rw_gen_package.py
+++ b/
common/rw_gen_package.py
@@
-25,10
+25,10
@@
import xml.etree.ElementTree as etree
from gi.repository import (
RwYang,
from gi.repository import (
RwYang,
- NsdYang,
- RwNsdYang,
- VnfdYang,
- RwVnfdYang,
+
ProjectNsdYang as
NsdYang,
+ Rw
ProjectNsdYang as Rw
NsdYang,
+
ProjectVnfdYang as
VnfdYang,
+ Rw
ProjectVnfdYang as Rw
VnfdYang,
VldYang,
RwVldYang
)
VldYang,
RwVldYang
)
@@
-40,9
+40,9
@@
def read_from_file(module_list, infile, input_format, descr_type):
descr = None
if descr_type == "nsd":
descr = None
if descr_type == "nsd":
- descr = RwNsdYang.YangData_
Nsd
_NsdCatalog_Nsd()
+ descr = RwNsdYang.YangData_
RwProject_Project
_NsdCatalog_Nsd()
else:
else:
- descr = VnfdYang.YangData_
Vnfd
_VnfdCatalog_Vnfd()
+ descr = VnfdYang.YangData_
RwProject_Project
_VnfdCatalog_Vnfd()
if input_format == 'json':
json_str = open(infile).read()
if input_format == 'json':
json_str = open(infile).read()