diff options
| author |   prakash.e <prakash.e@huawei.com> | 2019-04-12 11:25:43 +0530 |
|---|---|---|
| committer | prakash.e <prakash.e@huawei.com> | 2019-04-12 14:54:19 +0530 |
| commit | 500fbc5d04025a48f8ac9c2955c82806ed49a84a (patch) | |
| tree | 4c198da524429d0d6fd7c97d5354dca1f80ed0a5 /platform-logic/generic-resource-api/src/main | |
| parent | 8f6f1684418eff098e1d6cb2ac05b58627992a28 (diff) | |
Fix SDWAN device DG to create AAI resource
Add a missing node in device DG to add a device record in AAI.
Change-Id: Iaf6ce5ff52bd13db960954c982c66d5c54a130d2
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
Former-commit-id: 797f52bd97a384e245ba166138ba5b8f6def226c
Diffstat (limited to 'platform-logic/generic-resource-api/src/main')
2 files changed, 220 insertions, 182 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json index d7e57be9..f258de41 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json @@ -1,22 +1,22 @@ [
{
- "id": "b9b83207.589ec",
+ "id": "5c12f35e.e1cabc",
"type": "switchNode",
"name": "switch this vnf-id == input vnf-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
"comments": "",
"outputs": 1,
- "x": 1124.8294982910156,
- "y": 251.16278839111328,
- "z": "c7d3e3a8.96c6a",
+ "x": 887.3294982910156,
+ "y": 250.16278743743896,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "8cae152d.7cd218"
+ "fc9a82de.84ce"
]
]
},
{
- "id": "e1800fba.baf5f",
+ "id": "b009e5d5.1d5ff8",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -24,508 +24,521 @@ "comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
"outputs": 1,
- "x": 414.5,
- "y": 144.99999237060547,
- "z": "c7d3e3a8.96c6a",
+ "x": 177,
+ "y": 143.99999141693115,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "6d32e66a.a8bcf8"
+ "9b496cef.08cf1"
]
]
},
{
- "id": "6d32e66a.a8bcf8",
+ "id": "9b496cef.08cf1",
"type": "method",
"name": "sdwan-vf-operation-device-create",
"xml": "<method rpc='sdwan-vf-operation-device-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 413.5,
- "y": 244.99999237060547,
- "z": "c7d3e3a8.96c6a",
+ "x": 176,
+ "y": 243.99999141693115,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "1cc250f1.53fd7f"
+ "a4608885.5f82c8"
]
]
},
{
- "id": "9c8db0b.eb2055",
+ "id": "7da866ae.544bb8",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 244,
- "y": 56,
- "z": "c7d3e3a8.96c6a",
+ "x": 98.50000381469727,
+ "y": 39,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "e1800fba.baf5f"
+ "b009e5d5.1d5ff8"
]
]
},
{
- "id": "1cc250f1.53fd7f",
+ "id": "a4608885.5f82c8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 572.4999847412109,
- "y": 361.0000009536743,
- "z": "c7d3e3a8.96c6a",
+ "x": 334.99998474121094,
+ "y": 360,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "3397e2d.64c521e",
- "92ec911d.95b14",
- "fa9c393f.4d0eb8",
- "1192cb09.4cd2d5",
- "3e5eeaad.69c6b6",
- "7e451b6c.fd6624",
- "f6264050.f42d5",
- "9e2c8c11.572dc",
- "407f8a81.546654",
- "f1088162.3598e",
- "4489ad98.445654",
- "860ccaf0.19f1e8"
+ "4e77e130.304fb",
+ "802c77ca.22e778",
+ "9922275a.527928",
+ "e01d2f82.7429f",
+ "a8f9e83.8a6e918",
+ "c8a186f7.659098",
+ "b9b958fd.141f08",
+ "f27c9cac.ebc18",
+ "35a34bb1.948374",
+ "178a7bac.307b74",
+ "7fbeb541.aa905c",
+ "4845313f.7a00d",
+ "e8cf2ce.61834d",
+ "d9a88b51.5c3ff8"
]
]
},
{
- "id": "3397e2d.64c521e",
+ "id": "4e77e130.304fb",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 872.8294067382812,
- "y": 252.49612522125244,
- "z": "c7d3e3a8.96c6a",
+ "x": 635.3294067382812,
+ "y": 251.49612426757812,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "b9b83207.589ec"
+ "5c12f35e.e1cabc"
]
]
},
{
- "id": "1913a60e.b7faaa",
+ "id": "ddad9e6f.97581",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1496.4959869384766,
- "y": 253.16279125213623,
- "z": "c7d3e3a8.96c6a",
+ "x": 1258.9959869384766,
+ "y": 252.1627902984619,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "8cae152d.7cd218",
+ "id": "fc9a82de.84ce",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1343.1628150939941,
- "y": 253.16277027130127,
- "z": "c7d3e3a8.96c6a",
+ "x": 1105.6628150939941,
+ "y": 252.16276931762695,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "1913a60e.b7faaa"
+ "ddad9e6f.97581"
]
]
},
{
- "id": "1192cb09.4cd2d5",
+ "id": "e01d2f82.7429f",
"type": "for",
"name": "for loop idx - VF input parameters",
"xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 946.7501907348633,
- "y": 474.66665840148926,
- "z": "c7d3e3a8.96c6a",
+ "x": 709.2501907348633,
+ "y": 473.66665744781494,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "f80594ca.7a0348"
+ "7ea0d8c4.d056e8"
]
]
},
{
- "id": "f80594ca.7a0348",
+ "id": "7ea0d8c4.d056e8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1161.5285339355469,
- "y": 472.2222423553467,
- "z": "c7d3e3a8.96c6a",
+ "x": 924.0285339355469,
+ "y": 471.22224140167236,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "99d262e0.f0c14",
- "9b7ec3.98d4c14"
+ "c6b87ab0.44cce8",
+ "f6199a92.b6bb08"
]
]
},
{
- "id": "99d262e0.f0c14",
+ "id": "c6b87ab0.44cce8",
"type": "execute",
"name": "execute split parameterName",
"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",
"comments": "",
"outputs": 1,
- "x": 1357.7847366333008,
- "y": 449.97038078308105,
- "z": "c7d3e3a8.96c6a",
+ "x": 1120.2847366333008,
+ "y": 448.97037982940674,
+ "z": "67d8f5f.109b30c",
"wires": [
[]
]
},
{
- "id": "9b7ec3.98d4c14",
+ "id": "f6199a92.b6bb08",
"type": "set",
"name": "set parameterName",
"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",
"comments": "",
- "x": 1327.2291641235352,
- "y": 486.97049713134766,
- "z": "c7d3e3a8.96c6a",
+ "x": 1089.7291641235352,
+ "y": 485.97049617767334,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "1ce3af0c.391b61",
+ "id": "92e456fa.39e618",
"type": "comment",
"name": "Take the parameter names by removing prefix",
"info": "",
"comments": "",
- "x": 1330.7503929138184,
- "y": 409.33332681655884,
- "z": "c7d3e3a8.96c6a",
+ "x": 1093.2503929138184,
+ "y": 408.3333258628845,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "92ec911d.95b14",
+ "id": "802c77ca.22e778",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 887.25,
- "y": 207.9999942779541,
- "z": "c7d3e3a8.96c6a",
+ "x": 649.75,
+ "y": 206.99999332427979,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "1b06d72a.f85559"
+ "b9775757.c586e8"
]
]
},
{
- "id": "1b06d72a.f85559",
+ "id": "b9775757.c586e8",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1073.9166793823242,
- "y": 207.3332920074463,
- "z": "c7d3e3a8.96c6a",
+ "x": 836.4166793823242,
+ "y": 206.33329105377197,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "7e3909f0.27dd48"
+ "8ca0a76c.6a9638"
]
]
},
{
- "id": "7e3909f0.27dd48",
+ "id": "8ca0a76c.6a9638",
"type": "returnFailure",
"name": "return failure",
"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",
"comments": "",
- "x": 1255.5833053588867,
- "y": 207.3332920074463,
- "z": "c7d3e3a8.96c6a",
+ "x": 1018.0833053588867,
+ "y": 206.33329105377197,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "fa9c393f.4d0eb8",
+ "id": "9922275a.527928",
"type": "switchNode",
"name": "switch vf-modules.vf-module_length",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 928.4999895095825,
- "y": 327.9999952316284,
- "z": "c7d3e3a8.96c6a",
+ "x": 690.9999895095825,
+ "y": 326.9999942779541,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "fe3884f5.3db408",
- "f43025e1.350458"
+ "c5166da1.64b87",
+ "f58b3753.891bc8"
]
]
},
{
- "id": "fe3884f5.3db408",
+ "id": "c5166da1.64b87",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1159.5,
- "y": 303.99999237060547,
- "z": "c7d3e3a8.96c6a",
+ "x": 922,
+ "y": 302.99999141693115,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "ec84c7cd.2c42f8"
+ "4d85b0fa.e45f4"
]
]
},
{
- "id": "f43025e1.350458",
+ "id": "f58b3753.891bc8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1159.5,
- "y": 343.99999237060547,
- "z": "c7d3e3a8.96c6a",
+ "x": 922,
+ "y": 342.99999141693115,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "3d425c4c.b021a4"
+ "3cc5230a.5b2c3c"
]
]
},
{
- "id": "ec84c7cd.2c42f8",
+ "id": "4d85b0fa.e45f4",
"type": "set",
"name": "set vf-index",
"xml": "<set>\n<parameter name='vf-index' value='0' />\n",
"comments": "",
- "x": 1302,
- "y": 303.99999237060547,
- "z": "c7d3e3a8.96c6a",
+ "x": 1064.5,
+ "y": 302.99999141693115,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "3d425c4c.b021a4",
+ "id": "3cc5230a.5b2c3c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1303.8570442199707,
- "y": 343.9365043640137,
- "z": "c7d3e3a8.96c6a",
+ "x": 1066.3570442199707,
+ "y": 342.93650341033936,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "30d4aa0b.cee996",
- "8e933b3.56987c8"
+ "1560cc74.e1f714",
+ "105e52c3.2d94dd"
]
]
},
{
- "id": "8e933b3.56987c8",
+ "id": "105e52c3.2d94dd",
"type": "set",
"name": "set vf-index",
"xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
"comments": "",
- "x": 1456.555519104004,
- "y": 313.5556030566804,
- "z": "c7d3e3a8.96c6a",
+ "x": 1219.055519104004,
+ "y": 312.5556021030061,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "30d4aa0b.cee996",
+ "id": "1560cc74.e1f714",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
"comments": "",
"outputs": 1,
- "x": 1512.9840240478516,
- "y": 366.7777328491211,
- "z": "c7d3e3a8.96c6a",
+ "x": 1275.4840240478516,
+ "y": 365.7777318954468,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "40a39312.e2cd5c"
+ "e9396ecf.61386"
]
]
},
{
- "id": "f966e582.bd5968",
+ "id": "9bfcdd3d.e8854",
"type": "comment",
"name": "make sure this network doesn't exist already",
"info": "",
"comments": "",
- "x": 1736.6347541809082,
- "y": 325.03179025650024,
- "z": "c7d3e3a8.96c6a",
+ "x": 1499.1347541809082,
+ "y": 324.0317893028259,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "40a39312.e2cd5c",
+ "id": "e9396ecf.61386",
"type": "switchNode",
"name": "switch vf-module-id found",
"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",
"comments": "",
"outputs": 1,
- "x": 1788.2697448730469,
- "y": 366.34923553466797,
- "z": "c7d3e3a8.96c6a",
+ "x": 1550.7697448730469,
+ "y": 365.34923458099365,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "d61c18df.dc4958"
+ "7c76b41d.ea06ac"
]
]
},
{
- "id": "d61c18df.dc4958",
+ "id": "7c76b41d.ea06ac",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1688.999942779541,
- "y": 424.9206666946411,
- "z": "c7d3e3a8.96c6a",
+ "x": 1451.499942779541,
+ "y": 423.9206657409668,
+ "z": "67d8f5f.109b30c",
"wires": [
[
- "d629e081.56166"
+ "91b09a0a.6c6428"
]
]
},
{
- "id": "d629e081.56166",
+ "id": "91b09a0a.6c6428",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",
"comments": "",
- "x": 1836.7500457763672,
- "y": 424.7778587634675,
- "z": "c7d3e3a8.96c6a",
+ "x": 1599.2500457763672,
+ "y": 423.7778578097932,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "407f8a81.546654",
+ "id": "35a34bb1.948374",
"type": "set",
"name": "copy input data to service data",
"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",
"comments": "",
- "x": 940.3531951904297,
- "y": 754.4962153434753,
- "z": "c7d3e3a8.96c6a",
+ "x": 702.8531951904297,
+ "y": 753.496214389801,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "9e2c8c11.572dc",
+ "id": "f27c9cac.ebc18",
"type": "execute",
"name": "execute generate-vf-module-index",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.device-vf-index\"/>\n",
"comments": "",
"outputs": 1,
- "x": 948.6866912841797,
- "y": 701.1629481315613,
- "z": "c7d3e3a8.96c6a",
+ "x": 711.1866912841797,
+ "y": 700.162947177887,
+ "z": "67d8f5f.109b30c",
"wires": [
[]
]
},
{
- "id": "f6264050.f42d5",
+ "id": "b9b958fd.141f08",
"type": "set",
"name": "set new vf-module_length",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",
"comments": "",
- "x": 922.6866683959961,
- "y": 647.162841796875,
- "z": "c7d3e3a8.96c6a",
+ "x": 685.1866683959961,
+ "y": 646.1628408432007,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "3e5eeaad.69c6b6",
+ "id": "a8f9e83.8a6e918",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",
"comments": "",
- "x": 937.6863288879395,
- "y": 537.1542224884033,
- "z": "c7d3e3a8.96c6a",
+ "x": 700.1863288879395,
+ "y": 536.154221534729,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "7e451b6c.fd6624",
+ "id": "c8a186f7.659098",
"type": "call",
"name": "call sdwan-get-vf-module-device-param",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 963.6867065429688,
- "y": 593.1544561386108,
- "z": "c7d3e3a8.96c6a",
+ "x": 726.1867065429688,
+ "y": 592.1544551849365,
+ "z": "67d8f5f.109b30c",
"wires": [
[]
]
},
{
- "id": "f1088162.3598e",
+ "id": "178a7bac.307b74",
"type": "set",
"name": "set vf-module-object-path",
"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",
"comments": "",
- "x": 935.5000877380371,
- "y": 805.0000605583191,
- "z": "c7d3e3a8.96c6a",
+ "x": 698.0000877380371,
+ "y": 804.0000596046448,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "4489ad98.445654",
+ "id": "7fbeb541.aa905c",
"type": "set",
"name": "set vf-module-level-oper-status",
"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",
"comments": "",
- "x": 943.0001907348633,
- "y": 853.0000247955322,
- "z": "c7d3e3a8.96c6a",
+ "x": 705.5001907348633,
+ "y": 852.0000238418579,
+ "z": "67d8f5f.109b30c",
"wires": []
},
{
- "id": "a1ffaa29.5bb868",
+ "id": "e8cf2ce.61834d",
"type": "save",
"name": "save sdwan vpn resource in AAI",
- "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/'` \" />",
+ "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",
"comments": "",
"outputs": 1,
- "x": 947.5000419616699,
- "y": 899.4999761581421,
- "z": "c7d3e3a8.96c6a",
+ "x": 713.0001373291016,
+ "y": 910.4999666213989,
+ "z": "67d8f5f.109b30c",
"wires": [
[]
]
},
{
- "id": "503ce76b.44e798",
+ "id": "d9a88b51.5c3ff8",
"type": "save",
"name": "save service relationship in AAI",
- "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",
+ "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",
"comments": "",
"outputs": 1,
- "x": 946.4999847412109,
- "y": 946.5000238418579,
- "z": "c7d3e3a8.96c6a",
+ "x": 708.9999847412109,
+ "y": 945.5000228881836,
+ "z": "67d8f5f.109b30c",
"wires": [
[]
]
},
{
- "id": "860ccaf0.19f1e8",
+ "id": "4845313f.7a00d",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
"comments": "",
- "x": 895.2225151062012,
- "y": 992.6738667488098,
- "z": "c7d3e3a8.96c6a",
+ "x": 657.7225151062012,
+ "y": 991.6738657951355,
+ "z": "67d8f5f.109b30c",
+ "wires": []
+ },
+ {
+ "id": "b5bea2af.4d20d",
+ "type": "comment",
+ "name": "TODO: if SO passes vnf-id, need to update prop.sdncCreate as true",
+ "info": "if SO passes vnf-id, need to update prop.sdncCreate as true",
+ "comments": "",
+ "x": 806.6974792480469,
+ "y": 141.0160083770752,
+ "z": "67d8f5f.109b30c",
"wires": []
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml index eed2f5fb..9b3109d3 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml @@ -103,6 +103,31 @@ <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`' />
<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`' />
</set>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device'
+ key='device.device-id = $prop.device-vf-index' >
+ <parameter name='device-id' value='`$prop.device-vf-index`' />
+ <parameter name='esn' value='`$prop.device.esn`' />
+ <parameter name='device-name' value='`$prop.device.name`' />
+ <parameter name='description' value='`$prop.device.description`' />
+ <parameter name='vendor' value='`$prop.device.vendor`' />
+ <parameter name='class' value='`$prop.device.class`' />
+ <parameter name='type' value='`$prop.device.deviceModel`' />
+ <parameter name='version' value='`$prop.device.version`' />
+ <parameter name='system-ip' value='`$prop.device.systemIp`' />
+ <parameter name='operational-status' value='Created' />
+ <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
+ <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
+ <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
+ <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/'` " />
+ </save>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'
+ key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
+ force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="device" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/devices/device/' + $prop.device-vf-index`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="device.device-id" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.device-vf-index`" />
+ </save>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
|