Fix SDWAN peer wise integration testing issues

SDWAN lan-port-config create,activate DGs are
fixed with valid request-action and updated
service-data with response-id returned from
SDWAN controller

Change-Id: Ib4067d4de257c64f81b4e70584bcf26c87bbaa04
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
Former-commit-id: 08d1ca8e484cab832ce1f54cc36539888d77b08a

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
index 710748f..722e5c1 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
@@ -557,8 +557,8 @@
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1243.008186340332,\r
-        "y": 773.003986954689,\r
+        "x": 1251.008171081543,\r
+        "y": 817.0040302276611,\r
         "z": "8f678717.6ce918",\r
         "wires": [\r
             [\r
@@ -573,8 +573,8 @@
         "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 889.0080261230469,\r
-        "y": 740.0040270090103,\r
+        "x": 1256.0080871582031,\r
+        "y": 730.0041098594666,\r
         "z": "8f678717.6ce918",\r
         "wires": [\r
             [\r
@@ -594,7 +594,7 @@
         "z": "8f678717.6ce918",\r
         "wires": [\r
             [\r
-                "752f257f.d5098c"\r
+                "f8bad303.dbe7d"\r
             ]\r
         ]\r
     },\r
@@ -605,8 +605,8 @@
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1465.0081024169922,\r
-        "y": 773.0040684938431,\r
+        "x": 1501.0082206726074,\r
+        "y": 811.0041122436523,\r
         "z": "8f678717.6ce918",\r
         "wires": [\r
             [\r
@@ -2086,8 +2086,8 @@
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1949.2583618164062,\r
-        "y": 755.5041704177856,\r
+        "x": 1961.2583961486816,\r
+        "y": 799.5041923522949,\r
         "z": "8f678717.6ce918",\r
         "wires": [\r
             [\r
@@ -2119,8 +2119,8 @@
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1663.5312805175781,\r
-        "y": 781.0312776565552,\r
+        "x": 1693.531337738037,\r
+        "y": 804.0312929153442,\r
         "z": "8f678717.6ce918",\r
         "wires": [\r
             [\r
@@ -2241,5 +2241,69 @@
         "y": 2197.2225341796875,\r
         "z": "8f678717.6ce918",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "f8bad303.dbe7d",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 875,\r
+        "y": 666.6666870117188,\r
+        "z": "8f678717.6ce918",\r
+        "wires": [\r
+            [\r
+                "8c2d8bf6.5cda78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8c2d8bf6.5cda78",\r
+        "type": "switchNode",\r
+        "name": "switch vf-modules.vf-module_length",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`\">\n\n<!--switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 708.7500152587891,\r
+        "y": 790.9167098999023,\r
+        "z": "8f678717.6ce918",\r
+        "wires": [\r
+            [\r
+                "fd56a113.86307"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fd56a113.86307",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 877,\r
+        "y": 734.6666870117188,\r
+        "z": "8f678717.6ce918",\r
+        "wires": [\r
+            [\r
+                "341d8e5.7253272"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "341d8e5.7253272",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1024.2500305175781,\r
+        "y": 733.416708946228,\r
+        "z": "8f678717.6ce918",\r
+        "wires": [\r
+            [\r
+                "752f257f.d5098c"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json
index 3ce166e..b09a059 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json
@@ -1,431 +1,431 @@
 [\r
     {\r
-        "id": "3ecdadeb.18aa62",\r
+        "id": "f782e37.109032",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 432.00389862060547,\r
-        "y": 378.9999885559082,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 583,\r
+        "y": 401.1628177165985,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "b1de8da9.db8a2",\r
-                "d704787.9944088",\r
-                "c4e200e6.2e02b",\r
-                "5f812e79.2be7e",\r
-                "2b234f37.76666",\r
-                "7dbca450.42794c",\r
-                "7e93696e.840218",\r
-                "676ec3b1.844d3c",\r
-                "e3e05047.2e5b8",\r
-                "91a71daa.ef5c2",\r
-                "b3c3b183.55c72",\r
-                "d01634bb.bb46b8",\r
-                "43cde2b5.87e1ac",\r
-                "c6fbc47.00d1938",\r
-                "98c6c3b2.42b6b"\r
+                "3a0d40d2.1b88f",\r
+                "fdf59618.623758",\r
+                "d535f520.a2b4c8",\r
+                "5957a088.cf332",\r
+                "9afb8db9.2b0d5",\r
+                "1b22ffce.90ac5",\r
+                "9c073f69.f288d",\r
+                "8cc9cbda.e9db18",\r
+                "1db1621b.e18c6e",\r
+                "33fd1f45.d7ff5",\r
+                "2ebef402.b67dec",\r
+                "a78628f7.4e9428",\r
+                "9f1428de.0587b8",\r
+                "69722b7c.abba54",\r
+                "86d99a3f.07f208"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1de8da9.db8a2",\r
+        "id": "3a0d40d2.1b88f",\r
         "type": "for",\r
         "name": "for loop idx - VF input parameters",\r
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 778.2540588378906,\r
-        "y": 361.66665744781494,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 929.2501602172852,\r
+        "y": 383.82948660850525,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "d245ffbf.59c6c"\r
+                "edd147b1.5a9678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d245ffbf.59c6c",\r
+        "id": "edd147b1.5a9678",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 993.0324020385742,\r
-        "y": 359.22224140167236,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1144.0285034179688,\r
+        "y": 381.38507056236267,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "82c635c3.382618",\r
-                "bcda53d8.f6893"\r
+                "239191e9.78691e",\r
+                "1a76d1a9.524ade"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82c635c3.382618",\r
+        "id": "239191e9.78691e",\r
         "type": "execute",\r
         "name": "execute split parameterName",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1189.2886047363281,\r
-        "y": 336.97037982940674,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1340.2847061157227,\r
+        "y": 359.13320899009705,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bcda53d8.f6893",\r
+        "id": "1a76d1a9.524ade",\r
         "type": "set",\r
         "name": "set parameterName",\r
         "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",\r
         "comments": "",\r
-        "x": 1158.7330322265625,\r
-        "y": 373.97049617767334,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1309.729133605957,\r
+        "y": 396.13332533836365,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ac17a6a.af45258",\r
+        "id": "24f00d92.239812",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 816.2542610168457,\r
-        "y": 318.3333249092102,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 967.2503623962402,\r
+        "y": 340.4961540699005,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c4e200e6.2e02b",\r
+        "id": "d535f520.a2b4c8",\r
         "type": "set",\r
         "name": "set new vf-module_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",\r
         "comments": "",\r
-        "x": 757.190673828125,\r
-        "y": 520.1629304885864,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 908.1867752075195,\r
+        "y": 542.3257596492767,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d704787.9944088",\r
+        "id": "fdf59618.623758",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",\r
         "comments": "",\r
-        "x": 764.1902618408203,\r
-        "y": 415.1541962623596,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 915.1863632202148,\r
+        "y": 437.3170254230499,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7e93696e.840218",\r
+        "id": "9c073f69.f288d",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' /-->\n<!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' /-->\n",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n",\r
         "comments": "",\r
-        "x": 769.3570175170898,\r
-        "y": 628.3335423469543,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 920.3531188964844,\r
+        "y": 650.4963715076447,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "676ec3b1.844d3c",\r
+        "id": "8cc9cbda.e9db18",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vf-id`'/> \n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 757.503942489624,\r
-        "y": 679.8373885154724,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 908.5000438690186,\r
+        "y": 702.0002176761627,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e3e05047.2e5b8",\r
+        "id": "1db1621b.e18c6e",\r
         "type": "save",\r
         "name": "save sdwan lan-port-config resource in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='lan-port-config.lan-port-config-id = $prop.vf-id' >\n<parameter name=\"lan-port-config-id\" value=\"`$prop.vf-id`\" />\n<parameter name=\"device-id\" value='`$prop.lan.deviceName`' />\n<parameter name=\"port-switch\" value='`$prop.lan.portSwitch`' />\n<parameter name=\"port-type\" value='`$prop.lan.portType`' />\n<parameter name=\"port-number\" value='`$prop.lan.portnumber`' />\n<parameter name=\"ipv4-address\" value='`$prop.lan.ipAddress`' />\n<parameter name='vlan-tag' value='`$prop.lan.vlanId`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 812.5039215087891,\r
-        "y": 772.3373708724976,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 963.5000228881836,\r
+        "y": 794.5002000331879,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "91a71daa.ef5c2",\r
+        "id": "33fd1f45.d7ff5",\r
         "type": "save",\r
         "name": "save service relationship in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"lan-port-config\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"lan-port-config-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vf-id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 772.5038375854492,\r
-        "y": 819.3373589515686,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 923.4999389648438,\r
+        "y": 841.5001881122589,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b3c3b183.55c72",\r
+        "id": "2ebef402.b67dec",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 723.2263832092285,\r
-        "y": 866.5112180709839,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 874.222484588623,\r
+        "y": 888.6740472316742,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f812e79.2be7e",\r
+        "id": "5957a088.cf332",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 733.424467086792,\r
-        "y": 68.5038731098175,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 884.4205684661865,\r
+        "y": 90.66670227050781,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "ecb5481e.49db98"\r
+                "26211aa4.6aca76"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ecb5481e.49db98",\r
+        "id": "26211aa4.6aca76",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 920.0911464691162,\r
-        "y": 67.83717083930969,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1071.0872478485107,\r
+        "y": 90,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "5cc69be0.888194"\r
+                "60b9b040.3db19"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5cc69be0.888194",\r
+        "id": "60b9b040.3db19",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n",\r
         "comments": "",\r
-        "x": 1101.7577724456787,\r
-        "y": 67.83717083930969,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1252.7538738250732,\r
+        "y": 90,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b234f37.76666",\r
+        "id": "9afb8db9.2b0d5",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 771.6744890213013,\r
-        "y": 245.50386714935303,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 922.6705904006958,\r
+        "y": 267.66669631004333,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "43b76269.61638c",\r
-                "80f9fdd1.5acfa"\r
+                "925220d0.8e6e8",\r
+                "8d034f0b.c8c8d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43b76269.61638c",\r
+        "id": "925220d0.8e6e8",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1002.6744995117188,\r
-        "y": 221.50386428833008,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1153.6706008911133,\r
+        "y": 243.66669344902039,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "30daa7e7.f7d908"\r
+                "f6929bd3.916468"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80f9fdd1.5acfa",\r
+        "id": "8d034f0b.c8c8d",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1002.6744995117188,\r
-        "y": 261.5038642883301,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1153.6706008911133,\r
+        "y": 283.6666934490204,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "15ffa14c.a3471f"\r
+                "28516ca8.58b9a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30daa7e7.f7d908",\r
+        "id": "f6929bd3.916468",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1145.1744995117188,\r
-        "y": 221.50386428833008,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1296.1706008911133,\r
+        "y": 243.66669344902039,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "15ffa14c.a3471f",\r
+        "id": "28516ca8.58b9a4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1147.0315437316895,\r
-        "y": 261.4403762817383,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1298.027645111084,\r
+        "y": 283.6032054424286,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "81c65311.3e7fa",\r
-                "1c59d473.dd26bc"\r
+                "fe45ce64.2ccb7",\r
+                "e4014c75.a1a78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c59d473.dd26bc",\r
+        "id": "e4014c75.a1a78",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",\r
         "comments": "",\r
-        "x": 1299.7300186157227,\r
-        "y": 231.05947497440502,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1450.7261199951172,\r
+        "y": 253.22230413509533,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "81c65311.3e7fa",\r
+        "id": "fe45ce64.2ccb7",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1356.1585235595703,\r
-        "y": 284.2816047668457,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1507.1546249389648,\r
+        "y": 306.444433927536,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "aaf0ab5e.460008"\r
+                "c9dd9d48.363c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85ce8231.1cc8f",\r
+        "id": "93986914.2633c8",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1579.809253692627,\r
-        "y": 242.53566217422485,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1730.8053550720215,\r
+        "y": 264.69849133491516,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aaf0ab5e.460008",\r
+        "id": "c9dd9d48.363c4",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1631.4442443847656,\r
-        "y": 283.8531074523926,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1782.4403457641602,\r
+        "y": 306.0159366130829,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "1a7eae6b.66a2b2"\r
+                "3a28d2c1.9fee3e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a7eae6b.66a2b2",\r
+        "id": "3a28d2c1.9fee3e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1532.1744422912598,\r
-        "y": 342.4245386123657,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1683.1705436706543,\r
+        "y": 364.58736777305603,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "40223de2.189ee4"\r
+                "c7dfb468.8d2468"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40223de2.189ee4",\r
+        "id": "c7dfb468.8d2468",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1679.924545288086,\r
-        "y": 342.28173068119213,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1830.9206466674805,\r
+        "y": 364.44455984188244,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7dbca450.42794c",\r
+        "id": "1b22ffce.90ac5",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-lanport-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 803.0039367675781,\r
-        "y": 468.0000219345093,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 954.0000381469727,\r
+        "y": 490.1628510951996,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d01634bb.bb46b8",\r
+        "id": "a78628f7.4e9428",\r
         "type": "set",\r
         "name": "set vf-module-level-oper-status",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",\r
         "comments": "",\r
-        "x": 774.00390625,\r
-        "y": 722.00390625,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 925.0000076293945,\r
+        "y": 744.1667354106903,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80c0749d.c5b758",\r
+        "id": "ceaeb6e4.45d088",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 101.00390625,\r
-        "y": 95.00390625,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 252.00000762939453,\r
+        "y": 117.16673541069031,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "1e8e9be2.f38a84"\r
+                "b9aae3a1.4ae74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e8e9be2.f38a84",\r
+        "id": "b9aae3a1.4ae74",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -433,146 +433,145 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 215.50390434265137,\r
-        "y": 202.00389766693115,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 366.5000057220459,\r
+        "y": 224.16672682762146,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "441193b5.7a563c"\r
+                "486cfe7f.88b42"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "441193b5.7a563c",\r
+        "id": "486cfe7f.88b42",\r
         "type": "method",\r
         "name": "sdwan-vf-operation-lanport-create",\r
         "xml": "<method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 214.50390434265137,\r
-        "y": 302.00389766693115,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 365.5000057220459,\r
+        "y": 324.16672682762146,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "3ecdadeb.18aa62"\r
+                "f782e37.109032"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43cde2b5.87e1ac",\r
+        "id": "9f1428de.0587b8",\r
         "type": "execute",\r
         "name": "execute generate-vf-id",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vf-id\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 756.0039520263672,\r
-        "y": 576.5038995742798,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 907.0000534057617,\r
+        "y": 598.6667287349701,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c6fbc47.00d1938",\r
+        "id": "69722b7c.abba54",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 723.0038871765137,\r
-        "y": 123.00390815734863,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 873.9999885559082,\r
+        "y": 145.16673731803894,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "a2640a51.5d0d78"\r
+                "c4314464.ea4888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2640a51.5d0d78",\r
+        "id": "c4314464.ea4888",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 974.0039825439453,\r
-        "y": 118.67052865028381,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1125.0000839233398,\r
+        "y": 140.83335781097412,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "d22976f8.730608"\r
+                "7e2619a7.4c1a38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d22976f8.730608",\r
+        "id": "7e2619a7.4c1a38",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1192.3372993469238,\r
-        "y": 120.6705105304718,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1343.3334007263184,\r
+        "y": 142.8333396911621,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "92022bc5.0cdcc8"\r
+                "e7b8aabb.779c28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92022bc5.0cdcc8",\r
+        "id": "e7b8aabb.779c28",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1345.6704711914062,\r
-        "y": 120.67053151130676,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1496.6665725708008,\r
+        "y": 142.83336067199707,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98c6c3b2.42b6b",\r
+        "id": "86d99a3f.07f208",\r
         "type": "switchNode",\r
         "name": "switch vnf-index",\r
         "xml": "<switch test='`$vnf-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 737.00390625,\r
-        "y": 184.00390625,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 888.0000076293945,\r
+        "y": 206.1667354106903,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "681068c6.40fb78"\r
+                "885839d2.ea1b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "681068c6.40fb78",\r
+        "id": "885839d2.ea1b48",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 899.0039520263672,\r
-        "y": 183.00390529632568,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1050.0000534057617,\r
+        "y": 205.166734457016,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": [\r
             [\r
-                "f9b4e412.cab938"\r
+                "1a2b1c2a.3b4624"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9b4e412.cab938",\r
+        "id": "1a2b1c2a.3b4624",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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 id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1048.2540435791016,\r
-        "y": 180.78178310394287,\r
-        "z": "dfb806d8.8899e8",\r
+        "x": 1199.250144958496,\r
+        "y": 202.94461226463318,\r
+        "z": "5ddf8caa.1b92e4",\r
         "wires": []\r
     }\r
-]\r
-\r
+]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
index 65c2f0e..3414cb9 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
@@ -1,36 +1,36 @@
 [\r
     {\r
-        "id": "4d340fd2.1d47a",\r
+        "id": "aeae6125.a8d28",\r
         "type": "method",\r
         "name": "method vnf-topology-operation-vpn-site-resource-create",\r
         "xml": "<method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 251.00390625,\r
-        "y": 191.9999925820157,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 265,\r
+        "y": 223.9999925820157,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             [\r
-                "dd995ca6.5527c"\r
+                "10f15a6d.ba1d76"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83ce2cf0.a21b",\r
+        "id": "3eb5635c.ae734c",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 127.57528686523438,\r
-        "y": 44,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 141.57138061523438,\r
+        "y": 76,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             [\r
-                "d4e5788.5ad9988"\r
+                "1821ad11.5dad23"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4e5788.5ad9988",\r
+        "id": "1821ad11.5dad23",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -38,337 +38,432 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 229.86099243164062,\r
-        "y": 102.23810407798737,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 243.85708618164062,\r
+        "y": 134.23810407798737,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             [\r
-                "4d340fd2.1d47a"\r
+                "aeae6125.a8d28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd995ca6.5527c",\r
+        "id": "10f15a6d.ba1d76",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 231.24195098876953,\r
-        "y": 363.6666643349454,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 245.23804473876953,\r
+        "y": 395.6666643349454,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             [\r
-                "9e4483c6.3ac77",\r
-                "a13164e4.2addc8",\r
-                "3a6751cb.2db1fe",\r
-                "deb0deb9.10aa8",\r
-                "8f8480.f469fb8",\r
-                "f27c92ed.2a351",\r
-                "4152c1db.9724f",\r
-                "34769e57.986742",\r
-                "27f27223.64947e",\r
-                "5e423ee5.be879",\r
-                "dfdcb682.501ff8"\r
+                "175dc57.fde8c3b",\r
+                "3afb3c65.1ca3a4",\r
+                "fadde341.82f5a",\r
+                "9885c8cf.ded0d8",\r
+                "a5e91b3d.29e478",\r
+                "6e79157a.cf280c",\r
+                "fff46357.6f3ad",\r
+                "5da9f931.70bc48",\r
+                "df8e278a.898b28",\r
+                "3a3acb9a.529fc4",\r
+                "ff8a3cb6.2dc93",\r
+                "1bd26429.61c74c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a13164e4.2addc8",\r
+        "id": "3afb3c65.1ca3a4",\r
         "type": "set",\r
         "name": "set vnf-level-oper-status to Created",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",\r
         "comments": "",\r
-        "x": 665.3887023925781,\r
-        "y": 617.6705932617188,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 667.3848571777344,\r
+        "y": 759.670597076416,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9e4483c6.3ac77",\r
+        "id": "175dc57.fde8c3b",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",\r
         "comments": "",\r
-        "x": 657.2418899536133,\r
-        "y": 512.6668453216553,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 659.2380447387695,\r
+        "y": 654.6668491363525,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f8480.f469fb8",\r
+        "id": "a5e91b3d.29e478",\r
         "type": "execute",\r
         "name": "execute generate-vnf-index",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-id\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 645.5753936767578,\r
-        "y": 462.33342933654785,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 647.5715484619141,\r
+        "y": 604.3334331512451,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dfdcb682.501ff8",\r
+        "id": "ff8a3cb6.2dc93",\r
         "type": "set",\r
         "name": "set vnf-index to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",\r
         "comments": "",\r
-        "x": 656.5754699707031,\r
-        "y": 569.3334331512451,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 658.5716247558594,\r
+        "y": 711.3334369659424,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3a6751cb.2db1fe",\r
+        "id": "fadde341.82f5a",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 660.5752716064453,\r
-        "y": 242.3333559036255,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 674.5713653564453,\r
+        "y": 274.3333559036255,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             [\r
-                "2c3f6b93.ddbca4",\r
-                "29bbdb18.cfe584"\r
+                "fe0779f6.a341a8",\r
+                "9f0ded05.d925c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c3f6b93.ddbca4",\r
+        "id": "fe0779f6.a341a8",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 895.2896575927734,\r
-        "y": 237.47617626190186,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 909.2857513427734,\r
+        "y": 269.47617626190186,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             [\r
-                "8e783130.b1886"\r
+                "e3b683ce.f47fd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e783130.b1886",\r
+        "id": "e3b683ce.f47fd",\r
         "type": "set",\r
         "name": "set vnf-index=0",\r
         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1055.5753631591797,\r
-        "y": 237.47626781463623,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 1069.5714569091797,\r
+        "y": 269.47626781463623,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29bbdb18.cfe584",\r
+        "id": "9f0ded05.d925c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 891.7181968688965,\r
-        "y": 270.76200771331787,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 905.7142906188965,\r
+        "y": 302.76200771331787,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             [\r
-                "64bc2d84.970e54"\r
+                "411ddf99.4fbb3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c816157.792fce8",\r
+        "id": "b6024395.bc24",\r
         "type": "set",\r
         "name": "set vnf-index = vnf_length",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",\r
         "comments": "",\r
-        "x": 1284.575439453125,\r
-        "y": 249.04773330688477,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 1298.571533203125,\r
+        "y": 281.04773330688477,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a9c0fb1a.4ae688",\r
+        "id": "3b57b625.74c07a",\r
         "type": "for",\r
         "name": "for each existing VNF",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1273.0040588378906,\r
-        "y": 284.04770517349243,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 1287.0001525878906,\r
+        "y": 316.04770517349243,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             [\r
-                "e4810c54.16f7c"\r
+                "a7076dba.f36af"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64bc2d84.970e54",\r
+        "id": "411ddf99.4fbb3",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1026.4324798583984,\r
-        "y": 272.76197719573975,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 1040.4285736083984,\r
+        "y": 304.76197719573975,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             [\r
-                "c816157.792fce8",\r
-                "a9c0fb1a.4ae688"\r
+                "b6024395.bc24",\r
+                "3b57b625.74c07a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4810c54.16f7c",\r
+        "id": "a7076dba.f36af",\r
         "type": "switchNode",\r
         "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1666.289794921875,\r
-        "y": 284.61918926239014,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 1680.285888671875,\r
+        "y": 316.61918926239014,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             [\r
-                "d88564b1.978518"\r
+                "b4dc78a5.d896c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d88564b1.978518",\r
+        "id": "b4dc78a5.d896c8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1947.575496673584,\r
-        "y": 283.19059467315674,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 1961.571590423584,\r
+        "y": 315.19059467315674,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             [\r
-                "eb2d673c.26d6e8"\r
+                "51ac74f.88fd58c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a4256cd.31fdd8",\r
+        "id": "4be264b1.270e6c",\r
         "type": "comment",\r
         "name": "make sure this vnf-id doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1635.4324111938477,\r
-        "y": 248.1905813217163,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 1649.4285049438477,\r
+        "y": 280.1905813217163,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "deb0deb9.10aa8",\r
+        "id": "9885c8cf.ded0d8",\r
         "type": "set",\r
         "name": "set new vnf_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",\r
         "comments": "",\r
-        "x": 617.5753936767578,\r
-        "y": 410.33342599868774,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 619.5715484619141,\r
+        "y": 552.333429813385,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f27c92ed.2a351",\r
+        "id": "6e79157a.cf280c",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 604.5753555297852,\r
-        "y": 880.59694480896,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 606.5715103149414,\r
+        "y": 1022.5969486236572,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5e423ee5.be879",\r
+        "id": "3a3acb9a.529fc4",\r
         "type": "save",\r
         "name": "save service relationship in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 667.2421264648438,\r
-        "y": 827.5968379974365,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 669.23828125,\r
+        "y": 969.5968418121338,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4152c1db.9724f",\r
+        "id": "fff46357.6f3ad",\r
         "type": "set",\r
         "name": "set vnf-index and vnf-object-path",\r
         "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />",\r
         "comments": "",\r
-        "x": 658.5753860473633,\r
-        "y": 658.5968637466431,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 660.5715408325195,\r
+        "y": 800.5968675613403,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "34769e57.986742",\r
+        "id": "5da9f931.70bc48",\r
         "type": "set",\r
         "name": "set vnf-request-input.",\r
         "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",\r
         "comments": "",\r
-        "x": 623.5750274658203,\r
-        "y": 361.3247985839844,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 625.5711822509766,\r
+        "y": 503.32480239868164,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb2d673c.26d6e8",\r
+        "id": "51ac74f.88fd58c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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 id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",\r
         "comments": "",\r
-        "x": 2076.1468658447266,\r
-        "y": 334.1906089782715,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 2090.1429595947266,\r
+        "y": 366.1906089782715,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6aca9b4.e7d1e64",\r
-        "type": "comment",\r
-        "name": "Take the parameter names by removing prefix",\r
-        "info": "",\r
+        "id": "df8e278a.898b28",\r
+        "type": "save",\r
+        "name": "save AnAI - vnf-instance.orchestration-status",\r
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-id\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",\r
         "comments": "",\r
-        "x": 1369.5754776000977,\r
-        "y": 337.66667556762695,\r
-        "z": "b6e8aa45.a03d48",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 715.5458450317383,\r
+        "y": 910.2470846176147,\r
+        "z": "3deddfaf.57c2f",\r
+        "wires": [\r
+            []\r
+        ]\r
     },\r
     {\r
-        "id": "301883bc.025f5c",\r
+        "id": "6f579a3f.d15af4",\r
         "type": "comment",\r
         "name": "TODO: change AAI models",\r
         "info": "",\r
         "comments": "",\r
-        "x": 647.1859512329102,\r
-        "y": 727.9742965698242,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 649.1821060180664,\r
+        "y": 869.9743003845215,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "27f27223.64947e",\r
-        "type": "save",\r
-        "name": "save AnAI - vnf-instance.orchestration-status",\r
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-id\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",\r
+        "id": "1bd26429.61c74c",\r
+        "type": "switchNode",\r
+        "name": "switch service-data.vnf-request-input.vnf-name",\r
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-name`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 693.0000152587891,\r
+        "y": 393.0000114440918,\r
+        "z": "3deddfaf.57c2f",\r
+        "wires": [\r
+            [\r
+                "33ff6eed.504462",\r
+                "e2af6995.223f28",\r
+                "cc14ee3a.bceeb"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "33ff6eed.504462",\r
+        "type": "outcomeTrue",\r
+        "name": "SDWAN-vpn",\r
+        "xml": "<outcome value='SDWAN-vpn'>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 990.6667137145996,\r
+        "y": 378.0000114440918,\r
+        "z": "3deddfaf.57c2f",\r
+        "wires": [\r
+            [\r
+                "55868aa1.2254e4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e2af6995.223f28",\r
+        "type": "outcomeTrue",\r
+        "name": "SDWAN-site",\r
+        "xml": "<outcome value='SDWAN-site'>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 983.6666870117188,\r
+        "y": 428,\r
+        "z": "3deddfaf.57c2f",\r
+        "wires": [\r
+            [\r
+                "496e33ab.398b4c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cc14ee3a.bceeb",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 966.6666870117188,\r
+        "y": 478,\r
+        "z": "3deddfaf.57c2f",\r
+        "wires": [\r
+            [\r
+                "c9a98bce.5a8c88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c9a98bce.5a8c88",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "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: vnf-name should be either SDWAN-vpn or SDWAN-site.\" />\n",\r
         "comments": "",\r
+        "x": 1137.333366394043,\r
+        "y": 476.00001335144043,\r
+        "z": "3deddfaf.57c2f",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "55868aa1.2254e4",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1172,\r
+        "y": 379,\r
+        "z": "3deddfaf.57c2f",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "496e33ab.398b4c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
         "outputs": 1,\r
-        "x": 713.549690246582,\r
-        "y": 768.2470808029175,\r
-        "z": "b6e8aa45.a03d48",\r
+        "x": 1163,\r
+        "y": 427,\r
+        "z": "3deddfaf.57c2f",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
index d13b5db..7a6c727 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
@@ -1,6 +1,6 @@
 <service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    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}'>\r
+        xmlns='http://www.onap.org/sdnc/svclogic'\r
+        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}'>\r
     <method rpc='sdwan-vf-operation-lanport-activate' mode='sync'>\r
         <block atomic="true">\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
@@ -104,46 +104,55 @@
                 <parameter name='prop.siteIds_length' value='0' />\r
             </set>\r
             <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
-                    <block>\r
-                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
-                            <outcome value='true'>\r
-                                <block atomic="true">\r
-                                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`">\r
+                <block atomic="true">\r
+                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`">\r
+                        <!--switch test="`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`"-->\r
+                        <outcome value='true'>\r
+                            <block atomic="true">\r
+                                <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
+                                    <block>\r
+                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
                                             <outcome value='true'>\r
                                                 <block atomic="true">\r
-                                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`">\r
-                                                        <outcome value='true'>\r
-                                                            <set>\r
-                                                                <parameter name='prop.role' value="spoke" />\r
-                                                            </set>\r
-                                                        </outcome>\r
-                                                    </switch>\r
-                                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'dsvpn-hub'`">\r
-                                                        <outcome value='true'>\r
-                                                            <set>\r
-                                                                <parameter name='prop.role' value="hub" />\r
-                                                            </set>\r
-                                                        </outcome>\r
-                                                    </switch>\r
-                                                    <for index='sidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`">\r
+                                                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`">\r
                                                             <outcome value='true'>\r
                                                                 <block atomic="true">\r
-                                                                    <set>\r
-                                                                        <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />\r
-                                                                    </set>\r
-                                                                    <set>\r
-                                                                        <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\r
-                                                                        <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\r
-                                                                    </set>\r
-                                                                    <set>\r
-                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\r
-                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\r
-                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\r
-                                                                        <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\r
-                                                                    </set>\r
+                                                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`">\r
+                                                                        <outcome value='true'>\r
+                                                                            <set>\r
+                                                                                <parameter name='prop.role' value="spoke" />\r
+                                                                            </set>\r
+                                                                        </outcome>\r
+                                                                    </switch>\r
+                                                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'dsvpn-hub'`">\r
+                                                                        <outcome value='true'>\r
+                                                                            <set>\r
+                                                                                <parameter name='prop.role' value="hub" />\r
+                                                                            </set>\r
+                                                                        </outcome>\r
+                                                                    </switch>\r
+                                                                    <for index='sidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`">\r
+                                                                            <outcome value='true'>\r
+                                                                                <block atomic="true">\r
+                                                                                    <set>\r
+                                                                                        <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />\r
+                                                                                    </set>\r
+                                                                                    <set>\r
+                                                                                        <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\r
+                                                                                        <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\r
+                                                                                    </set>\r
+                                                                                    <set>\r
+                                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\r
+                                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\r
+                                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\r
+                                                                                        <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\r
+                                                                                    </set>\r
+                                                                                </block>\r
+                                                                            </outcome>\r
+                                                                        </switch>\r
+                                                                    </for>\r
                                                                 </block>\r
                                                             </outcome>\r
                                                         </switch>\r
@@ -151,41 +160,41 @@
                                                 </block>\r
                                             </outcome>\r
                                         </switch>\r
-                                    </for>\r
-                                </block>\r
-                            </outcome>\r
-                        </switch>\r
-                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">\r
-                            <outcome value='true'>\r
-                                <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                                    <block atomic="true">\r
-                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`">\r
-                                            <outcome value='true'>\r
-                                                <set>\r
-                                                    <parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
-                                                </set>\r
-                                            </outcome>\r
-                                        </switch>\r
-                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`">\r
-                                            <outcome value='true'>\r
-                                                <set>\r
-                                                    <parameter name='prop.name' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
-                                                </set>\r
-                                            </outcome>\r
-                                        </switch>\r
-                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">\r
+                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">\r
                                             <outcome value='true'>\r
-                                                <set>\r
-                                                    <parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
-                                                </set>\r
+                                                <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                                    <block atomic="true">\r
+                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`">\r
+                                                            <outcome value='true'>\r
+                                                                <set>\r
+                                                                    <parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                                </set>\r
+                                                            </outcome>\r
+                                                        </switch>\r
+                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`">\r
+                                                            <outcome value='true'>\r
+                                                                <set>\r
+                                                                    <parameter name='prop.name' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                                </set>\r
+                                                            </outcome>\r
+                                                        </switch>\r
+                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">\r
+                                                            <outcome value='true'>\r
+                                                                <set>\r
+                                                                    <parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                                </set>\r
+                                                            </outcome>\r
+                                                        </switch>\r
+                                                    </block>\r
+                                                </for>\r
                                             </outcome>\r
                                         </switch>\r
                                     </block>\r
                                 </for>\r
-                            </outcome>\r
-                        </switch>\r
-                    </block>\r
-                </for>\r
+                            </block>\r
+                        </outcome>\r
+                    </switch>\r
+                </block>\r
             </for>\r
             <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module_length`' >\r
                 <block>\r
@@ -225,11 +234,11 @@
                     </return>\r
                 </outcome>\r
             </execute>\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="esr-thirdparty-sdnc" \r
-               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \r
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                          resource="esr-thirdparty-sdnc"\r
+                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND\r
                     depth = '1'"\r
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
+                          pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
                 <outcome value='success'>\r
                     <set>\r
                         <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
@@ -447,13 +456,13 @@
  + $vf-module-topology-operation-input.vf-module-information.vf-module-id\r
  + '/vf-module-data/vf-module-topology/'`"/>\r
                 <parameter name='vnf-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+                           value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/vnfs/vnf/'\r
  + $service-data.vnfs.vnf[$vnf-index].vnf-id\r
  + '/vnf-data/vnf-topology/'`"/>\r
                 <parameter name='service-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+                           value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/service-topology/'`"/>\r
             </set>\r
@@ -462,8 +471,8 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
             </set>\r
-            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \r
-      key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
+            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'\r
+                    key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
                 <parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
                 <parameter name='operational-status' value='Active' />\r
                 <!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
index d253871..d1578ec 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
@@ -1,6 +1,6 @@
 <service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    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}'>\r
+        xmlns='http://www.onap.org/sdnc/svclogic'\r
+        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}'>\r
     <method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\r
         <block atomic="true">\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
@@ -85,8 +85,8 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\r
-                <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' /-->\r
-                <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' /-->\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\r
             </set>\r
             <set>\r
                 <parameter name='vf-module-id' value='`$prop.vf-id`'/>\r
@@ -98,13 +98,13 @@
  + $vf-module-topology-operation-input.vf-module-information.vf-module-id\r
  + '/vf-module-data/vf-module-topology/'`"/>\r
                 <parameter name='vnf-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+                           value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/vnfs/vnf/'\r
  + $service-data.vnfs.vnf[$vnf-index].vnf-id\r
  + '/vnf-data/vnf-topology/'`"/>\r
                 <parameter name='service-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+                           value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/service-topology/'`"/>\r
             </set>\r
@@ -113,8 +113,8 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
             </set>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \r
-      key='lan-port-config.lan-port-config-id = $prop.vf-id' >\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'\r
+                  key='lan-port-config.lan-port-config-id = $prop.vf-id' >\r
                 <parameter name="lan-port-config-id" value="`$prop.vf-id`" />\r
                 <parameter name="device-id" value='`$prop.lan.deviceName`' />\r
                 <parameter name="port-switch" value='`$prop.lan.portSwitch`' />\r
@@ -128,9 +128,9 @@
                 <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\r
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />\r
             </save>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \r
-      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
-      force="true" pfx="tmp.AnAI-data">\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'\r
+                  key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'\r
+                  force="true" pfx="tmp.AnAI-data">\r
                 <parameter name="relationship-list.relationship[0].related-to" value="lan-port-config" />\r
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="lan-port-config-id" />\r
@@ -143,5 +143,4 @@
             </return>\r
         </block>\r
     </method>\r
-</service-logic>\r
-\r
+</service-logic>
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
index b730b32..3e8b537 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
@@ -1,6 +1,6 @@
 <service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    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}'>\r
+        xmlns='http://www.onap.org/sdnc/svclogic'\r
+        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}'>\r
     <method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\r
         <block atomic="true">\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
@@ -29,6 +29,21 @@
                     </block>\r
                 </outcome>\r
             </switch>\r
+            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-name`'>\r
+                <outcome value='SDWAN-vpn'>\r
+                    <block atomic="true"></block>\r
+                </outcome>\r
+                <outcome value='SDWAN-site'>\r
+                    <block atomic="true"></block>\r
+                </outcome>\r
+                <outcome value='Other'>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="Error: vnf-name should be either SDWAN-vpn or SDWAN-site." />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\r
             <set>\r
                 <parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\r
             </set>\r
@@ -58,17 +73,17 @@
                 <parameter name='vnfId' value='`$prop.vnf-id`' />\r
                 <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` " />\r
             </set>\r
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="generic-vnf"   \r
-               key="generic-vnf.vnf-id = $prop.vnf-id" >\r
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                  resource="generic-vnf"\r
+                  key="generic-vnf.vnf-id = $prop.vnf-id" >\r
                 <parameter name="orchestration-status" value="create" />\r
                 <parameter name="vnf-type" value="some vnf-type" />\r
             </save>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \r
-      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \r
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \r
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \r
-      force="true" pfx="tmp.AnAI-data">\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
+                  key='service-instance.service-instance-id = $service-data.service-information.service-instance-id\r
+         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id\r
+         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'\r
+                  force="true" pfx="tmp.AnAI-data">\r
                 <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />\r
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />\r