diff options
2 files changed, 145 insertions, 150 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json index af262892..65c2f0ec 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json @@ -1,36 +1,36 @@ [
{
- "id": "668a4a6a.11fb74",
+ "id": "4d340fd2.1d47a",
"type": "method",
"name": "method vnf-topology-operation-vpn-site-resource-create",
"xml": "<method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 260.0104064941406,
- "y": 185.0104217529297,
- "z": "872ff8dd.fe5e78",
+ "x": 251.00390625,
+ "y": 191.9999925820157,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "f0e43a5a.fb4558"
+ "dd995ca6.5527c"
]
]
},
{
- "id": "61b91100.d7ede",
+ "id": "83ce2cf0.a21b",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 136.581787109375,
- "y": 37.010429170913994,
- "z": "872ff8dd.fe5e78",
+ "x": 127.57528686523438,
+ "y": 44,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "bc2b5176.73e7e"
+ "d4e5788.5ad9988"
]
]
},
{
- "id": "bc2b5176.73e7e",
+ "id": "d4e5788.5ad9988",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -38,337 +38,337 @@ "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": 238.86749267578125,
- "y": 95.24853324890137,
- "z": "872ff8dd.fe5e78",
+ "x": 229.86099243164062,
+ "y": 102.23810407798737,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "668a4a6a.11fb74"
+ "4d340fd2.1d47a"
]
]
},
{
- "id": "f0e43a5a.fb4558",
+ "id": "dd995ca6.5527c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 240.24845123291016,
- "y": 356.6770935058594,
- "z": "872ff8dd.fe5e78",
+ "x": 231.24195098876953,
+ "y": 363.6666643349454,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "6dab251c.49205c",
- "10940ab9.a5fb85",
- "2aab9019.e3a45",
- "be0c443b.256188",
- "46389e76.c8e6",
- "89f88258.b891f",
- "dc405c48.cda4b",
- "1170677a.a70a49",
- "997721e4.3b61b",
- "71ec508c.bf2e1",
- "60143a97.af1404"
+ "9e4483c6.3ac77",
+ "a13164e4.2addc8",
+ "3a6751cb.2db1fe",
+ "deb0deb9.10aa8",
+ "8f8480.f469fb8",
+ "f27c92ed.2a351",
+ "4152c1db.9724f",
+ "34769e57.986742",
+ "27f27223.64947e",
+ "5e423ee5.be879",
+ "dfdcb682.501ff8"
]
]
},
{
- "id": "10940ab9.a5fb85",
+ "id": "a13164e4.2addc8",
"type": "set",
"name": "set vnf-level-oper-status to Created",
"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",
"comments": "",
- "x": 674.3952026367188,
- "y": 610.6810224326327,
- "z": "872ff8dd.fe5e78",
+ "x": 665.3887023925781,
+ "y": 617.6705932617188,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "6dab251c.49205c",
+ "id": "9e4483c6.3ac77",
"type": "set",
"name": "copy input data to service data",
- "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",
+ "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",
"comments": "",
- "x": 666.2483901977539,
- "y": 505.67727449256927,
- "z": "872ff8dd.fe5e78",
+ "x": 657.2418899536133,
+ "y": 512.6668453216553,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "46389e76.c8e6",
+ "id": "8f8480.f469fb8",
"type": "execute",
"name": "execute generate-vnf-index",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-index\"/>\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 654.5818939208984,
- "y": 455.34385850746185,
- "z": "872ff8dd.fe5e78",
+ "x": 645.5753936767578,
+ "y": 462.33342933654785,
+ "z": "b6e8aa45.a03d48",
"wires": [
[]
]
},
{
- "id": "60143a97.af1404",
+ "id": "dfdcb682.501ff8",
"type": "set",
"name": "set vnf-index to service data",
- "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />\n",
+ "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",
"comments": "",
- "x": 665.5819702148438,
- "y": 562.3438623221591,
- "z": "872ff8dd.fe5e78",
+ "x": 656.5754699707031,
+ "y": 569.3334331512451,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "2aab9019.e3a45",
+ "id": "3a6751cb.2db1fe",
"type": "switchNode",
"name": "switch service-data.vnfs.vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 669.5817718505859,
- "y": 235.34378507453948,
- "z": "872ff8dd.fe5e78",
+ "x": 660.5752716064453,
+ "y": 242.3333559036255,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "214b38d8.c822d8",
- "308ac75b.244168"
+ "2c3f6b93.ddbca4",
+ "29bbdb18.cfe584"
]
]
},
{
- "id": "214b38d8.c822d8",
+ "id": "2c3f6b93.ddbca4",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 904.2961578369141,
- "y": 230.48660543281585,
- "z": "872ff8dd.fe5e78",
+ "x": 895.2896575927734,
+ "y": 237.47617626190186,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "bcebd76e.5a08d8"
+ "8e783130.b1886"
]
]
},
{
- "id": "bcebd76e.5a08d8",
+ "id": "8e783130.b1886",
"type": "set",
"name": "set vnf-index=0",
"xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
"comments": "",
- "x": 1064.5818634033203,
- "y": 230.48669698555022,
- "z": "872ff8dd.fe5e78",
+ "x": 1055.5753631591797,
+ "y": 237.47626781463623,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "308ac75b.244168",
+ "id": "29bbdb18.cfe584",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 900.7246971130371,
- "y": 263.77243688423187,
- "z": "872ff8dd.fe5e78",
+ "x": 891.7181968688965,
+ "y": 270.76200771331787,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "af41a2cb.7d1be"
+ "64bc2d84.970e54"
]
]
},
{
- "id": "c6ca1095.8fc32",
+ "id": "c816157.792fce8",
"type": "set",
"name": "set vnf-index = vnf_length",
"xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
"comments": "",
- "x": 1293.5819396972656,
- "y": 242.05816247779876,
- "z": "872ff8dd.fe5e78",
+ "x": 1284.575439453125,
+ "y": 249.04773330688477,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "c1df9f5.ae8c56",
+ "id": "a9c0fb1a.4ae688",
"type": "for",
"name": "for each existing VNF",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1282.0105590820312,
- "y": 277.0581343444064,
- "z": "872ff8dd.fe5e78",
+ "x": 1273.0040588378906,
+ "y": 284.04770517349243,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "6e99eb9c.1d2854"
+ "e4810c54.16f7c"
]
]
},
{
- "id": "af41a2cb.7d1be",
+ "id": "64bc2d84.970e54",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1035.438980102539,
- "y": 265.77240636665374,
- "z": "872ff8dd.fe5e78",
+ "x": 1026.4324798583984,
+ "y": 272.76197719573975,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "c6ca1095.8fc32",
- "c1df9f5.ae8c56"
+ "c816157.792fce8",
+ "a9c0fb1a.4ae688"
]
]
},
{
- "id": "6e99eb9c.1d2854",
+ "id": "e4810c54.16f7c",
"type": "switchNode",
"name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",
"xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 1675.2962951660156,
- "y": 277.62961843330413,
- "z": "872ff8dd.fe5e78",
+ "x": 1666.289794921875,
+ "y": 284.61918926239014,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "b8a872f3.280e3"
+ "d88564b1.978518"
]
]
},
{
- "id": "b8a872f3.280e3",
+ "id": "d88564b1.978518",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1956.5819969177246,
- "y": 276.20102384407073,
- "z": "872ff8dd.fe5e78",
+ "x": 1947.575496673584,
+ "y": 283.19059467315674,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "2b05b5cd.40cb0a"
+ "eb2d673c.26d6e8"
]
]
},
{
- "id": "1bd5d19c.ac71ae",
+ "id": "5a4256cd.31fdd8",
"type": "comment",
"name": "make sure this vnf-id doesn't exist already",
"info": "",
"comments": "",
- "x": 1644.4389114379883,
- "y": 241.2010104926303,
- "z": "872ff8dd.fe5e78",
+ "x": 1635.4324111938477,
+ "y": 248.1905813217163,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "be0c443b.256188",
+ "id": "deb0deb9.10aa8",
"type": "set",
"name": "set new vnf_length",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
"comments": "",
- "x": 626.5818939208984,
- "y": 403.34385516960174,
- "z": "872ff8dd.fe5e78",
+ "x": 617.5753936767578,
+ "y": 410.33342599868774,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "89f88258.b891f",
+ "id": "f27c92ed.2a351",
"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": 613.5818557739258,
- "y": 873.607373979874,
- "z": "872ff8dd.fe5e78",
+ "x": 604.5753555297852,
+ "y": 880.59694480896,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "71ec508c.bf2e1",
+ "id": "5e423ee5.be879",
"type": "save",
"name": "save service relationship in AAI",
- "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`\" /-->",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 676.2486267089844,
- "y": 820.6072671683505,
- "z": "872ff8dd.fe5e78",
+ "x": 667.2421264648438,
+ "y": 827.5968379974365,
+ "z": "b6e8aa45.a03d48",
"wires": [
[]
]
},
{
- "id": "dc405c48.cda4b",
+ "id": "4152c1db.9724f",
"type": "set",
"name": "set vnf-index and vnf-object-path",
- "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/'` \" />",
+ "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` \" />",
"comments": "",
- "x": 667.5818862915039,
- "y": 651.6072929175571,
- "z": "872ff8dd.fe5e78",
+ "x": 658.5753860473633,
+ "y": 658.5968637466431,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "1170677a.a70a49",
+ "id": "34769e57.986742",
"type": "set",
"name": "set vnf-request-input.",
"xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",
"comments": "",
- "x": 632.5815277099609,
- "y": 354.33522775489837,
- "z": "872ff8dd.fe5e78",
+ "x": 623.5750274658203,
+ "y": 361.3247985839844,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "2b05b5cd.40cb0a",
+ "id": "eb2d673c.26d6e8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'VNF 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",
"comments": "",
- "x": 2085.153366088867,
- "y": 327.2010381491855,
- "z": "872ff8dd.fe5e78",
+ "x": 2076.1468658447266,
+ "y": 334.1906089782715,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "8463cd7c.a7a22",
+ "id": "6aca9b4.e7d1e64",
"type": "comment",
"name": "Take the parameter names by removing prefix",
"info": "",
"comments": "",
- "x": 1378.5819778442383,
- "y": 330.67710473854095,
- "z": "872ff8dd.fe5e78",
+ "x": 1369.5754776000977,
+ "y": 337.66667556762695,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "ecfeb487.443888",
+ "id": "301883bc.025f5c",
"type": "comment",
"name": "TODO: change AAI models",
"info": "",
"comments": "",
- "x": 656.1924514770508,
- "y": 720.9847257407382,
- "z": "872ff8dd.fe5e78",
+ "x": 647.1859512329102,
+ "y": 727.9742965698242,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "997721e4.3b61b",
+ "id": "27f27223.64947e",
"type": "save",
"name": "save AnAI - vnf-instance.orchestration-status",
- "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\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-id\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
"comments": "",
"outputs": 1,
- "x": 722.5561904907227,
- "y": 761.2575099738315,
- "z": "872ff8dd.fe5e78",
+ "x": 713.549690246582,
+ "y": 768.2470808029175,
+ "z": "b6e8aa45.a03d48",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml index f7847c7c..b730b324 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml @@ -36,10 +36,10 @@ <parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
- <parameter name="ctx-destination" value="prop.vnf-index"/>
+ <parameter name="ctx-destination" value="prop.vnf-id"/>
</execute>
<set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-index`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />
@@ -47,7 +47,7 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />
</set>
<set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />
@@ -55,12 +55,12 @@ <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`' />
</set>
<set>
- <parameter name='vnfId' value='`$prop.vnf-index`' />
- <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/'` " />
+ <parameter name='vnfId' value='`$prop.vnf-id`' />
+ <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` " />
</set>
<save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="generic-vnf"
- key="generic-vnf.vnf-id = $prop.vnf-index" >
+ key="generic-vnf.vnf-id = $prop.vnf-id" >
<parameter name="orchestration-status" value="create" />
<parameter name="vnf-type" value="some vnf-type" />
</save>
@@ -70,14 +70,9 @@ AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'
force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-index`" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-index`" />
- <!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
- key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
- AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id
- AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'
- force="true" pfx="tmp.AnAI-data"><parameter name="relationship-list.relationship[0].related-to" value="vpn-resource" /><parameter name="relationship-list.relationship[0].related-link" value="`'/network/vpn-resources/vpn-resource/' + $prop.vnf-index`" /><parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="vpn-resource.vpn-resource-id" /><parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-index`" /-->
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-id`" />
</save>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
|