SDWAN site-resource to generic-vnf relationship failed 13/85813/4
authorshashikanth.vh <shashikanth.vh@huawei.com>
Fri, 19 Apr 2019 13:01:42 +0000 (13:01 +0000)
committerDan Timoney <dtimoney@att.com>
Wed, 24 Apr 2019 13:48:44 +0000 (13:48 +0000)
Change-Id: I500b260710c0c869d1e2c0cd3a4d17e532250f70
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
Former-commit-id: b90c38f8871cc36434568009d856cb90c8c6448a

platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml

index 833563e..b70f8ce 100644 (file)
@@ -1,6 +1,6 @@
 [\r
     {\r
-        "id": "39688a3a.06a796",\r
+        "id": "f2c51e78.6ee01",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "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": 265.00390625,\r
-        "y": 145.999990940094,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 233.5,\r
+        "y": 162.99999046325684,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "921891f8.416e5"\r
+                "e7f78c27.133fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "921891f8.416e5",\r
+        "id": "e7f78c27.133fa",\r
         "type": "method",\r
         "name": "sdwan-vf-operation-site-create",\r
         "xml": "<method rpc='sdwan-vf-operation-site-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 264.00390625,\r
-        "y": 245.999990940094,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 232.5,\r
+        "y": 262.99999046325684,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "22a013b4.ab58dc"\r
+                "31fa463e.82923a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "695e0384.f33d9c",\r
+        "id": "bac9bd77.fe0f",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 94.50390625,\r
-        "y": 56.999998569488525,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 85,\r
+        "y": 68.00000381469727,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "39688a3a.06a796"\r
+                "f2c51e78.6ee01"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22a013b4.ab58dc",\r
+        "id": "31fa463e.82923a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 423.00389099121094,\r
-        "y": 361.99999952316284,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 391.49998474121094,\r
+        "y": 378.9999990463257,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "4325b612.73e1e8",\r
-                "a6c02374.2dca",\r
-                "40ba27b5.057bf8",\r
-                "d6478b6b.a2b888",\r
-                "59e1bfa3.d11e4",\r
-                "1c5585c5.9cdc3a",\r
-                "a7e8dd90.c6661",\r
-                "2f9ca627.c38e7a",\r
-                "40436b2a.16f614",\r
-                "64771e44.2196d",\r
-                "bb863987.8db5d8",\r
-                "462de6d9.81f588"\r
+                "dda69c6e.0dcdc",\r
+                "73e90791.30e428",\r
+                "539f4691.77ee38",\r
+                "b886ea54.85e0f8",\r
+                "be0d3540.8ebb28",\r
+                "788efb60.76f4a4",\r
+                "154ced05.a101f3",\r
+                "76dbb250.b292cc",\r
+                "df7eb194.69b7e",\r
+                "6868f266.5fe7ec",\r
+                "e78bb1b3.a529d",\r
+                "2b07f61e.bf4a1a",\r
+                "fd37bb03.271ec8",\r
+                "395e35c1.a6a5fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4325b612.73e1e8",\r
+        "id": "dda69c6e.0dcdc",\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.3333129882812,\r
-        "y": 253.49612379074097,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 691.8294067382812,\r
+        "y": 270.4961233139038,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "63fc0005.8f2ee"\r
+                "e02bea98.6a2108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63fc0005.8f2ee",\r
+        "id": "e02bea98.6a2108",\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": 975.3334045410156,\r
-        "y": 252.1627869606018,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 943.8294982910156,\r
+        "y": 269.16278648376465,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "c555201.0223fe"\r
+                "44afa032.ce578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6fae689f.7fef88",\r
+        "id": "c12c2186.d601b",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1346.9998931884766,\r
-        "y": 254.16278982162476,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1315.4959869384766,\r
+        "y": 271.1627893447876,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c555201.0223fe",\r
+        "id": "44afa032.ce578",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1193.6667213439941,\r
-        "y": 254.1627688407898,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1162.1628150939941,\r
+        "y": 271.16276836395264,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "6fae689f.7fef88"\r
+                "c12c2186.d601b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6478b6b.a2b888",\r
+        "id": "b886ea54.85e0f8",\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": 797.2540969848633,\r
-        "y": 475.6666569709778,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 765.7501907348633,\r
+        "y": 492.6666564941406,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "e10e6c76.58a1d"\r
+                "d6ac010b.ad6e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e10e6c76.58a1d",\r
+        "id": "d6ac010b.ad6e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1012.0324401855469,\r
-        "y": 473.2222409248352,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 980.5285339355469,\r
+        "y": 490.22224044799805,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "9a3f095b.53aca8",\r
-                "454b0ff.c77c1f"\r
+                "265e23d4.36e02c",\r
+                "e3c83d1b.72db1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a3f095b.53aca8",\r
+        "id": "265e23d4.36e02c",\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": 1208.2886428833008,\r
-        "y": 450.9703793525696,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1176.7847366333008,\r
+        "y": 467.9703788757324,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "454b0ff.c77c1f",\r
+        "id": "e3c83d1b.72db1",\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": 1177.7330703735352,\r
-        "y": 487.9704957008362,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1146.2291641235352,\r
+        "y": 504.970495223999,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b7ed90b.0ee057",\r
+        "id": "6cbee016.f6042",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1181.2542991638184,\r
-        "y": 410.33332538604736,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1149.7503929138184,\r
+        "y": 427.3333249092102,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a6c02374.2dca",\r
+        "id": "73e90791.30e428",\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": 737.75390625,\r
-        "y": 208.99999284744263,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 706.25,\r
+        "y": 225.99999237060547,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "698329a9.119718"\r
+                "d8c3ff3.9b067"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "698329a9.119718",\r
+        "id": "d8c3ff3.9b067",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 924.4205856323242,\r
-        "y": 208.33329057693481,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 892.9166793823242,\r
+        "y": 225.33329010009766,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "f31a5878.bf4fd8"\r
+                "94ec6856.a83cd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f31a5878.bf4fd8",\r
+        "id": "94ec6856.a83cd8",\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": 1106.0872116088867,\r
-        "y": 208.33329057693481,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1074.5833053588867,\r
+        "y": 225.33329010009766,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40ba27b5.057bf8",\r
+        "id": "539f4691.77ee38",\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": 779.0038957595825,\r
-        "y": 328.99999380111694,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 747.4999895095825,\r
+        "y": 345.9999933242798,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "51b4cfc4.d81ec",\r
-                "9cba331b.ccedc"\r
+                "83439569.31aa38",\r
+                "bcb4cae0.4f9908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51b4cfc4.d81ec",\r
+        "id": "83439569.31aa38",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1010.00390625,\r
-        "y": 304.999990940094,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 978.5,\r
+        "y": 321.99999046325684,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "3f2cb9e5.051a76"\r
+                "ba3dff03.8dc24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9cba331b.ccedc",\r
+        "id": "bcb4cae0.4f9908",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1010.00390625,\r
-        "y": 344.999990940094,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 978.5,\r
+        "y": 361.99999046325684,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "e0c33286.cb104"\r
+                "890fe4fa.c0f128"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f2cb9e5.051a76",\r
+        "id": "ba3dff03.8dc24",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1152.50390625,\r
-        "y": 304.999990940094,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1121,\r
+        "y": 321.99999046325684,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e0c33286.cb104",\r
+        "id": "890fe4fa.c0f128",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1154.3609504699707,\r
-        "y": 344.9365029335022,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1122.8570442199707,\r
+        "y": 361.93650245666504,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "8b8b9efa.275ce",\r
-                "1791a391.e4fccc"\r
+                "3895380d.b43d08",\r
+                "ba2eca23.0f6508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1791a391.e4fccc",\r
+        "id": "ba2eca23.0f6508",\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": 1307.059425354004,\r
-        "y": 314.55560162616894,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1275.555519104004,\r
+        "y": 331.5556011493318,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8b8b9efa.275ce",\r
+        "id": "3895380d.b43d08",\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": 1363.4879302978516,\r
-        "y": 367.7777314186096,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1331.9840240478516,\r
+        "y": 384.77773094177246,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "aaa91538.94bcc8"\r
+                "8202a636.7f9518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd3d2242.9164e",\r
+        "id": "51af10a6.1b1e3",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1587.1386604309082,\r
-        "y": 326.03178882598877,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1555.6347541809082,\r
+        "y": 343.0317883491516,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aaa91538.94bcc8",\r
+        "id": "8202a636.7f9518",\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": 1638.7736511230469,\r
-        "y": 367.3492341041565,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1607.2697448730469,\r
+        "y": 384.34923362731934,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "a84edb80.0d80e8"\r
+                "ce7e5cca.15004"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a84edb80.0d80e8",\r
+        "id": "ce7e5cca.15004",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1539.503849029541,\r
-        "y": 425.92066526412964,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1507.999942779541,\r
+        "y": 442.9206647872925,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "7ca646fd.066d78"\r
+                "7c5cfe61.fdc3f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ca646fd.066d78",\r
+        "id": "7c5cfe61.fdc3f",\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": 1687.2539520263672,\r
-        "y": 425.77785733295605,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1655.7500457763672,\r
+        "y": 442.7778568561189,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40436b2a.16f614",\r
+        "id": "df7eb194.69b7e",\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.site-vf-index`' />\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\n",\r
         "comments": "",\r
-        "x": 790.8571014404297,\r
-        "y": 755.4962139129639,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 759.3531951904297,\r
+        "y": 772.4962134361267,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f9ca627.c38e7a",\r
+        "id": "76dbb250.b292cc",\r
         "type": "execute",\r
         "name": "execute generate-vf-module-index",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.site-vf-index\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 799.1905975341797,\r
-        "y": 702.1629467010498,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 767.6866912841797,\r
+        "y": 719.1629462242126,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a7e8dd90.c6661",\r
+        "id": "154ced05.a101f3",\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": 773.1905746459961,\r
-        "y": 648.1628403663635,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 741.6866683959961,\r
+        "y": 665.1628398895264,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "59e1bfa3.d11e4",\r
+        "id": "be0d3540.8ebb28",\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": 788.1902351379395,\r
-        "y": 538.1542210578918,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 756.6863288879395,\r
+        "y": 555.1542205810547,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c5585c5.9cdc3a",\r
+        "id": "788efb60.76f4a4",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-site-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-site-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 804.190544128418,\r
-        "y": 590.154402256012,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 772.686637878418,\r
+        "y": 607.1544017791748,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "64771e44.2196d",\r
+        "id": "6868f266.5fe7ec",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.site-vf-index`' />\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 + $prop.site-vf-index\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": 786.0039939880371,\r
-        "y": 806.0000591278076,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 754.5000877380371,\r
+        "y": 823.0000586509705,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb863987.8db5d8",\r
+        "id": "e78bb1b3.a529d",\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": 795.5040130615234,\r
-        "y": 854.9999685287476,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 764.0001068115234,\r
+        "y": 871.9999680519104,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "670cd372.9429ec",\r
+        "id": "fd37bb03.271ec8",\r
         "type": "save",\r
         "name": "save sdwan vpn resource in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.site-resource-id = $prop.site-vf-index' >\n<parameter name='site-resource-id' value='`$prop.site-vf-index`' />\n<parameter name='site-resource-name' value='`$prop.site.name`' />\n<parameter name='description' value='`$prop.site.description`' />\n<parameter name='type' value='`$prop.site.type`' />\n<parameter name='role' value='`$prop.site.role`' />\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.site-vf-index + '/vf-module-data/'` \" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 798.0039482116699,\r
-        "y": 900.4999747276306,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 766.5000419616699,\r
+        "y": 917.4999742507935,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4d453124.5225e",\r
+        "id": "395e35c1.a6a5fa",\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=\"sdwan-vpn\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-vpns/sdwan-vpn/' + $prop.site-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.site-vf-index`\" />\n\n\n<!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource:relationship-list' \n      key='site-resource.site-resource-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=\"sdwan-site\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-sites/sdwan-site/' + $prop.site-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.site-vf-index`\" /-->\n",\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=\"site-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/site-resources/site-resource/' + $prop.site-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"site-resource.site-resource-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.site-vf-index`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 797.0038909912109,\r
-        "y": 947.5000224113464,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 765.4999847412109,\r
+        "y": 964.5000219345093,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "462de6d9.81f588",\r
+        "id": "2b07f61e.bf4a1a",\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": 745.7264213562012,\r
-        "y": 993.6738653182983,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 714.2225151062012,\r
+        "y": 1010.6738648414612,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index d13f680..e4bdd6f 100644 (file)
                 <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='site-resource' \r
+      key='site-resource.site-resource-id = $prop.site-vf-index' >\r
+                <parameter name='site-resource-id' value='`$prop.site-vf-index`' />\r
+                <parameter name='site-resource-name' value='`$prop.site.name`' />\r
+                <parameter name='description' value='`$prop.site.description`' />\r
+                <parameter name='type' value='`$prop.site.type`' />\r
+                <parameter name='role' value='`$prop.site.role`' />\r
+                <parameter name='operational-status' value='Created' />\r
+                <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\r
+                <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\r
+                <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.site-vf-index + '/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
+                <parameter name="relationship-list.relationship[0].related-to" value="site-resource" />\r
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/site-resources/site-resource/' + $prop.site-vf-index`" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="site-resource.site-resource-id" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.site-vf-index`" />\r
+            </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
                 <parameter name="error-code" value="200" />\r