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_sdwan-vnf-topology-operation-wanport-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.json
deleted file mode 100644
index bf71f28b..00000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.json
+++ /dev/null
@@ -1,569 +0,0 @@
-[
-  {
-    "id": "d97ddb0b.9dbae8",
-    "type": "switchNode",
-    "name": "switch service-data.vnfs.vnf_length",
-    "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 657.5634536743164,
-    "y": 290.26117038726807,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "78101855.a55318",
-        "303c0757.9740d8"
-      ]
-    ]
-  },
-  {
-    "id": "ffc786dd.6d3ce8",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 119.46875,
-    "y": 55,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "19627a0c.fad7f6"
-      ]
-    ]
-  },
-  {
-    "id": "19627a0c.fad7f6",
-    "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": 194.75445556640625,
-    "y": 95.23811149597168,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "90edfff9.8d8dc"
-      ]
-    ]
-  },
-  {
-    "id": "89fc7e96.e130c",
-    "type": "comment",
-    "name": "wan port-vnf-topology-operation-delete",
-    "info": "",
-    "comments": "",
-    "x": 568.8136672973633,
-    "y": 128.58639907836914,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "12b8b4a9.73677b",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 196.13541412353516,
-    "y": 356.6666717529297,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "79e6b6ed.e79cf8",
-        "a877fa3c.5b8268",
-        "86a0bf6e.0b80b",
-        "d97ddb0b.9dbae8",
-        "c603984a.796d78",
-        "b1f3fdb5.343c9",
-        "c5c45c6b.923e9",
-        "96916512.691c98",
-        "f2a5223f.497fa",
-        "14bdc57f.29da0b",
-        "9171f0e2.d13bf"
-      ]
-    ]
-  },
-  {
-    "id": "78101855.a55318",
-    "type": "other",
-    "name": "outcome Null",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 922.2857666015625,
-    "y": 272.81679248809814,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "74e8241b.eea89c"
-      ]
-    ]
-  },
-  {
-    "id": "74e8241b.eea89c",
-    "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": 1103.2856369018555,
-    "y": 267.81667041778564,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "303c0757.9740d8",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 907.7857666015625,
-    "y": 324.8167552947998,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "1483b08f.bc2c8f"
-      ]
-    ]
-  },
-  {
-    "id": "1483b08f.bc2c8f",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1079.785472869873,
-    "y": 324.8167533874512,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "e9c362d9.eda3b",
-        "c7e2b23c.082b2"
-      ]
-    ]
-  },
-  {
-    "id": "c7e2b23c.082b2",
-    "type": "switchNode",
-    "name": "switch tmp.vidx ",
-    "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1254.78564453125,
-    "y": 343.8166751861572,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "b277af35.24bde"
-      ]
-    ]
-  },
-  {
-    "id": "86a0bf6e.0b80b",
-    "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": 627.9524536132812,
-    "y": 364.70563411712646,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "bebaa9f9.5133d8",
-        "de5a57a9.6e5c38"
-      ]
-    ]
-  },
-  {
-    "id": "bebaa9f9.5133d8",
-    "type": "outcome",
-    "name": "outcome PendingDelete",
-    "xml": "<outcome value='PendingDelete'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 918.7857208251953,
-    "y": 368.81675720214844,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "a8bce4a2.2db818"
-      ]
-    ]
-  },
-  {
-    "id": "de5a57a9.6e5c38",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 864.7857818603516,
-    "y": 415.8167610168457,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "c9cdcb18.116a68"
-      ]
-    ]
-  },
-  {
-    "id": "c9cdcb18.116a68",
-    "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": 1024.2855491638184,
-    "y": 418.8167600631714,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "c603984a.796d78",
-    "type": "switchNode",
-    "name": "switch vnf-id",
-    "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 593.7857704162598,
-    "y": 245.81676387786865,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "9c65cfbe.e7f66"
-      ]
-    ]
-  },
-  {
-    "id": "9c65cfbe.e7f66",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 791.7858352661133,
-    "y": 235.81677627563477,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "16c05e83.252251"
-      ]
-    ]
-  },
-  {
-    "id": "16c05e83.252251",
-    "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": 958.2857208251953,
-    "y": 232.81677055358887,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "e9c362d9.eda3b",
-    "type": "for",
-    "name": "for vidx..service-data.vnfs.vnf[]",
-    "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1315.2856483459473,
-    "y": 279.81667137145996,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "76ffd99.2cf1928"
-      ]
-    ]
-  },
-  {
-    "id": "76ffd99.2cf1928",
-    "type": "switchNode",
-    "name": "switch vnf-id 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": 1571.2856674194336,
-    "y": 279.81667137145996,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "157a2e27.614112"
-      ]
-    ]
-  },
-  {
-    "id": "157a2e27.614112",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1747.7857208251953,
-    "y": 282.81667137145996,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "9ee7d32a.eb396"
-      ]
-    ]
-  },
-  {
-    "id": "9ee7d32a.eb396",
-    "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].vnf-data.`' />\n",
-    "comments": "",
-    "x": 1914.7857360839844,
-    "y": 343.81667137145996,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "b167d24d.6ae55",
-    "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": 1560.285659790039,
-    "y": 343.8166751861572,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "b277af35.24bde",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1422.785659790039,
-    "y": 343.8166751861572,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "b167d24d.6ae55"
-      ]
-    ]
-  },
-  {
-    "id": "79e6b6ed.e79cf8",
-    "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": 599.8022537231445,
-    "y": 647.3334503173828,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "a877fa3c.5b8268",
-    "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": 572.913516998291,
-    "y": 772.8888854980469,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "c5c45c6b.923e9",
-    "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": 577.4347686767578,
-    "y": 555.8044013977051,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "a8bce4a2.2db818",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1116.0921211242676,
-    "y": 379.14191150665283,
-    "z": "298a9201.dd932e",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "90edfff9.8d8dc",
-    "type": "method",
-    "name": "method sdwan-vnf-topology-operation-wanport-delete",
-    "xml": "<method rpc='sdwan-vnf-topology-operation-wanport-delete' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 200,
-    "y": 211.26117038726807,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "12b8b4a9.73677b"
-      ]
-    ]
-  },
-  {
-    "id": "b1f3fdb5.343c9",
-    "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": 651.2858276367188,
-    "y": 185.81676292419434,
-    "z": "298a9201.dd932e",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "96916512.691c98",
-    "type": "delete",
-    "name": "delete wan port instance configuration in AAI",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='wan-port-config' \n        key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 649.0001983642578,
-    "y": 685.2611904144287,
-    "z": "298a9201.dd932e",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f2a5223f.497fa",
-    "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": 611.3333854675293,
-    "y": 505.0001096725464,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "53b23540.75768c"
-      ]
-    ]
-  },
-  {
-    "id": "53b23540.75768c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 855.333366394043,
-    "y": 531.0000691413879,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "52fdf367.fb37ac"
-      ]
-    ]
-  },
-  {
-    "id": "52fdf367.fb37ac",
-    "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": 1047.3333129882812,
-    "y": 540.0001134872437,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "ae48a2e3.38f76"
-      ]
-    ]
-  },
-  {
-    "id": "ae48a2e3.38f76",
-    "type": "outcomeFalse",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1233.3333282470703,
-    "y": 524,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "617570c9.1b48"
-      ]
-    ]
-  },
-  {
-    "id": "8341b52b.a87b88",
-    "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": 1549.3333473205566,
-    "y": 500.0001916885376,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "14bdc57f.29da0b",
-    "type": "set",
-    "name": "set prop.vnfNewidx",
-    "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
-    "comments": "",
-    "x": 576.3333892822266,
-    "y": 469.0000686645508,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "45e47923.545468",
-    "type": "set",
-    "name": "set prop.vnfNewidx",
-    "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
-    "comments": "",
-    "x": 1571.3333473205566,
-    "y": 556.0001554489136,
-    "z": "298a9201.dd932e",
-    "wires": []
-  },
-  {
-    "id": "617570c9.1b48",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1384.333251953125,
-    "y": 525.000036239624,
-    "z": "298a9201.dd932e",
-    "wires": [
-      [
-        "8341b52b.a87b88",
-        "45e47923.545468"
-      ]
-    ]
-  },
-  {
-    "id": "9171f0e2.d13bf",
-    "type": "set",
-    "name": "Remove vnf from ServiceData",
-    "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$prop.vnfidxLen].\" value=\"\"/>\n\n",
-    "comments": "",
-    "x": 613.0000534057617,
-    "y": 598.0000357627869,
-    "z": "298a9201.dd932e",
-    "wires": []
-  }
-]