Merge branch 'feature10996-cancel_operation' into 'master'

feature10996-cancel_operation

See merge request !149

05-osm-usage.md

@@ -2038,6 +2038,21 @@ __Step 2: See the notification in notification receiver.__
 - Support for subscription and notification for VNFD.
 - Cache to store subscribers.
 
+## How to cancel an ongoing operation over a NS
+
+The OSM client command `ns-op-cancel` allows to cancel any ongoing operation of Network Service. For instance, to cancel the instantiation of a NS execute the following steps:
+
+1. Create the NS with `osm ns-create` and save the Network Service ID (NS_ID)
+2. Obtain the Operation ID of the NS instantiation with `osm ns-op-list NS_ID`
+3. Cancel the operation with `osm ns-op-cancel OP_ID`
+4. The NS will be in `FAILED_TEMP` status.
+
+Be aware that resources created before the cancellation will not be rolled back and the Network Service could be unhealthy.
+
+If some operation is blocked due to an ungraceful restart of LCM module, you can use this command to delete the operation and unblock the Network Service.
+
+Queued (unstarted) operations can also be deleted with this command. 
+
 ## Start, Stop and Rebuild operations over a VDU of a running VNF instance
 
 These three operations involves starting , stopping, and rebuilding of a VDU on a running VNF instance by using the NGUI. 

10-osm-client-commands-reference.md

@@ -53,6 +53,7 @@ Commands:
   ns-delete                  deletes a NS instance
   ns-list                    list all NS instances
   ns-metric-export           exports a metric to the internal OSM bus, which can be read by other apps
+  ns-op-cancel               cancels an ongoing NS operation
   ns-op-list                 shows the history of operations over a NS instance
   ns-op-show                 shows the info of a NS operation
   ns-show                    shows the info of a NS instance

12-osm-nbi.md

@@ -118,7 +118,7 @@ URL: /osm                                                       GET     POST
                     heal                                                5
             /ns_lcm_op_occs                                     5       5
                 /<nsLcmOpOccId>                                 5                       5       5
-                    TO BE COMPLETED                             5               5
+                    cancel                                              05
             /vnf_instances  (also vnfrs for compatibility)      O
                 /<vnfInstanceId>                                O
             /subscriptions                                      5       5