X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Fns.py;h=472ce795102b4da00aec82d0b766c5ac37216519;hb=72c67141682d0156c0108302eb0d2dcc52cfd808;hp=d42433ba7bb15353e538b523eda65159fdcb1caf;hpb=0e9588639955dd0d099fd11d6a532af309918673;p=osm%2FRO.git

diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py
index d42433ba..472ce795 100644
--- a/NG-RO/osm_ng_ro/ns.py
+++ b/NG-RO/osm_ng_ro/ns.py
@@ -16,38 +16,38 @@
 # limitations under the License.
 ##
 
-# import yaml
+from http import HTTPStatus
 import logging
+from random import choice as random_choice
+from threading import Lock
+from time import time
 from traceback import format_exc as traceback_format_exc
-from osm_ng_ro.ns_thread import NsWorker, NsWorkerException, deep_get
-from osm_ng_ro.validation import validate_input, deploy_schema
+from uuid import uuid4
+
+from cryptography.hazmat.backends import default_backend as crypto_default_backend
+from cryptography.hazmat.primitives import serialization as crypto_serialization
+from cryptography.hazmat.primitives.asymmetric import rsa
+from jinja2 import (
+    Environment,
+    StrictUndefined,
+    TemplateError,
+    TemplateNotFound,
+    UndefinedError,
+)
 from osm_common import (
-    dbmongo,
     dbmemory,
+    dbmongo,
     fslocal,
     fsmongo,
-    msglocal,
     msgkafka,
+    msglocal,
     version as common_version,
 )
 from osm_common.dbbase import DbException
 from osm_common.fsbase import FsException
 from osm_common.msgbase import MsgException
-from http import HTTPStatus
-from uuid import uuid4
-from threading import Lock
-from random import choice as random_choice
-from time import time
-from jinja2 import (
-    Environment,
-    TemplateError,
-    TemplateNotFound,
-    StrictUndefined,
-    UndefinedError,
-)
-from cryptography.hazmat.primitives import serialization as crypto_serialization
-from cryptography.hazmat.primitives.asymmetric import rsa
-from cryptography.hazmat.backends import default_backend as crypto_default_backend
+from osm_ng_ro.ns_thread import deep_get, NsWorker, NsWorkerException
+from osm_ng_ro.validation import deploy_schema, validate_input
 
 __author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
 min_common_version = "0.1.16"
@@ -563,6 +563,11 @@ class Ns(object):
                         flavor_data["ephemeral"] = int(
                             storage.get("size-of-storage", 0)
                         )
+                    elif (
+                        storage.get("type-of-storage")
+                        == "etsi-nfv-descriptors:swap-storage"
+                    ):
+                        flavor_data["swap"] = int(storage.get("size-of-storage", 0))
 
                 if target_flavor.get("guest-epa"):
                     extended = {}
@@ -688,6 +693,23 @@ class Ns(object):
 
                 return extra_dict
 
+            def _process_affinity_group_params(
+                target_affinity_group, vim_info, target_record_id
+            ):
+                extra_dict = {}
+
+                affinity_group_data = {
+                    "name": target_affinity_group["name"],
+                    "type": target_affinity_group["type"],
+                    "scope": target_affinity_group["scope"],
+                }
+
+                extra_dict["params"] = {
+                    "affinity_group_data": affinity_group_data,
+                }
+
+                return extra_dict
+
             def _ip_profile_2_ro(ip_profile):
                 if not ip_profile:
                     return None
@@ -903,6 +925,25 @@ class Ns(object):
                         == "persistent-storage:persistent-storage"
                     ]
 
+                affinity_group_list = []
+
+                if target_vdu.get("affinity-or-anti-affinity-group-id"):
+                    affinity_group = {}
+                    for affinity_group_id in target_vdu[
+                        "affinity-or-anti-affinity-group-id"
+                    ]:
+                        affinity_group_text = (
+                            ns_preffix
+                            + ":affinity-or-anti-affinity-group."
+                            + affinity_group_id
+                        )
+
+                        extra_dict["depends_on"].append(affinity_group_text)
+                        affinity_group["affinity_group_id"] = (
+                            "TASK-" + affinity_group_text
+                        )
+                        affinity_group_list.append(affinity_group)
+
                 extra_dict["params"] = {
                     "name": "{}-{}-{}-{}".format(
                         indata["name"][:16],
@@ -914,6 +955,7 @@ class Ns(object):
                     "start": True,
                     "image_id": "TASK-" + image_text,
                     "flavor_id": "TASK-" + flavor_text,
+                    "affinity_group_list": affinity_group_list,
                     "net_list": net_list,
                     "cloud_config": cloud_config or None,
                     "disk_list": disk_list,
@@ -1151,6 +1193,20 @@ class Ns(object):
                         process_params=_process_flavor_params,
                     )
 
+                    step = "process NS Affinity Groups"
+                    _process_items(
+                        target_list=indata.get("affinity-or-anti-affinity-group") or [],
+                        existing_list=db_nsr.get("affinity-or-anti-affinity-group")
+                        or [],
+                        db_record="nsrs:{}:affinity-or-anti-affinity-group".format(
+                            nsr_id
+                        ),
+                        db_update=db_nsr_update,
+                        db_path="affinity-or-anti-affinity-group",
+                        item="affinity-or-anti-affinity-group",
+                        process_params=_process_affinity_group_params,
+                    )
+
                     # VNF.vld
                     for vnfr_id, vnfr in db_vnfrs.items():
                         # vnfr_id need to be set as global variable for among others nested method _process_vdu_params