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%2FGENERIC-RESOURCE-API_pnf-topology-operation-assign.json;h=effe51e6b31b6dce54d290f1db0d92b2ade9b15e;hp=2e3a1c2e8e01cec30131b0a57039ce0ab8238a55;hb=refs%2Fheads%2Fmaster;hpb=d0ce678113d24f7ebfa401488e6df8bfb849cccb

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-assign.json
index 2e3a1c2e..effe51e6 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-assign.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "d3b3a7ea.d04d08",
+        "id": "ee243452.aa33a8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 133.3333282470703,
-        "y": 79.63588523864746,
-        "z": "6dfe2c1.a0003d4",
+        "x": 134,
+        "y": 98,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "46bb10f7.5c3fb"
+                "5810e1f9.1768b"
             ]
         ]
     },
     {
-        "id": "46bb10f7.5c3fb",
+        "id": "5810e1f9.1768b",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,403 +22,447 @@
         "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": 248.61903381347656,
-        "y": 121.54066467285156,
-        "z": "6dfe2c1.a0003d4",
+        "x": 249.28570556640625,
+        "y": 139.9047794342041,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "11b944cd.c96c5b"
+                "70e23e6c.961c38"
             ]
         ]
     },
     {
-        "id": "11b944cd.c96c5b",
+        "id": "70e23e6c.961c38",
         "type": "method",
         "name": "method pnf-topology-operation-assign",
         "xml": "<method rpc='pnf-topology-operation-assign' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 243.92864990234375,
-        "y": 165.55255317687988,
-        "z": "6dfe2c1.a0003d4",
+        "x": 244.59532165527344,
+        "y": 183.91666793823242,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "ce6b8a58.b8d3e8"
+                "c77449b3.048b78"
             ]
         ]
     },
     {
-        "id": "7e923496.314c4c",
+        "id": "14cec61f.9eab5a",
         "type": "comment",
         "name": "pnf-topology-operation-assign",
         "info": "",
         "comments": "",
-        "x": 535.5948638916016,
-        "y": 41.38888931274414,
-        "z": "6dfe2c1.a0003d4",
+        "x": 536.2615356445312,
+        "y": 59.75300407409668,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "2c8dd484.c334bc",
+        "id": "da472ec3.e5ccd8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$pnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 627.2143096923828,
-        "y": 309.0287160873413,
-        "z": "6dfe2c1.a0003d4",
+        "x": 627.8809814453125,
+        "y": 327.39283084869385,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "e97259d0.1af158",
-                "413f5d48.571fc4"
+                "b27a37af.b36718",
+                "f6fae337.330588"
             ]
         ]
     },
     {
-        "id": "e97259d0.1af158",
+        "id": "b27a37af.b36718",
         "type": "outcome",
         "name": "CreatePnfInstance",
         "xml": "<outcome value='CreatePnfInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 880.9286041259766,
-        "y": 286.1715974807739,
-        "z": "6dfe2c1.a0003d4",
+        "x": 881.5952758789062,
+        "y": 304.53571224212646,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "f6bc9eb4.5cc37"
+                "5bfce726.0e0808"
             ]
         ]
     },
     {
-        "id": "413f5d48.571fc4",
+        "id": "f6fae337.330588",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 842.9285697937012,
-        "y": 331.88592529296875,
-        "z": "6dfe2c1.a0003d4",
+        "x": 843.5952415466309,
+        "y": 350.2500400543213,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "514d78e9.baa838"
+                "e0cd414.414b64"
             ]
         ]
     },
     {
-        "id": "f6bc9eb4.5cc37",
+        "id": "5bfce726.0e0808",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1065.785732269287,
-        "y": 286.17162704467773,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1066.4524040222168,
+        "y": 304.5357418060303,
+        "z": "19228309.79f23d",
         "wires": [
             []
         ]
     },
     {
-        "id": "514d78e9.baa838",
+        "id": "e0cd414.414b64",
         "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=\"If svc-action is 'assign' then request-action must be 'CreatePnfInstance'\" />\n",
         "comments": "",
-        "x": 1082.9285774230957,
-        "y": 331.8858833312988,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1083.5952491760254,
+        "y": 350.24999809265137,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "4388ff9d.ce7d6",
+        "id": "19b08e1.3415872",
         "type": "get-resource",
         "name": "get-resource VF_MODEL",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid'\n  pfx='db.vf-model'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 639.5476150512695,
-        "y": 400.17158603668213,
-        "z": "6dfe2c1.a0003d4",
+        "x": 640.2142868041992,
+        "y": 418.53570079803467,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "512ab575.220ccc",
-                "3a1614d2.3eacec"
+                "982998d2.b1104",
+                "55fc7df0.63822c"
             ]
         ]
     },
     {
-        "id": "6dc29919.0f2208",
+        "id": "ec81ba8b.5b2c9",
         "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 model found for VF customization UUID ' + $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid`\" />\n",
         "comments": "",
-        "x": 1080.9760932922363,
-        "y": 423.60007190704346,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1081.642765045166,
+        "y": 441.964186668396,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "512ab575.220ccc",
+        "id": "982998d2.b1104",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 840.3333129882812,
-        "y": 380.55242347717285,
-        "z": "6dfe2c1.a0003d4",
+        "x": 840.9999847412109,
+        "y": 398.9165382385254,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "d5d2d14c.f67aa"
+                "6a64650.0d6f39c"
             ]
         ]
     },
     {
-        "id": "3a1614d2.3eacec",
+        "id": "55fc7df0.63822c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 848.9047431945801,
-        "y": 424.83813667297363,
-        "z": "6dfe2c1.a0003d4",
+        "x": 849.5714149475098,
+        "y": 443.2022514343262,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "6dc29919.0f2208"
+                "ec81ba8b.5b2c9"
             ]
         ]
     },
     {
-        "id": "d5d2d14c.f67aa",
+        "id": "6a64650.0d6f39c",
         "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 reading VF_MODEL table\" />\n",
         "comments": "",
-        "x": 1080.333293914795,
-        "y": 378.695330619812,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1080.9999656677246,
+        "y": 397.05944538116455,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "95465986.653a28",
+        "id": "a75821b1.edfb58",
         "type": "execute",
         "name": "execute PropertiesNode",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 635.1190948486328,
-        "y": 182.314471244812,
-        "z": "6dfe2c1.a0003d4",
+        "x": 637.7857666015625,
+        "y": 117.6785888671875,
+        "z": "19228309.79f23d",
         "wires": [
             []
         ]
     },
     {
-        "id": "ce6b8a58.b8d3e8",
+        "id": "c77449b3.048b78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 353.41272735595703,
-        "y": 309.5079708099365,
-        "z": "6dfe2c1.a0003d4",
+        "x": 354.0793991088867,
+        "y": 327.87208557128906,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "2c8dd484.c334bc",
-                "4388ff9d.ce7d6",
-                "95465986.653a28",
-                "6cdfcbff.124fe4",
-                "4f7127f2.481f58"
+                "da472ec3.e5ccd8",
+                "19b08e1.3415872",
+                "a75821b1.edfb58",
+                "780d7aca.b60934",
+                "71d0891.189e778",
+                "f6ad14ca.084b8"
             ]
         ]
     },
     {
-        "id": "6cdfcbff.124fe4",
+        "id": "780d7aca.b60934",
         "type": "switchNode",
         "name": "switch input cloud-owner",
         "xml": "<switch test='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 635.8333511352539,
-        "y": 237.55254077911377,
-        "z": "6dfe2c1.a0003d4",
+        "x": 636.5000228881836,
+        "y": 255.9166555404663,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "fbe3ca5c.624b78",
-                "12f9e0f5.d15d1f"
+                "c9bdd3dc.faf7b",
+                "6e4e01ec.cdd3b8"
             ]
         ]
     },
     {
-        "id": "fbe3ca5c.624b78",
+        "id": "c9bdd3dc.faf7b",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 819.1667251586914,
-        "y": 207.55252933502197,
-        "z": "6dfe2c1.a0003d4",
+        "x": 819.8333969116211,
+        "y": 225.9166440963745,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "c50e0e6c.80923"
+                "f08a07.1ccc0df8"
             ]
         ]
     },
     {
-        "id": "12f9e0f5.d15d1f",
+        "id": "6e4e01ec.cdd3b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 818.9286308288574,
-        "y": 248.5050230026245,
-        "z": "6dfe2c1.a0003d4",
+        "x": 819.5953025817871,
+        "y": 266.86913776397705,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "6843bdbc.1eb674"
+                "9f00eed0.781e1"
             ]
         ]
     },
     {
-        "id": "c50e0e6c.80923",
+        "id": "f08a07.1ccc0df8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 954.1666793823242,
-        "y": 205.88586902618408,
-        "z": "6dfe2c1.a0003d4",
+        "x": 954.8333511352539,
+        "y": 224.24998378753662,
+        "z": "19228309.79f23d",
         "wires": [
             []
         ]
     },
     {
-        "id": "6843bdbc.1eb674",
+        "id": "9f00eed0.781e1",
         "type": "set",
         "name": "set prop.cloud-region.cloud-owner",
         "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`' />\n",
         "comments": "",
-        "x": 1035.8333358764648,
-        "y": 247.55255031585693,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1036.5000076293945,
+        "y": 265.9166650772095,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "940a3bec.b79db8",
+        "id": "9a07bcfe.297ad8",
         "type": "call",
         "name": "call self-serve-pnf-assign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-pnf-assign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 848.5553359985352,
-        "y": 596.4128832817078,
-        "z": "6dfe2c1.a0003d4",
+        "x": 849.2220077514648,
+        "y": 614.7769980430603,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "ee11637d.64cc5"
+                "1b53503a.a14958"
             ]
         ]
     },
     {
-        "id": "22ef4f33.3ca9c",
+        "id": "d15a667b.1812a",
         "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=\"`'Failed to create self-serve assignment for pnf with pnf-id=' + $pnf-topology-operation-input.pnf-details.pnf-id + ' with error: ' + $error-message`\" />\n",
         "comments": "",
-        "x": 1232.6267127990723,
-        "y": 596.4128336906433,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1233.293384552002,
+        "y": 614.7769484519958,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "d7499e88.a3c54",
+        "id": "b09b2b8a.09a48",
         "type": "comment",
         "name": "SELF-SERVE FORK",
         "info": "",
         "comments": "",
-        "x": 758.174690246582,
-        "y": 547.6151220798492,
-        "z": "6dfe2c1.a0003d4",
+        "x": 758.8413619995117,
+        "y": 565.9792368412018,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "ee11637d.64cc5",
+        "id": "1b53503a.a14958",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1053.8529167175293,
-        "y": 595.9009146690369,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1054.519588470459,
+        "y": 614.2650294303894,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "22ef4f33.3ca9c"
+                "d15a667b.1812a"
             ]
         ]
     },
     {
-        "id": "8085154e.65e6a8",
+        "id": "1f34dbbd.dc61f4",
         "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": 820.9642715454102,
-        "y": 750.5674510002136,
-        "z": "6dfe2c1.a0003d4",
+        "x": 821.6309432983398,
+        "y": 768.9315657615662,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "4326ce02.3a255",
+        "id": "1f5752f6.bdefd5",
         "type": "set",
         "name": "set pnf-level-oper-status to PendingCreate",
         "xml": "<set>\n<parameter name='service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-level-oper-status.last-rpc-action' value='`$pnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-level-oper-status.last-action' value='`$pnf-topology-operation-input.request-information.request-action`' />",
         "comments": "",
-        "x": 959.0277328491211,
-        "y": 649.15491771698,
-        "z": "6dfe2c1.a0003d4",
+        "x": 959.6944046020508,
+        "y": 667.5190324783325,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "b05b3263.f3526",
+        "id": "e1473b9e.65e3f8",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-pnf-assign.log' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 810.8689994812012,
-        "y": 698.3447003364563,
-        "z": "6dfe2c1.a0003d4",
+        "x": 811.5356712341309,
+        "y": 716.7088150978088,
+        "z": "19228309.79f23d",
         "wires": [
             []
         ]
     },
     {
-        "id": "4f7127f2.481f58",
+        "id": "71d0891.189e778",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 599.535530090332,
-        "y": 667.8531589508057,
-        "z": "6dfe2c1.a0003d4",
+        "x": 600.2022018432617,
+        "y": 686.2172737121582,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "940a3bec.b79db8",
-                "8085154e.65e6a8",
-                "b05b3263.f3526"
+                "9a07bcfe.297ad8",
+                "1f34dbbd.dc61f4",
+                "e1473b9e.65e3f8"
             ]
         ]
+    },
+    {
+        "id": "f6ad14ca.084b8",
+        "type": "switchNode",
+        "name": "Is cloud-owner passed in input?",
+        "xml": "<switch test=\"`$pnf-topology-operation-input.pnf-request-input.cloud-owner != ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 723,
+        "y": 172,
+        "z": "19228309.79f23d",
+        "wires": [
+            [
+                "98dded3d.86af78"
+            ]
+        ]
+    },
+    {
+        "id": "98dded3d.86af78",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1020,
+        "y": 172,
+        "z": "19228309.79f23d",
+        "wires": [
+            [
+                "fdb56d64.3dcfa"
+            ]
+        ]
+    },
+    {
+        "id": "fdb56d64.3dcfa",
+        "type": "set",
+        "name": "set prop.cloud-region.cloud-owner to input cloud-owner",
+        "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`' />\n",
+        "comments": "",
+        "x": 1391,
+        "y": 168,
+        "z": "19228309.79f23d",
+        "wires": []
     }
 ]
\ No newline at end of file