projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from OSM SO master
[osm/SO.git]
/
models
/
openmano
/
python
/
rift
/
openmano
/
rift2openmano.py
diff --git
a/models/openmano/python/rift/openmano/rift2openmano.py
b/models/openmano/python/rift/openmano/rift2openmano.py
index
8043646
..
92296ff
100755
(executable)
--- a/
models/openmano/python/rift/openmano/rift2openmano.py
+++ b/
models/openmano/python/rift/openmano/rift2openmano.py
@@
-27,13
+27,13
@@
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('Rw
Project
VnfdYang', '1.0')
+gi.require_version('Rw
Project
NsdYang', '1.0')
from gi.repository import (
RwYang,
from gi.repository import (
RwYang,
- RwVnfdYang,
- RwNsdYang,
+ Rw
ProjectVnfdYang as Rw
VnfdYang,
+ Rw
ProjectNsdYang as Rw
NsdYang,
)
import rift.package.store
)
import rift.package.store
@@
-88,20
+88,20
@@
class RiftNSD(object):
@classmethod
def from_xml_file_hdl(cls, hdl):
hdl.seek(0)
@classmethod
def from_xml_file_hdl(cls, hdl):
hdl.seek(0)
- descriptor = RwNsdYang.YangData_
Nsd
_NsdCatalog_Nsd()
+ descriptor = RwNsdYang.YangData_
RwProject_Project
_NsdCatalog_Nsd()
descriptor.from_xml_v2(RiftNSD.model, hdl.read())
return cls(descriptor)
@classmethod
def from_yaml_file_hdl(cls, hdl):
hdl.seek(0)
descriptor.from_xml_v2(RiftNSD.model, hdl.read())
return cls(descriptor)
@classmethod
def from_yaml_file_hdl(cls, hdl):
hdl.seek(0)
- descriptor = RwNsdYang.YangData_
Nsd
_NsdCatalog_Nsd()
+ descriptor = RwNsdYang.YangData_
RwProject_Project
_NsdCatalog_Nsd()
descriptor.from_yaml(RiftNSD.model, hdl.read())
return cls(descriptor)
@classmethod
def from_dict(cls, nsd_dict):
descriptor.from_yaml(RiftNSD.model, hdl.read())
return cls(descriptor)
@classmethod
def from_dict(cls, nsd_dict):
- descriptor = RwNsdYang.YangData_
Nsd
_NsdCatalog_Nsd.from_dict(nsd_dict)
+ descriptor = RwNsdYang.YangData_
RwProject_Project
_NsdCatalog_Nsd.from_dict(nsd_dict)
return cls(descriptor)
return cls(descriptor)
@@
-143,20
+143,20
@@
class RiftVNFD(object):
@classmethod
def from_xml_file_hdl(cls, hdl):
hdl.seek(0)
@classmethod
def from_xml_file_hdl(cls, hdl):
hdl.seek(0)
- descriptor = RwVnfdYang.YangData_
Vnfd
_VnfdCatalog_Vnfd()
+ descriptor = RwVnfdYang.YangData_
RwProject_Project
_VnfdCatalog_Vnfd()
descriptor.from_xml_v2(RiftVNFD.model, hdl.read())
return cls(descriptor)
@classmethod
def from_yaml_file_hdl(cls, hdl):
hdl.seek(0)
descriptor.from_xml_v2(RiftVNFD.model, hdl.read())
return cls(descriptor)
@classmethod
def from_yaml_file_hdl(cls, hdl):
hdl.seek(0)
- descriptor = RwVnfdYang.YangData_
Vnfd
_VnfdCatalog_Vnfd()
+ descriptor = RwVnfdYang.YangData_
RwProject_Project
_VnfdCatalog_Vnfd()
descriptor.from_yaml(RiftVNFD.model, hdl.read())
return cls(descriptor)
@classmethod
def from_dict(cls, vnfd_dict):
descriptor.from_yaml(RiftVNFD.model, hdl.read())
return cls(descriptor)
@classmethod
def from_dict(cls, vnfd_dict):
- descriptor = RwVnfdYang.YangData_
Vnfd
_VnfdCatalog_Vnfd.from_dict(vnfd_dict)
+ descriptor = RwVnfdYang.YangData_
RwProject_Project
_VnfdCatalog_Vnfd.from_dict(vnfd_dict)
return cls(descriptor)
return cls(descriptor)
@@
-499,12
+499,11
@@
def rift2openmano_vnfd(rift_vnfd, rift_nsd):
if vdu.vm_flavor.has_field("vcpu_count"):
vnfc["numas"][0]["cores"] = max(vdu.vm_flavor.vcpu_count, 1)
if vdu.vm_flavor.has_field("vcpu_count"):
vnfc["numas"][0]["cores"] = max(vdu.vm_flavor.vcpu_count, 1)
- else:
- if vdu.vm_flavor.has_field("vcpu_count") and vdu.vm_flavor.vcpu_count:
- vnfc["vcpus"] = vdu.vm_flavor.vcpu_count
+ if vdu.vm_flavor.has_field("vcpu_count") and vdu.vm_flavor.vcpu_count:
+ vnfc["vcpus"] = vdu.vm_flavor.vcpu_count
-
if vdu.vm_flavor.has_field("memory_mb") and vdu.vm_flavor.memory_mb:
-
vnfc["ram"] = vdu.vm_flavor.memory_mb
+ if vdu.vm_flavor.has_field("memory_mb") and vdu.vm_flavor.memory_mb:
+ vnfc["ram"] = vdu.vm_flavor.memory_mb
if vdu.has_field("hypervisor_epa"):
if vdu.has_field("hypervisor_epa"):