projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add MANO roles for projects
[osm/SO.git]
/
models
/
openmano
/
src
/
openmano2rift.py
diff --git
a/models/openmano/src/openmano2rift.py
b/models/openmano/src/openmano2rift.py
index
503ad89
..
750115c
100755
(executable)
--- a/
models/openmano/src/openmano2rift.py
+++ b/
models/openmano/src/openmano2rift.py
@@
-1,7
+1,7
@@
#!/usr/bin/env python3
#
#!/usr/bin/env python3
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016
-2017
RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-28,12
+28,14
@@
import yaml
import gi
gi.require_version('RwYang', '1.0')
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,
from gi.repository import (
RwYang,
- RwVnfdYang,
- RwNsdYang,
+ RwProjectVnfdYang as RwVnfdYang,
+ RwProjectNsdYang as RwNsdYang,
+ RwProjectYang,
)
logging.basicConfig(level=logging.WARNING)
)
logging.basicConfig(level=logging.WARNING)
@@
-115,7
+117,7
@@
class RiftNS(RiftManoDescriptor):
return vnf_name
def openmano2rift(self, vnf_list):
return vnf_name
def openmano2rift(self, vnf_list):
- self.descriptor = RwNsdYang.YangData_
Nsd
_NsdCatalog()
+ self.descriptor = RwNsdYang.YangData_
RwProject_Project
_NsdCatalog()
openmano_nsd = self.openmano.dictionary
self.name = openmano_nsd['name']
nsd = self.descriptor.nsd.add()
openmano_nsd = self.openmano.dictionary
self.name = openmano_nsd['name']
nsd = self.descriptor.nsd.add()
@@
-203,7
+205,7
@@
class RiftVnfd(RiftManoDescriptor):
return None
def openmano2rift(self):
return None
def openmano2rift(self):
- self.descriptor = RwVnfdYang.YangData_
Vnfd
_VnfdCatalog()
+ self.descriptor = RwVnfdYang.YangData_
RwProject_Project
_VnfdCatalog()
vnfd = self.descriptor.vnfd.add()
self.vnfd = vnfd
vnfd.id = str(uuid.uuid1())
vnfd = self.descriptor.vnfd.add()
self.vnfd = vnfd
vnfd.id = str(uuid.uuid1())
@@
-467,8
+469,9
@@
def main(argv=sys.argv[1:]):
vnf_list = create_vnfs_from_yaml_files(args.yaml_file_hdls)
ns_list = create_ns_from_yaml_files(args.yaml_file_hdls, vnf_list)
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(
writer = DescriptorFileWriter(
- module_list=['
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,
)
output_dir=args.outdir,
output_format=args.format,
)