X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fsotn_nni%2FGENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json;h=ce7f41ad225c4344050d510d5509b8aceb0ef49e;hp=9730d51fe94fe017e6150b74a339d105a8147df1;hb=f515a8831e0036414d69d73030e871dec88180f8;hpb=1df36cd2a20f26dfa1c80bc5c3baaa03140f1987

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json
index 9730d51f..ce7f41ad 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "f8944be3.096ab8",
+        "id": "e012ce90.0e58e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 111,
-        "y": 56,
-        "z": "9dcfec88.5f292",
+        "x": 154,
+        "y": 93,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "68420034.5c6d98"
+                "971026a6.52ce9"
             ]
         ]
     },
     {
-        "id": "68420034.5c6d98",
+        "id": "971026a6.52ce9",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,350 +22,350 @@
         "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": 242.2856903076172,
-        "y": 105.23810863494873,
-        "z": "9dcfec88.5f292",
+        "x": 285.2856903076172,
+        "y": 142.23810863494873,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "9e33642a.9ab6b8"
+                "424280.3e7be58"
             ]
         ]
     },
     {
-        "id": "9e33642a.9ab6b8",
+        "id": "424280.3e7be58",
         "type": "method",
         "name": "method sotn-vnf-topology-operation-underlay-activate",
         "xml": "<method rpc='sotn-vnf-topology-operation-underlay-activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 245.42861938476562,
-        "y": 190.00003242492676,
-        "z": "9dcfec88.5f292",
+        "x": 288.4286193847656,
+        "y": 227.00003242492676,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "f3fc4610.118298"
+                "15b1d170.c6c3bf"
             ]
         ]
     },
     {
-        "id": "f3fc4610.118298",
+        "id": "15b1d170.c6c3bf",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 395.238037109375,
-        "y": 319.6666564941406,
-        "z": "9dcfec88.5f292",
+        "x": 438.238037109375,
+        "y": 356.6666564941406,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "321f78ca.ccdc38",
-                "47a0d8c5.66ef38",
-                "30a9bb6d.ac3de4",
-                "470fa21f.c90dac",
-                "a9e79f17.0260f",
-                "79db1524.d2b97c",
-                "47e6b5ed.41cf1c"
+                "d341e8da.386dc8",
+                "7757d326.0ab11c",
+                "28b09a42.4448ee",
+                "3ec3b54e.f18002",
+                "363c01cb.431f2e",
+                "b58db0f2.2bd788",
+                "78a6cae.62d4c34"
             ]
         ]
     },
     {
-        "id": "321f78ca.ccdc38",
+        "id": "d341e8da.386dc8",
         "type": "set",
         "name": "set vnf-level-oper-status to Active",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\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": 738.3849563598633,
-        "y": 556.6705458434299,
-        "z": "9dcfec88.5f292",
+        "x": 781.3849563598633,
+        "y": 593.6705458434299,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "47a0d8c5.66ef38",
+        "id": "7757d326.0ab11c",
         "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": 658.571647644043,
-        "y": 682.5970833571628,
-        "z": "9dcfec88.5f292",
+        "x": 701.571647644043,
+        "y": 719.5970833571628,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "30a9bb6d.ac3de4",
+        "id": "28b09a42.4448ee",
         "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": 744.5716018676758,
-        "y": 504.5968001158908,
-        "z": "9dcfec88.5f292",
+        "x": 787.5716018676758,
+        "y": 541.5968001158908,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "470fa21f.c90dac",
+        "id": "3ec3b54e.f18002",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 753,
-        "y": 259,
-        "z": "9dcfec88.5f292",
+        "x": 796,
+        "y": 296,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "bde1ee44.7683d",
-                "2e788e91.c6a1c2",
-                "946699e9.3b5b1"
+                "2a1b5222.0a12ce",
+                "7071c692.fef0f",
+                "f5af0773.6ebfd8"
             ]
         ]
     },
     {
-        "id": "946699e9.3b5b1",
+        "id": "f5af0773.6ebfd8",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1145.968994140625,
-        "y": 224.96875,
-        "z": "9dcfec88.5f292",
+        "x": 1188.968994140625,
+        "y": 261.96875,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "5b4e6761.75d918"
+                "deb6d8c5.8a0d18"
             ]
         ]
     },
     {
-        "id": "5b4e6761.75d918",
+        "id": "deb6d8c5.8a0d18",
         "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": 1300.7778816223145,
-        "y": 243.889018535614,
-        "z": "9dcfec88.5f292",
+        "x": 1343.7778816223145,
+        "y": 280.889018535614,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "bde1ee44.7683d",
+        "id": "2a1b5222.0a12ce",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1139.0001335144043,
-        "y": 264.00007152557373,
-        "z": "9dcfec88.5f292",
+        "x": 1182.0001335144043,
+        "y": 301.00007152557373,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "5b4e6761.75d918"
+                "deb6d8c5.8a0d18"
             ]
         ]
     },
     {
-        "id": "2e788e91.c6a1c2",
+        "id": "7071c692.fef0f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1132.0005416870117,
-        "y": 297.000075340271,
-        "z": "9dcfec88.5f292",
+        "x": 1175.0005416870117,
+        "y": 334.000075340271,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "ebf17a44.2210a8"
+                "16d2cb29.ef702d"
             ]
         ]
     },
     {
-        "id": "ebf17a44.2210a8",
+        "id": "16d2cb29.ef702d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1279.2700843811035,
-        "y": 297.5547204017639,
-        "z": "9dcfec88.5f292",
+        "x": 1322.2700843811035,
+        "y": 334.5547204017639,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "e3ab2fd7.ebbf08"
+                "ed1ae4ee.47337"
             ]
         ]
     },
     {
-        "id": "e3ab2fd7.ebbf08",
+        "id": "ed1ae4ee.47337",
         "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": 1525.2862014770508,
-        "y": 304.42864084243774,
-        "z": "9dcfec88.5f292",
+        "x": 1568.2862014770508,
+        "y": 341.42864084243774,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "18572251.98d83e"
+                "3d63efba.81c87"
             ]
         ]
     },
     {
-        "id": "18572251.98d83e",
+        "id": "3d63efba.81c87",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1744.6358337402344,
-        "y": 303.96872091293335,
-        "z": "9dcfec88.5f292",
+        "x": 1787.6358337402344,
+        "y": 340.96872091293335,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "4a39ea58.7fb184"
+                "db2db94d.9596f8"
             ]
         ]
     },
     {
-        "id": "4a39ea58.7fb184",
+        "id": "db2db94d.9596f8",
         "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": 1898.715431213379,
-        "y": 303.67880296707153,
-        "z": "9dcfec88.5f292",
+        "x": 1941.715431213379,
+        "y": 340.67880296707153,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "669b0d11.8a0824"
+                "b38b8c2b.ab959"
             ]
         ]
     },
     {
-        "id": "669b0d11.8a0824",
+        "id": "b38b8c2b.ab959",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2109.6675758361816,
-        "y": 306.571494102478,
-        "z": "9dcfec88.5f292",
+        "x": 2152.6675758361816,
+        "y": 343.571494102478,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "e89a8750.1f8e18"
+                "f56ad8f6.f25e88"
             ]
         ]
     },
     {
-        "id": "e89a8750.1f8e18",
+        "id": "f56ad8f6.f25e88",
         "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": 2319.199951171875,
-        "y": 308.32159423828125,
-        "z": "9dcfec88.5f292",
+        "x": 2362.199951171875,
+        "y": 345.32159423828125,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "a9e79f17.0260f",
+        "id": "363c01cb.431f2e",
         "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=\"Active\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
         "comments": "",
         "outputs": 1,
-        "x": 763.9999618530273,
-        "y": 623.0103714736179,
-        "z": "9dcfec88.5f292",
+        "x": 806.9999618530273,
+        "y": 660.0103714736179,
+        "z": "770d39a2.206bf8",
         "wires": [
             []
         ]
     },
     {
-        "id": "79db1524.d2b97c",
+        "id": "b58db0f2.2bd788",
         "type": "set",
         "name": "copy input data to service data",
         "xml": "<set>\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": 743.0000762939453,
-        "y": 454.01033284980804,
-        "z": "9dcfec88.5f292",
+        "x": 786.0000762939453,
+        "y": 491.01033284980804,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "47e6b5ed.41cf1c",
+        "id": "78a6cae.62d4c34",
         "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": 729.7499389648438,
-        "y": 359.00390270072967,
-        "z": "9dcfec88.5f292",
+        "x": 772.7499389648438,
+        "y": 396.00390270072967,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "3e2d00ea.214d9",
-                "ed7ee56e.298fc8"
+                "d6917198.13129",
+                "178db909.328e8f"
             ]
         ]
     },
     {
-        "id": "3e2d00ea.214d9",
+        "id": "d6917198.13129",
         "type": "outcome",
         "name": "outcome Created",
         "xml": "<outcome value='Created'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1109.5833320617676,
-        "y": 364.1149909766391,
-        "z": "9dcfec88.5f292",
+        "x": 1152.5833320617676,
+        "y": 401.1149909766391,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "34b25335.603514"
+                "6cd721df.116148"
             ]
         ]
     },
     {
-        "id": "ed7ee56e.298fc8",
+        "id": "178db909.328e8f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1087.583351135254,
-        "y": 414.1150024207309,
-        "z": "9dcfec88.5f292",
+        "x": 1130.583351135254,
+        "y": 451.1150024207309,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "4a64950b.2e4a84"
+                "ff0fdf62.38c4c"
             ]
         ]
     },
     {
-        "id": "4a64950b.2e4a84",
+        "id": "ff0fdf62.38c4c",
         "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": 1247.0831184387207,
-        "y": 417.1150014670566,
-        "z": "9dcfec88.5f292",
+        "x": 1290.0831184387207,
+        "y": 454.1150014670566,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "34b25335.603514",
+        "id": "6cd721df.116148",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1319.889705657959,
-        "y": 375.44016626197845,
-        "z": "9dcfec88.5f292",
+        "x": 1362.889705657959,
+        "y": 412.44016626197845,
+        "z": "770d39a2.206bf8",
         "wires": [
             []
         ]