aboutsummaryrefslogtreecommitdiffstats
path: root/platform-logic/datachange/src
diff options
context:
space:
mode:
authorshashikanth.vh <shashikanth.vh@huawei.com>2018-09-07 14:38:22 +0530
committershashikanth.vh <shashikanth.vh@huawei.com>2018-09-07 17:24:17 +0530
commit55b429cfc73802e3e52fa2f3864ecc4cdd552728 (patch)
tree5eee99f5b0b7e039ea0250d5549ca25aae74fd04 /platform-logic/datachange/src
parentdb323d0fa39eabc03faf8c803876da5f87079e58 (diff)
integration test issues fix for sdwan and sotn
Change-Id: I406550404f0cfb661d6e480cf1df48d39fad06e7 Issue-ID: SDNC-357 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com> Former-commit-id: 3e4fa46160a5d6d52bb7eccf08dbb790d96a4682
Diffstat (limited to 'platform-logic/datachange/src')
-rw-r--r--platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json757
-rw-r--r--platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json684
-rw-r--r--platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json229
-rw-r--r--platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml21
-rw-r--r--platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml9
-rw-r--r--platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml30
6 files changed, 915 insertions, 815 deletions
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
index da0567b7..426b8562 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
@@ -1,379 +1,378 @@
-[
- {
- "id": "865891e7.3a6c6",
- "type": "other",
- "name": "update",
- "xml": "<outcome value='Update'>\n",
- "comments": "",
- "outputs": 1,
- "x": 673.4443511962891,
- "y": 212.66669368743896,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "3eefa587.6bd50a"
- ]
- ]
- },
- {
- "id": "4e8bb18c.6ca95",
- "type": "other",
- "name": "delete",
- "xml": "<outcome value='delete'>\n",
- "comments": "",
- "outputs": 1,
- "x": 701.6665267944336,
- "y": 484.33349609375,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "523ab02e.031c1"
- ]
- ]
- },
- {
- "id": "523ab02e.031c1",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 857.1112060546875,
- "y": 484.33351707458496,
- "z": "fce0b4d3.a9be08",
- "wires": [
- []
- ]
- },
- {
- "id": "977d339.f9669d",
- "type": "comment",
- "name": "TODO: Delete topology from AAI",
- "info": "",
- "comments": "",
- "x": 781.7777862548828,
- "y": 447.0001811981201,
- "z": "fce0b4d3.a9be08",
- "wires": []
- },
- {
- "id": "9b67a1c0.1e23e",
- "type": "switchNode",
- "name": "switch aai-event-trigger",
- "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 457.9999771118164,
- "y": 351.2222261428833,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "865891e7.3a6c6",
- "4e8bb18c.6ca95"
- ]
- ]
- },
- {
- "id": "3eefa587.6bd50a",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 841.7781524658203,
- "y": 211.11124515533447,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "8498ca44.850928",
- "31425256.e48c3e",
- "fd4c6f6.9751e9"
- ]
- ]
- },
- {
- "id": "8498ca44.850928",
- "type": "execute",
- "name": "execute RestApiCallNode Get token",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
- "comments": "",
- "outputs": 1,
- "x": 1119.4376068115234,
- "y": 167.03049993515015,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "c3c1ad15.85994",
- "cd6736f3.94ff18"
- ]
- ]
- },
- {
- "id": "c3c1ad15.85994",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1354.4376068115234,
- "y": 145.03049993515015,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "e15c61b4.92509"
- ]
- ]
- },
- {
- "id": "cd6736f3.94ff18",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1346.6876068115234,
- "y": 198.6733832359314,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "40518e2c.2c734"
- ]
- ]
- },
- {
- "id": "e15c61b4.92509",
- "type": "set",
- "name": "set token-id",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
- "comments": "",
- "x": 1508.4376068115234,
- "y": 146.03049993515015,
- "z": "fce0b4d3.a9be08",
- "wires": []
- },
- {
- "id": "31425256.e48c3e",
- "type": "execute",
- "name": "execute RestApiCallNode Get Topology",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
- "comments": "",
- "outputs": 1,
- "x": 1122.7710418701172,
- "y": 260.73423767089844,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "ac09d1db.665eb",
- "4c50157f.5bc03c"
- ]
- ]
- },
- {
- "id": "ac09d1db.665eb",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1381.3263664245605,
- "y": 238.73421955108643,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "7a8d5805.fa1088"
- ]
- ]
- },
- {
- "id": "7a8d5805.fa1088",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "comments": "",
- "outputs": 1,
- "x": 1556.8818969726562,
- "y": 236.40094184875488,
- "z": "fce0b4d3.a9be08",
- "wires": [
- []
- ]
- },
- {
- "id": "7717d78.ee45028",
- "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=\"Error executing Create vpn rest api\" />\n",
- "comments": "",
- "x": 1565.1041717529297,
- "y": 310.62305545806885,
- "z": "fce0b4d3.a9be08",
- "wires": []
- },
- {
- "id": "4c50157f.5bc03c",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1386.770851135254,
- "y": 309.84528493881226,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "7717d78.ee45028"
- ]
- ]
- },
- {
- "id": "fe88648c.ffce68",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 78.4443130493164,
- "y": 91,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "7387008c.4a9fe"
- ]
- ]
- },
- {
- "id": "7387008c.4a9fe",
- "type": "service-logic",
- "name": "DataChange ${project.version}",
- "module": "DataChange",
- "version": "${project.version}",
- "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='DataChange' version='${project.version}'>",
- "outputs": 1,
- "x": 236.55543899536133,
- "y": 132.4444613456726,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "f56e7701.2fd2c8"
- ]
- ]
- },
- {
- "id": "f56e7701.2fd2c8",
- "type": "method",
- "name": "method esr-thirdparty-sdnc-discovery",
- "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 333,
- "y": 243.22224235534668,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "4c6047b0.71e118"
- ]
- ]
- },
- {
- "id": "4c6047b0.71e118",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 241.22222900390625,
- "y": 352.11122035980225,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "9b67a1c0.1e23e"
- ]
- ]
- },
- {
- "id": "fd4c6f6.9751e9",
- "type": "for",
- "name": "for each Network",
- "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1054.9258041381836,
- "y": 388.22217655181885,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "22efb538.f3605a"
- ]
- ]
- },
- {
- "id": "22efb538.f3605a",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1244.925765991211,
- "y": 395.9999694824219,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "995bcad0.798cf8",
- "31478e5.e5c4072"
- ]
- ]
- },
- {
- "id": "995bcad0.798cf8",
- "type": "call",
- "name": "call update-network-to-aai",
- "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1498.2591876983643,
- "y": 459.3333396911621,
- "z": "fce0b4d3.a9be08",
- "wires": [
- []
- ]
- },
- {
- "id": "31478e5.e5c4072",
- "type": "set",
- "name": "set network",
- "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
- "comments": "",
- "x": 1450.4813079833984,
- "y": 377.111083984375,
- "z": "fce0b4d3.a9be08",
- "wires": []
- },
- {
- "id": "40518e2c.2c734",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1508.2590026855469,
- "y": 193.7777624130249,
- "z": "fce0b4d3.a9be08",
- "wires": [
- []
- ]
- },
- {
- "id": "793cc07c.4e65e",
- "type": "comment",
- "name": "Do Nothing",
- "info": "",
- "comments": "",
- "x": 1643.814576466878,
- "y": 192.666638162401,
- "z": "fce0b4d3.a9be08",
- "wires": []
- }
-] \ No newline at end of file
+[
+ {
+ "id": "e714f114.a841a",
+ "type": "other",
+ "name": "update",
+ "xml": "<outcome value='Update'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 674.5000419616699,
+ "y": 205.66669845581055,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "412d4a4c.5ea2f4"
+ ]
+ ]
+ },
+ {
+ "id": "47ba392d.437028",
+ "type": "other",
+ "name": "delete",
+ "xml": "<outcome value='delete'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 702.7222175598145,
+ "y": 477.3335008621216,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "e84e5704.965b68"
+ ]
+ ]
+ },
+ {
+ "id": "e84e5704.965b68",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 858.1668968200684,
+ "y": 477.33352184295654,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "5e6b6675.fc5a18",
+ "type": "comment",
+ "name": "TODO: Delete topology from AAI",
+ "info": "",
+ "comments": "",
+ "x": 782.8334770202637,
+ "y": 440.0001859664917,
+ "z": "f60ccc0b.2e9e5",
+ "wires": []
+ },
+ {
+ "id": "bf8e19f1.7f5908",
+ "type": "switchNode",
+ "name": "switch aai-event-trigger",
+ "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 459.05566787719727,
+ "y": 344.2222309112549,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "e714f114.a841a",
+ "47ba392d.437028"
+ ]
+ ]
+ },
+ {
+ "id": "412d4a4c.5ea2f4",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 842.8338432312012,
+ "y": 204.11124992370605,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "52b0fb73.694034",
+ "b992a9e2.abb498"
+ ]
+ ]
+ },
+ {
+ "id": "bf4a7e8b.e2772",
+ "type": "execute",
+ "name": "execute RestApiCallNode Get token",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1120.4932975769043,
+ "y": 160.03050470352173,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "cbcc146a.b18a48",
+ "934e7ef4.942bd"
+ ]
+ ]
+ },
+ {
+ "id": "cbcc146a.b18a48",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1355.4932975769043,
+ "y": 138.03050470352173,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "9ebe20af.228e5"
+ ]
+ ]
+ },
+ {
+ "id": "934e7ef4.942bd",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1347.7432975769043,
+ "y": 191.67338800430298,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "fe461c21.f9128"
+ ]
+ ]
+ },
+ {
+ "id": "9ebe20af.228e5",
+ "type": "set",
+ "name": "set token-id",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+ "comments": "",
+ "x": 1509.4932975769043,
+ "y": 139.03050470352173,
+ "z": "f60ccc0b.2e9e5",
+ "wires": []
+ },
+ {
+ "id": "52b0fb73.694034",
+ "type": "execute",
+ "name": "execute RestApiCallNode Get Topology",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+ "comments": "",
+ "outputs": 1,
+ "x": 1123.8267250061035,
+ "y": 253.73424243927002,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "bf8dd5a2.3ec108",
+ "4e2f04da.b5496c"
+ ]
+ ]
+ },
+ {
+ "id": "bf8dd5a2.3ec108",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1382.3820571899414,
+ "y": 231.734224319458,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "9692e7a9.a7ad78"
+ ]
+ ]
+ },
+ {
+ "id": "9692e7a9.a7ad78",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1557.937587738037,
+ "y": 229.40094661712646,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "1548c97d.137267",
+ "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=\"Error executing Create vpn rest api\" />\n",
+ "comments": "",
+ "x": 1566.1598625183105,
+ "y": 303.62306022644043,
+ "z": "f60ccc0b.2e9e5",
+ "wires": []
+ },
+ {
+ "id": "4e2f04da.b5496c",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1387.8265419006348,
+ "y": 302.84528970718384,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "1548c97d.137267"
+ ]
+ ]
+ },
+ {
+ "id": "773b4a80.972f64",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 99.50000381469727,
+ "y": 84.00000476837158,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "6b3bf10f.0a471"
+ ]
+ ]
+ },
+ {
+ "id": "6b3bf10f.0a471",
+ "type": "service-logic",
+ "name": "DataChange ${project.version}",
+ "module": "DataChange",
+ "version": "${project.version}",
+ "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='DataChange' version='${project.version}'>",
+ "outputs": 1,
+ "x": 237.6111297607422,
+ "y": 125.44446611404419,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "34347376.ce668c"
+ ]
+ ]
+ },
+ {
+ "id": "34347376.ce668c",
+ "type": "method",
+ "name": "method esr-thirdparty-sdnc-discovery",
+ "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 334.05569076538086,
+ "y": 236.22224712371826,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "1ded1b72.af18c5"
+ ]
+ ]
+ },
+ {
+ "id": "1ded1b72.af18c5",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 242.2779197692871,
+ "y": 345.1112251281738,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "bf8e19f1.7f5908"
+ ]
+ ]
+ },
+ {
+ "id": "b992a9e2.abb498",
+ "type": "for",
+ "name": "for each Network",
+ "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1055.9814949035645,
+ "y": 381.22218132019043,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "d00ff672.d0b048"
+ ]
+ ]
+ },
+ {
+ "id": "d00ff672.d0b048",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1245.9814567565918,
+ "y": 388.99997425079346,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ [
+ "ba2cdcd.67eab2",
+ "b9e492ff.96a56"
+ ]
+ ]
+ },
+ {
+ "id": "ba2cdcd.67eab2",
+ "type": "call",
+ "name": "call update-network-to-aai",
+ "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1499.3148784637451,
+ "y": 452.3333444595337,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "b9e492ff.96a56",
+ "type": "set",
+ "name": "set network",
+ "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
+ "comments": "",
+ "x": 1451.5369987487793,
+ "y": 370.1110887527466,
+ "z": "f60ccc0b.2e9e5",
+ "wires": []
+ },
+ {
+ "id": "fe461c21.f9128",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1509.3146934509277,
+ "y": 186.77776718139648,
+ "z": "f60ccc0b.2e9e5",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "12e3cffc.36ff4",
+ "type": "comment",
+ "name": "Do Nothing",
+ "info": "",
+ "comments": "",
+ "x": 1644.8702672322588,
+ "y": 185.66664293077258,
+ "z": "f60ccc0b.2e9e5",
+ "wires": []
+ }
+]
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
index 5c40ac4c..94cd2655 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
@@ -1,320 +1,364 @@
-[
- {
- "id": "d0fde8b6.3aa408",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 114.00390625,
- "y": 42.00390625,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "4796011e.231d3"
- ]
- ]
- },
- {
- "id": "4796011e.231d3",
- "type": "service-logic",
- "name": "DataChange ${project.version}",
- "module": "DataChange",
- "version": "${project.version}",
- "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='DataChange' version='${project.version}'>",
- "outputs": 1,
- "x": 300.1150550842285,
- "y": 146.44837760925293,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "83e631da.db4b1"
- ]
- ]
- },
- {
- "id": "83e631da.db4b1",
- "type": "method",
- "name": "method esr-thirdparty-sdnc",
- "xml": "<method rpc='esr-thirdparty-sdnc' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 297.5596046447754,
- "y": 310.2261629104614,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "2d86f41b.00eefc"
- ]
- ]
- },
- {
- "id": "2d86f41b.00eefc",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 252.7818717956543,
- "y": 445.1152181625366,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "1ccf3882.d71c77",
- "41fd63bc.2e97bc",
- "ba86cde8.fb9f3",
- "b799af7a.5b9c9"
- ]
- ]
- },
- {
- "id": "ba86cde8.fb9f3",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
- "comments": "",
- "outputs": 1,
- "x": 542.00390625,
- "y": 516.00390625,
- "z": "57a3a26d.f7d23c",
- "wires": [
- []
- ]
- },
- {
- "id": "1ccf3882.d71c77",
- "type": "call",
- "name": "call validate-esr-thirdparty-sdnc-input",
- "xml": "<call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 655.7815399169922,
- "y": 379.0037097930908,
- "z": "57a3a26d.f7d23c",
- "wires": [
- []
- ]
- },
- {
- "id": "41fd63bc.2e97bc",
- "type": "for",
- "name": "for 0..key-data_length",
- "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 590.4480133056641,
- "y": 461.19469451904297,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "b1d2d6de.13b948"
- ]
- ]
- },
- {
- "id": "b1d2d6de.13b948",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 762.3374786376953,
- "y": 460.4169397354126,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "1ad86336.4ad5cd",
- "fa2d7e75.6219e",
- "5d462805.1bcf28",
- "44977471.592c0c"
- ]
- ]
- },
- {
- "id": "1ad86336.4ad5cd",
- "type": "switchNode",
- "name": "switch service-url",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 974.5591812133789,
- "y": 370.5280923843384,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "49195641.421748"
- ]
- ]
- },
- {
- "id": "49195641.421748",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1138.5593032836914,
- "y": 369.5593252182007,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "68e2f0ac.a4549"
- ]
- ]
- },
- {
- "id": "68e2f0ac.a4549",
- "type": "set",
- "name": "set service-url",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1292.5593948364258,
- "y": 369.1593189239502,
- "z": "57a3a26d.f7d23c",
- "wires": []
- },
- {
- "id": "fa2d7e75.6219e",
- "type": "switchNode",
- "name": "switch user-name",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 971.8489265441895,
- "y": 439.7751522064209,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "4a967272.ac408c"
- ]
- ]
- },
- {
- "id": "4a967272.ac408c",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1140.8489151000977,
- "y": 437.8063955307007,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "a97aae71.052dc"
- ]
- ]
- },
- {
- "id": "a97aae71.052dc",
- "type": "set",
- "name": "set user",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1276.8490676879883,
- "y": 437.40638637542725,
- "z": "57a3a26d.f7d23c",
- "wires": []
- },
- {
- "id": "5d462805.1bcf28",
- "type": "switchNode",
- "name": "switch password",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 969.6267585754395,
- "y": 505.33070182800293,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "aa2c8a18.06def8"
- ]
- ]
- },
- {
- "id": "aa2c8a18.06def8",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1141.6267166137695,
- "y": 505.36194705963135,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "ae62fe3a.d8789"
- ]
- ]
- },
- {
- "id": "ae62fe3a.d8789",
- "type": "set",
- "name": "set password",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1296.6269607543945,
- "y": 503.9619264602661,
- "z": "57a3a26d.f7d23c",
- "wires": []
- },
- {
- "id": "b799af7a.5b9c9",
- "type": "call",
- "name": "call esr-thirdparty-sdnc-discovery",
- "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 613.4416656494141,
- "y": 587.5529069900513,
- "z": "57a3a26d.f7d23c",
- "wires": [
- []
- ]
- },
- {
- "id": "44977471.592c0c",
- "type": "switchNode",
- "name": "switch esr-system-info-id",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 991.4480667114258,
- "y": 559.3370685577393,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "e1fdba16.c57aa8"
- ]
- ]
- },
- {
- "id": "e1fdba16.c57aa8",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1166.4480438232422,
- "y": 557.3682584762573,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "3f219327.b83efc"
- ]
- ]
- },
- {
- "id": "3f219327.b83efc",
- "type": "set",
- "name": "set esr-system-info-id",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1332.448013305664,
- "y": 558.968282699585,
- "z": "57a3a26d.f7d23c",
- "wires": []
- }
-] \ No newline at end of file
+[
+ {
+ "id": "3645100d.93b1e",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 131,
+ "y": 57,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "a67dda3b.aa6388"
+ ]
+ ]
+ },
+ {
+ "id": "a67dda3b.aa6388",
+ "type": "service-logic",
+ "name": "DataChange ${project.version}",
+ "module": "DataChange",
+ "version": "${project.version}",
+ "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='DataChange' version='${project.version}'>",
+ "outputs": 1,
+ "x": 317.1111488342285,
+ "y": 161.44447135925293,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "fc54766d.ffb9e8"
+ ]
+ ]
+ },
+ {
+ "id": "fc54766d.ffb9e8",
+ "type": "method",
+ "name": "method esr-thirdparty-sdnc",
+ "xml": "<method rpc='esr-thirdparty-sdnc' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 314.5556983947754,
+ "y": 325.2222566604614,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "e6c2b0ea.17014"
+ ]
+ ]
+ },
+ {
+ "id": "e6c2b0ea.17014",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 269.7779655456543,
+ "y": 460.1113119125366,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "9897db0a.e34dc8",
+ "9787862d.18f5b8",
+ "195661d4.a9c59e",
+ "8e1fe65e.d69f18"
+ ]
+ ]
+ },
+ {
+ "id": "195661d4.a9c59e",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 559,
+ "y": 531,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "9897db0a.e34dc8",
+ "type": "call",
+ "name": "call validate-esr-thirdparty-sdnc-input",
+ "xml": "<call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 672.7776336669922,
+ "y": 393.9998035430908,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "9787862d.18f5b8",
+ "type": "for",
+ "name": "for 0..key-data_length",
+ "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 607.4441070556641,
+ "y": 476.19078826904297,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "64de51c2.171a2"
+ ]
+ ]
+ },
+ {
+ "id": "64de51c2.171a2",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 779.3335723876953,
+ "y": 475.4130334854126,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "6c37c93a.5a9338",
+ "f8e49db.93b206",
+ "b38e3659.a3e968",
+ "abe36d34.993f2",
+ "ab9e3d95.0ab8"
+ ]
+ ]
+ },
+ {
+ "id": "6c37c93a.5a9338",
+ "type": "switchNode",
+ "name": "switch service-url",
+ "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 991.5552749633789,
+ "y": 385.5241861343384,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "ef74e18a.347bb"
+ ]
+ ]
+ },
+ {
+ "id": "ef74e18a.347bb",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1155.5553970336914,
+ "y": 384.5554189682007,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "ce02826f.96607"
+ ]
+ ]
+ },
+ {
+ "id": "ce02826f.96607",
+ "type": "set",
+ "name": "set service-url",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+ "comments": "",
+ "x": 1309.5554885864258,
+ "y": 384.1554126739502,
+ "z": "f5f8cf31.a0ec1",
+ "wires": []
+ },
+ {
+ "id": "f8e49db.93b206",
+ "type": "switchNode",
+ "name": "switch user-name",
+ "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 988.8450202941895,
+ "y": 454.7712459564209,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "b1f04d56.2de33"
+ ]
+ ]
+ },
+ {
+ "id": "b1f04d56.2de33",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1157.8450088500977,
+ "y": 452.8024892807007,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "393fe106.5ce84e"
+ ]
+ ]
+ },
+ {
+ "id": "393fe106.5ce84e",
+ "type": "set",
+ "name": "set user",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+ "comments": "",
+ "x": 1293.8451614379883,
+ "y": 452.40248012542725,
+ "z": "f5f8cf31.a0ec1",
+ "wires": []
+ },
+ {
+ "id": "b38e3659.a3e968",
+ "type": "switchNode",
+ "name": "switch password",
+ "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 986.6228523254395,
+ "y": 520.3267955780029,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "31f8b0b.92d9a5"
+ ]
+ ]
+ },
+ {
+ "id": "31f8b0b.92d9a5",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1158.6228103637695,
+ "y": 520.3580408096313,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "4275b621.ba48f8"
+ ]
+ ]
+ },
+ {
+ "id": "4275b621.ba48f8",
+ "type": "set",
+ "name": "set password",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+ "comments": "",
+ "x": 1313.6230545043945,
+ "y": 518.9580202102661,
+ "z": "f5f8cf31.a0ec1",
+ "wires": []
+ },
+ {
+ "id": "8e1fe65e.d69f18",
+ "type": "call",
+ "name": "call esr-thirdparty-sdnc-discovery",
+ "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 630.4377593994141,
+ "y": 602.5490007400513,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "abe36d34.993f2",
+ "type": "switchNode",
+ "name": "switch esr-system-info-id",
+ "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1008.4441528320312,
+ "y": 574.3331909179688,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "c47d5b3c.ec2b98"
+ ]
+ ]
+ },
+ {
+ "id": "c47d5b3c.ec2b98",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1183.4441375732422,
+ "y": 572.3643522262573,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "b46d33d6.3f8df"
+ ]
+ ]
+ },
+ {
+ "id": "b46d33d6.3f8df",
+ "type": "set",
+ "name": "set esr-system-info-id",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+ "comments": "",
+ "x": 1349.444107055664,
+ "y": 573.964376449585,
+ "z": "f5f8cf31.a0ec1",
+ "wires": []
+ },
+ {
+ "id": "ab9e3d95.0ab8",
+ "type": "switchNode",
+ "name": "switch thirdparty-sdnc-id",
+ "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1003,
+ "y": 619,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "6a0992e2.98429c"
+ ]
+ ]
+ },
+ {
+ "id": "6a0992e2.98429c",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1177.999984741211,
+ "y": 617.0311613082886,
+ "z": "f5f8cf31.a0ec1",
+ "wires": [
+ [
+ "75b4346a.e3888c"
+ ]
+ ]
+ },
+ {
+ "id": "75b4346a.e3888c",
+ "type": "set",
+ "name": "set thirdparty-sdnc-id",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+ "comments": "",
+ "x": 1343.9999542236328,
+ "y": 618.6311855316162,
+ "z": "f5f8cf31.a0ec1",
+ "wires": []
+ }
+]
diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
index c1cf62db..f82168b9 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
@@ -1,20 +1,20 @@
[
{
- "id": "20435d2f.b707b2",
+ "id": "4d48ad52.66bce4",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 129.01040649414062,
- "y": 61.010414123535156,
- "z": "3e15e6f8.d8900a",
+ "x": 116,
+ "y": 72,
+ "z": "972d7ac.f66db88",
"wires": [
[
- "83ca6f8e.538a2"
+ "66f854f4.bc80cc"
]
]
},
{
- "id": "83ca6f8e.538a2",
+ "id": "66f854f4.bc80cc",
"type": "service-logic",
"name": "DataChange ${project.version}",
"module": "DataChange",
@@ -22,216 +22,279 @@
"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='DataChange' version='${project.version}'>",
"outputs": 1,
- "x": 218.01043701171875,
- "y": 151.8993263244629,
- "z": "3e15e6f8.d8900a",
+ "x": 205.00003051757812,
+ "y": 162.88891220092773,
+ "z": "972d7ac.f66db88",
"wires": [
[
- "5fa2f1f3.bb35e"
+ "7eee0fcc.e1d78"
]
]
},
{
- "id": "5fa2f1f3.bb35e",
+ "id": "7eee0fcc.e1d78",
"type": "method",
"name": "method update-network-to-aai",
"xml": "<method rpc='update-network-to-aai' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 254.1216583251953,
- "y": 222.23265075683594,
- "z": "3e15e6f8.d8900a",
+ "x": 241.1112518310547,
+ "y": 233.22223663330078,
+ "z": "972d7ac.f66db88",
"wires": [
[
- "44238134.7d97f"
+ "dd17da81.f85678"
]
]
},
{
- "id": "44238134.7d97f",
+ "id": "dd17da81.f85678",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 479.3438415527344,
- "y": 221.78833770751953,
- "z": "3e15e6f8.d8900a",
+ "x": 466.33343505859375,
+ "y": 232.77792358398438,
+ "z": "972d7ac.f66db88",
"wires": [
[
- "84458cb3.2004e",
- "282c5771.31f2f8",
- "c27c36c9.fe0038"
+ "c70a984d.cc2a48",
+ "5cf53006.e1ea9",
+ "a9f8a08c.a159f"
]
]
},
{
- "id": "282c5771.31f2f8",
+ "id": "5cf53006.e1ea9",
"type": "update",
"name": "save network-resource",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource' \n key='network-resource.network-id = $tmp.network-id' >\n<parameter name='network-id' value='`$tmp.network-id`' />\n<parameter name='client-id' value='`$network.client-id`' />\n<parameter name='te-topo-id' value='`$network.te-topology-id`' />\n<parameter name='provider-id' value='`$network.provider-id`' />\n\n\n",
"comments": "",
"outputs": 1,
- "x": 709.3436584472656,
- "y": 127.01042938232422,
- "z": "3e15e6f8.d8900a",
+ "x": 696.333251953125,
+ "y": 138.00001525878906,
+ "z": "972d7ac.f66db88",
"wires": [
[]
]
},
{
- "id": "8db597cb.e2ef58",
+ "id": "bc0b4672.53b908",
"type": "update",
"name": "save pnf",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='network-resource.network-id = $tmp.network-id\n AND pnf.pnf-name = $node.node-id' >\n<parameter name='pnf-name' value='`$node.node-id`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $node.node-id' >\n<parameter name='pnf-name' value='`$node.node-id`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 899.1215515136719,
- "y": 179.12151336669922,
- "z": "3e15e6f8.d8900a",
+ "x": 879.111141204834,
+ "y": 191.111102104187,
+ "z": "972d7ac.f66db88",
"wires": [
[]
]
},
{
- "id": "c27c36c9.fe0038",
+ "id": "a9f8a08c.a159f",
"type": "for",
"name": "for each node",
"xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 685.8992614746094,
- "y": 171.3437271118164,
- "z": "3e15e6f8.d8900a",
+ "x": 679.8888549804688,
+ "y": 208.33331298828125,
+ "z": "972d7ac.f66db88",
"wires": [
[
- "8db597cb.e2ef58",
- "6b246a86.7d22b4",
- "79357b97.6a6604",
- "629488d9.a436f8",
- "89ed3af1.c4f958"
+ "bc0b4672.53b908",
+ "6b3704fc.0bd35c",
+ "24e04af5.ddea66",
+ "9b1ff78d.8b3c08",
+ "8e9342c1.220f"
]
]
},
{
- "id": "6b246a86.7d22b4",
+ "id": "6b3704fc.0bd35c",
"type": "set",
"name": "set network",
"xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n",
"comments": "",
- "x": 906.1214904785156,
- "y": 145.23262786865234,
- "z": "3e15e6f8.d8900a",
+ "x": 893.111083984375,
+ "y": 156.2222137451172,
+ "z": "972d7ac.f66db88",
"wires": []
},
{
- "id": "79357b97.6a6604",
+ "id": "9b1ff78d.8b3c08",
"type": "save",
"name": "save pnf relationship to network-resource in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $node.node-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.network-id`\" />",
"comments": "",
"outputs": 1,
- "x": 1017.7884216308594,
- "y": 212.45490264892578,
- "z": "3e15e6f8.d8900a",
+ "x": 1004.7779541015625,
+ "y": 223.44447803497314,
+ "z": "972d7ac.f66db88",
"wires": [
[]
]
},
{
- "id": "89ed3af1.c4f958",
+ "id": "8e9342c1.220f",
"type": "for",
"name": "for each termination point",
"xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 950.4548645019531,
- "y": 328.12149810791016,
- "z": "3e15e6f8.d8900a",
+ "x": 937.4444580078125,
+ "y": 339.111083984375,
+ "z": "972d7ac.f66db88",
"wires": [
[
- "6bc546b5.f87e18",
- "8d1a709c.fbdf6",
- "ad4de444.eb7858",
- "bd80da47.090a88"
+ "7c32bd23.da1e04",
+ "38ff90b0.67e0b",
+ "36dd756f.9a425a"
]
]
},
{
- "id": "6bc546b5.f87e18",
+ "id": "7c32bd23.da1e04",
"type": "set",
"name": "set termination point",
"xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
"comments": "",
- "x": 1217.1217346191406,
- "y": 289.01045989990234,
- "z": "3e15e6f8.d8900a",
+ "x": 1204.111328125,
+ "y": 300.0000457763672,
+ "z": "972d7ac.f66db88",
"wires": []
},
{
- "id": "bd80da47.090a88",
+ "id": "36dd756f.9a425a",
"type": "update",
"name": "save p-interface",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='network-resource.network-id = $tmp.network-id\n AND pnf.pnf-name = $node.node-id\n AND p-interface.interface-name = $unique-ltpId' > \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $node.node-id\n AND p-interface.interface-name = $unique-ltpId' > \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 1200.8254699707031,
- "y": 357.5660171508789,
- "z": "3e15e6f8.d8900a",
+ "x": 1187.8151397705078,
+ "y": 473.5555934906006,
+ "z": "972d7ac.f66db88",
"wires": [
- []
+ [
+ "310a666a.23204a",
+ "52308d76.244944"
+ ]
]
},
{
- "id": "8d1a709c.fbdf6",
+ "id": "9b33d7c5.abef78",
"type": "save",
"name": "save pnf relationship to p-interface in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $node.node-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/p-interfaces/p-interface/' + $unique-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId`\" />",
"comments": "",
"outputs": 1,
- "x": 1278.7142639160156,
- "y": 395.34375762939453,
- "z": "3e15e6f8.d8900a",
+ "x": 1263.7038879394531,
+ "y": 562.333345413208,
+ "z": "972d7ac.f66db88",
"wires": [
[]
]
},
{
- "id": "ad4de444.eb7858",
+ "id": "38ff90b0.67e0b",
"type": "set",
"name": "set unique-ltpId",
"xml": "<set>\n<parameter name='unique-ltpId' value=\"`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`\" />\n",
"comments": "",
- "x": 1201.0106506347656,
- "y": 323.1215286254883,
- "z": "3e15e6f8.d8900a",
+ "x": 1188.000244140625,
+ "y": 334.1111145019531,
+ "z": "972d7ac.f66db88",
"wires": []
},
{
- "id": "84458cb3.2004e",
+ "id": "c70a984d.cc2a48",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$network.network-id`\"/>\n <parameter name=\"outputPath\" value=\"tmp.network-id\"/>\n <parameter name=\"target\" value=\"/\"/>\n <parameter name=\"replacement\" value=\"-\"/>\n ",
"comments": "",
"outputs": 1,
- "x": 659.0039367675781,
- "y": 88.00390625,
- "z": "3e15e6f8.d8900a",
+ "x": 645.9935302734375,
+ "y": 98.99349212646484,
+ "z": "972d7ac.f66db88",
"wires": [
[]
]
},
{
- "id": "629488d9.a436f8",
+ "id": "24e04af5.ddea66",
"type": "save",
"name": "save pnf relation with esr-thirdparty-sdnc",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 986,
+ "y": 259.9934997558594,
+ "z": "972d7ac.f66db88",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "310a666a.23204a",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1359.4998397827148,
+ "y": 460.7460689544678,
+ "z": "972d7ac.f66db88",
+ "wires": [
+ [
+ "fcc0153a.edfd18"
+ ]
+ ]
+ },
+ {
+ "id": "52308d76.244944",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1353.1784286499023,
+ "y": 512.9603805541992,
+ "z": "972d7ac.f66db88",
+ "wires": [
+ [
+ "1c6a1f1f.8e0f61"
+ ]
+ ]
+ },
+ {
+ "id": "fcc0153a.edfd18",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1510,
+ "y": 460,
+ "z": "972d7ac.f66db88",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "1c6a1f1f.8e0f61",
+ "type": "update",
+ "name": "save p-interface",
+ "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $node.node-id\n AND p-interface.interface-name = $unique-ltpId' > \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 999.0104064941406,
- "y": 249.00391387939453,
- "z": "3e15e6f8.d8900a",
+ "x": 1530,
+ "y": 510,
+ "z": "972d7ac.f66db88",
"wires": [
[]
]
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
index ba2ea398..3f2dc892 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
@@ -7,25 +7,6 @@
<outcome value='Update'>
<block atomic="true">
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="post"/>
- <parameter name="responsePrefix" value="token-result"/>
- <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
- <parameter name="trustStorePassword" value="adminadmin"/>
- <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
- <parameter name="keyStorePassword" value="adminadmin"/>
- <outcome value='success'>
- <set>
- <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
- </set>
- </outcome>
- <outcome value='failure'>
- <block></block>
- </outcome>
- </execute>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
@@ -64,4 +45,4 @@
</switch>
</block>
</method>
-</service-logic> \ No newline at end of file
+</service-logic>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
index 33d91a7c..edce7fbb 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
@@ -30,6 +30,13 @@
<switch test="`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`">
<outcome value='true'>
<set>
+ <parameter name='prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`">
+ <outcome value='true'>
+ <set>
<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />
</set>
</outcome>
@@ -47,4 +54,4 @@
<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' ></call>
</block>
</method>
-</service-logic> \ No newline at end of file
+</service-logic>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
index f3f089a9..666d337a 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
@@ -21,8 +21,7 @@
<parameter name='node.' value='`$network.node[$pidx].`' />
</set>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'
- key='network-resource.network-id = $tmp.network-id
- AND pnf.pnf-name = $node.node-id' >
+ key='pnf.pnf-name = $node.node-id' >
<parameter name='pnf-name' value='`$node.node-id`' />
<parameter name='pnf-id' value='`$node.node-id`' />
<parameter name='operational-status' value='`$node.te.oper-status`' />
@@ -40,7 +39,7 @@
key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id'
force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="pnf" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id`" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />
</save>
@@ -52,8 +51,7 @@
<parameter name='unique-ltpId' value="`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`" />
</set>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
- key='network-resource.network-id = $tmp.network-id
- AND pnf.pnf-name = $node.node-id
+ key='pnf.pnf-name = $node.node-id
AND p-interface.interface-name = $unique-ltpId' >
<parameter name='interface-name' value='`$unique-ltpId`' />
<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
@@ -61,13 +59,21 @@
<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
<parameter name='operational-status' value='`$tp.te.oper-status`' />
<parameter name='in-maint' value="true" />
- </save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
- key='pnf.pnf-name = $node.node-id' force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/p-interfaces/p-interface/' + $unique-ltpId`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ltpId`" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='failure'>
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
+ key='pnf.pnf-name = $node.node-id
+ AND p-interface.interface-name = $unique-ltpId' >
+ <parameter name='interface-name' value='`$unique-ltpId`' />
+ <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
+ <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
+ <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
+ <parameter name='operational-status' value='`$tp.te.oper-status`' />
+ <parameter name='in-maint' value="true" />
+ </update>
+ </outcome>
</save>
</for>
</for>