Merge "Handle case where sslcert file is not specified"
authorDavid Stilwell <stilwelld@att.com>
Fri, 12 Apr 2019 14:31:58 +0000 (14:31 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 12 Apr 2019 14:31:58 +0000 (14:31 +0000)
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml

index d7e57be..f258de4 100644 (file)
@@ -1,22 +1,22 @@
 [\r
     {\r
-        "id": "b9b83207.589ec",\r
+        "id": "5c12f35e.e1cabc",\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": 1124.8294982910156,\r
-        "y": 251.16278839111328,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 887.3294982910156,\r
+        "y": 250.16278743743896,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "8cae152d.7cd218"\r
+                "fc9a82de.84ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1800fba.baf5f",\r
+        "id": "b009e5d5.1d5ff8",\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": 414.5,\r
-        "y": 144.99999237060547,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 177,\r
+        "y": 143.99999141693115,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "6d32e66a.a8bcf8"\r
+                "9b496cef.08cf1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d32e66a.a8bcf8",\r
+        "id": "9b496cef.08cf1",\r
         "type": "method",\r
         "name": "sdwan-vf-operation-device-create",\r
         "xml": "<method rpc='sdwan-vf-operation-device-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 413.5,\r
-        "y": 244.99999237060547,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 176,\r
+        "y": 243.99999141693115,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "1cc250f1.53fd7f"\r
+                "a4608885.5f82c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c8db0b.eb2055",\r
+        "id": "7da866ae.544bb8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 244,\r
-        "y": 56,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 98.50000381469727,\r
+        "y": 39,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "e1800fba.baf5f"\r
+                "b009e5d5.1d5ff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cc250f1.53fd7f",\r
+        "id": "a4608885.5f82c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 572.4999847412109,\r
-        "y": 361.0000009536743,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 334.99998474121094,\r
+        "y": 360,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "3397e2d.64c521e",\r
-                "92ec911d.95b14",\r
-                "fa9c393f.4d0eb8",\r
-                "1192cb09.4cd2d5",\r
-                "3e5eeaad.69c6b6",\r
-                "7e451b6c.fd6624",\r
-                "f6264050.f42d5",\r
-                "9e2c8c11.572dc",\r
-                "407f8a81.546654",\r
-                "f1088162.3598e",\r
-                "4489ad98.445654",\r
-                "860ccaf0.19f1e8"\r
+                "4e77e130.304fb",\r
+                "802c77ca.22e778",\r
+                "9922275a.527928",\r
+                "e01d2f82.7429f",\r
+                "a8f9e83.8a6e918",\r
+                "c8a186f7.659098",\r
+                "b9b958fd.141f08",\r
+                "f27c9cac.ebc18",\r
+                "35a34bb1.948374",\r
+                "178a7bac.307b74",\r
+                "7fbeb541.aa905c",\r
+                "4845313f.7a00d",\r
+                "e8cf2ce.61834d",\r
+                "d9a88b51.5c3ff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3397e2d.64c521e",\r
+        "id": "4e77e130.304fb",\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": 872.8294067382812,\r
-        "y": 252.49612522125244,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 635.3294067382812,\r
+        "y": 251.49612426757812,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "b9b83207.589ec"\r
+                "5c12f35e.e1cabc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1913a60e.b7faaa",\r
+        "id": "ddad9e6f.97581",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1496.4959869384766,\r
-        "y": 253.16279125213623,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1258.9959869384766,\r
+        "y": 252.1627902984619,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8cae152d.7cd218",\r
+        "id": "fc9a82de.84ce",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1343.1628150939941,\r
-        "y": 253.16277027130127,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1105.6628150939941,\r
+        "y": 252.16276931762695,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "1913a60e.b7faaa"\r
+                "ddad9e6f.97581"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1192cb09.4cd2d5",\r
+        "id": "e01d2f82.7429f",\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": 946.7501907348633,\r
-        "y": 474.66665840148926,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 709.2501907348633,\r
+        "y": 473.66665744781494,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "f80594ca.7a0348"\r
+                "7ea0d8c4.d056e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f80594ca.7a0348",\r
+        "id": "7ea0d8c4.d056e8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1161.5285339355469,\r
-        "y": 472.2222423553467,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 924.0285339355469,\r
+        "y": 471.22224140167236,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "99d262e0.f0c14",\r
-                "9b7ec3.98d4c14"\r
+                "c6b87ab0.44cce8",\r
+                "f6199a92.b6bb08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99d262e0.f0c14",\r
+        "id": "c6b87ab0.44cce8",\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": 1357.7847366333008,\r
-        "y": 449.97038078308105,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1120.2847366333008,\r
+        "y": 448.97037982940674,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9b7ec3.98d4c14",\r
+        "id": "f6199a92.b6bb08",\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": 1327.2291641235352,\r
-        "y": 486.97049713134766,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1089.7291641235352,\r
+        "y": 485.97049617767334,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1ce3af0c.391b61",\r
+        "id": "92e456fa.39e618",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1330.7503929138184,\r
-        "y": 409.33332681655884,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1093.2503929138184,\r
+        "y": 408.3333258628845,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "92ec911d.95b14",\r
+        "id": "802c77ca.22e778",\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": 887.25,\r
-        "y": 207.9999942779541,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 649.75,\r
+        "y": 206.99999332427979,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "1b06d72a.f85559"\r
+                "b9775757.c586e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b06d72a.f85559",\r
+        "id": "b9775757.c586e8",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1073.9166793823242,\r
-        "y": 207.3332920074463,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 836.4166793823242,\r
+        "y": 206.33329105377197,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "7e3909f0.27dd48"\r
+                "8ca0a76c.6a9638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e3909f0.27dd48",\r
+        "id": "8ca0a76c.6a9638",\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": 1255.5833053588867,\r
-        "y": 207.3332920074463,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1018.0833053588867,\r
+        "y": 206.33329105377197,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa9c393f.4d0eb8",\r
+        "id": "9922275a.527928",\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": 928.4999895095825,\r
-        "y": 327.9999952316284,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 690.9999895095825,\r
+        "y": 326.9999942779541,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "fe3884f5.3db408",\r
-                "f43025e1.350458"\r
+                "c5166da1.64b87",\r
+                "f58b3753.891bc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe3884f5.3db408",\r
+        "id": "c5166da1.64b87",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1159.5,\r
-        "y": 303.99999237060547,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 922,\r
+        "y": 302.99999141693115,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "ec84c7cd.2c42f8"\r
+                "4d85b0fa.e45f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f43025e1.350458",\r
+        "id": "f58b3753.891bc8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1159.5,\r
-        "y": 343.99999237060547,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 922,\r
+        "y": 342.99999141693115,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "3d425c4c.b021a4"\r
+                "3cc5230a.5b2c3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec84c7cd.2c42f8",\r
+        "id": "4d85b0fa.e45f4",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1302,\r
-        "y": 303.99999237060547,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1064.5,\r
+        "y": 302.99999141693115,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d425c4c.b021a4",\r
+        "id": "3cc5230a.5b2c3c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1303.8570442199707,\r
-        "y": 343.9365043640137,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1066.3570442199707,\r
+        "y": 342.93650341033936,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "30d4aa0b.cee996",\r
-                "8e933b3.56987c8"\r
+                "1560cc74.e1f714",\r
+                "105e52c3.2d94dd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e933b3.56987c8",\r
+        "id": "105e52c3.2d94dd",\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": 1456.555519104004,\r
-        "y": 313.5556030566804,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1219.055519104004,\r
+        "y": 312.5556021030061,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30d4aa0b.cee996",\r
+        "id": "1560cc74.e1f714",\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": 1512.9840240478516,\r
-        "y": 366.7777328491211,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1275.4840240478516,\r
+        "y": 365.7777318954468,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "40a39312.e2cd5c"\r
+                "e9396ecf.61386"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f966e582.bd5968",\r
+        "id": "9bfcdd3d.e8854",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1736.6347541809082,\r
-        "y": 325.03179025650024,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1499.1347541809082,\r
+        "y": 324.0317893028259,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40a39312.e2cd5c",\r
+        "id": "e9396ecf.61386",\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": 1788.2697448730469,\r
-        "y": 366.34923553466797,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1550.7697448730469,\r
+        "y": 365.34923458099365,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "d61c18df.dc4958"\r
+                "7c76b41d.ea06ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d61c18df.dc4958",\r
+        "id": "7c76b41d.ea06ac",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1688.999942779541,\r
-        "y": 424.9206666946411,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1451.499942779541,\r
+        "y": 423.9206657409668,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             [\r
-                "d629e081.56166"\r
+                "91b09a0a.6c6428"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d629e081.56166",\r
+        "id": "91b09a0a.6c6428",\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": 1836.7500457763672,\r
-        "y": 424.7778587634675,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 1599.2500457763672,\r
+        "y": 423.7778578097932,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "407f8a81.546654",\r
+        "id": "35a34bb1.948374",\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.device-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": 940.3531951904297,\r
-        "y": 754.4962153434753,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 702.8531951904297,\r
+        "y": 753.496214389801,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9e2c8c11.572dc",\r
+        "id": "f27c9cac.ebc18",\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.device-vf-index\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 948.6866912841797,\r
-        "y": 701.1629481315613,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 711.1866912841797,\r
+        "y": 700.162947177887,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f6264050.f42d5",\r
+        "id": "b9b958fd.141f08",\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": 922.6866683959961,\r
-        "y": 647.162841796875,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 685.1866683959961,\r
+        "y": 646.1628408432007,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e5eeaad.69c6b6",\r
+        "id": "a8f9e83.8a6e918",\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": 937.6863288879395,\r
-        "y": 537.1542224884033,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 700.1863288879395,\r
+        "y": 536.154221534729,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7e451b6c.fd6624",\r
+        "id": "c8a186f7.659098",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-device-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 963.6867065429688,\r
-        "y": 593.1544561386108,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 726.1867065429688,\r
+        "y": 592.1544551849365,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f1088162.3598e",\r
+        "id": "178a7bac.307b74",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "xml": "<set>\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.device-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": 935.5000877380371,\r
-        "y": 805.0000605583191,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 698.0000877380371,\r
+        "y": 804.0000596046448,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4489ad98.445654",\r
+        "id": "7fbeb541.aa905c",\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": 943.0001907348633,\r
-        "y": 853.0000247955322,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 705.5001907348633,\r
+        "y": 852.0000238418579,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a1ffaa29.5bb868",\r
+        "id": "e8cf2ce.61834d",\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
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.device-vf-index' >\n<parameter name='device-id' value='`$prop.device-vf-index`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\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.device-vf-index + '/vf-module-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 947.5000419616699,\r
-        "y": 899.4999761581421,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 713.0001373291016,\r
+        "y": 910.4999666213989,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "503ce76b.44e798",\r
+        "id": "d9a88b51.5c3ff8",\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=\"device\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/devices/device/' + $prop.device-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"device.device-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.device-vf-index`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 946.4999847412109,\r
-        "y": 946.5000238418579,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 708.9999847412109,\r
+        "y": 945.5000228881836,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "860ccaf0.19f1e8",\r
+        "id": "4845313f.7a00d",\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": 895.2225151062012,\r
-        "y": 992.6738667488098,\r
-        "z": "c7d3e3a8.96c6a",\r
+        "x": 657.7225151062012,\r
+        "y": 991.6738657951355,\r
+        "z": "67d8f5f.109b30c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b5bea2af.4d20d",\r
+        "type": "comment",\r
+        "name": "TODO: if SO passes vnf-id, need to update prop.sdncCreate as true",\r
+        "info": "if SO passes vnf-id, need to update prop.sdncCreate as true",\r
+        "comments": "",\r
+        "x": 806.6974792480469,\r
+        "y": 141.0160083770752,\r
+        "z": "67d8f5f.109b30c",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 7e74909..af26289 100644 (file)
@@ -1,36 +1,36 @@
 [\r
     {\r
-        "id": "ba2f1a27.8f7c88",\r
+        "id": "668a4a6a.11fb74",\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": 233,\r
-        "y": 190.9999925820157,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 260.0104064941406,\r
+        "y": 185.0104217529297,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             [\r
-                "887ebd07.82fca"\r
+                "f0e43a5a.fb4558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99a008b4.eb0bc8",\r
+        "id": "61b91100.d7ede",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 109.57138061523438,\r
-        "y": 43,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 136.581787109375,\r
+        "y": 37.010429170913994,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             [\r
-                "9964126a.58753"\r
+                "bc2b5176.73e7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9964126a.58753",\r
+        "id": "bc2b5176.73e7e",\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": 211.85708618164062,\r
-        "y": 101.23810407798737,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 238.86749267578125,\r
+        "y": 95.24853324890137,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             [\r
-                "ba2f1a27.8f7c88"\r
+                "668a4a6a.11fb74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "887ebd07.82fca",\r
+        "id": "f0e43a5a.fb4558",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 213.23804473876953,\r
-        "y": 362.6666643349454,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 240.24845123291016,\r
+        "y": 356.6770935058594,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             [\r
-                "e036c242.ea2d7",\r
-                "8ac28eea.03b2e",\r
-                "bee946ca.5b9488",\r
-                "fa22ed9a.8f597",\r
-                "259c9f6d.05187",\r
-                "1c3377d1.23ec68",\r
-                "33f4194.b4adce6",\r
-                "cd58d769.440f18",\r
-                "50ac8040.e368f",\r
-                "82bd0bd5.564548"\r
+                "6dab251c.49205c",\r
+                "10940ab9.a5fb85",\r
+                "2aab9019.e3a45",\r
+                "be0c443b.256188",\r
+                "46389e76.c8e6",\r
+                "89f88258.b891f",\r
+                "dc405c48.cda4b",\r
+                "1170677a.a70a49",\r
+                "997721e4.3b61b",\r
+                "71ec508c.bf2e1",\r
+                "60143a97.af1404"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ac28eea.03b2e",\r
+        "id": "10940ab9.a5fb85",\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": 647.3847961425781,\r
-        "y": 616.6705932617188,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 674.3952026367188,\r
+        "y": 610.6810224326327,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e036c242.ea2d7",\r
+        "id": "6dab251c.49205c",\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-index`' />\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": 639.2379837036133,\r
-        "y": 511.6668453216553,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 666.2483901977539,\r
+        "y": 505.67727449256927,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "259c9f6d.05187",\r
+        "id": "46389e76.c8e6",\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-index\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 627.5714874267578,\r
-        "y": 461.33342933654785,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 654.5818939208984,\r
+        "y": 455.34385850746185,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4832dc07.c382d4",\r
+        "id": "60143a97.af1404",\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-index`' />\n",\r
         "comments": "",\r
-        "x": 638.5715637207031,\r
-        "y": 568.3334331512451,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 665.5819702148438,\r
+        "y": 562.3438623221591,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bee946ca.5b9488",\r
+        "id": "2aab9019.e3a45",\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": 642.5713653564453,\r
-        "y": 241.3333559036255,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 669.5817718505859,\r
+        "y": 235.34378507453948,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             [\r
-                "b7b01487.9885f8",\r
-                "aecaf676.67f6b8"\r
+                "214b38d8.c822d8",\r
+                "308ac75b.244168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b7b01487.9885f8",\r
+        "id": "214b38d8.c822d8",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 877.2857513427734,\r
-        "y": 236.47617626190186,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 904.2961578369141,\r
+        "y": 230.48660543281585,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             [\r
-                "1f5394d7.70124b"\r
+                "bcebd76e.5a08d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f5394d7.70124b",\r
+        "id": "bcebd76e.5a08d8",\r
         "type": "set",\r
         "name": "set vnf-index=0",\r
         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1037.5714569091797,\r
-        "y": 236.47626781463623,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 1064.5818634033203,\r
+        "y": 230.48669698555022,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aecaf676.67f6b8",\r
+        "id": "308ac75b.244168",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 873.7142906188965,\r
-        "y": 269.76200771331787,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 900.7246971130371,\r
+        "y": 263.77243688423187,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             [\r
-                "6e2b33e1.03a57c"\r
+                "af41a2cb.7d1be"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd7ad864.5375c8",\r
+        "id": "c6ca1095.8fc32",\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": 1266.571533203125,\r
-        "y": 248.04773330688477,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 1293.5819396972656,\r
+        "y": 242.05816247779876,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d9951812.e7fdb8",\r
+        "id": "c1df9f5.ae8c56",\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": 1255.0001525878906,\r
-        "y": 283.04770517349243,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 1282.0105590820312,\r
+        "y": 277.0581343444064,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             [\r
-                "febea1ac.bb0d8"\r
+                "6e99eb9c.1d2854"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e2b33e1.03a57c",\r
+        "id": "af41a2cb.7d1be",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1008.4285736083984,\r
-        "y": 271.76197719573975,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 1035.438980102539,\r
+        "y": 265.77240636665374,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             [\r
-                "bd7ad864.5375c8",\r
-                "d9951812.e7fdb8"\r
+                "c6ca1095.8fc32",\r
+                "c1df9f5.ae8c56"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "febea1ac.bb0d8",\r
+        "id": "6e99eb9c.1d2854",\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": 1648.285888671875,\r
-        "y": 283.61918926239014,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 1675.2962951660156,\r
+        "y": 277.62961843330413,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             [\r
-                "359b5cad.1078a4"\r
+                "b8a872f3.280e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "359b5cad.1078a4",\r
+        "id": "b8a872f3.280e3",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1929.571590423584,\r
-        "y": 282.19059467315674,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 1956.5819969177246,\r
+        "y": 276.20102384407073,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             [\r
-                "e5d5a5d7.361b48"\r
+                "2b05b5cd.40cb0a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe823586.a40dc8",\r
+        "id": "1bd5d19c.ac71ae",\r
         "type": "comment",\r
         "name": "make sure this vnf-id doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1617.4285049438477,\r
-        "y": 247.1905813217163,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 1644.4389114379883,\r
+        "y": 241.2010104926303,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa22ed9a.8f597",\r
+        "id": "be0c443b.256188",\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": 599.5714874267578,\r
-        "y": 409.33342599868774,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 626.5818939208984,\r
+        "y": 403.34385516960174,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c3377d1.23ec68",\r
+        "id": "89f88258.b891f",\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": 586.5714492797852,\r
-        "y": 879.59694480896,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 613.5818557739258,\r
+        "y": 873.607373979874,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "82bd0bd5.564548",\r
+        "id": "71ec508c.bf2e1",\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-index`\" />\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-index`\" />\n\n\n<!--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=\"vpn-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/vpn-resources/vpn-resource/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vpn-resource.vpn-resource-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" /-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 649.2382202148438,\r
-        "y": 826.5968379974365,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 676.2486267089844,\r
+        "y": 820.6072671683505,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "33f4194.b4adce6",\r
+        "id": "dc405c48.cda4b",\r
         "type": "set",\r
         "name": "set vnf-index and vnf-object-path",\r
         "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-index`' />\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-index  + '/vnf-data/'` \" />",\r
         "comments": "",\r
-        "x": 640.5714797973633,\r
-        "y": 657.5968637466431,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 667.5818862915039,\r
+        "y": 651.6072929175571,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd58d769.440f18",\r
+        "id": "1170677a.a70a49",\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": 605.5711212158203,\r
-        "y": 360.3247985839844,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 632.5815277099609,\r
+        "y": 354.33522775489837,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e5d5a5d7.361b48",\r
+        "id": "2b05b5cd.40cb0a",\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": 2058.1429595947266,\r
-        "y": 333.1906089782715,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 2085.153366088867,\r
+        "y": 327.2010381491855,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b6f6713f.1cb83",\r
+        "id": "8463cd7c.a7a22",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1351.5715713500977,\r
-        "y": 336.66667556762695,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 1378.5819778442383,\r
+        "y": 330.67710473854095,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a6480f2e.967df",\r
+        "id": "ecfeb487.443888",\r
         "type": "comment",\r
         "name": "TODO: change AAI models",\r
         "info": "",\r
         "comments": "",\r
-        "x": 629.1820449829102,\r
-        "y": 726.9742965698242,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 656.1924514770508,\r
+        "y": 720.9847257407382,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": []\r
     },\r
     {\r
-        "id": "50ac8040.e368f",\r
+        "id": "997721e4.3b61b",\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-index\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 695.545783996582,\r
-        "y": 767.2470808029175,\r
-        "z": "bc55b65a.bac808",\r
+        "x": 722.5561904907227,\r
+        "y": 761.2575099738315,\r
+        "z": "872ff8dd.fe5e78",\r
         "wires": [\r
             []\r
         ]\r
index eed2f5f..9b3109d 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='device' \r
+      key='device.device-id = $prop.device-vf-index' >\r
+                <parameter name='device-id' value='`$prop.device-vf-index`' />\r
+                <parameter name='esn' value='`$prop.device.esn`' />\r
+                <parameter name='device-name' value='`$prop.device.name`' />\r
+                <parameter name='description' value='`$prop.device.description`' />\r
+                <parameter name='vendor' value='`$prop.device.vendor`' />\r
+                <parameter name='class' value='`$prop.device.class`' />\r
+                <parameter name='type' value='`$prop.device.deviceModel`' />\r
+                <parameter name='version' value='`$prop.device.version`' />\r
+                <parameter name='system-ip' value='`$prop.device.systemIp`' />\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.device-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="device" />\r
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/devices/device/' + $prop.device-vf-index`" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="device.device-id" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.device-vf-index`" />\r
+            </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
                 <parameter name="error-code" value="200" />\r
index 9fbcd8f..f7847c7 100644 (file)
@@ -46,6 +46,9 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\r
             </set>\r
+            <set>\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />\r
+            </set>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\r
                 <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`' />\r