From: Adurti <adurti.v@tataelxsi.co.in>
Date: Thu, 21 Mar 2024 08:42:52 +0000 (+0000)
Subject: Bug 2353 Fixed Unable to update roles for few role permissions
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=c74f44d90d5848928674f7fd0b7d5f05e98bb7bc;p=osm%2FNBI.git

Bug 2353 Fixed Unable to update roles for few role permissions

Change-Id: Id340d4e05751a6b67f24d6ebc9d88ddab05dad1d
Signed-off-by: Adurti <adurti.v@tataelxsi.co.in>
---

diff --git a/osm_nbi/nbi.py b/osm_nbi/nbi.py
index 46b5758..5a8dfac 100644
--- a/osm_nbi/nbi.py
+++ b/osm_nbi/nbi.py
@@ -328,7 +328,7 @@ valid_url_methods = {
         "v1": {
             "ns_descriptors_content": {
                 "METHODS": ("GET", "POST"),
-                "ROLE_PERMISSION": "nsds:",
+                "ROLE_PERMISSION": "nsds:content:",
                 "<ID>": {
                     "METHODS": ("GET", "PUT", "DELETE"),
                     "ROLE_PERMISSION": "nsds:id:",
@@ -346,7 +346,7 @@ valid_url_methods = {
                     },
                     "nsd": {
                         "METHODS": ("GET",),  # descriptor inside package
-                        "ROLE_PERMISSION": "nsds:id:content:",
+                        "ROLE_PERMISSION": "nsds:id:nsd:",
                     },
                     "artifacts": {
                         "METHODS": ("GET",),
@@ -372,7 +372,7 @@ valid_url_methods = {
         "v1": {
             "vnf_packages_content": {
                 "METHODS": ("GET", "POST"),
-                "ROLE_PERMISSION": "vnfds:",
+                "ROLE_PERMISSION": "vnfds:content:",
                 "<ID>": {
                     "METHODS": ("GET", "PUT", "DELETE"),
                     "ROLE_PERMISSION": "vnfds:id:",
@@ -386,7 +386,7 @@ valid_url_methods = {
                     "ROLE_PERMISSION": "vnfds:id:",
                     "package_content": {
                         "METHODS": ("GET", "PUT"),  # package
-                        "ROLE_PERMISSION": "vnfds:id:",
+                        "ROLE_PERMISSION": "vnfds:id:content:",
                         "upload_from_uri": {
                             "METHODS": (),
                             "TODO": ("POST",),
@@ -395,7 +395,7 @@ valid_url_methods = {
                     },
                     "vnfd": {
                         "METHODS": ("GET",),  # descriptor inside package
-                        "ROLE_PERMISSION": "vnfds:id:content:",
+                        "ROLE_PERMISSION": "vnfds:id:vnfd:",
                     },
                     "artifacts": {
                         "METHODS": ("GET",),
@@ -423,7 +423,7 @@ valid_url_methods = {
         "v1": {
             "ns_instances_content": {
                 "METHODS": ("GET", "POST"),
-                "ROLE_PERMISSION": "ns_instances:",
+                "ROLE_PERMISSION": "ns_instances:content:",
                 "<ID>": {
                     "METHODS": ("GET", "DELETE"),
                     "ROLE_PERMISSION": "ns_instances:id:",
diff --git a/osm_nbi/resources_to_operations.yml b/osm_nbi/resources_to_operations.yml
index 3c5ba3d..8bec24c 100644
--- a/osm_nbi/resources_to_operations.yml
+++ b/osm_nbi/resources_to_operations.yml
@@ -45,7 +45,7 @@ resources_to_operations:
 ##################################### NSDs #####################################
 ################################################################################
 
-  "GET /nsd/v1/ns_descriptors_content": "nsds:get"
+  "GET /nsd/v1/ns_descriptors_content": "nsds:content:get"
   "GET /nsd/v1/ns_descriptors": "nsds:get"
 
   "POST /nsd/v1/ns_descriptors_content": "nsds:content:post"
@@ -75,7 +75,7 @@ resources_to_operations:
 ##################################### VNFDs ####################################
 ################################################################################
 
-  "GET /vnfpkgm/v1/vnf_packages_content": "vnfds:get"
+  "GET /vnfpkgm/v1/vnf_packages_content": "vnfds:content:get"
   "GET /vnfpkgm/v1/vnf_packages": "vnfds:get"
 
   "POST /vnfpkgm/v1/vnf_packages_content": "vnfds:content:post"
@@ -112,7 +112,7 @@ resources_to_operations:
 ################################## NS Instances ################################
 ################################################################################
 
-  "GET /nslcm/v1/ns_instances_content": "ns_instances:get"
+  "GET /nslcm/v1/ns_instances_content": "ns_instances:content:get"
   "GET /nslcm/v1/ns_instances": "ns_instances:get"
 
   "POST /nslcm/v1/ns_instances_content": "ns_instances:content:post"