Refactored SOTN and SDWAN DG

Refactored SOTN and SDWAN DG to seperate sub directories for better
maintainability.

Change-Id: I49c57d20fc8fcb7de65d3634bceb691d0b7f80fd
Issue-ID: SDNC-350
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

Former-commit-id: d3d3ce137625a244accf736da3a8f6736b44300e

1 files changed, 0 insertions, 569 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json
deleted file mode 100644
index 463dc7f2..00000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json
+++ /dev/null
@@ -1,569 +0,0 @@
-[
-  {
-    "id": "1e0cb698.a04019",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 107.57138061523438,
-    "y": 61.999998569488525,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "277c65c2.ed804a"
-      ]
-    ]
-  },
-  {
-    "id": "277c65c2.ed804a",
-    "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": 182.85708618164062,
-    "y": 102.2381100654602,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "a7e1f73c.bc4948"
-      ]
-    ]
-  },
-  {
-    "id": "a7e1f73c.bc4948",
-    "type": "method",
-    "name": "method site-vnf-topology-operation-delete",
-    "xml": "<method rpc='site-vnf-topology-operation-delete' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 163,
-    "y": 237.99999856948853,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "bdf1765.0f24c88"
-      ]
-    ]
-  },
-  {
-    "id": "ca44419d.5ab99",
-    "type": "comment",
-    "name": "site-vnf-topology-operation-delete",
-    "info": "",
-    "comments": "",
-    "x": 556.9162979125977,
-    "y": 135.58639764785767,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "bdf1765.0f24c88",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 184.23804473876953,
-    "y": 363.6666703224182,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "372cbde7.587372",
-        "5c8ef11.4d9e21",
-        "c063c177.c449a",
-        "b76f0527.dbb128",
-        "bcc212f6.b90ab",
-        "12ca3dc.2d458c2",
-        "c460861f.38f098",
-        "6a5ea2dd.9c807c",
-        "55ed5ce8.2b1ae4",
-        "ba708495.2ebbe8",
-        "4890886d.4993b8"
-      ]
-    ]
-  },
-  {
-    "id": "bcc212f6.b90ab",
-    "type": "switchNode",
-    "name": "switch service-data.vnfs.vnf_length",
-    "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 645.6660842895508,
-    "y": 297.2611689567566,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "d5d54ea4.ba5c6",
-        "291bcf0.559d232"
-      ]
-    ]
-  },
-  {
-    "id": "d5d54ea4.ba5c6",
-    "type": "other",
-    "name": "outcome Null",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 910.3883972167969,
-    "y": 279.81679105758667,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "30ee642f.b18d2c"
-      ]
-    ]
-  },
-  {
-    "id": "30ee642f.b18d2c",
-    "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": 1091.3882675170898,
-    "y": 274.81666898727417,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "291bcf0.559d232",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 895.8883972167969,
-    "y": 331.81675386428833,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "fb8a0e1a.913bb"
-      ]
-    ]
-  },
-  {
-    "id": "fb8a0e1a.913bb",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1067.8881034851074,
-    "y": 331.8167519569397,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "5412f014.12424",
-        "97fd60bf.39c2c"
-      ]
-    ]
-  },
-  {
-    "id": "97fd60bf.39c2c",
-    "type": "switchNode",
-    "name": "switch tmp.nidx ",
-    "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1242.8882751464844,
-    "y": 350.81667375564575,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "7e0c16e8.e0d2b8"
-      ]
-    ]
-  },
-  {
-    "id": "b76f0527.dbb128",
-    "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": 616.0550842285156,
-    "y": 371.705632686615,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "2c1cb407.0b20fc",
-        "7a49e612.028b78"
-      ]
-    ]
-  },
-  {
-    "id": "2c1cb407.0b20fc",
-    "type": "outcome",
-    "name": "outcome PendingDelete",
-    "xml": "<outcome value='PendingDelete'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 906.8883514404297,
-    "y": 375.81675577163696,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "4b86cba0.d35104"
-      ]
-    ]
-  },
-  {
-    "id": "7a49e612.028b78",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 852.8884124755859,
-    "y": 422.81675958633423,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "cae57504.d32048"
-      ]
-    ]
-  },
-  {
-    "id": "cae57504.d32048",
-    "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": 1012.3881797790527,
-    "y": 425.8167586326599,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "12ca3dc.2d458c2",
-    "type": "switchNode",
-    "name": "switch vnf-id",
-    "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 581.8884010314941,
-    "y": 252.81676244735718,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "479f1e18.fbfce"
-      ]
-    ]
-  },
-  {
-    "id": "479f1e18.fbfce",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 779.8884658813477,
-    "y": 242.8167748451233,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "e26d76c0.5decd8"
-      ]
-    ]
-  },
-  {
-    "id": "e26d76c0.5decd8",
-    "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-request-input.vnf-input-parameters.name is a required input\" />\n",
-    "comments": "",
-    "x": 946.3883514404297,
-    "y": 239.8167691230774,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "c460861f.38f098",
-    "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": 639.3884582519531,
-    "y": 192.81676149368286,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "5412f014.12424",
-    "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": 1303.3882789611816,
-    "y": 286.8166699409485,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "148fbb0c.c24365"
-      ]
-    ]
-  },
-  {
-    "id": "148fbb0c.c24365",
-    "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": 1559.388298034668,
-    "y": 286.8166699409485,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "b65bbab.9ca2c48"
-      ]
-    ]
-  },
-  {
-    "id": "b65bbab.9ca2c48",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1735.8883514404297,
-    "y": 289.8166699409485,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "1a4ecfb7.7d8f8"
-      ]
-    ]
-  },
-  {
-    "id": "1a4ecfb7.7d8f8",
-    "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": 1902.8883666992188,
-    "y": 350.8166699409485,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "e8e5a7c0.1c4938",
-    "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": 1548.3882904052734,
-    "y": 350.81667375564575,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "7e0c16e8.e0d2b8",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1410.8882904052734,
-    "y": 350.81667375564575,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "e8e5a7c0.1c4938"
-      ]
-    ]
-  },
-  {
-    "id": "5c8ef11.4d9e21",
-    "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": 578.9050178527832,
-    "y": 641.3335304260254,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "c063c177.c449a",
-    "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": 538.0161476135254,
-    "y": 759.8890404701233,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "372cbde7.587372",
-    "type": "delete",
-    "name": "delete site instance configuration in AAI",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='site-resource' \n        key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 606.4265480041504,
-    "y": 697.1378149986267,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "4b86cba0.d35104",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1104.194751739502,
-    "y": 386.14191007614136,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "6a5ea2dd.9c807c",
-    "type": "set",
-    "name": "set prop.vnfNewidx",
-    "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
-    "comments": "",
-    "x": 585.0000762939453,
-    "y": 422.00006771087646,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "55ed5ce8.2b1ae4",
-    "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": 602.0000381469727,
-    "y": 472.00007152557373,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "1913c26.edfaf3e"
-      ]
-    ]
-  },
-  {
-    "id": "1913c26.edfaf3e",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 863.000114440918,
-    "y": 476.0001063346863,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "b02e3feb.ffee3"
-      ]
-    ]
-  },
-  {
-    "id": "b02e3feb.ffee3",
-    "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": 1055.0000610351562,
-    "y": 485.000150680542,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "e6008550.52d2f8"
-      ]
-    ]
-  },
-  {
-    "id": "e6008550.52d2f8",
-    "type": "outcomeFalse",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1241.0000762939453,
-    "y": 469.00003719329834,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "59e45e4c.5156f"
-      ]
-    ]
-  },
-  {
-    "id": "59e45e4c.5156f",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1392,
-    "y": 470.00007343292236,
-    "z": "4e13a6ca.bd7208",
-    "wires": [
-      [
-        "9655d3b.ed2503",
-        "ee40dd88.8d1f1"
-      ]
-    ]
-  },
-  {
-    "id": "9655d3b.ed2503",
-    "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": 1557.0000953674316,
-    "y": 445.00022888183594,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "ee40dd88.8d1f1",
-    "type": "set",
-    "name": "set prop.vnfNewidx",
-    "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
-    "comments": "",
-    "x": 1579.0000953674316,
-    "y": 501.0001926422119,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "ba708495.2ebbe8",
-    "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": 571.101432800293,
-    "y": 525.8043546676636,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  },
-  {
-    "id": "4890886d.4993b8",
-    "type": "set",
-    "name": "Remove vnf from ServiceData",
-    "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$prop.vnfidxLen].\" value=\"\"/>\n\n",
-    "comments": "",
-    "x": 608.0001106262207,
-    "y": 581.0001163482666,
-    "z": "4e13a6ca.bd7208",
-    "wires": []
-  }
-]