X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fnbi.py;h=d78379f77103b8b70629183333300361acf35944;hb=683a4215b12190c28de78bc8f49ac081fe5adcba;hp=502207f31de4735443e01cef3d9a49f50ecc6364;hpb=a9a1fc8427db17f47ea7ff782e35d24be4094f95;p=osm%2FNBI.git

diff --git a/osm_nbi/nbi.py b/osm_nbi/nbi.py
index 502207f..d78379f 100644
--- a/osm_nbi/nbi.py
+++ b/osm_nbi/nbi.py
@@ -85,7 +85,9 @@ URL: /osm                                                       GET     POST
                     terminate                                           O5
                     action                                              O
                     scale                                               O5
-                    heal                                                5
+                    migrate                                             O
+                    update                                              05
+                    heal                                                O5
             /ns_lcm_op_occs                                     5       5
                 /<nsLcmOpOccId>                                 5                       5       5
                     TO BE COMPLETED                             5               5
@@ -170,7 +172,7 @@ query string:
         ADMIN: To act as an administrator or a different project
         PUBLIC: To get public descriptors or set a descriptor as public
         SET_PROJECT: To make a descriptor available for other project
-        
+
 Header field name	Reference	Example	Descriptions
     Accept	IETF RFC 7231 [19]	application/json	Content-Types that are acceptable for the response.
     This header field shall be present if the response is expected to have a non-empty message body.
@@ -431,6 +433,10 @@ valid_url_methods = {
                 "<ID>": {
                     "METHODS": ("GET", "DELETE"),
                     "ROLE_PERMISSION": "ns_instances:id:",
+                    "heal": {
+                        "METHODS": ("POST",),
+                        "ROLE_PERMISSION": "ns_instances:id:heal:",
+                    },
                     "scale": {
                         "METHODS": ("POST",),
                         "ROLE_PERMISSION": "ns_instances:id:scale:",
@@ -443,10 +449,22 @@ valid_url_methods = {
                         "METHODS": ("POST",),
                         "ROLE_PERMISSION": "ns_instances:id:instantiate:",
                     },
+                    "migrate": {
+                        "METHODS": ("POST",),
+                        "ROLE_PERMISSION": "ns_instances:id:migrate:",
+                    },
                     "action": {
                         "METHODS": ("POST",),
                         "ROLE_PERMISSION": "ns_instances:id:action:",
                     },
+                    "update": {
+                        "METHODS": ("POST",),
+                        "ROLE_PERMISSION": "ns_instances:id:update:",
+                    },
+                    "verticalscale": {
+                        "METHODS": ("POST",),
+                        "ROLE_PERMISSION": "ns_instances:id:verticalscale:"
+                           },
                 },
             },
             "ns_lcm_op_occs": {
@@ -477,6 +495,37 @@ valid_url_methods = {
             },
         }
     },
+    "vnflcm": {
+        "v1": {
+            "vnf_instances": {"METHODS": ("GET", "POST"),
+                              "ROLE_PERMISSION": "vnflcm_instances:",
+                              "<ID>": {"METHODS": ("GET", "DELETE"),
+                                       "ROLE_PERMISSION": "vnflcm_instances:id:",
+                                       "scale": {"METHODS": ("POST",),
+                                                 "ROLE_PERMISSION": "vnflcm_instances:id:scale:"
+                                                },
+                                       "terminate": {"METHODS": ("POST",),
+                                                     "ROLE_PERMISSION": "vnflcm_instances:id:terminate:"
+                                                    },
+                                       "instantiate": {"METHODS": ("POST",),
+                                                       "ROLE_PERMISSION": "vnflcm_instances:id:instantiate:"
+                                                      },
+                                       }
+                            },
+            "vnf_lcm_op_occs": {"METHODS": ("GET",),
+                               "ROLE_PERMISSION": "vnf_instances:opps:",
+                               "<ID>": {"METHODS": ("GET",),
+                                        "ROLE_PERMISSION": "vnf_instances:opps:id:"
+                                        },
+                               },
+            "subscriptions": {"METHODS": ("GET", "POST"),
+                              "ROLE_PERMISSION": "vnflcm_subscriptions:",
+                              "<ID>": {"METHODS": ("GET", "DELETE"),
+                                       "ROLE_PERMISSION": "vnflcm_subscriptions:id:"
+                                       }
+                              },
+        }
+    },
     "nst": {
         "v1": {
             "netslice_templates_content": {
@@ -1293,6 +1342,7 @@ class Server(object):
                 "nst",
                 "nsilcm",
                 "nspm",
+                "vnflcm",
             ):
                 raise NbiException(
                     "URL main_topic '{}' not supported".format(main_topic),
@@ -1347,6 +1397,9 @@ class Server(object):
                     engine_topic = "nslcmops"
                 if topic == "vnfrs" or topic == "vnf_instances":
                     engine_topic = "vnfrs"
+            elif main_topic == "vnflcm":
+                if topic == "vnf_lcm_op_occs":
+                    engine_topic = "vnflcmops"
             elif main_topic == "nst":
                 engine_topic = "nsts"
             elif main_topic == "nsilcm":
@@ -1504,6 +1557,13 @@ class Server(object):
                         "_links": link,
                     }
                     cherrypy.response.status = HTTPStatus.CREATED.value
+                elif topic == "vnf_instances" and item:
+                    indata["lcmOperationType"] = item
+                    indata["vnfInstanceId"] = _id
+                    _id, _ = self.engine.new_item(rollback, engine_session, "vnflcmops", indata, kwargs)
+                    self._set_location_header(main_topic, version, "vnf_lcm_op_occs", _id)
+                    outdata = {"id": _id}
+                    cherrypy.response.status = HTTPStatus.ACCEPTED.value
                 else:
                     _id, op_id = self.engine.new_item(
                         rollback,