DGs for SOTN NNI based service creation

Issue-ID: SDNC-900
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I3ae8efc39aaa5fc5de48b3323f986531d3c7fa74

Former-commit-id: 84477fc8f92e417f809ffe040ffb12de46a43a77

1 files changed, 382 insertions, 27 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.json
index 22f21465..543904d1 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.json
@@ -1,20 +1,20 @@
 [

     {

-        "id": "cbc1a13.7b8456",

+        "id": "3ad24b85.b3bf64",

         "type": "dgstart",

         "name": "DGSTART",

         "outputs": 1,

-        "x": 154.56666564941406,

-        "y": 94.56666564941406,

-        "z": "81a75cb3.dfe96",

+        "x": 106,

+        "y": 56,

+        "z": "1749c920.27afb7",

         "wires": [

             [

-                "58be845c.53f8dc"

+                "7476f33b.2d0eb4"

             ]

         ]

     },

     {

-        "id": "58be845c.53f8dc",

+        "id": "7476f33b.2d0eb4",

         "type": "service-logic",

         "name": "GENERIC-RESOURCE-API ${project.version}",

         "module": "GENERIC-RESOURCE-API",

@@ -22,57 +22,412 @@
         "comments": "",

         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",

         "outputs": 1,

-        "x": 438.85235595703125,

-        "y": 155.8047742843628,

-        "z": "81a75cb3.dfe96",

+        "x": 390.2856903076172,

+        "y": 117.23810863494873,

+        "z": "1749c920.27afb7",

         "wires": [

             [

-                "1e9f5313.eb2125"

+                "7da838c5.7d227"

             ]

         ]

     },

     {

-        "id": "1e9f5313.eb2125",

+        "id": "7da838c5.7d227",

         "type": "method",

         "name": "method sotn-vnf-topology-operation-underlay-deactivate",

         "xml": "<method rpc='sotn-vnf-topology-operation-underlay-deactivate' mode='sync'>\n",

         "comments": "",

         "outputs": 1,

-        "x": 444.9952697753906,

-        "y": 240.5666961669922,

-        "z": "81a75cb3.dfe96",

+        "x": 396.42860412597656,

+        "y": 202.00003051757812,

+        "z": "1749c920.27afb7",

         "wires": [

             [

-                "1920f1ef.4bc3e6"

+                "a742330d.128a3"

             ]

         ]

     },

     {

-        "id": "1920f1ef.4bc3e6",

+        "id": "a742330d.128a3",

         "type": "block",

         "name": "block : atomic",

-        "xml": "<block atomic=\"true\">\n",

-        "atomic": "false",

-        "comments": "",

+        "xml": "<block atomic=\"true\">",

+        "atomic": "true",

         "outputs": 1,

-        "x": 583.0940055847168,

-        "y": 457.6408796310425,

-        "z": "81a75cb3.dfe96",

+        "x": 592.2380447387695,

+        "y": 360.66666814964265,

+        "z": "1749c920.27afb7",

         "wires": [

             [

-                "7d3f17a8.8dc"

+                "dfd1a930.eeb17",

+                "b0be94f0.05dfb8",

+                "59f78da4.50f2fc",

+                "41673fa0.b1a818",

+                "cdfb0ad2.8ad0d8",

+                "4b93b56d.437c5c",

+                "614f37e0.0249a"

             ]

         ]

     },

     {

-        "id": "7d3f17a8.8dc",

+        "id": "dfd1a930.eeb17",

+        "type": "set",

+        "name": "set vnf-level-oper-status to PendingDelete",

+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",

+        "comments": "",

+        "x": 1000.3849029541016,

+        "y": 509.670627951622,

+        "z": "1749c920.27afb7",

+        "wires": []

+    },

+    {

+        "id": "b0be94f0.05dfb8",

         "type": "returnSuccess",

         "name": "return success",

         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",

         "comments": "",

-        "x": 836.566650390625,

-        "y": 568.566650390625,

-        "z": "81a75cb3.dfe96",

+        "x": 926.5716247558594,

+        "y": 618.5970582962036,

+        "z": "1749c920.27afb7",

+        "wires": []

+    },

+    {

+        "id": "59f78da4.50f2fc",

+        "type": "set",

+        "name": "set vnf-index and vnf-object-path",

+        "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",

+        "comments": "",

+        "x": 977.5716247558594,

+        "y": 465.5968955755234,

+        "z": "1749c920.27afb7",

+        "wires": []

+    },

+    {

+        "id": "41673fa0.b1a818",

+        "type": "switchNode",

+        "name": "switch service-data.vnfs.vnf_length",

+        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 1022.0000610351562,

+        "y": 250.00000545661896,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "46f139dc.3ca98",

+                "7a6d1b04.564dbc",

+                "95730397.a4e998"

+            ]

+        ]

+    },

+    {

+        "id": "95730397.a4e998",

+        "type": "outcome",

+        "name": "0",

+        "xml": "<outcome value='0'>\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 1280.9689559936523,

+        "y": 211.96876499336213,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "646213b6.68f42c"

+            ]

+        ]

+    },

+    {

+        "id": "646213b6.68f42c",

+        "type": "returnFailure",

+        "name": "return failure",

+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",

+        "comments": "",

+        "x": 1435.7778434753418,

+        "y": 230.88903352897614,

+        "z": "1749c920.27afb7",

         "wires": []

+    },

+    {

+        "id": "46f139dc.3ca98",

+        "type": "other",

+        "name": "Null",

+        "xml": "<outcome value=''>\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 1274.0000953674316,

+        "y": 251.00008651893586,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "646213b6.68f42c"

+            ]

+        ]

+    },

+    {

+        "id": "7a6d1b04.564dbc",

+        "type": "other",

+        "name": "other",

+        "xml": "<outcome value='Other'>\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 1267.000503540039,

+        "y": 284.0000903336331,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "4e29626e.e0608c"

+            ]

+        ]

+    },

+    {

+        "id": "4e29626e.e0608c",

+        "type": "block",

+        "name": "block : atomic",

+        "xml": "<block atomic=\"true\">",

+        "atomic": "true",

+        "outputs": 1,

+        "x": 1414.2700462341309,

+        "y": 284.55473539512604,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "530877d0.02663",

+                "a9f43f7c.095d3"

+            ]

+        ]

+    },

+    {

+        "id": "530877d0.02663",

+        "type": "for",

+        "name": "for vidx..service-data.vnfs.vnf_length[]",

+        "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 1660.2861633300781,

+        "y": 291.4286558357999,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "a8e35f93.0e2bf"

+            ]

+        ]

+    },

+    {

+        "id": "a8e35f93.0e2bf",

+        "type": "block",

+        "name": "block",

+        "xml": "<block>\n",

+        "atomic": "false",

+        "comments": "",

+        "outputs": 1,

+        "x": 1879.6357955932617,

+        "y": 290.9687359062955,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "370233d.767e7cc"

+            ]

+        ]

+    },

+    {

+        "id": "370233d.767e7cc",

+        "type": "switchNode",

+        "name": "switch vnfid found",

+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 2033.7153930664062,

+        "y": 290.67881796043366,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "908635e8.5a6bb"

+            ]

+        ]

+    },

+    {

+        "id": "908635e8.5a6bb",

+        "type": "outcomeTrue",

+        "name": "true",

+        "xml": "<outcome value='true'>\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 2209.6675148010254,

+        "y": 290.57150003593415,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "f0769224.c0af2"

+            ]

+        ]

+    },

+    {

+        "id": "f0769224.c0af2",

+        "type": "block",

+        "name": "block : atomic",

+        "xml": "<block atomic=\"true\">",

+        "atomic": "true",

+        "outputs": 1,

+        "x": 2358.312973022461,

+        "y": 278.97913000267,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "6bf835a7.6620bc"

+            ]

+        ]

+    },

+    {

+        "id": "6bf835a7.6620bc",

+        "type": "set",

+        "name": "set tmp.vidx and ctx.vnf-data",

+        "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",

+        "comments": "",

+        "x": 2620.1997680664062,

+        "y": 256.3215563027188,

+        "z": "1749c920.27afb7",

+        "wires": []

+    },

+    {

+        "id": "a9f43f7c.095d3",

+        "type": "switchNode",

+        "name": "switch tmp.vidx ",

+        "xml": "<switch test=\"`$tmp.vidx`\">\n\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 1603.0000228881836,

+        "y": 345.99999353569,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "b3149be7.2c6a9"

+            ]

+        ]

+    },

+    {

+        "id": "b3149be7.2c6a9",

+        "type": "outcome",

+        "name": "NULL",

+        "xml": "<outcome value=''>\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 1758.4286499023438,

+        "y": 345.57137701194733,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "4610208d.e47188"

+            ]

+        ]

+    },

+    {

+        "id": "4610208d.e47188",

+        "type": "returnFailure",

+        "name": "return failure",

+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",

+        "comments": "",

+        "x": 1903.8573913574219,

+        "y": 345.7143146721646,

+        "z": "1749c920.27afb7",

+        "wires": []

+    },

+    {

+        "id": "cdfb0ad2.8ad0d8",

+        "type": "switchNode",

+        "name": "switch vnf-level-oper-status",

+        "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 971.0000762939453,

+        "y": 358.88902044296265,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "c03a8f6a.5ba2c",

+                "fbd10336.a597a8"

+            ]

+        ]

+    },

+    {

+        "id": "c03a8f6a.5ba2c",

+        "type": "outcome",

+        "name": "outcome Active",

+        "xml": "<outcome value='Active'>\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 1216.8333702087402,

+        "y": 360.00011825561523,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "442f984.65ce9e8"

+            ]

+        ]

+    },

+    {

+        "id": "442f984.65ce9e8",

+        "type": "block",

+        "name": "block : atomic",

+        "xml": "<block atomic=\"true\">",

+        "atomic": "true",

+        "outputs": 1,

+        "x": 1430.139762878418,

+        "y": 369.32530784606934,

+        "z": "1749c920.27afb7",

+        "wires": [

+            []

+        ]

+    },

+    {

+        "id": "fbd10336.a597a8",

+        "type": "other",

+        "name": "other",

+        "xml": "<outcome value='Other'>\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 1194.8333892822266,

+        "y": 410.00012969970703,

+        "z": "1749c920.27afb7",

+        "wires": [

+            [

+                "2dff766b.d66b12"

+            ]

+        ]

+    },

+    {

+        "id": "2dff766b.d66b12",

+        "type": "returnFailure",

+        "name": "return failure",

+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",

+        "comments": "",

+        "x": 1354.3331565856934,

+        "y": 413.0001287460327,

+        "z": "1749c920.27afb7",

+        "wires": []

+    },

+    {

+        "id": "4b93b56d.437c5c",

+        "type": "set",

+        "name": "copy input data to service data",

+        "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",

+        "comments": "",

+        "x": 980.0065612792969,

+        "y": 418.010435461998,

+        "z": "1749c920.27afb7",

+        "wires": []

+    },

+    {

+        "id": "614f37e0.0249a",

+        "type": "save",

+        "name": "update AnAI - vnf-instance.orchestration-status",

+        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"PendingDelete\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",

+        "comments": "",

+        "outputs": 1,

+        "x": 1022.0064239501953,

+        "y": 564.0105141401291,

+        "z": "1749c920.27afb7",

+        "wires": [

+            []

+        ]

     }

 ]
\ No newline at end of file