From 8e136272ffd5555c66ac4b8b6310eb974ca86e19 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Tue, 27 Aug 2019 09:53:59 -0400
Subject: Revert "GRAPI DG enhancement"

This reverts commit 48c912df5cc69f58592d96a93e8b72900587dc89 [formerly 8d5a350ab0128e46a81042341f2024a88631d35a].
This change breaks the flow in a few ways:
 - loses fix to case where now GW preload is found.
 - depends on an adaptor that is not part of ONAP (MSOAdaptor)
 - uses a rest api template that does not exist.

Change-Id: I7db150174484309e2ec3b49365403ca0d4f7ac6f
Issue-ID: SDNC-870
Issue-ID: SDNC-871
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

Former-commit-id: ffce554d009b58c71e433d9edc3ba6476f4ce9ce
---
 ...ESOURCE-API_self-serve-vf-module-mdsal-put.json | 184 ---------------------
 1 file changed, 184 deletions(-)
 delete mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.json

(limited to 'platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.json')

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.json
deleted file mode 100644
index a71fa066..00000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.json
+++ /dev/null
@@ -1,184 +0,0 @@
-[
-    {
-        "id": "3bf8c671.7f376a",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 212.8720245361328,
-        "y": 81.44345092773438,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "dfbef821.00c2d8"
-            ]
-        ]
-    },
-    {
-        "id": "4b80a72e.2a60b8",
-        "type": "method",
-        "name": "method self-serve-vf-module-mdsal-put",
-        "xml": "<method rpc='self-serve-vf-module-mdsal-put' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 357.8839416503906,
-        "y": 146.14980506896973,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "3703bd36.764b22"
-            ]
-        ]
-    },
-    {
-        "id": "dfbef821.00c2d8",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "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": 475.11022186279297,
-        "y": 81.63394355773926,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "4b80a72e.2a60b8"
-            ]
-        ]
-    },
-    {
-        "id": "3703bd36.764b22",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 636.6220474243164,
-        "y": 291.443452835083,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "fa0889c9.30fd08",
-                "7f28b6cc.262928",
-                "bba1c88d.c97208",
-                "8ce26831.f031e8",
-                "e45f0d28.1cec2"
-            ]
-        ]
-    },
-    {
-        "id": "fa0889c9.30fd08",
-        "type": "execute",
-        "name": "execute RestApiCallNode - PUT vf-module",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ss-vfmodule\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1027.1694793701172,
-        "y": 409.067419052124,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "9648b461.f14b68",
-                "7d59a7d6.4df008"
-            ]
-        ]
-    },
-    {
-        "id": "9648b461.f14b68",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1310.5131568908691,
-        "y": 438.06558895111084,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "318b6c3c.6a17d4"
-            ]
-        ]
-    },
-    {
-        "id": "7d59a7d6.4df008",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1299.6917686462402,
-        "y": 384.5655927658081,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "318b6c3c.6a17d4"
-            ]
-        ]
-    },
-    {
-        "id": "7f28b6cc.262928",
-        "type": "set",
-        "name": "set vf data for restapi-call-node",
-        "xml": "<set>\n<parameter name='vf.vf-module-id'\n    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />\n<parameter name='vf.vf-module-data.sdnc-request-header.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />\n<parameter name='vf.vf-module-data.request-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />\n<parameter name='vf.vf-module-data.service-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />\n<parameter name='vf.vf-module-data.vnf-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />\n<parameter name='vf.vf-module-data.vf-module-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />\n<parameter name='vf.vf-module-data.vf-module-topology.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />\n<parameter name='vf.vf-module-data.vf-module-level-oper-status.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.request-version'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.tenant'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />",
-        "comments": "",
-        "x": 993.6815032958984,
-        "y": 193.18542575836182,
-        "z": "52d92258.1c8e7c",
-        "wires": []
-    },
-    {
-        "id": "bba1c88d.c97208",
-        "type": "execute",
-        "name": "generate ss-vfmodule url replace service-instance-id",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.ss-vfmodule-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1063.6814422607422,
-        "y": 239.93548774719238,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8ce26831.f031e8",
-        "type": "execute",
-        "name": "generate ss-vfmodule url - replace vnf-id",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1024.2171478271484,
-        "y": 289.24438762664795,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e45f0d28.1cec2",
-        "type": "execute",
-        "name": "generate ss-vfmodule url - replace vf-module-id",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vf-module-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1046.1578216552734,
-        "y": 339.1608877182007,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "318b6c3c.6a17d4",
-        "type": "set",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Failed to persist self-serve vf-module assignments during assign in MD-SAL. ' + $error-message`\" />",
-        "comments": "",
-        "x": 1501.0029106140137,
-        "y": 384.39960289001465,
-        "z": "52d92258.1c8e7c",
-        "wires": []
-    }
-]
\ No newline at end of file
-- 
cgit 1.2.3-korg