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-vf-operation-l2vpn-delete.json;h=385835c9c553c98a4a202e437a1738befb9a6e1e;hb=84477fc8f92e417f809ffe040ffb12de46a43a77;hp=223bb835b00a8e10c383b39351f764023fe23aac;hpb=92555a71ca2c208d33cbbb043c755f0175c6decc;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.json
index 223bb835..385835c9 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "8398072c.bb",
+        "id": "7d66251e.b82664",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 164.8055419921875,
-        "y": 111.47222900390625,
-        "z": "227abea9.82942a",
+        "x": 113,
+        "y": 47,
+        "z": "71661d78.a73ff4",
         "wires": [
             [
-                "f7478e4.3f877f"
+                "4f798745.7c23f8"
             ]
         ]
     },
     {
-        "id": "f7478e4.3f877f",
+        "id": "4f798745.7c23f8",
         "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": 296.0912322998047,
-        "y": 160.71033763885498,
-        "z": "227abea9.82942a",
+        "x": 244.2856903076172,
+        "y": 96.23810863494873,
+        "z": "71661d78.a73ff4",
         "wires": [
             [
-                "2116c7dc.76a62"
+                "1efd944f.808cec"
             ]
         ]
     },
     {
-        "id": "2116c7dc.76a62",
+        "id": "1efd944f.808cec",
         "type": "method",
         "name": "method sotn-vf-operation-l2vpn-delete",
         "xml": "<method rpc='sotn-vf-operation-l2vpn-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 299.2341613769531,
-        "y": 245.472261428833,
-        "z": "227abea9.82942a",
+        "x": 247.42861938476562,
+        "y": 181.00003242492676,
+        "z": "71661d78.a73ff4",
         "wires": [
             [
-                "6477dca3.236454"
+                "2676cdd4.4c0ad2"
             ]
         ]
     },
     {
-        "id": "6477dca3.236454",
+        "id": "f7045a47.ec91a8",
+        "type": "comment",
+        "name": "site-vnf-topology-operation-delete",
+        "info": "",
+        "comments": "",
+        "x": 839.9162979125977,
+        "y": 108.58639907836914,
+        "z": "71661d78.a73ff4",
+        "wires": []
+    },
+    {
+        "id": "2676cdd4.4c0ad2",
         "type": "block",
         "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 467.23804473876953,
+        "y": 336.6666717529297,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "f0919342.f5b18",
+                "3e674db0.3066aa",
+                "36348cc4.967c94",
+                "556d053a.ecf65c",
+                "9da386b6.2f7bc8",
+                "3d13e6d3.244982",
+                "e37c16ee.29bad",
+                "3a03f985.f60a36",
+                "5d2f33ed.f40a3c",
+                "663336cd.33fb4"
+            ]
+        ]
+    },
+    {
+        "id": "556d053a.ecf65c",
+        "type": "switchNode",
+        "name": "switch service-data.vnfs.vnf_length",
+        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 919.6660919189453,
+        "y": 254.2611792087555,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "1a39a448.9524cc",
+                "db3976bf.5d493"
+            ]
+        ]
+    },
+    {
+        "id": "1a39a448.9524cc",
+        "type": "other",
+        "name": "outcome Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 440.33288192749023,
-        "y": 462.54644298553467,
-        "z": "227abea9.82942a",
+        "x": 1184.3884048461914,
+        "y": 236.81680130958557,
+        "z": "71661d78.a73ff4",
         "wires": [
             [
-                "ef907cc.c0768"
+                "5a4bd76d.294688"
             ]
         ]
     },
     {
-        "id": "ef907cc.c0768",
+        "id": "5a4bd76d.294688",
+        "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": 1365.3882751464844,
+        "y": 231.81667923927307,
+        "z": "71661d78.a73ff4",
+        "wires": []
+    },
+    {
+        "id": "db3976bf.5d493",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1169.8884048461914,
+        "y": 288.81676411628723,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "c9f5f464.acb94"
+            ]
+        ]
+    },
+    {
+        "id": "c9f5f464.acb94",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1341.888111114502,
+        "y": 288.8167622089386,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "40524cb7.d8b3cc",
+                "f7ed532.06146b"
+            ]
+        ]
+    },
+    {
+        "id": "f7ed532.06146b",
+        "type": "switchNode",
+        "name": "switch tmp.nidx ",
+        "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1516.888282775879,
+        "y": 307.81668400764465,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "be1fbab.e3a7448"
+            ]
+        ]
+    },
+    {
+        "id": "36348cc4.967c94",
+        "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": 890.0550918579102,
+        "y": 328.7056429386139,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "cd00c4a5.6199c",
+                "b9b69fcf.de09f8"
+            ]
+        ]
+    },
+    {
+        "id": "cd00c4a5.6199c",
+        "type": "outcome",
+        "name": "outcome PendingDelete",
+        "xml": "<outcome value='PendingDelete'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1166.8884353637695,
+        "y": 331.8167426586151,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "a741ca6a.f08e98"
+            ]
+        ]
+    },
+    {
+        "id": "b9b69fcf.de09f8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1127.8884201049805,
+        "y": 377.8167917728424,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "40a415b6.d6dcac"
+            ]
+        ]
+    },
+    {
+        "id": "40a415b6.d6dcac",
+        "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": 1276.3881340026855,
+        "y": 376.81677174568176,
+        "z": "71661d78.a73ff4",
+        "wires": []
+    },
+    {
+        "id": "9da386b6.2f7bc8",
+        "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": 906.388427734375,
+        "y": 197.8167588710785,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "40524cb7.d8b3cc",
+        "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": 1577.3882865905762,
+        "y": 243.8166801929474,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "43e325ae.156bcc"
+            ]
+        ]
+    },
+    {
+        "id": "43e325ae.156bcc",
+        "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": 1833.3883056640625,
+        "y": 243.8166801929474,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "9e9616bd.2cd428"
+            ]
+        ]
+    },
+    {
+        "id": "9e9616bd.2cd428",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2009.8883590698242,
+        "y": 246.8166801929474,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "42ca9813.a6a5e8"
+            ]
+        ]
+    },
+    {
+        "id": "42ca9813.a6a5e8",
+        "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": 2176.8883743286133,
+        "y": 307.8166801929474,
+        "z": "71661d78.a73ff4",
+        "wires": []
+    },
+    {
+        "id": "44e24bd3.4cb9b4",
+        "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": 1822.388298034668,
+        "y": 307.81668400764465,
+        "z": "71661d78.a73ff4",
+        "wires": []
+    },
+    {
+        "id": "be1fbab.e3a7448",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1684.888298034668,
+        "y": 307.81668400764465,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "44e24bd3.4cb9b4"
+            ]
+        ]
+    },
+    {
+        "id": "f0919342.f5b18",
+        "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": 876.9051132202148,
+        "y": 543.3336856365204,
+        "z": "71661d78.a73ff4",
+        "wires": []
+    },
+    {
+        "id": "3e674db0.3066aa",
         "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": 708.25,
-        "y": 545.0833435058594,
-        "z": "227abea9.82942a",
+        "x": 833.0162658691406,
+        "y": 620.8892447948456,
+        "z": "71661d78.a73ff4",
+        "wires": []
+    },
+    {
+        "id": "a741ca6a.f08e98",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1362.1947937011719,
+        "y": 339.14194798469543,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3d13e6d3.244982",
+        "type": "set",
+        "name": "set prop.vnfNewidx",
+        "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
+        "comments": "",
+        "x": 859.0000839233398,
+        "y": 379.00007796287537,
+        "z": "71661d78.a73ff4",
+        "wires": []
+    },
+    {
+        "id": "e37c16ee.29bad",
+        "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": 883.0000686645508,
+        "y": 421.0000765323639,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "fe111823.451958"
+            ]
+        ]
+    },
+    {
+        "id": "fe111823.451958",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1144.000144958496,
+        "y": 425.00011134147644,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "b1807c80.f455e8"
+            ]
+        ]
+    },
+    {
+        "id": "b1807c80.f455e8",
+        "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": 1336.0000915527344,
+        "y": 434.00015568733215,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "c1cf5e92.b6dff8"
+            ]
+        ]
+    },
+    {
+        "id": "c1cf5e92.b6dff8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1522.0001068115234,
+        "y": 418.0000422000885,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "4f7d8dc5.1b171c"
+            ]
+        ]
+    },
+    {
+        "id": "4f7d8dc5.1b171c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1673.0000305175781,
+        "y": 419.0000784397125,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            [
+                "e4e48378.71222",
+                "644d0d16.d332c4"
+            ]
+        ]
+    },
+    {
+        "id": "e4e48378.71222",
+        "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": 1840.0001983642578,
+        "y": 393.00026202201843,
+        "z": "71661d78.a73ff4",
         "wires": []
+    },
+    {
+        "id": "644d0d16.d332c4",
+        "type": "set",
+        "name": "set prop.vnfNewidx",
+        "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
+        "comments": "",
+        "x": 1860.0001258850098,
+        "y": 450.0001976490021,
+        "z": "71661d78.a73ff4",
+        "wires": []
+    },
+    {
+        "id": "3a03f985.f60a36",
+        "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": 851.1014823913574,
+        "y": 464.804429769516,
+        "z": "71661d78.a73ff4",
+        "wires": []
+    },
+    {
+        "id": "5d2f33ed.f40a3c",
+        "type": "set",
+        "name": "Remove vnf from ServiceData",
+        "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$prop.vnfidxLen].\" value=\"\"/>\n\n",
+        "comments": "",
+        "x": 881.0002517700195,
+        "y": 503.00021290779114,
+        "z": "71661d78.a73ff4",
+        "wires": []
+    },
+    {
+        "id": "663336cd.33fb4",
+        "type": "save",
+        "name": "delete AnAI - l2vpn.operational-status",
+        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"   \n\t\tkey=\"connectivity.connectivity-id = $vnfId\" >\n<parameter name=\"operational-status\" value=\"PendingDelete\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 938.0066452026367,
+        "y": 580.0106251239777,
+        "z": "71661d78.a73ff4",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file