attic/run_test.py

@@ -24,7 +24,7 @@ import yaml
 # import json
 # import tarfile
 from time import sleep
-from random import randint
+import random
 import os
 from sys import stderr
 from uuid import uuid4
@@ -2353,7 +2353,7 @@ class TestDeploy:
                 headers = headers_yaml
             else:
                 headers = headers_zip_yaml
-            if randint(0, 1) == 0:
+            if random.SystemRandom().randint(0, 1) == 0:
                 # vnfd CREATE AND UPLOAD in one step:
                 engine.test(
                     "Onboard VNFD in one step",
@@ -2431,7 +2431,7 @@ class TestDeploy:
         else:
             headers = headers_zip_yaml
 
-        if randint(0, 1) == 0:
+        if random.SystemRandom().randint(0, 1) == 0:
             # nsd CREATE AND UPLOAD in one step:
             engine.test(
                 "Onboard NSD in one step",

osm_nbi/admin_topics.py

@@ -1159,6 +1159,15 @@ class UserTopicAuth(UserTopic):
 
             # set
             if indata.get("project_role_mappings"):
+                duplicates = []
+                for pr in indata.get("project_role_mappings"):
+                    if pr not in duplicates:
+                        duplicates.append(pr)
+                if len(indata.get("project_role_mappings")) > len(duplicates):
+                    raise EngineException(
+                        "Project-role combination should not be repeated",
+                        http_code=HTTPStatus.UNPROCESSABLE_ENTITY,
+                    )
                 for to_set in indata["project_role_mappings"]:
                     for mapping in original_mapping:
                         if to_set["project"] in (

osm_nbi/descriptor_topics.py

@@ -2320,6 +2320,15 @@ class NsConfigTemplateTopic(DescriptorTopic):
                     for key, value in edit_content_param.items():
                         param = key
                         param_content = value
+                        if param == "vnf":
+                            for content in param_content:
+                                for vdu in content.get("vdu"):
+                                    if vdu.get("vim-flavor-name") and vdu.get(
+                                        "vim-flavor-id"
+                                    ):
+                                        raise EngineException(
+                                            "Instantiation parameters vim-flavor-name and vim-flavor-id are mutually exclusive"
+                                        )
                         validate_input(param_content, self.instantiation_params[param])
             return final_content
         except Exception as e:

osm_nbi/instance_topics.py

@@ -374,6 +374,15 @@ class NsrTopic(BaseTopic):
                     ns_config_template_db, "ns_config_template", self.db
                 )
 
+            elif ns_request.get("vnf"):
+                vnf_data = ns_request.get("vnf")
+                for vnf in vnf_data:
+                    for vdu in vnf.get("vdu"):
+                        if vdu.get("vim-flavor-name") and vdu.get("vim-flavor-id"):
+                            raise EngineException(
+                                "Instantiation parameters vim-flavor-name and vim-flavor-id are mutually exclusive"
+                            )
+
             step = "checking nsdOperationalState"
             self._check_nsd_operational_state(nsd, ns_request)
 

osm_nbi/validation.py

@@ -159,6 +159,8 @@ ns_instantiate_vdu = {
         "id": name_schema,
         "vim-flavor-id": name_schema,
         "instance_name": name_schema,
+        "vim-flavor-name": name_schema,
+        "security-group-name": name_schema,
         "volume": {
             "type": "array",
             "minItems": 1,