X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Fns.py;fp=NG-RO%2Fosm_ng_ro%2Fns.py;h=5e5cd9ccca61e36160e936430d3cb6f6c4dc6eaa;hb=25d668fbf53c69e3d88cddf04fb0ab2554c52e7d;hp=1850353136f2e7371b757670018e485017285af2;hpb=89d5ff91d7102b88db500cfec48a93171f2874c2;p=osm%2FRO.git

diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py
index 18503531..5e5cd9cc 100644
--- a/NG-RO/osm_ng_ro/ns.py
+++ b/NG-RO/osm_ng_ro/ns.py
@@ -812,6 +812,45 @@ class Ns(object):
                 extra_dict = {"depends_on": [image_text, flavor_text]}
                 net_list = []
 
+                # If the position info is provided for all the interfaces, it will be sorted
+                # according to position number ascendingly.
+                if all(
+                    i.get("position") + 1
+                    for i in target_vdu["interfaces"]
+                    if i.get("position") is not None
+                ):
+                    sorted_interfaces = sorted(
+                        target_vdu["interfaces"],
+                        key=lambda x: (x.get("position") is None, x.get("position")),
+                    )
+                    target_vdu["interfaces"] = sorted_interfaces
+
+                # If the position info is provided for some interfaces but not all of them, the interfaces
+                # which has specific position numbers will be placed and others' positions will not be taken care.
+                else:
+                    if any(
+                        i.get("position") + 1
+                        for i in target_vdu["interfaces"]
+                        if i.get("position") is not None
+                    ):
+                        n = len(target_vdu["interfaces"])
+                        sorted_interfaces = [-1] * n
+                        k, m = 0, 0
+                        while k < n:
+                            if target_vdu["interfaces"][k].get("position"):
+                                idx = target_vdu["interfaces"][k]["position"]
+                                sorted_interfaces[idx - 1] = target_vdu["interfaces"][k]
+                            k += 1
+                        while m < n:
+                            if not target_vdu["interfaces"][m].get("position"):
+                                idy = sorted_interfaces.index(-1)
+                                sorted_interfaces[idy] = target_vdu["interfaces"][m]
+                            m += 1
+
+                        target_vdu["interfaces"] = sorted_interfaces
+
+                # If the position info is not provided for the interfaces, interfaces will be attached
+                # according to the order in the VNFD.
                 for iface_index, interface in enumerate(target_vdu["interfaces"]):
                     if interface.get("ns-vld-id"):
                         net_text = ns_preffix + ":vld." + interface["ns-vld-id"]