X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fsotn_nni%2FGENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.json;h=be1161f3caf359fabb3cd365c5d5365481fc037c;hb=84477fc8f92e417f809ffe040ffb12de46a43a77;hp=6610951e46170d55ad243573cc73c720152703f9;hpb=92555a71ca2c208d33cbbb043c755f0175c6decc;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.json
index 6610951e..be1161f3 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "3747de4a.ccc95a",
+        "id": "99dfdf6b.5f9318",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 192.56666564941406,
-        "y": 124.56666564941406,
-        "z": "6d4d0934.24831",
+        "x": 99,
+        "y": 44,
+        "z": "fa25b782.cc03a",
         "wires": [
             [
-                "a6a68d99.1f09a8"
+                "92759b22.eb00d"
             ]
         ]
     },
     {
-        "id": "a6a68d99.1f09a8",
+        "id": "92759b22.eb00d",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,57 +22,504 @@
         "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": 476.85235595703125,
-        "y": 185.8047742843628,
-        "z": "6d4d0934.24831",
+        "x": 383.2856903076172,
+        "y": 105.23810863494873,
+        "z": "fa25b782.cc03a",
         "wires": [
             [
-                "19971b48.295af5"
+                "2dedb06e.bc71a8"
             ]
         ]
     },
     {
-        "id": "19971b48.295af5",
+        "id": "2dedb06e.bc71a8",
         "type": "method",
         "name": "method sotn-vnf-topology-operation-underlay-delete",
         "xml": "<method rpc='sotn-vnf-topology-operation-underlay-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 482.9952697753906,
-        "y": 270.5666961669922,
-        "z": "6d4d0934.24831",
+        "x": 389.42860412597656,
+        "y": 190.00003051757812,
+        "z": "fa25b782.cc03a",
         "wires": [
             [
-                "d89b2a32.f1b858"
+                "97c9b256.2d5028"
             ]
         ]
     },
     {
-        "id": "d89b2a32.f1b858",
+        "id": "9d9a5f2a.b67c4",
+        "type": "comment",
+        "name": "site-vnf-topology-operation-delete",
+        "info": "",
+        "comments": "",
+        "x": 961.9162979125977,
+        "y": 111.58639907836914,
+        "z": "fa25b782.cc03a",
+        "wires": []
+    },
+    {
+        "id": "97c9b256.2d5028",
         "type": "block",
         "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 589.2380447387695,
+        "y": 339.6666717529297,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "26acbc94.464644",
+                "29ca41d0.155d6e",
+                "8eccfc5e.058248",
+                "74bea299.2fc214",
+                "ca45e630.8251e",
+                "bd55244d.57f018",
+                "f446816e.b70aa8",
+                "b3a04e31.994298",
+                "de69c0de.2774",
+                "145f15a6.badfba"
+            ]
+        ]
+    },
+    {
+        "id": "74bea299.2fc214",
+        "type": "switchNode",
+        "name": "switch service-data.vnfs.vnf_length",
+        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1041.6660919189453,
+        "y": 257.2611792087555,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "c81a6b20.3c67a",
+                "3105aeca.f2a9f2"
+            ]
+        ]
+    },
+    {
+        "id": "c81a6b20.3c67a",
+        "type": "other",
+        "name": "outcome Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 621.0940055847168,
-        "y": 487.6408796310425,
-        "z": "6d4d0934.24831",
+        "x": 1306.3884048461914,
+        "y": 239.81680130958557,
+        "z": "fa25b782.cc03a",
         "wires": [
             [
-                "5e754ce4.b92d84"
+                "86a36888.63694"
             ]
         ]
     },
     {
-        "id": "5e754ce4.b92d84",
+        "id": "86a36888.63694",
+        "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": 1487.3882751464844,
+        "y": 234.81667923927307,
+        "z": "fa25b782.cc03a",
+        "wires": []
+    },
+    {
+        "id": "3105aeca.f2a9f2",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1291.8884048461914,
+        "y": 291.81676411628723,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "e367ae2f.4837d8"
+            ]
+        ]
+    },
+    {
+        "id": "e367ae2f.4837d8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1463.888111114502,
+        "y": 291.8167622089386,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "5a431e2a.3fe42",
+                "5859a1a2.5df2c8"
+            ]
+        ]
+    },
+    {
+        "id": "5859a1a2.5df2c8",
+        "type": "switchNode",
+        "name": "switch tmp.nidx ",
+        "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1638.888282775879,
+        "y": 310.81668400764465,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "fcf67c01.2589c8"
+            ]
+        ]
+    },
+    {
+        "id": "8eccfc5e.058248",
+        "type": "switchNode",
+        "name": "switch vnf-level-oper-status",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1012.0550918579102,
+        "y": 331.7056429386139,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "4aaa97b8.591b",
+                "ac9c60b4.538be8"
+            ]
+        ]
+    },
+    {
+        "id": "4aaa97b8.591b",
+        "type": "outcome",
+        "name": "outcome PendingDelete",
+        "xml": "<outcome value='PendingDelete'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1288.8884353637695,
+        "y": 334.8167426586151,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "4f3006f4.4a2aa"
+            ]
+        ]
+    },
+    {
+        "id": "ac9c60b4.538be8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1249.8884201049805,
+        "y": 380.8167917728424,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "309ebf7d.9eaeb"
+            ]
+        ]
+    },
+    {
+        "id": "309ebf7d.9eaeb",
+        "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": 1398.3881340026855,
+        "y": 379.81677174568176,
+        "z": "fa25b782.cc03a",
+        "wires": []
+    },
+    {
+        "id": "ca45e630.8251e",
+        "type": "execute",
+        "name": "execute requiredParameters",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vnf-topology-operation-input.vnf-information.vnf-id\" value=\"$vnf-topology-operation-input.vnf-information.vnf-id\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1028.388427734375,
+        "y": 200.8167588710785,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5a431e2a.3fe42",
+        "type": "for",
+        "name": "for nidx..service-data.vnfs.vnf[]",
+        "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1699.3882865905762,
+        "y": 246.8166801929474,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "aad2af6a.5ca7a8"
+            ]
+        ]
+    },
+    {
+        "id": "aad2af6a.5ca7a8",
+        "type": "switchNode",
+        "name": "switch vnf-id found",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1955.3883056640625,
+        "y": 246.8166801929474,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "5de2b129.640c08"
+            ]
+        ]
+    },
+    {
+        "id": "5de2b129.640c08",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2131.888359069824,
+        "y": 249.8166801929474,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "46f375ea.217e34"
+            ]
+        ]
+    },
+    {
+        "id": "46f375ea.217e34",
+        "type": "set",
+        "name": "set tmp.nidx and ctx.vnf-data",
+        "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />\n",
+        "comments": "",
+        "x": 2298.8883743286133,
+        "y": 310.8166801929474,
+        "z": "fa25b782.cc03a",
+        "wires": []
+    },
+    {
+        "id": "579c1f0d.46de88",
+        "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": 1944.388298034668,
+        "y": 310.81668400764465,
+        "z": "fa25b782.cc03a",
+        "wires": []
+    },
+    {
+        "id": "fcf67c01.2589c8",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1806.888298034668,
+        "y": 310.81668400764465,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "579c1f0d.46de88"
+            ]
+        ]
+    },
+    {
+        "id": "26acbc94.464644",
+        "type": "set",
+        "name": "set vnfId 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/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",
+        "comments": "",
+        "x": 998.9051132202148,
+        "y": 546.3336856365204,
+        "z": "fa25b782.cc03a",
+        "wires": []
+    },
+    {
+        "id": "29ca41d0.155d6e",
         "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": 874.566650390625,
-        "y": 598.566650390625,
-        "z": "6d4d0934.24831",
+        "x": 955.0162658691406,
+        "y": 623.8892447948456,
+        "z": "fa25b782.cc03a",
+        "wires": []
+    },
+    {
+        "id": "4f3006f4.4a2aa",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1484.1947937011719,
+        "y": 342.14194798469543,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bd55244d.57f018",
+        "type": "set",
+        "name": "set prop.vnfNewidx",
+        "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
+        "comments": "",
+        "x": 981.0000839233398,
+        "y": 382.00007796287537,
+        "z": "fa25b782.cc03a",
+        "wires": []
+    },
+    {
+        "id": "f446816e.b70aa8",
+        "type": "for",
+        "name": "for lidx..service-data.vnfs.vnf[]",
+        "xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1005.0000686645508,
+        "y": 424.0000765323639,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "1ab96be7.cabb84"
+            ]
+        ]
+    },
+    {
+        "id": "1ab96be7.cabb84",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1266.000144958496,
+        "y": 428.00011134147644,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "29fae41e.925d84"
+            ]
+        ]
+    },
+    {
+        "id": "29fae41e.925d84",
+        "type": "switchNode",
+        "name": "switch vnf-id found",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1458.0000915527344,
+        "y": 437.00015568733215,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "3df67c89.832674"
+            ]
+        ]
+    },
+    {
+        "id": "3df67c89.832674",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1644.0001068115234,
+        "y": 421.0000422000885,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "7d2244a.01d08bc"
+            ]
+        ]
+    },
+    {
+        "id": "7d2244a.01d08bc",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1795.0000305175781,
+        "y": 422.0000784397125,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            [
+                "83093bd6.426818",
+                "5e4d811b.25e5b"
+            ]
+        ]
+    },
+    {
+        "id": "83093bd6.426818",
+        "type": "set",
+        "name": "set  vnf data",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />\n",
+        "comments": "",
+        "x": 1962.0001983642578,
+        "y": 396.00026202201843,
+        "z": "fa25b782.cc03a",
         "wires": []
+    },
+    {
+        "id": "5e4d811b.25e5b",
+        "type": "set",
+        "name": "set prop.vnfNewidx",
+        "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
+        "comments": "",
+        "x": 1982.0001258850098,
+        "y": 453.0001976490021,
+        "z": "fa25b782.cc03a",
+        "wires": []
+    },
+    {
+        "id": "b3a04e31.994298",
+        "type": "set",
+        "name": "set new vnf length",
+        "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",
+        "comments": "",
+        "x": 973.1014823913574,
+        "y": 467.804429769516,
+        "z": "fa25b782.cc03a",
+        "wires": []
+    },
+    {
+        "id": "de69c0de.2774",
+        "type": "set",
+        "name": "Remove vnf from ServiceData",
+        "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$prop.vnfidxLen].\" value=\"\"/>\n\n",
+        "comments": "",
+        "x": 1003.0002517700195,
+        "y": 506.00021290779114,
+        "z": "fa25b782.cc03a",
+        "wires": []
+    },
+    {
+        "id": "145f15a6.badfba",
+        "type": "save",
+        "name": "delete AnAI - vnf-instance.orchestration-status",
+        "xml": "<delete 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\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1060.0066452026367,
+        "y": 583.0106251239777,
+        "z": "fa25b782.cc03a",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file