self-serve dg patch

inclues new self-serve forking logic, added silentFailure to for loops, not to set cap name to INPUT for generate-name

Change-Id: Idd3deb016533dc70611d60dd289f4c4bc40d3136
Issue-ID: CCSDK-604
Signed-off-by: Cheung, Pat <kc1472@att.com>

Former-commit-id: 7209c246e382048781f166c2b3eeab24be7e9815

1 files changed, 180 insertions, 140 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.json
index db153ffb..a29a7160 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "57248231.a7bfcc",
+        "id": "dc9ceada.747c9",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 108.75,
-        "y": 47.5,
-        "z": "484e90dc.3bd078",
+        "x": 79,
+        "y": 59,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "1d542904.ad727f"
+                "6bbe4a7.598cb34"
             ]
         ]
     },
     {
-        "id": "1d542904.ad727f",
+        "id": "6bbe4a7.598cb34",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,320 +22,360 @@
         "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": 384.75,
-        "y": 48.5,
-        "z": "484e90dc.3bd078",
+        "x": 355,
+        "y": 60,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "e103515d.6bcd18"
+                "bb95c798.3cf368"
             ]
         ]
     },
     {
-        "id": "e103515d.6bcd18",
+        "id": "bb95c798.3cf368",
         "type": "method",
         "name": "self-serve-vnf-changeassign ",
         "xml": "<method rpc='self-serve-vnf-changeassign' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 701.75,
-        "y": 48.5,
-        "z": "484e90dc.3bd078",
+        "x": 672,
+        "y": 60,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "42a27363.ddaeac"
+                "72afded.b78132"
             ]
         ]
     },
     {
-        "id": "42a27363.ddaeac",
+        "id": "72afded.b78132",
         "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 127.25,
-        "y": 130.5,
-        "z": "484e90dc.3bd078",
+        "x": 97.5,
+        "y": 142,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "1c0659a3.13cfde",
-                "ec3506ba.e14a98"
+                "7eab9742.528a9",
+                "c971c45d.67ed58"
             ]
         ]
     },
     {
-        "id": "30d6be53.aefb4a",
+        "id": "7e2d788f.d439a8",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n   <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].resource-resolution-data.status`' value='PENDING'/>\n   <parameter name='ss.input.param.index' value='`$i`' />\n   <parameter name='ss.service-data.param.index' value='`$j`' />",
+        "xml": "<set>\n   <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].resource-resolution-data.status`' value='PENDING'/>\n   <parameter name='ss.input.param.index' value='`$i`' />\n   <parameter name='ss.service-data.param.index' value='`$j`' />\n   <parameter name='ss.input.param.found.in.service.param' value='true' />\n   <parameter name='ss.capability-type' value='vnf' />\n   <parameter name='ss.capability-action' value='changeassign' />",
         "comments": "",
-        "x": 1343.75,
-        "y": 548.5,
-        "z": "484e90dc.3bd078",
+        "x": 1907,
+        "y": 446,
+        "z": "ea55fe64.6b3f48",
         "wires": []
     },
     {
-        "id": "1c0659a3.13cfde",
+        "id": "7eab9742.528a9",
         "type": "switchNode",
         "name": "switch vnf-input-parameters",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 369.75,
-        "y": 173.5,
-        "z": "484e90dc.3bd078",
+        "x": 340,
+        "y": 185,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "8a1cd82.5d583a8"
+                "b93197e8.d9d048"
             ]
         ]
     },
     {
-        "id": "8a1cd82.5d583a8",
+        "id": "b93197e8.d9d048",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 599.8928833007812,
-        "y": 173.35714721679688,
-        "z": "484e90dc.3bd078",
+        "x": 570.1428833007812,
+        "y": 184.85714721679688,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "37bbdbba.52315c"
+                "589a47b7.bf05e"
             ]
         ]
     },
     {
-        "id": "37bbdbba.52315c",
+        "id": "589a47b7.bf05e",
         "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=\"no param name/value provided in vnf-request-input\" />\n",
         "comments": "",
-        "x": 772.75,
-        "y": 173.5,
-        "z": "484e90dc.3bd078",
+        "x": 743,
+        "y": 185,
+        "z": "ea55fe64.6b3f48",
         "wires": []
     },
     {
-        "id": "ec3506ba.e14a98",
+        "id": "c971c45d.67ed58",
         "type": "for",
         "name": "for vnf-input-parameters.param index i",
         "xml": "<for index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 396.75,
-        "y": 297.5,
-        "z": "484e90dc.3bd078",
+        "x": 367,
+        "y": 309,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "14eea10b.aad3ff"
+                "a56c6c88.4c89e8"
             ]
         ]
     },
     {
-        "id": "14eea10b.aad3ff",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 640.75,
-        "y": 297.5,
-        "z": "484e90dc.3bd078",
-        "wires": [
-            [
-                "ca4e5f29.4175a8"
-            ]
-        ]
-    },
-    {
-        "id": "ca4e5f29.4175a8",
+        "id": "a56c6c88.4c89e8",
         "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\n\n",
+        "name": "switch service param length null",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 811.75,
-        "y": 297.5,
-        "z": "484e90dc.3bd078",
+        "x": 670,
+        "y": 310,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "3da72d90.fc11a2"
+                "34cc20c5.be038"
             ]
         ]
     },
     {
-        "id": "3da72d90.fc11a2",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 559.75,
-        "y": 381.5,
-        "z": "484e90dc.3bd078",
-        "wires": [
-            [
-                "c490ce0.767473"
-            ]
-        ]
-    },
-    {
-        "id": "c490ce0.767473",
+        "id": "80ac5f3.6ad6ca",
         "type": "for",
         "name": "for service-data.vnf-parameters-data.param index j",
         "xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 851.75,
-        "y": 381.5,
-        "z": "484e90dc.3bd078",
+        "x": 1038,
+        "y": 447,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "1937b752.ee7f01"
+                "9335b73a.1c0978"
             ]
         ]
     },
     {
-        "id": "1937b752.ee7f01",
+        "id": "9335b73a.1c0978",
         "type": "switchNode",
-        "name": "switch input vnf-name",
+        "name": "switch match for vnf-name",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].name == $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 794.75,
-        "y": 475.5,
-        "z": "484e90dc.3bd078",
+        "x": 1369,
+        "y": 447,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "c29b5f3e.26a9e",
-                "7e31cc58.38af8c"
+                "94ee529d.b53828"
             ]
         ]
     },
     {
-        "id": "7e31cc58.38af8c",
+        "id": "94ee529d.b53828",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1007.75,
-        "y": 548.5,
-        "z": "484e90dc.3bd078",
+        "x": 1559,
+        "y": 447,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "380d4f5a.84c61"
+                "97f03230.8c76b8"
             ]
         ]
     },
     {
-        "id": "c29b5f3e.26a9e",
+        "id": "ad40df27.b42668",
         "type": "not-found",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1015.75,
-        "y": 430.5,
-        "z": "484e90dc.3bd078",
+        "x": 1153,
+        "y": 531,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "97ff5a7e.916158"
+                "c7b41da6.be73e"
             ]
         ]
     },
     {
-        "id": "97ff5a7e.916158",
+        "id": "c7b41da6.be73e",
         "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=\"`'No param with param[].name = ' +  $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + ' found in service-data.'`\" />\n",
         "comments": "",
-        "x": 1220.75,
-        "y": 429.5,
-        "z": "484e90dc.3bd078",
+        "x": 1349,
+        "y": 531,
+        "z": "ea55fe64.6b3f48",
         "wires": []
     },
     {
-        "id": "380d4f5a.84c61",
+        "id": "97f03230.8c76b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1168.75,
-        "y": 547.5,
-        "z": "484e90dc.3bd078",
+        "x": 1714,
+        "y": 445,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "30d6be53.aefb4a",
-                "e0135d7c.04a028"
+                "7e2d788f.d439a8",
+                "ada6d713.8fde8",
+                "8f887c51.38a1b"
             ]
         ]
     },
     {
-        "id": "e0135d7c.04a028",
+        "id": "ada6d713.8fde8",
         "type": "call",
         "name": "call self-serve-generate-name-changeassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1460.75,
-        "y": 624.5,
-        "z": "484e90dc.3bd078",
+        "x": 2018,
+        "y": 515,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "f8df579c.55d728",
-                "5a6cefeb.f45dc"
+                "e152b55.54f7b48",
+                "e8deb550.a2fdb"
             ]
         ]
     },
     {
-        "id": "f8df579c.55d728",
+        "id": "e152b55.54f7b48",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1710.75,
-        "y": 596.5,
-        "z": "484e90dc.3bd078",
+        "x": 2268,
+        "y": 487,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "11426210.f443de"
+                "b0b66b18.a254d8"
             ]
         ]
     },
     {
-        "id": "5a6cefeb.f45dc",
+        "id": "e8deb550.a2fdb",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1720.75,
-        "y": 664.5,
-        "z": "484e90dc.3bd078",
+        "x": 2278,
+        "y": 555,
+        "z": "ea55fe64.6b3f48",
         "wires": [
             [
-                "11426210.f443de"
+                "b0b66b18.a254d8"
             ]
         ]
     },
     {
-        "id": "11426210.f443de",
+        "id": "b0b66b18.a254d8",
         "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=\"Error from self-service-generate-name-changeassign\" />\n",
         "comments": "",
-        "x": 1909.75,
-        "y": 595.5,
-        "z": "484e90dc.3bd078",
+        "x": 2462,
+        "y": 516,
+        "z": "ea55fe64.6b3f48",
+        "wires": []
+    },
+    {
+        "id": "34cc20c5.be038",
+        "type": "other",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 885,
+        "y": 310,
+        "z": "ea55fe64.6b3f48",
+        "wires": [
+            [
+                "8ae41419.5f27e8"
+            ]
+        ]
+    },
+    {
+        "id": "a74b1481.6af278",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name='ss.input.param.found.in.service.param' value='false' />",
+        "comments": "",
+        "x": 895,
+        "y": 388,
+        "z": "ea55fe64.6b3f48",
         "wires": []
+    },
+    {
+        "id": "d662c9f0.cf7fb",
+        "type": "switchNode",
+        "name": "switch if found vnf_name",
+        "xml": "<switch test='`$ss.input.param.found.in.service.param`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 952,
+        "y": 531,
+        "z": "ea55fe64.6b3f48",
+        "wires": [
+            [
+                "ad40df27.b42668"
+            ]
+        ]
+    },
+    {
+        "id": "8f887c51.38a1b",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n",
+        "comments": "",
+        "x": 1930,
+        "y": 588,
+        "z": "ea55fe64.6b3f48",
+        "wires": []
+    },
+    {
+        "id": "8ae41419.5f27e8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 711,
+        "y": 388,
+        "z": "ea55fe64.6b3f48",
+        "wires": [
+            [
+                "a74b1481.6af278",
+                "80ac5f3.6ad6ca",
+                "d662c9f0.cf7fb"
+            ]
+        ]
     }
 ]
\ No newline at end of file