Merge changes Ib5727c51,I18510f66 into v1.1
* changes:
Fix interface ordering for bridge interfaces in translation layer
Fix internal connection type in rift2openmano
diff --git a/models/openmano/python/rift/openmano/rift2openmano.py b/models/openmano/python/rift/openmano/rift2openmano.py
index 37b2f06..28eb483 100755
--- a/models/openmano/python/rift/openmano/rift2openmano.py
+++ b/models/openmano/python/rift/openmano/rift2openmano.py
@@ -417,7 +417,7 @@
connection = {
"name": vld.name,
"description": vld.description,
- "type": "data",
+ "type": "bridge",
"elements": [],
}
@@ -579,6 +579,9 @@
if bps/x[1] >= 1:
intf["bandwidth"] = "{} {}bps".format(math.ceil(bps/x[1]), x[0])
+ # Sort bridge-ifaces-list TODO sort others
+ newlist = sorted(vnfc["bridge-ifaces"], key=lambda k: k['name'])
+ vnfc["bridge-ifaces"] = newlist
return openmano_vnf