diff options
Diffstat (limited to 'platform-logic')
9 files changed, 1275 insertions, 1124 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.json index aed52855..ffa95daa 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.json @@ -1,20 +1,20 @@ [ { - "id": "69df8be4.4c3cb4", + "id": "d59dffe3.1ebcb", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 894.000244140625, - "y": 493.0001220703125, - "z": "b55dc3b9.0674e8", + "x": 175.03125, + "y": 203.0001277923584, + "z": "f135a623.0543d8", "wires": [ [ - "96779afc.eefcf8" + "ec08cd91.55039" ] ] }, { - "id": "96779afc.eefcf8", + "id": "ec08cd91.55039", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1116 +22,1196 @@ "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": 1186.9996490478516, - "y": 493.0000219345093, - "z": "b55dc3b9.0674e8", + "x": 468.03065490722656, + "y": 203.00002765655518, + "z": "f135a623.0543d8", "wires": [ [ - "22e6483c.f93448" + "513fbcd2.03e4e4" ] ] }, { - "id": "22e6483c.f93448", + "id": "513fbcd2.03e4e4", "type": "method", "name": "method:bbs-access-connectivity-network-topology-operation-create-huawei", "xml": "<method rpc='bbs-access-connectivity-network-topology-operation-create-huawei' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 1184.9996490478516, - "y": 689.0000619888306, - "z": "b55dc3b9.0674e8", + "x": 466.03065490722656, + "y": 399.00006771087646, + "z": "f135a623.0543d8", "wires": [ [ - "cecb6fa.14b431" + "5ffa3fc6.3a25d" ] ] }, { - "id": "cecb6fa.14b431", + "id": "5ffa3fc6.3a25d", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1591.9998626708984, - "y": 690.0000619888306, - "z": "b55dc3b9.0674e8", + "x": 873.0308685302734, + "y": 400.00006771087646, + "z": "f135a623.0543d8", "wires": [ [ - "ca1c14e4.4d339", - "3b41cd0b.76074a", - "1552bd19.8bb8f3", - "f5dbdf79.0f05b8", - "8cf2e6de.4d3138", - "fe430565.3e4f9", - "f837852c.dfc578", - "ffa77aae.f154d" + "d08319bc.bcb898", + "3702f371.c0220c", + "28397a59.582c76", + "98ddfc72.d43d9", + "a775f115.24069", + "f893f8d3.d95988", + "da212c99.cb2c6", + "d0f6c86f.1dac08" ] ] }, { - "id": "ca1c14e4.4d339", + "id": "d08319bc.bcb898", "type": "execute", "name": "excute:readProperties", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n\n", "comments": "", "outputs": 1, - "x": 2024.0000915527344, - "y": 584.1111812591553, - "z": "b55dc3b9.0674e8", + "x": 1305.0310974121094, + "y": 294.1111869812012, + "z": "f135a623.0543d8", "wires": [ [] ] }, { - "id": "3b41cd0b.76074a", + "id": "3702f371.c0220c", "type": "call", "name": "call:validate-bbs-network-input-parameters", "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-network-input-parameters' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 2105, - "y": 366.99999237060547, - "z": "b55dc3b9.0674e8", + "x": 1386.031005859375, + "y": 76.99999809265137, + "z": "f135a623.0543d8", "wires": [ [] ] }, { - "id": "ffa77aae.f154d", + "id": "d0f6c86f.1dac08", "type": "execute", "name": "execute:createAccessConnectivityService", "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-access-connectivity-create.json'`\" />\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`\" />\n <parameter name=\"contentType\" value=\"application/json\"/>\n <parameter name=\"httpMethod\" value=\"post\"/>\n <parameter name=\"responsePrefix\" value=\"service-result\"/>\n <parameter name=\"customHttpHeaders\" value=\"`'X-Auth-Token=' + $prop.sdncRestApi.token_id`\"/>\n <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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": 2082.6510620117188, - "y": 1139.9608306884766, - "z": "b55dc3b9.0674e8", + "x": 1363.6820678710938, + "y": 849.9608364105225, + "z": "f135a623.0543d8", "wires": [ [ - "40de66ad.cee7a8", - "694a1aa1.ee44dc" + "fe656633.23f858", + "6f1e2083.ac153" ] ] }, { - "id": "40de66ad.cee7a8", + "id": "fe656633.23f858", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2427.983829498291, - "y": 1229.9607305526733, - "z": "b55dc3b9.0674e8", + "x": 1709.014835357666, + "y": 939.9607362747192, + "z": "f135a623.0543d8", "wires": [ [ - "7c823c35.187454" + "f4a3c0d8.430c" ] ] }, { - "id": "694a1aa1.ee44dc", + "id": "6f1e2083.ac153", "type": "outcome", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2419.893310546875, - "y": 1138.142593383789, - "z": "b55dc3b9.0674e8", + "x": 1700.92431640625, + "y": 848.142599105835, + "z": "f135a623.0543d8", "wires": [ [ - "69e343d2.09328c" + "c90fe181.73329" ] ] }, { - "id": "fe430565.3e4f9", + "id": "f893f8d3.d95988", "type": "execute", "name": "execute:querryTokenID", "xml": " <execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-token-template.json'`\"/>\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>\n <parameter name=\"format\" value=\"json\"/>\n <parameter name=\"httpMethod\" value=\"put\"/>\n <parameter name=\"responsePrefix\" value=\"token-result\"/>\n <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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\n", "comments": "", "outputs": 1, - "x": 2018.2224426269531, - "y": 941.5557956695557, - "z": "b55dc3b9.0674e8", + "x": 1299.2534484863281, + "y": 651.5558013916016, + "z": "f135a623.0543d8", "wires": [ [ - "985f7741.c62248", - "4862a7fc.da72" + "a70e4e47.132c9", + "7cc0e9d7.1e3408" ] ] }, { - "id": "4862a7fc.da72", + "id": "7cc0e9d7.1e3408", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2306.167236328125, - "y": 941.2501926422119, - "z": "b55dc3b9.0674e8", + "x": 1587.1982421875, + "y": 651.2501983642578, + "z": "f135a623.0543d8", "wires": [ [ - "43ef79ed.dece58" + "42bd34dc.590d6c" ] ] }, { - "id": "985f7741.c62248", + "id": "a70e4e47.132c9", "type": "outcome", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2304.4402465820312, - "y": 1014.6138677597046, - "z": "b55dc3b9.0674e8", + "x": 1585.4712524414062, + "y": 724.6138734817505, + "z": "f135a623.0543d8", "wires": [ [ - "464505a9.92b4fc" + "ede8d766.0fb378" ] ] }, { - "id": "52c062b7.adf254", + "id": "45c2f33c.d2afcc", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing queryTokenID,vaule is null\" />\n", "comments": "", - "x": 2925.281051635742, - "y": 1008.1595916748047, - "z": "b55dc3b9.0674e8", + "x": 2206.312057495117, + "y": 718.1595973968506, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "da4c9472.fb8c58", + "id": "6ab23511.933ffc", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2709.000461578369, - "y": 1010.0004034042358, - "z": "b55dc3b9.0674e8", + "x": 1990.0314674377441, + "y": 720.0004091262817, + "z": "f135a623.0543d8", "wires": [ [ - "52c062b7.adf254" + "45c2f33c.d2afcc" ] ] }, { - "id": "43ef79ed.dece58", + "id": "42bd34dc.590d6c", "type": "switchNode", "name": "switch:token ", "xml": "<switch test='`$token-result.accessSession`'>\n", "comments": "", "outputs": 1, - "x": 2520.0002937316895, - "y": 940.0001783370972, - "z": "b55dc3b9.0674e8", + "x": 1801.0312995910645, + "y": 650.0001840591431, + "z": "f135a623.0543d8", "wires": [ [ - "da4c9472.fb8c58", - "30ae394a.e0a3b6" + "6ab23511.933ffc", + "279d981f.fd7de8" ] ] }, { - "id": "30ae394a.e0a3b6", + "id": "279d981f.fd7de8", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2707.000301361084, - "y": 939.0001754760742, - "z": "b55dc3b9.0674e8", + "x": 1988.031307220459, + "y": 649.0001811981201, + "z": "f135a623.0543d8", "wires": [ [ - "969c3ea5.479ec" + "23e4d28e.64b4ce" ] ] }, { - "id": "969c3ea5.479ec", + "id": "23e4d28e.64b4ce", "type": "set", "name": "set:token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\n", "comments": "", - "x": 2917.5003089904785, - "y": 939.2501764297485, - "z": "b55dc3b9.0674e8", + "x": 2198.5313148498535, + "y": 649.2501821517944, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "1552bd19.8bb8f3", + "id": "28397a59.582c76", "type": "set", "name": "set:variables", "xml": "<set>\n<parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />\n<parameter name='prop.bbs.HsiPackage' value='50M' />\n<parameter name='prop.bbs.HsiType' value='IPoE' />\n", "comments": "", - "x": 1983.0006408691406, - "y": 479.0002498626709, - "z": "b55dc3b9.0674e8", + "x": 1264.0316467285156, + "y": 189.0002555847168, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "1c40c39.920b2bc", + "id": "1bcdb021.046c7", "type": "record", "name": "log file", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"`$prop.bbs.remote_id`\" />\n <parameter name=\"field3\" value=\"`$prop.bbs.ONTSN`\" />\n <parameter name=\"field4\" value=\"`$prop.bbs.CVLAN`\" />\n <parameter name=\"field5\" value=\"`$prop.bbs.SVLAN`\" />\n <parameter name=\"field6\" value=\"`$prop.bbs.HsiPackage`\" />\n <parameter name=\"field7\" value=\"`$prop.bbs.HsiType`\" />", "comments": "", "outputs": 1, - "x": 1973.0005187988281, - "y": 772.0001878738403, - "z": "b55dc3b9.0674e8", + "x": 1254.0315246582031, + "y": 482.00019359588623, + "z": "f135a623.0543d8", "wires": [ [] ] }, { - "id": "5d75b0e5.89aa78", + "id": "8375eb61.7efbd8", "type": "record", "name": "log file", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"createAccessConnectivityService success!\" />\n <parameter name=\"field2\" value=\"`$service-result.accessE2Eservice.serviceID`\" />\n ", "comments": "", "outputs": 1, - "x": 3246.0002841949463, - "y": 1299.0002943873405, - "z": "b55dc3b9.0674e8", + "x": 2527.0312900543213, + "y": 1009.0003001093864, + "z": "f135a623.0543d8", "wires": [ [] ] }, { - "id": "7c823c35.187454", + "id": "f4a3c0d8.430c", "type": "switchNode", "name": "switch:service-result", "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n", "comments": "", "outputs": 1, - "x": 2662.9999504089355, - "y": 1229.0000257492065, - "z": "b55dc3b9.0674e8", + "x": 1944.0309562683105, + "y": 939.0000314712524, + "z": "f135a623.0543d8", "wires": [ [ - "a213720b.ac45d", - "3e855bfc.b9a11c" + "2f011cb2.7f1894", + "34a1e5de.d206ea" ] ] }, { - "id": "a213720b.ac45d", + "id": "2f011cb2.7f1894", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2884.000255584717, - "y": 1151.0002088546753, - "z": "b55dc3b9.0674e8", + "x": 2165.031261444092, + "y": 861.0002145767212, + "z": "f135a623.0543d8", "wires": [ [ - "a83a86bf.d38c58" + "bb6f25d3.83d998" ] ] }, { - "id": "3e855bfc.b9a11c", + "id": "34a1e5de.d206ea", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2884.9998779296875, - "y": 1227.0000076293945, - "z": "b55dc3b9.0674e8", + "x": 2166.0308837890625, + "y": 937.0000133514404, + "z": "f135a623.0543d8", "wires": [ [ - "68a87be6.e042a4" + "ca2d548e.082f68" ] ] }, { - "id": "9642119f.73843", + "id": "19b1bc05.08dfa4", "type": "record", "name": "log error", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"createAccessConnectivityService falied!\" />\n <parameter name=\"field2\" value=\"`$service-result.errors.error[0].error-info.error-code`\" />\n <parameter name=\"field3\" value=\"`$service-result.errors.error[0].error-message`\" />\n <parameter name=\"field4\" value=\"`$service-result.errors.error[0].error-tag`\" />\n ", "comments": "", "outputs": 1, - "x": 3422.0002822875977, - "y": 1189.000202178955, - "z": "b55dc3b9.0674e8", + "x": 2703.0312881469727, + "y": 899.000207901001, + "z": "f135a623.0543d8", "wires": [ [] ] }, { - "id": "8cf2e6de.4d3138", + "id": "a775f115.24069", "type": "for", "name": "for:network-input-paramters", "xml": "<for index='idx' start='0' end='`$network-input-parameters.param_length`' >\n", "comments": "", "outputs": 1, - "x": 2047.5003662109375, - "y": 682.0001649856567, - "z": "b55dc3b9.0674e8", + "x": 1328.5313720703125, + "y": 392.00017070770264, + "z": "f135a623.0543d8", "wires": [ [ - "98d94257.11223" + "7be7fd6e.b84cb4" ] ] }, { - "id": "ab021836.64d55", + "id": "9e9f8c41.189ca", "type": "switchNode", "name": "switch:remote_id", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'remote_id'`\">\n", "comments": "", "outputs": 1, - "x": 2588.5004920959473, - "y": 483.00021839141846, - "z": "b55dc3b9.0674e8", + "x": 1869.5314979553223, + "y": 193.00022411346436, + "z": "f135a623.0543d8", "wires": [ [ - "97011d1b.729758" + "ce6f91ef.3d714" ] ] }, { - "id": "97011d1b.729758", + "id": "ce6f91ef.3d714", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2791.5004119873047, - "y": 483.00018978118896, - "z": "b55dc3b9.0674e8", + "x": 2072.5314178466797, + "y": 193.00019550323486, + "z": "f135a623.0543d8", "wires": [ [ - "6416001f.b55fe8" + "58a6c9b5.515018" ] ] }, { - "id": "c399b374.94be5", + "id": "29210a5.c1b86f6", "type": "set", "name": "set:remote_id", "xml": "<set>\n<parameter name='prop.bbs.remote_id' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3509.5001678466797, - "y": 481.6001958847046, - "z": "b55dc3b9.0674e8", + "x": 2790.5311737060547, + "y": 191.6002016067505, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "98d94257.11223", + "id": "7be7fd6e.b84cb4", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2302.500663757324, - "y": 683.0002040863037, - "z": "b55dc3b9.0674e8", + "x": 1583.5316696166992, + "y": 393.0002098083496, + "z": "f135a623.0543d8", "wires": [ [ - "ab021836.64d55", - "ad1f45c9.ae1e", - "2107c7fb.ef7398", - "bd0fc4cf.4ad23" + "9e9f8c41.189ca", + "496a4a60.f5cbc4", + "f8848aaa.eca5f8", + "6d2dca88.730874" ] ] }, { - "id": "ad1f45c9.ae1e", + "id": "496a4a60.f5cbc4", "type": "switchNode", "name": "switch:ONTSN", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ONTSN'`\">\n", "comments": "", "outputs": 1, - "x": 2588.3522872924805, - "y": 544.0002202987671, - "z": "b55dc3b9.0674e8", + "x": 1869.3832931518555, + "y": 254.000226020813, + "z": "f135a623.0543d8", "wires": [ [ - "2e18f3ad.687b94" + "43a3f0e3.19198" ] ] }, { - "id": "2e18f3ad.687b94", + "id": "43a3f0e3.19198", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2790.3521900177, - "y": 544.0002841949463, - "z": "b55dc3b9.0674e8", + "x": 2071.383195877075, + "y": 254.0002899169922, + "z": "f135a623.0543d8", "wires": [ [ - "96c33b24.ac61b8" + "41775fcc.20422" ] ] }, { - "id": "56ad068a.96a788", + "id": "ee55b9c9.49b6b8", "type": "set", "name": "set:ONTSN", "xml": "<set>\n<parameter name='prop.bbs.ONTSN' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3508.3524742126465, - "y": 543.6002607345581, - "z": "b55dc3b9.0674e8", + "x": 2789.3834800720215, + "y": 253.600266456604, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "2107c7fb.ef7398", + "id": "f8848aaa.eca5f8", "type": "switchNode", "name": "switch:CVLAN", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'CVLAN'`\">\n", "comments": "", "outputs": 1, - "x": 2588.3523597717285, - "y": 604.0002698898315, - "z": "b55dc3b9.0674e8", + "x": 1869.3833656311035, + "y": 314.00027561187744, + "z": "f135a623.0543d8", "wires": [ [ - "92e83b0.845cd48" + "b5f77746.96a768" ] ] }, { - "id": "92e83b0.845cd48", + "id": "b5f77746.96a768", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2790.3522186279297, - "y": 604.0002813339233, - "z": "b55dc3b9.0674e8", + "x": 2071.3832244873047, + "y": 314.00028705596924, + "z": "f135a623.0543d8", "wires": [ [ - "fd2b5da0.8a0b98" + "b1f319ce.9914f8" ] ] }, { - "id": "dd448b5e.614c78", + "id": "9b2ab1ad.17aaf", "type": "set", "name": "set:CVLAN", "xml": "<set>\n<parameter name='prop.bbs.CVLAN' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3506.3522186279297, - "y": 604.6002569198608, - "z": "b55dc3b9.0674e8", + "x": 2787.3832244873047, + "y": 314.60026264190674, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "bd0fc4cf.4ad23", + "id": "6d2dca88.730874", "type": "switchNode", "name": "switch:SVLAN", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'SVLAN'`\">\n", "comments": "", "outputs": 1, - "x": 2585.352367401123, - "y": 680.2225370407104, - "z": "b55dc3b9.0674e8", + "x": 1866.383373260498, + "y": 390.22254276275635, + "z": "f135a623.0543d8", "wires": [ [ - "b390ab14.2876" + "cc5f4474.e42938" ] ] }, { - "id": "b390ab14.2876", + "id": "cc5f4474.e42938", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2793.3522520065308, - "y": 679.2225351333618, - "z": "b55dc3b9.0674e8", + "x": 2074.3832578659058, + "y": 389.2225408554077, + "z": "f135a623.0543d8", "wires": [ [ - "6efee915.b74488" + "b5f2e193.ef867" ] ] }, { - "id": "8e8664b6.96a008", + "id": "4ead37e0.712608", "type": "set", "name": "set:SVLAN", "xml": "<set>\n<parameter name='prop.bbs.SVLAN' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3512.3522186279297, - "y": 678.8225469589233, - "z": "b55dc3b9.0674e8", + "x": 2793.3832244873047, + "y": 388.82255268096924, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "6416001f.b55fe8", + "id": "58a6c9b5.515018", "type": "switchNode", "name": "switch:remote_id value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3036.5004119873047, - "y": 482.0002202987671, - "z": "b55dc3b9.0674e8", + "x": 2317.5314178466797, + "y": 192.000226020813, + "z": "f135a623.0543d8", "wires": [ [ - "8f779a47.45116", - "ffdee3f4.53697" + "e480f1f8.dda81", + "404720ad.59648" ] ] }, { - "id": "ffdee3f4.53697", + "id": "404720ad.59648", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3324.5004119873047, - "y": 481.0002202987671, - "z": "b55dc3b9.0674e8", + "x": 2605.5314178466797, + "y": 191.000226020813, + "z": "f135a623.0543d8", "wires": [ [ - "c399b374.94be5" + "29210a5.c1b86f6" ] ] }, { - "id": "8f779a47.45116", + "id": "e480f1f8.dda81", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 3322.500820159912, - "y": 412.00019931793213, - "z": "b55dc3b9.0674e8", + "x": 2603.531826019287, + "y": 122.00020503997803, + "z": "f135a623.0543d8", "wires": [ [ - "2d4312f0.72e22e" + "e479132a.923ce" ] ] }, { - "id": "96c33b24.ac61b8", + "id": "41775fcc.20422", "type": "switchNode", "name": "switch:ONTSN value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3036.5004119873047, - "y": 544.0002202987671, - "z": "b55dc3b9.0674e8", + "x": 2317.5314178466797, + "y": 254.000226020813, + "z": "f135a623.0543d8", "wires": [ [ - "8f779a47.45116", - "226a5e32.f325da" + "e480f1f8.dda81", + "17a1e965.948987" ] ] }, { - "id": "226a5e32.f325da", + "id": "17a1e965.948987", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3326.5004119873047, - "y": 544.0002202987671, - "z": "b55dc3b9.0674e8", + "x": 2607.5314178466797, + "y": 254.000226020813, + "z": "f135a623.0543d8", "wires": [ [ - "56ad068a.96a788" + "ee55b9c9.49b6b8" ] ] }, { - "id": "fd2b5da0.8a0b98", + "id": "b1f319ce.9914f8", "type": "switchNode", "name": "switch:CVLAN value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3039.5004119873047, - "y": 605.0002202987671, - "z": "b55dc3b9.0674e8", + "x": 2320.5314178466797, + "y": 315.000226020813, + "z": "f135a623.0543d8", "wires": [ [ - "8f779a47.45116", - "c05bd1ad.17646" + "e480f1f8.dda81", + "cdd37ad7.35df78" ] ] }, { - "id": "c05bd1ad.17646", + "id": "cdd37ad7.35df78", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3327.5004119873047, - "y": 604.0002202987671, - "z": "b55dc3b9.0674e8", + "x": 2608.5314178466797, + "y": 314.000226020813, + "z": "f135a623.0543d8", "wires": [ [ - "dd448b5e.614c78" + "9b2ab1ad.17aaf" ] ] }, { - "id": "6efee915.b74488", + "id": "b5f2e193.ef867", "type": "switchNode", "name": "switch:SVLAN value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3040.5004119873047, - "y": 679.0002202987671, - "z": "b55dc3b9.0674e8", + "x": 2321.5314178466797, + "y": 389.000226020813, + "z": "f135a623.0543d8", "wires": [ [ - "8f779a47.45116", - "f6e1110f.5f2e3" + "e480f1f8.dda81", + "1419c0d9.5cb57f" ] ] }, { - "id": "f6e1110f.5f2e3", + "id": "1419c0d9.5cb57f", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3330.5004119873047, - "y": 680.0002202987671, - "z": "b55dc3b9.0674e8", + "x": 2611.5314178466797, + "y": 390.000226020813, + "z": "f135a623.0543d8", "wires": [ [ - "8e8664b6.96a008" + "4ead37e0.712608" ] ] }, { - "id": "f5dbdf79.0f05b8", + "id": "98ddfc72.d43d9", "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`\" />", "comments": "", - "x": 1956.0554504394531, - "y": 1723.7781028747559, - "z": "b55dc3b9.0674e8", + "x": 1237.0864562988281, + "y": 1433.7781085968018, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "68a87be6.e042a4", + "id": "ca2d548e.082f68", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3043.1665077209473, - "y": 1227.9999828338623, - "z": "b55dc3b9.0674e8", + "x": 2324.1975135803223, + "y": 937.9999885559082, + "z": "f135a623.0543d8", "wires": [ [ - "5d75b0e5.89aa78", - "95ed41fa.e44ec" + "568e0d0f.176924" ] ] }, { - "id": "a83a86bf.d38c58", + "id": "bb6f25d3.83d998", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error createAccessConnectivityService return: '+$service-result.errors.error[0].error-message`\" />", "comments": "", - "x": 3070.4999237060547, - "y": 1151.0000457763672, - "z": "b55dc3b9.0674e8", + "x": 2351.5309295654297, + "y": 861.0000514984131, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "2d4312f0.72e22e", + "id": "e479132a.923ce", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`$network-input-parameters.param[$idx].name +' value is null, please check it.'`\" />\n", "comments": "", - "x": 3505.4999084472656, - "y": 412.0000238418579, - "z": "b55dc3b9.0674e8", + "x": 2786.5309143066406, + "y": 122.00002956390381, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "464505a9.92b4fc", + "id": "ede8d766.0fb378", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call queryTokenID\" />\n", "comments": "", - "x": 2504.7557830810547, - "y": 1015.0284881591797, - "z": "b55dc3b9.0674e8", + "x": 1785.7867889404297, + "y": 725.0284938812256, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "69e343d2.09328c", + "id": "c90fe181.73329", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call createAccessConnectivityService\" />\n", "comments": "", - "x": 2634.3925018310547, - "y": 1137.846694946289, - "z": "b55dc3b9.0674e8", + "x": 1915.4235076904297, + "y": 847.846700668335, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "97d94787.251f08", + "id": "45b79ec3.5bbd2", "type": "save", "name": "save:generic-vnf", - "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $vnf-id\" >\n<parameter name= \"vnf-id\" value = \"`$vnf-id`\"/>\n<parameter name= \"vnf-name\" value = \"`$vnf-name`\"/>\n<parameter name= \"vnf-type\" value = \"AccessConnectivity\"/>\n<parameter name= \"service-id\" value = \"`$network-topology-operation-input.service-information.service-id`\"/>\n<parameter name= \"prov-status\" value = \"ACTIVE\"/>\n<parameter name= \"orchestration-status\" value = \"Active\"/>\n<parameter name= \"ipv4-oam-address\" value = \"169.254.236.13\"/>\n<parameter name= \"in-maint\" value = \"false\" />\n<parameter name= \"is-closed-loop-disabled\" value = \"false\" />\n<parameter name= \"model-invariant-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name= \"model-version-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-uuid`\"/>\n<parameter name= \"model-customization-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`\"/>", + "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $vnf-id\" >\n<parameter name= \"vnf-id\" value = \"`$vnf-id`\"/>\n<parameter name= \"vnf-name\" value = \"`$vnf-name`\"/>\n<parameter name= \"vnf-type\" value = \"AccessConnectivity\"/>\n<parameter name= \"service-id\" value = \"`$network-topology-operation-input.service-information.service-id`\"/>\n<parameter name= \"prov-status\" value = \"ACTIVE\"/>\n<parameter name= \"orchestration-status\" value = \"Active\"/>\n<parameter name= \"is-closed-loop-disabled\" value = \"false\" />\n<parameter name= \"model-invariant-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name= \"model-version-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-uuid`\"/>\n<parameter name= \"model-customization-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`\"/>", "comments": "", "outputs": 1, - "x": 2279.533456802368, - "y": 1579.0320892333984, - "z": "b55dc3b9.0674e8", + "x": 1560.5644626617432, + "y": 1289.0320949554443, + "z": "f135a623.0543d8", "wires": [ [ - "a3497f20.d7ea3", - "9efe9955.3e7888", - "58b775d1.206ccc" + "9720d237.9ab5a", + "ea7c0871.ebdfc8", + "9a4cfbb2.d3a8d8" ] ] }, { - "id": "a3497f20.d7ea3", + "id": "9720d237.9ab5a", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2515.7553119659424, - "y": 1450.920846939087, - "z": "b55dc3b9.0674e8", + "x": 1796.7863178253174, + "y": 1160.9208526611328, + "z": "f135a623.0543d8", "wires": [ [ - "bebc769c.0837e8" + "bbf8d78d.8c6dd8" ] ] }, { - "id": "9efe9955.3e7888", + "id": "ea7c0871.ebdfc8", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 2526.7311305999756, - "y": 1510.9367032051086, - "z": "b55dc3b9.0674e8", + "x": 1807.7621364593506, + "y": 1220.9367089271545, + "z": "f135a623.0543d8", "wires": [ [ - "e37c929.c92107" + "f882f752.137d88" ] ] }, { - "id": "bebc769c.0837e8", + "id": "bbf8d78d.8c6dd8", "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=\"Failure calling AAI to save generic-vnf\" />\n", "comments": "", - "x": 2751.8978595733643, - "y": 1450.4923119544983, - "z": "b55dc3b9.0674e8", + "x": 2032.9288654327393, + "y": 1160.4923176765442, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "e37c929.c92107", + "id": "f882f752.137d88", "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=\"generic-vnf instance does not exist in AAI\" />\n", "comments": "", - "x": 2746.778657913208, - "y": 1511.4130177497864, - "z": "b55dc3b9.0674e8", + "x": 2027.809663772583, + "y": 1221.4130234718323, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "58b775d1.206ccc", + "id": "9a4cfbb2.d3a8d8", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2520.34193611145, - "y": 1576.0631833076477, - "z": "b55dc3b9.0674e8", + "x": 1801.3729419708252, + "y": 1286.0631890296936, + "z": "f135a623.0543d8", "wires": [ - [ - "23816cea.e07514" - ] + [] ] }, { - "id": "23816cea.e07514", + "id": "6292b001.56889", "type": "record", "name": "log file", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"save generic-vnf success!\" />\n ", "comments": "", "outputs": 1, - "x": 2728.3421897888184, - "y": 1574.0633125305176, - "z": "b55dc3b9.0674e8", + "x": 2009.3731956481934, + "y": 1284.0633182525635, + "z": "f135a623.0543d8", "wires": [ [] ] }, { - "id": "116359fa.597806", + "id": "10ba27d1.b765f8", "type": "save", "name": "save:metadata", "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id \n\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id\n\t AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type\n\t AND service-instance.service-instance-id = $network-topology-operation-input.service-information.service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\"\n >\n <parameter name=\"metadata.metadatum[0].metaname\" value=\"remote-id\" />\n <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$prop.bbs.remote_id`\" />\n <parameter name=\"metadata.metadatum[1].metaname\" value=\"controller-service-id\" />\n <parameter name=\"metadata.metadatum[1].metaval\" value=\"`$prop.bbs.serviceID`\" />", "comments": "", "outputs": 1, - "x": 2261.032783508301, - "y": 1742.0319175720215, - "z": "b55dc3b9.0674e8", + "x": 1542.0637893676758, + "y": 1452.0319232940674, + "z": "f135a623.0543d8", "wires": [ [ - "835155a5.b67df8", - "c341fca3.24318", - "eea59fae.70bf9" + "b441478d.1f9148", + "17bb11c4.8fa90e", + "ebf9ce7d.2261c" ] ] }, { - "id": "835155a5.b67df8", + "id": "b441478d.1f9148", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2491.5082931518555, - "y": 1673.3965210914612, - "z": "b55dc3b9.0674e8", + "x": 1772.5392990112305, + "y": 1383.396526813507, + "z": "f135a623.0543d8", "wires": [ [ - "ce09f6b.b604008" + "e654ba85.7dfa08" ] ] }, { - "id": "c341fca3.24318", + "id": "17bb11c4.8fa90e", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 2503.4844551086426, - "y": 1743.4124546051025, - "z": "b55dc3b9.0674e8", + "x": 1784.5154609680176, + "y": 1453.4124603271484, + "z": "f135a623.0543d8", "wires": [ [ - "356aae98.7445f2" + "332a3386.5895dc" ] ] }, { - "id": "ce09f6b.b604008", + "id": "e654ba85.7dfa08", "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=\"Failure calling AAI to save metadatum\" />\n", "comments": "", - "x": 2731.6510887145996, - "y": 1671.9680228233337, - "z": "b55dc3b9.0674e8", + "x": 2012.6820945739746, + "y": 1381.9680285453796, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "356aae98.7445f2", + "id": "332a3386.5895dc", "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=\"metadatum instance does not exist in AAI\" />\n", "comments": "", - "x": 2728.531988143921, - "y": 1742.8886909484863, - "z": "b55dc3b9.0674e8", + "x": 2009.562994003296, + "y": 1452.8886966705322, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "eea59fae.70bf9", + "id": "ebf9ce7d.2261c", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2498.0951652526855, - "y": 1813.5388941764832, - "z": "b55dc3b9.0674e8", + "x": 1779.1261711120605, + "y": 1523.538899898529, + "z": "f135a623.0543d8", "wires": [ - [ - "8a223ca4.509e4" - ] + [] ] }, { - "id": "8a223ca4.509e4", + "id": "7d0a0f4c.3633b", "type": "record", "name": "log file", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"save metadatum success!\" />\n ", "comments": "", "outputs": 1, - "x": 2709.0951652526855, - "y": 1813.5388941764832, - "z": "b55dc3b9.0674e8", + "x": 1990.1261711120605, + "y": 1523.538899898529, + "z": "f135a623.0543d8", "wires": [ [] ] }, { - "id": "f837852c.dfc578", + "id": "da212c99.cb2c6", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1974.6670570373535, - "y": 1453.0006408691406, - "z": "b55dc3b9.0674e8", + "x": 1255.6980628967285, + "y": 1163.0006465911865, + "z": "f135a623.0543d8", "wires": [ [ - "97d94787.251f08", - "116359fa.597806", - "306a1b6e.90a264", - "53d01937.c7f688" + "45b79ec3.5bbd2", + "10ba27d1.b765f8", + "662db182.a7563", + "3313131f.0c8d1c", + "bd6ec8f4.04e3a8" ] ] }, { - "id": "306a1b6e.90a264", + "id": "662db182.a7563", "type": "set", "name": "set:variables", "xml": "<set>\n<parameter name='vnf-id' value=\"`$prop.random-data-list[3]`\"/>\n<parameter name='vnf-name' value=\"`'vnf-'+$prop.random-data-list[4]`\"/>\n", "comments": "", - "x": 2263.667526245117, - "y": 1457.3336334228516, - "z": "b55dc3b9.0674e8", + "x": 1544.6985321044922, + "y": 1167.3336391448975, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "53d01937.c7f688", + "id": "3313131f.0c8d1c", "type": "execute", "name": "execute:generate", "xml": " <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\">\n <parameter name=\"ctx-destination\" value=\"prop.random-data\"/>", "comments": "", "outputs": 1, - "x": 2282.0319061279297, - "y": 1376.0315399169922, - "z": "b55dc3b9.0674e8", + "x": 1563.0629119873047, + "y": 1086.031545639038, + "z": "f135a623.0543d8", "wires": [ [ - "d511316d.80f4c" + "61f3386a.396d88" ] ] }, { - "id": "d511316d.80f4c", + "id": "61f3386a.396d88", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2520.031665802002, - "y": 1377.0315704345703, - "z": "b55dc3b9.0674e8", + "x": 1801.062671661377, + "y": 1087.0315761566162, + "z": "f135a623.0543d8", "wires": [ [ - "350eef68.69f9e" + "1e9f0299.df61fd" ] ] }, { - "id": "350eef68.69f9e", + "id": "1e9f0299.df61fd", "type": "execute", "name": "execute", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n <parameter name=\"ctx_memory_result_key\" value=\"prop.random-data-list\"/>\n <parameter name=\"original_string\" value=\"`$prop.random-data`\"/>\n <parameter name=\"regex\" value=\"-\"/>\n", "comments": "", "outputs": 1, - "x": 2707.0317211151123, - "y": 1376.031478881836, - "z": "b55dc3b9.0674e8", + "x": 1988.0627269744873, + "y": 1086.0314846038818, + "z": "f135a623.0543d8", "wires": [ [ - "abdff798.71d8c8" + "4fbc1b9e.fffd34" ] ] }, { - "id": "52dff766.2dd2d8", + "id": "9e0485c3.32fc78", "type": "record", "name": "log file", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"`$prop.random-data`\" />\n ", "comments": "", "outputs": 1, - "x": 3039.031784057617, - "y": 1374.0315399169922, - "z": "b55dc3b9.0674e8", + "x": 2320.062789916992, + "y": 1084.031545639038, + "z": "f135a623.0543d8", "wires": [ [] ] }, { - "id": "abdff798.71d8c8", + "id": "4fbc1b9e.fffd34", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2874.031660079956, - "y": 1375.031509399414, - "z": "b55dc3b9.0674e8", + "x": 2155.062665939331, + "y": 1085.03151512146, + "z": "f135a623.0543d8", "wires": [ - [ - "52dff766.2dd2d8" - ] + [] ] }, { - "id": "95ed41fa.e44ec", + "id": "568e0d0f.176924", "type": "set", "name": "set:variables", "xml": "<set>\n<parameter name='prop.bbs.serviceID' value=\"`$service-result.accessE2Eservice.serviceID`\"/>\n", "comments": "", - "x": 3257.031536102295, - "y": 1227.031421661377, - "z": "b55dc3b9.0674e8", + "x": 2538.06254196167, + "y": 937.0314273834229, + "z": "f135a623.0543d8", "wires": [] }, { - "id": "fa43c07a.448fc", + "id": "cfb87bad.450ae8", "type": "set", "name": "set:variables", "xml": "<set>\n<parameter name='prop.bbs.serviceID' value=\"HSI20190330\"/>\n\n", "comments": "", - "x": 1953.3333740234375, - "y": 1216.3333740234375, - "z": "b55dc3b9.0674e8", + "x": 1234.3643798828125, + "y": 926.3333797454834, + "z": "f135a623.0543d8", + "wires": [] + }, + { + "id": "bd6ec8f4.04e3a8", + "type": "save", + "name": "save:relationship", + "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:relationship-list\" \n key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id\n AND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id\n AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type \n AND service-instance.service-instance-id = $network-topology-operation-input.service-information.service-instance-id\" 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/' + $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=\"`$vnf-id`\" />\n ", + "comments": "", + "outputs": 1, + "x": 1548.53125, + "y": 1642.03125, + "z": "f135a623.0543d8", + "wires": [ + [ + "1578cba7.023b84", + "40fbebd2.9a7d24", + "af6b94b5.5bf458" + ] + ] + }, + { + "id": "1578cba7.023b84", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 1799.53125, + "y": 1595.03125, + "z": "f135a623.0543d8", + "wires": [ + [ + "26c2f8e7.5d2188" + ] + ] + }, + { + "id": "40fbebd2.9a7d24", + "type": "failure", + "name": "not-found", + "xml": "<outcome value='not-found'>\n", + "comments": "", + "outputs": 1, + "x": 1811.507411956787, + "y": 1665.0471835136414, + "z": "f135a623.0543d8", + "wires": [ + [ + "d32cb96a.5805d8" + ] + ] + }, + { + "id": "26c2f8e7.5d2188", + "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=\"Failure calling AAI to save metadatum\" />\n", + "comments": "", + "x": 2039.6740455627441, + "y": 1593.6027517318726, + "z": "f135a623.0543d8", + "wires": [] + }, + { + "id": "d32cb96a.5805d8", + "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=\"metadatum instance does not exist in AAI\" />\n", + "comments": "", + "x": 2036.5549449920654, + "y": 1664.5234198570251, + "z": "f135a623.0543d8", "wires": [] + }, + { + "id": "af6b94b5.5bf458", + "type": "outcome", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 1806.11812210083, + "y": 1735.173623085022, + "z": "f135a623.0543d8", + "wires": [ + [] + ] } -] +]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json index 1dd2f320..444e2dc6 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json @@ -1,20 +1,20 @@ [ { - "id": "32e79365.f9a674", + "id": "3e7ef4ac.b2e17c", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 585, - "y": 664, - "z": "e7492f37.77e028", + "x": 704.53125, + "y": 248.03125, + "z": "9458f851.9a2498", "wires": [ [ - "b127d6e2.ff9c7" + "cbfbc44.cd69838" ] ] }, { - "id": "b127d6e2.ff9c7", + "id": "cbfbc44.cd69838", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,548 +22,546 @@ "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": 972.9998817443848, - "y": 664.0000047683716, - "z": "e7492f37.77e028", + "x": 1092.5311317443848, + "y": 248.03125476837158, + "z": "9458f851.9a2498", "wires": [ [ - "2c85dd35.2b753a" + "8072076.84dccf8" ] ] }, { - "id": "2c85dd35.2b753a", + "id": "8072076.84dccf8", "type": "method", "name": "method:bbs-access-connectivity-network-topology-operation-delete-huawei", "xml": "<method rpc='bbs-access-connectivity-network-topology-operation-delete-huawei' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 935.9998817443848, - "y": 783.0000047683716, - "z": "e7492f37.77e028", + "x": 1055.5311317443848, + "y": 367.0312547683716, + "z": "9458f851.9a2498", "wires": [ [ - "ef9e0c93.94adf8" + "9a3cc53d.6e79d8" ] ] }, { - "id": "ef9e0c93.94adf8", + "id": "9a3cc53d.6e79d8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1333.9999885559082, - "y": 782.0000047683716, - "z": "e7492f37.77e028", + "x": 1453.5312385559082, + "y": 366.0312547683716, + "z": "9458f851.9a2498", "wires": [ [ - "267997b8.e9b0d", - "f1c69874.61cb9", - "7e468fe4.3b77e8", - "68d0163d.33ab6", - "1d5f9b67.3462ad", - "5f5fa66b.a3a898", - "a5de3800.3f3c9" + "d6360288.4527f", + "29565532.cf8cca", + "79257394.2307bc", + "bfbc37d6.3aa9c8", + "5837e3f.e88671c", + "ccc27501.c46688", + "afc719e1.eb7f48" ] ] }, { - "id": "267997b8.e9b0d", + "id": "d6360288.4527f", "type": "execute", "name": "excute:readProperties", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n\n", "comments": "", "outputs": 1, - "x": 1776.000286102295, - "y": 636.1110858917236, - "z": "e7492f37.77e028", + "x": 1895.531536102295, + "y": 220.14233589172363, + "z": "9458f851.9a2498", "wires": [ [] ] }, { - "id": "5f5fa66b.a3a898", + "id": "ccc27501.c46688", "type": "for", "name": "for:network-input-paramters", "xml": "<for index='idx' start='0' end='`$network-input-parameters.param_length`' >\n", "comments": "", "outputs": 1, - "x": 1780.0003089904785, - "y": 857.9999313354492, - "z": "e7492f37.77e028", + "x": 1899.5315589904785, + "y": 442.0311813354492, + "z": "9458f851.9a2498", "wires": [ [ - "a2cbb6ad.9498d8" + "430a13df.a78e9c" ] ] }, { - "id": "1d5f9b67.3462ad", + "id": "5837e3f.e88671c", "type": "execute", "name": "execute:querryTokenID", "xml": " <execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-token-template.json'`\"/>\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>\n <parameter name=\"format\" value=\"json\"/>\n <parameter name=\"httpMethod\" value=\"put\"/>\n <parameter name=\"responsePrefix\" value=\"token-result\"/>\n <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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\n", "comments": "", "outputs": 1, - "x": 1771.0003089904785, - "y": 768.0000076293945, - "z": "e7492f37.77e028", + "x": 1890.5315589904785, + "y": 352.03125762939453, + "z": "9458f851.9a2498", "wires": [ [ - "2b64faec.a1d51e", - "15bc857f.bafd43" + "632411.2d700bf", + "df6b78a.61b9688" ] ] }, { - "id": "15bc857f.bafd43", + "id": "df6b78a.61b9688", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2070.166934967041, - "y": 764.2500076293945, - "z": "e7492f37.77e028", + "x": 2189.698184967041, + "y": 348.28125762939453, + "z": "9458f851.9a2498", "wires": [ [ - "c730ec93.32f82" + "c7e8c95e.bd9528" ] ] }, { - "id": "2b64faec.a1d51e", + "id": "632411.2d700bf", "type": "outcome", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2066.166934967041, - "y": 658.2499771118164, - "z": "e7492f37.77e028", + "x": 2185.698184967041, + "y": 242.2812271118164, + "z": "9458f851.9a2498", "wires": [ [ - "20d8621f.db8eee" + "da5c448.537c3b8" ] ] }, { - "id": "5704a92f.4d6488", + "id": "53a754bd.11dc7c", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing queryTokenID,vaule is null\" />\n", "comments": "", - "x": 2613.2807388305664, - "y": 706.6136617660522, - "z": "e7492f37.77e028", + "x": 2732.8119888305664, + "y": 290.64491176605225, + "z": "9458f851.9a2498", "wires": [] }, { - "id": "a55c0e66.2654c8", + "id": "54233be2.f30004", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2437.000316619873, - "y": 706.999963760376, - "z": "e7492f37.77e028", + "x": 2556.531566619873, + "y": 291.031213760376, + "z": "9458f851.9a2498", "wires": [ [ - "5704a92f.4d6488" + "53a754bd.11dc7c" ] ] }, { - "id": "c730ec93.32f82", + "id": "c7e8c95e.bd9528", "type": "switchNode", "name": "switch:token ", "xml": "<switch test='`$token-result.accessSession`'>\n", "comments": "", "outputs": 1, - "x": 2269.000316619873, - "y": 764.999963760376, - "z": "e7492f37.77e028", + "x": 2388.531566619873, + "y": 349.031213760376, + "z": "9458f851.9a2498", "wires": [ [ - "a55c0e66.2654c8", - "72281c79.15bf7c" + "54233be2.f30004", + "2525724.318638e" ] ] }, { - "id": "72281c79.15bf7c", + "id": "2525724.318638e", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2438.000316619873, - "y": 763.999963760376, - "z": "e7492f37.77e028", + "x": 2557.531566619873, + "y": 348.031213760376, + "z": "9458f851.9a2498", "wires": [ [ - "85cd43c3.a877f8" + "b5f78ce0.e4e8f" ] ] }, { - "id": "85cd43c3.a877f8", + "id": "b5f78ce0.e4e8f", "type": "set", "name": "set:token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\n", "comments": "", - "x": 2612.5003089904785, - "y": 763.2500076293945, - "z": "e7492f37.77e028", + "x": 2732.0315589904785, + "y": 347.28125762939453, + "z": "9458f851.9a2498", "wires": [] }, { - "id": "cf8179f9.6c703", + "id": "e0b6a2ae.458e8", "type": "record", "name": "log file", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"sucess executing Get token rest api\" />\n <parameter name=\"field3\" value=\"`$token-result.accessSession`\" />\n ", "comments": "", "outputs": 1, - "x": 2824.0003089904785, - "y": 760.9999465942383, - "z": "e7492f37.77e028", + "x": 2943.5315589904785, + "y": 345.0311965942383, + "z": "9458f851.9a2498", "wires": [ [] ] }, { - "id": "68d0163d.33ab6", + "id": "bfbc37d6.3aa9c8", "type": "set", "name": "set:variables", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />\n<parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />\n", "comments": "", - "x": 1742.000286102295, - "y": 556.0001621246338, - "z": "e7492f37.77e028", + "x": 1861.531536102295, + "y": 140.0314121246338, + "z": "9458f851.9a2498", "wires": [] }, { - "id": "a5de3800.3f3c9", + "id": "afc719e1.eb7f48", "type": "execute", "name": "execute:deleteAccessConnectivityService", "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/DeactivateOnt?serviceID='+$prop.bbs.serviceID`\" />\n <parameter name=\"httpMethod\" value=\"get\"/>\n <parameter name=\"contentType\" value=\"application/x-www-form-urlencoded\"/>\n <parameter name=\"responsePrefix\" value=\"service-result\"/>\n <parameter name=\"customHttpHeaders\" value=\"`'X-Auth-Token=' + $prop.sdncRestApi.token_id`\"/>\n <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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": 1832.0005722045898, - "y": 1038.0001103878021, - "z": "e7492f37.77e028", + "x": 1951.5318222045898, + "y": 622.0313603878021, + "z": "9458f851.9a2498", "wires": [ [ - "5b7315a4.8b9d54", - "b2a61f83.59c088" + "c6939dae.0ae37", + "7116ae31.13271" ] ] }, { - "id": "5b7315a4.8b9d54", + "id": "c6939dae.0ae37", "type": "outcome", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2137.000587463379, - "y": 978.0000915527344, - "z": "e7492f37.77e028", + "x": 2256.531837463379, + "y": 562.0313415527344, + "z": "9458f851.9a2498", "wires": [ [ - "218de6d2.4c392a" + "c09b1f3e.53091" ] ] }, { - "id": "b2a61f83.59c088", + "id": "7116ae31.13271", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2137.000560760498, - "y": 1037.0000913143158, - "z": "e7492f37.77e028", + "x": 2256.531810760498, + "y": 621.0313413143158, + "z": "9458f851.9a2498", "wires": [ [ - "ce8b9653.804e" + "1c65ae1f.8b01d2" ] ] }, { - "id": "67d761ed.040b7", + "id": "b5b74804.ae8938", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2623.0006713867188, - "y": 934.000025510788, - "z": "e7492f37.77e028", + "x": 2742.5319213867188, + "y": 518.031275510788, + "z": "9458f851.9a2498", "wires": [ [ - "f6e3cbc5.9d1b18" + "19c841bb.b9c39e" ] ] }, { - "id": "f6e3cbc5.9d1b18", + "id": "19c841bb.b9c39e", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"$network-input-parameters.param[$idx].name +' value is null, please check it.'\" />\n", "comments": "", - "x": 2807.9096183776855, - "y": 933.9090785980225, - "z": "e7492f37.77e028", + "x": 2927.4408683776855, + "y": 517.9403285980225, + "z": "9458f851.9a2498", "wires": [] }, { - "id": "a2cbb6ad.9498d8", + "id": "430a13df.a78e9c", "type": "switchNode", "name": "switch:serviceID", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'serviceID'`\">\n", "comments": "", "outputs": 1, - "x": 2055.0003356933594, - "y": 857.0000190734863, - "z": "e7492f37.77e028", + "x": 2174.5315856933594, + "y": 441.0312690734863, + "z": "9458f851.9a2498", "wires": [ [ - "8cd031d1.154ec8" + "804331b5.825a1" ] ] }, { - "id": "8cd031d1.154ec8", + "id": "804331b5.825a1", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2228.000220298767, - "y": 856.0000171661377, - "z": "e7492f37.77e028", + "x": 2347.531470298767, + "y": 440.0312671661377, + "z": "9458f851.9a2498", "wires": [ [ - "9ffc371.a8c8ec8" + "1d00164b.c74e1a" ] ] }, { - "id": "7e9b3155.7cd6d", + "id": "b8311cf7.388d1", "type": "set", "name": "set:serviceID", "xml": "<set>\n<parameter name='prop.bbs.serviceID' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 2799.000186920166, - "y": 855.6000289916992, - "z": "e7492f37.77e028", + "x": 2918.531436920166, + "y": 439.6312789916992, + "z": "9458f851.9a2498", "wires": [] }, { - "id": "9ffc371.a8c8ec8", + "id": "1d00164b.c74e1a", "type": "switchNode", "name": "switch:serviceID value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2409.148380279541, - "y": 855.777702331543, - "z": "e7492f37.77e028", + "x": 2528.679630279541, + "y": 439.80895233154297, + "z": "9458f851.9a2498", "wires": [ [ - "46008887.d0731", - "67d761ed.040b7" + "acaa6a13.89b9f8", + "b5b74804.ae8938" ] ] }, { - "id": "46008887.d0731", + "id": "acaa6a13.89b9f8", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2617.148380279541, - "y": 856.777702331543, - "z": "e7492f37.77e028", + "x": 2736.679630279541, + "y": 440.80895233154297, + "z": "9458f851.9a2498", "wires": [ [ - "7e9b3155.7cd6d" + "b8311cf7.388d1" ] ] }, { - "id": "f1c69874.61cb9", + "id": "29565532.cf8cca", "type": "call", "name": "call:validate-bbs-network-input-parameters", "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-network-input-parameters' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 1853.499912261963, - "y": 475.00001335144043, - "z": "e7492f37.77e028", + "x": 1973.031162261963, + "y": 59.03126335144043, + "z": "9458f851.9a2498", "wires": [ [] ] }, { - "id": "fca294fa.de967", - "type": "record", - "name": "log file", - "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />\n ", - "comments": "", - "outputs": 1, - "x": 3170.500503540039, - "y": 1121.0001611709595, - "z": "e7492f37.77e028", - "wires": [ - [] - ] - }, - { - "id": "ce8b9653.804e", + "id": "1c65ae1f.8b01d2", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2313.500358581543, - "y": 1038.0002694129944, - "z": "e7492f37.77e028", + "x": 2433.031608581543, + "y": 622.0315194129944, + "z": "9458f851.9a2498", "wires": [ [ - "558a111d.84c158" + "cced1fd6.04da4" ] ] }, { - "id": "558a111d.84c158", + "id": "cced1fd6.04da4", "type": "switchNode", "name": "switch:service-result", "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n", "comments": "", "outputs": 1, - "x": 2531.5002365112305, - "y": 1037.0001168251038, - "z": "e7492f37.77e028", + "x": 2651.0314865112305, + "y": 621.0313668251038, + "z": "9458f851.9a2498", "wires": [ [ - "3ed23c26.7d9344", - "3b7a58ab.469a28" + "4dce053b.3feafc", + "cf917e9d.94b86" ] ] }, { - "id": "3ed23c26.7d9344", + "id": "4dce053b.3feafc", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2765.5002822875977, - "y": 1038.0000767707825, - "z": "e7492f37.77e028", + "x": 2885.0315322875977, + "y": 622.0313267707825, + "z": "9458f851.9a2498", "wires": [ [ - "a4966b56.feb3a" + "7c2264f5.7e8cec" ] ] }, { - "id": "3b7a58ab.469a28", + "id": "cf917e9d.94b86", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2767.5002822875977, - "y": 1124.0000767707825, - "z": "e7492f37.77e028", + "x": 2887.0315322875977, + "y": 708.0313267707825, + "z": "9458f851.9a2498", "wires": [ [ - "f89a532c.628618" + "523726af.0e2f78" ] ] }, { - "id": "daa9ee04.8494a8", + "id": "7f7a43fa.cb783c", "type": "record", "name": "log error", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"deleteAccessConnectivityService falied!\" />\n <parameter name=\"field2\" value=\"`$service-result.errors.error[0].error-info.error-code`\" />\n <parameter name=\"field3\" value=\"`$service-result.errors.error[0].error-message`\" />\n <parameter name=\"field4\" value=\"`$service-result.errors.error[0].error-tag`\" />\n ", "comments": "", "outputs": 1, - "x": 3205.50044631958, - "y": 1025.000093460083, - "z": "e7492f37.77e028", + "x": 3325.03169631958, + "y": 609.031343460083, + "z": "9458f851.9a2498", "wires": [ [] ] }, { - "id": "7e468fe4.3b77e8", + "id": "79257394.2307bc", "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": 1733.5001258850098, - "y": 1176.0000190734863, - "z": "e7492f37.77e028", + "x": 1853.0313758850098, + "y": 760.0312690734863, + "z": "9458f851.9a2498", "wires": [] }, { - "id": "a4966b56.feb3a", + "id": "7c2264f5.7e8cec", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error deleteAccessConnectivityService return: '+$service-result.errors.error[0].error-message`\" />\n\n", "comments": "", - "x": 2965.49995803833, - "y": 1038.0000114440918, - "z": "e7492f37.77e028", + "x": 3085.03120803833, + "y": 622.0312614440918, + "z": "9458f851.9a2498", "wires": [] }, { - "id": "f89a532c.628618", + "id": "523726af.0e2f78", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2951.4999771118164, - "y": 1123.2726850509644, - "z": "e7492f37.77e028", + "x": 3071.0312271118164, + "y": 707.3039350509644, + "z": "9458f851.9a2498", "wires": [ - [ - "fca294fa.de967" - ] + [] ] }, { - "id": "20d8621f.db8eee", + "id": "da5c448.537c3b8", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call queryTokenID\" />\n", "comments": "", - "x": 2258.664794921875, - "y": 659.1193237304688, - "z": "e7492f37.77e028", + "x": 2378.196044921875, + "y": 243.15057373046875, + "z": "9458f851.9a2498", "wires": [] }, { - "id": "218de6d2.4c392a", + "id": "c09b1f3e.53091", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call deleteAccessConnectivityService\" />\n", "comments": "", - "x": 2307.272705078125, - "y": 976.3635864257812, - "z": "e7492f37.77e028", + "x": 2426.803955078125, + "y": 560.3948364257812, + "z": "9458f851.9a2498", "wires": [] + }, + { + "id": "3a60417f.fe190e", + "type": "record", + "name": "log file", + "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />\n ", + "comments": "", + "outputs": 1, + "x": 3290.031753540039, + "y": 705.0314111709595, + "z": "9458f851.9a2498", + "wires": [ + [] + ] } ]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json index 9fb4ecb4..849637a3 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json @@ -1,20 +1,20 @@ [ { - "id": "1e347aad.d3338d", + "id": "1005a4d7.cdc89b", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 880, - "y": 429, - "z": "2edf7d59.cf16ea", + "x": 157.03125, + "y": 337.9999974966049, + "z": "b5d9a62e.6044f8", "wires": [ [ - "842aa2b0.9a6e38" + "84618843.f74f18" ] ] }, { - "id": "842aa2b0.9a6e38", + "id": "84618843.f74f18", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,853 +22,852 @@ "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": 1187.9996490478516, - "y": 429.0000219345093, - "z": "2edf7d59.cf16ea", + "x": 465.03089904785156, + "y": 338.0000194311142, + "z": "b5d9a62e.6044f8", "wires": [ [ - "fd3c684f.426a28" + "39d6495c.2a8966" ] ] }, { - "id": "fd3c684f.426a28", + "id": "39d6495c.2a8966", "type": "method", "name": "method:bbs-internet-profile-network-topology-operation-common-huawei", "xml": "<method rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 1185.9996643066406, - "y": 649.0000991821289, - "z": "2edf7d59.cf16ea", + "x": 463.0309143066406, + "y": 558.0000966787338, + "z": "b5d9a62e.6044f8", "wires": [ [ - "2175700f.c2f0c8" + "bc585204.23434" ] ] }, { - "id": "2175700f.c2f0c8", + "id": "bc585204.23434", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1609.9998626708984, - "y": 648.0000991821289, - "z": "2edf7d59.cf16ea", + "x": 887.0311126708984, + "y": 557.0000966787338, + "z": "b5d9a62e.6044f8", "wires": [ [ - "4127c3fa.9673b4", - "1d343f0c.026059", - "eab220b4.352a5", - "55d0514e.620318", - "38f1d224.3b5b8e" + "641b9dc3.c76d44", + "22e9e7f6.319e28", + "5806343e.90d4bc", + "ff7e2b0b.240d18" ] ] }, { - "id": "4127c3fa.9673b4", + "id": "641b9dc3.c76d44", "type": "call", "name": "call:validate-bbs-network-input-parameters", "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-network-input-parameters' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 2076.000030517578, - "y": 327.00000953674316, - "z": "2edf7d59.cf16ea", + "x": 1353.0312805175781, + "y": 236.00000703334808, + "z": "b5d9a62e.6044f8", "wires": [ [] ] }, { - "id": "1d343f0c.026059", + "id": "22e9e7f6.319e28", "type": "set", "name": "set:variables", "xml": "<set>\n<parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='http://172.30.0.121:5000' />\n<parameter name='prop.bbs.service_id' value='`$network-topology-operation-input.service-information.service-id`' />\n\n", "comments": "", - "x": 1966.00053024292, - "y": 433.00020599365234, - "z": "2edf7d59.cf16ea", + "x": 1243.03178024292, + "y": 342.00020349025726, + "z": "b5d9a62e.6044f8", "wires": [] }, { - "id": "eab220b4.352a5", + "id": "5806343e.90d4bc", "type": "execute", "name": "excute:readProperties", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n\n", "comments": "", "outputs": 1, - "x": 1993, - "y": 543.1111707687378, - "z": "2edf7d59.cf16ea", + "x": 1270.03125, + "y": 452.1111682653427, + "z": "b5d9a62e.6044f8", "wires": [ [] ] }, { - "id": "55d0514e.620318", + "id": "ff7e2b0b.240d18", "type": "for", "name": "for:network-input-paramters", "xml": "<for index='idx' start='0' end='`$network-input-parameters.param_length`' >\n", "comments": "", "outputs": 1, - "x": 2009.5003662109375, - "y": 642.0001726150513, - "z": "2edf7d59.cf16ea", + "x": 1286.5316162109375, + "y": 551.0001701116562, + "z": "b5d9a62e.6044f8", "wires": [ [ - "7929126f.1978ec" + "405ee64e.c6f528" ] ] }, { - "id": "8a494a8.20a8bb8", + "id": "87370c41.174ad", "type": "switchNode", "name": "switch:ip_remote_id", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_remote_id'`\">\n", "comments": "", "outputs": 1, - "x": 2606.5004272460938, - "y": 423.00020694732666, - "z": "2edf7d59.cf16ea", + "x": 1883.5316772460938, + "y": 332.0002044439316, + "z": "b5d9a62e.6044f8", "wires": [ [ - "fe05659d.525818" + "6f712c2f.00fd94" ] ] }, { - "id": "fe05659d.525818", + "id": "6f712c2f.00fd94", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2810.500347137451, - "y": 423.00017833709717, - "z": "2edf7d59.cf16ea", + "x": 2087.531597137451, + "y": 332.0001758337021, + "z": "b5d9a62e.6044f8", "wires": [ [ - "8225c847.1697b" + "1531c27c.bf6ace" ] ] }, { - "id": "a7d3481c.08f7b8", + "id": "82c53c1.cbe2cc", "type": "set", "name": "set:remote_id", "xml": "<set>\n<parameter name='prop.bbs.remote_id' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3529.5007095336914, - "y": 416.60026264190674, - "z": "2edf7d59.cf16ea", + "x": 2806.5319595336914, + "y": 325.60026013851166, + "z": "b5d9a62e.6044f8", "wires": [] }, { - "id": "7929126f.1978ec", + "id": "405ee64e.c6f528", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2255.5004081726074, - "y": 641.0001811981201, - "z": "2edf7d59.cf16ea", + "x": 1532.5316581726074, + "y": 550.000178694725, + "z": "b5d9a62e.6044f8", "wires": [ [ - "8a494a8.20a8bb8", - "c33f3624.738b68", - "e50f084d.3dcf38", - "19d2ce64.f177ba", - "d857f73d.adc418", - "17321748.f836a9", - "80e0672.33dd098", - "9ec2e808.aa4ef" + "87370c41.174ad", + "c3b38917.be7dd8", + "9df0c6fb.c3cff8", + "c04f9f0a.fdecd", + "70d3b64e.02f668", + "518351b3.5bba", + "3d4326b7.055a3a", + "363ebd91.fb5852" ] ] }, { - "id": "c33f3624.738b68", + "id": "c3b38917.be7dd8", "type": "switchNode", "name": "switch:ont_sn", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ont_sn'`\">\n", "comments": "", "outputs": 1, - "x": 2606.352222442627, - "y": 484.0002088546753, - "z": "2edf7d59.cf16ea", + "x": 1883.383472442627, + "y": 393.0002063512802, + "z": "b5d9a62e.6044f8", "wires": [ [ - "91cb6667.0e6f38" + "fcb34afe.c01578" ] ] }, { - "id": "91cb6667.0e6f38", + "id": "fcb34afe.c01578", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2809.3521251678467, - "y": 484.0002727508545, - "z": "2edf7d59.cf16ea", + "x": 2086.3833751678467, + "y": 393.0002702474594, + "z": "b5d9a62e.6044f8", "wires": [ [ - "2781aecd.a647d2" + "b65719a8.25dce8" ] ] }, { - "id": "98c0b103.95e21", + "id": "1cf31c48.ca8d04", "type": "set", "name": "set:ont_sn", "xml": "<set>\n<parameter name='prop.bbs.ont_sn' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3528.353015899658, - "y": 478.60032749176025, - "z": "2edf7d59.cf16ea", + "x": 2805.384265899658, + "y": 387.6003249883652, + "z": "b5d9a62e.6044f8", "wires": [] }, { - "id": "e50f084d.3dcf38", + "id": "9df0c6fb.c3cff8", "type": "switchNode", "name": "switch:c_vlan", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'c_vlan'`\">\n", "comments": "", "outputs": 1, - "x": 2601.3524780273438, - "y": 843.0003833770752, - "z": "2edf7d59.cf16ea", + "x": 1878.3837280273438, + "y": 752.0003808736801, + "z": "b5d9a62e.6044f8", "wires": [ [ - "cc2858fe.effe8" + "9f06e43c.6bf558" ] ] }, { - "id": "cc2858fe.effe8", + "id": "9f06e43c.6bf558", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2804.352336883545, - "y": 843.000394821167, - "z": "2edf7d59.cf16ea", + "x": 2081.383586883545, + "y": 752.0003923177719, + "z": "b5d9a62e.6044f8", "wires": [ [ - "9cd70077.ad156" + "6d16f565.8a456c" ] ] }, { - "id": "484906a8.869108", + "id": "da1647b1.e6b208", "type": "set", "name": "set:c_vlan", "xml": "<set>\n<parameter name='prop.bbs.c_vlan' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3523.35302734375, - "y": 839.6004438400269, - "z": "2edf7d59.cf16ea", + "x": 2800.38427734375, + "y": 748.6004413366318, + "z": "b5d9a62e.6044f8", "wires": [] }, { - "id": "19d2ce64.f177ba", + "id": "c04f9f0a.fdecd", "type": "switchNode", "name": "switch:s_vlan", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 's_vlan'`\">\n", "comments": "", "outputs": 1, - "x": 2596.3524856567383, - "y": 786.2226104736328, - "z": "2edf7d59.cf16ea", + "x": 1873.3837356567383, + "y": 695.2226079702377, + "z": "b5d9a62e.6044f8", "wires": [ [ - "63ab238d.357434" + "c02cb5b5.2a9368" ] ] }, { - "id": "63ab238d.357434", + "id": "c02cb5b5.2a9368", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2805.352370262146, - "y": 785.2226085662842, - "z": "2edf7d59.cf16ea", + "x": 2082.383620262146, + "y": 694.2226060628891, + "z": "b5d9a62e.6044f8", "wires": [ [ - "79609442.62289c" + "ad861806.5a6d18" ] ] }, { - "id": "1dc9c73a.36a871", + "id": "e8f72dd1.3f17a", "type": "set", "name": "set:s_vlan", "xml": "<set>\n<parameter name='prop.bbs.s_vlan' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3525.35294342041, - "y": 779.8226985931396, - "z": "2edf7d59.cf16ea", + "x": 2802.38419342041, + "y": 688.8226960897446, + "z": "b5d9a62e.6044f8", "wires": [] }, { - "id": "8225c847.1697b", + "id": "1531c27c.bf6ace", "type": "switchNode", "name": "switch:ip_remote_id value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3021.500347137451, - "y": 422.0002088546753, - "z": "2edf7d59.cf16ea", + "x": 2298.531597137451, + "y": 331.0002063512802, + "z": "b5d9a62e.6044f8", "wires": [ [ - "f6d633a5.8dcd68", - "c415f41b.dc79" + "ead29df7.edff2", + "7088f31b.2c3bac" ] ] }, { - "id": "c415f41b.dc79", + "id": "7088f31b.2c3bac", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3322.5007553100586, - "y": 416.00030040740967, - "z": "2edf7d59.cf16ea", + "x": 2599.5320053100586, + "y": 325.0002979040146, + "z": "b5d9a62e.6044f8", "wires": [ [ - "a7d3481c.08f7b8" + "82c53c1.cbe2cc" ] ] }, { - "id": "2781aecd.a647d2", + "id": "b65719a8.25dce8", "type": "switchNode", "name": "switch:ont_sn value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3021.500347137451, - "y": 484.0002088546753, - "z": "2edf7d59.cf16ea", + "x": 2298.531597137451, + "y": 393.0002063512802, + "z": "b5d9a62e.6044f8", "wires": [ [ - "f6d633a5.8dcd68", - "68a8565a.8b2ef" + "ead29df7.edff2", + "693a2d60.620f14" ] ] }, { - "id": "68a8565a.8b2ef", + "id": "693a2d60.620f14", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3324.5007553100586, - "y": 479.00030040740967, - "z": "2edf7d59.cf16ea", + "x": 2601.5320053100586, + "y": 388.0002979040146, + "z": "b5d9a62e.6044f8", "wires": [ [ - "98c0b103.95e21" + "1cf31c48.ca8d04" ] ] }, { - "id": "9cd70077.ad156", + "id": "6d16f565.8a456c", "type": "switchNode", "name": "switch:c_vlan value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3019.50053024292, - "y": 844.0003337860107, - "z": "2edf7d59.cf16ea", + "x": 2296.53178024292, + "y": 753.0003312826157, + "z": "b5d9a62e.6044f8", "wires": [ [ - "f6d633a5.8dcd68", - "5078e952.0204f8" + "ead29df7.edff2", + "c393438f.bba03" ] ] }, { - "id": "5078e952.0204f8", + "id": "c393438f.bba03", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3323.5011291503906, - "y": 841.0004281997681, - "z": "2edf7d59.cf16ea", + "x": 2600.5323791503906, + "y": 750.000425696373, + "z": "b5d9a62e.6044f8", "wires": [ [ - "484906a8.869108" + "da1647b1.e6b208" ] ] }, { - "id": "79609442.62289c", + "id": "ad861806.5a6d18", "type": "switchNode", "name": "switch:s_vlan value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3018.50053024292, - "y": 785.0002937316895, - "z": "2edf7d59.cf16ea", + "x": 2295.53178024292, + "y": 694.0002912282944, + "z": "b5d9a62e.6044f8", "wires": [ [ - "f6d633a5.8dcd68", - "4f84a1a2.f9dfb8" + "ead29df7.edff2", + "bcb8e5a5.9e5928" ] ] }, { - "id": "4f84a1a2.f9dfb8", + "id": "bcb8e5a5.9e5928", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3321.5009384155273, - "y": 781.0003852844238, - "z": "2edf7d59.cf16ea", + "x": 2598.5321884155273, + "y": 690.0003827810287, + "z": "b5d9a62e.6044f8", "wires": [ [ - "1dc9c73a.36a871" + "e8f72dd1.3f17a" ] ] }, { - "id": "f6d633a5.8dcd68", + "id": "ead29df7.edff2", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 3334.500732421875, - "y": 259.0002098083496, - "z": "2edf7d59.cf16ea", + "x": 2611.531982421875, + "y": 168.00020730495453, + "z": "b5d9a62e.6044f8", "wires": [ [ - "7c23f619.45f3b8" + "b35dde56.d6c17" ] ] }, { - "id": "d857f73d.adc418", + "id": "70d3b64e.02f668", "type": "switchNode", "name": "switch:ip_service_type", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_service_type'`\">\n", "comments": "", "outputs": 1, - "x": 2603.333610534668, - "y": 544.0001068115234, - "z": "2edf7d59.cf16ea", + "x": 1880.364860534668, + "y": 453.00010430812836, + "z": "b5d9a62e.6044f8", "wires": [ [ - "3b602ed0.d84d6a" + "920a7410.841ae8" ] ] }, { - "id": "3b602ed0.d84d6a", + "id": "920a7410.841ae8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2812.3334951400757, - "y": 543.0001049041748, - "z": "2edf7d59.cf16ea", + "x": 2089.3647451400757, + "y": 452.0001024007797, + "z": "b5d9a62e.6044f8", "wires": [ [ - "a24014b6.22fb98" + "a417f2d7.b944f" ] ] }, { - "id": "c455421d.7c5a78", + "id": "5db34f7f.78458", "type": "set", "name": "set:service_type", "xml": "<set>\n<parameter name='prop.bbs.service_type' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3532.33406829834, - "y": 537.6001949310303, - "z": "2edf7d59.cf16ea", + "x": 2809.36531829834, + "y": 446.6001924276352, + "z": "b5d9a62e.6044f8", "wires": [] }, { - "id": "a24014b6.22fb98", + "id": "a417f2d7.b944f", "type": "switchNode", "name": "switch:ip_service_type value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3025.4816551208496, - "y": 542.7777900695801, - "z": "2edf7d59.cf16ea", + "x": 2302.5129051208496, + "y": 451.777787566185, + "z": "b5d9a62e.6044f8", "wires": [ [ - "dae0bd9.b9c44c", - "f6d633a5.8dcd68" + "2cc279ab.a0af76", + "ead29df7.edff2" ] ] }, { - "id": "dae0bd9.b9c44c", + "id": "2cc279ab.a0af76", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3328.482063293457, - "y": 538.7778816223145, - "z": "2edf7d59.cf16ea", + "x": 2605.513313293457, + "y": 447.7778791189194, + "z": "b5d9a62e.6044f8", "wires": [ [ - "c455421d.7c5a78" + "5db34f7f.78458" ] ] }, { - "id": "17321748.f836a9", + "id": "518351b3.5bba", "type": "switchNode", "name": "switch:ip_rg_mac_addr", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_rg_mac_addr'`\">\n", "comments": "", "outputs": 1, - "x": 2601.333610534668, - "y": 604.0001087188721, - "z": "2edf7d59.cf16ea", + "x": 1878.364860534668, + "y": 513.000106215477, + "z": "b5d9a62e.6044f8", "wires": [ [ - "2e394322.e3b494" + "8a32b1ef.5d1bd" ] ] }, { - "id": "2e394322.e3b494", + "id": "8a32b1ef.5d1bd", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2810.3334951400757, - "y": 603.0001068115234, - "z": "2edf7d59.cf16ea", + "x": 2087.3647451400757, + "y": 512.0001043081284, + "z": "b5d9a62e.6044f8", "wires": [ [ - "f5b4bf6e.71b26" + "d637aef8.5a4c4" ] ] }, { - "id": "b4892f9a.ccf8d8", + "id": "201d0bf8.38ef94", "type": "set", "name": "set:mac", "xml": "<set>\n<parameter name='prop.bbs.mac' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3519.333984375, - "y": 597.6002368927002, - "z": "2edf7d59.cf16ea", + "x": 2796.365234375, + "y": 506.6002343893051, + "z": "b5d9a62e.6044f8", "wires": [] }, { - "id": "f5b4bf6e.71b26", + "id": "d637aef8.5a4c4", "type": "switchNode", "name": "switch:ip_rg_mac_addr value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3023.4816551208496, - "y": 602.7777919769287, - "z": "2edf7d59.cf16ea", + "x": 2300.5129051208496, + "y": 511.77778947353363, + "z": "b5d9a62e.6044f8", "wires": [ [ - "6b930f07.9c92d", - "f6d633a5.8dcd68" + "2891a7be.4e6178", + "ead29df7.edff2" ] ] }, { - "id": "6b930f07.9c92d", + "id": "2891a7be.4e6178", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3326.482063293457, - "y": 598.7778835296631, - "z": "2edf7d59.cf16ea", + "x": 2603.513313293457, + "y": 507.777881026268, + "z": "b5d9a62e.6044f8", "wires": [ [ - "b4892f9a.ccf8d8" + "201d0bf8.38ef94" ] ] }, { - "id": "9ec2e808.aa4ef", + "id": "363ebd91.fb5852", "type": "switchNode", "name": "switch:ip_downstream_speed", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_downstream_speed'`\">\n", "comments": "", "outputs": 1, - "x": 2600.333770751953, - "y": 726.0002136230469, - "z": "2edf7d59.cf16ea", + "x": 1877.3650207519531, + "y": 635.0002111196518, + "z": "b5d9a62e.6044f8", "wires": [ [ - "af0e2874.cdaf58" + "bb19ad4b.b256c" ] ] }, { - "id": "af0e2874.cdaf58", + "id": "bb19ad4b.b256c", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2809.333655357361, - "y": 725.0002117156982, - "z": "2edf7d59.cf16ea", + "x": 2086.364905357361, + "y": 634.0002092123032, + "z": "b5d9a62e.6044f8", "wires": [ [ - "5343752.1ca258c" + "fdc80625.9b6288" ] ] }, { - "id": "93741b2.676f168", + "id": "541d49b3.202258", "type": "set", "name": "set:down_speed", "xml": "<set>\n<parameter name='prop.bbs.down_speed' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3529.334228515625, - "y": 719.6003017425537, - "z": "2edf7d59.cf16ea", + "x": 2806.365478515625, + "y": 628.6002992391586, + "z": "b5d9a62e.6044f8", "wires": [] }, { - "id": "5343752.1ca258c", + "id": "fdc80625.9b6288", "type": "switchNode", "name": "switch:ip_downstream_speed value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3022.4818153381348, - "y": 724.7778968811035, - "z": "2edf7d59.cf16ea", + "x": 2299.5130653381348, + "y": 633.7778943777084, + "z": "b5d9a62e.6044f8", "wires": [ [ - "4ea44007.a38f9", - "f6d633a5.8dcd68" + "6796c19d.201ef", + "ead29df7.edff2" ] ] }, { - "id": "4ea44007.a38f9", + "id": "6796c19d.201ef", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3325.482223510742, - "y": 720.7779884338379, - "z": "2edf7d59.cf16ea", + "x": 2602.513473510742, + "y": 629.7779859304428, + "z": "b5d9a62e.6044f8", "wires": [ [ - "93741b2.676f168" + "541d49b3.202258" ] ] }, { - "id": "df5d55aa.feb328", + "id": "f9293ec6.f63f5", "type": "switchNode", "name": "switch:service_id", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'service_id'`\">\n", "comments": "", "outputs": 1, - "x": 2611.3334617614746, - "y": 365.0000114440918, - "z": "2edf7d59.cf16ea", + "x": 1888.3647117614746, + "y": 274.0000089406967, + "z": "b5d9a62e.6044f8", "wires": [ [ - "915b1f59.98c2" + "5b9ff78a.e4ef68" ] ] }, { - "id": "915b1f59.98c2", + "id": "5b9ff78a.e4ef68", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2815.333381652832, - "y": 364.9999828338623, - "z": "2edf7d59.cf16ea", + "x": 2092.364631652832, + "y": 273.9999803304672, + "z": "b5d9a62e.6044f8", "wires": [ [ - "97d5893.0c105f8" + "bd60c3c1.753f3" ] ] }, { - "id": "bd2c3108.5e8e4", + "id": "666554a.9b343ac", "type": "set", "name": "set:service_id", "xml": "<set>\n<parameter name='prop.bbs.service_id' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3534.3337440490723, - "y": 358.6000671386719, - "z": "2edf7d59.cf16ea", + "x": 2811.3649940490723, + "y": 267.6000646352768, + "z": "b5d9a62e.6044f8", "wires": [] }, { - "id": "97d5893.0c105f8", + "id": "bd60c3c1.753f3", "type": "switchNode", "name": "switch:service_id value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3026.333381652832, - "y": 364.00001335144043, - "z": "2edf7d59.cf16ea", + "x": 2303.364631652832, + "y": 273.00001084804535, + "z": "b5d9a62e.6044f8", "wires": [ [ - "c8da08c5.7c8588" + "db0298c0.2da528" ] ] }, { - "id": "c8da08c5.7c8588", + "id": "db0298c0.2da528", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3327.3337898254395, - "y": 358.0001049041748, - "z": "2edf7d59.cf16ea", + "x": 2604.3650398254395, + "y": 267.0001024007797, + "z": "b5d9a62e.6044f8", "wires": [ [ - "bd2c3108.5e8e4" + "666554a.9b343ac" ] ] }, { - "id": "80e0672.33dd098", + "id": "3d4326b7.055a3a", "type": "switchNode", "name": "switch:ip_upstream_speed", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_upstream_speed'`\">\n", "comments": "", "outputs": 1, - "x": 2600.3339309692383, - "y": 665.0001907348633, - "z": "2edf7d59.cf16ea", + "x": 1877.3651809692383, + "y": 574.0001882314682, + "z": "b5d9a62e.6044f8", "wires": [ [ - "20277844.76ed4" + "b44522a4.559ad" ] ] }, { - "id": "20277844.76ed4", + "id": "b44522a4.559ad", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2809.333815574646, - "y": 664.0001888275146, - "z": "2edf7d59.cf16ea", + "x": 2086.365065574646, + "y": 573.0001863241196, + "z": "b5d9a62e.6044f8", "wires": [ [ - "1e51a898.1b496f" + "dd2d9b7b.ed18c8" ] ] }, { - "id": "204cebd9.88796c", + "id": "d48daabb.434658", "type": "set", "name": "set:up_speed", "xml": "<set>\n<parameter name='prop.bbs.up_speed' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3529.33438873291, - "y": 658.6002788543701, - "z": "2edf7d59.cf16ea", + "x": 2806.36563873291, + "y": 567.600276350975, + "z": "b5d9a62e.6044f8", "wires": [] }, { - "id": "1e51a898.1b496f", + "id": "dd2d9b7b.ed18c8", "type": "switchNode", "name": "switch:ip_upstream_speed value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 3022.48197555542, - "y": 663.7778739929199, - "z": "2edf7d59.cf16ea", + "x": 2299.51322555542, + "y": 572.7778714895248, + "z": "b5d9a62e.6044f8", "wires": [ [ - "cf0ce51.5cc7b18", - "f6d633a5.8dcd68" + "45350699.e53268", + "ead29df7.edff2" ] ] }, { - "id": "cf0ce51.5cc7b18", + "id": "45350699.e53268", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3325.4823837280273, - "y": 659.7779655456543, - "z": "2edf7d59.cf16ea", + "x": 2602.5136337280273, + "y": 568.7779630422592, + "z": "b5d9a62e.6044f8", "wires": [ [ - "204cebd9.88796c" + "d48daabb.434658" ] ] }, { - "id": "7c23f619.45f3b8", + "id": "b35dde56.d6c17", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`$network-input-parameters.param[$idx].name +' value is null, please check it.'`\" />\n", "comments": "", - "x": 3521.333251953125, - "y": 258, - "z": "2edf7d59.cf16ea", + "x": 2798.364501953125, + "y": 166.99999749660492, + "z": "b5d9a62e.6044f8", "wires": [] }, { - "id": "38f1d224.3b5b8e", + "id": "b035a2d5.a72c7", "type": "record", "name": "log file", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"bbs-internet-profile-common\" />\n <parameter name=\"field2\" value=\"`$prop.bbs.service_id`\" />\n <parameter name=\"field3\" value=\"`$prop.bbs.remote_id`\" />\n <parameter name=\"field4\" value=\"`$prop.bbs.ont_sn`\" />\n <parameter name=\"field5\" value=\"`$prop.bbs.service_type`\" />\n <parameter name=\"field6\" value=\"`$prop.bbs.mac`\" />\n <parameter name=\"field7\" value=\"`$prop.bbs.up_speed`\" />\n <parameter name=\"field8\" value=\"`$prop.bbs.down_speed`\" />\n <parameter name=\"field9\" value=\"`$prop.bbs.s_vlan`\" />\n <parameter name=\"field10\" value=\"`$prop.bbs.c_vlan`\" />", "comments": "", "outputs": 1, - "x": 1944.222095489502, - "y": 748.5555591583252, - "z": "2edf7d59.cf16ea", + "x": 1221.253345489502, + "y": 657.5555566549301, + "z": "b5d9a62e.6044f8", "wires": [ [] ] } -] +]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json index 49090932..1e7e189f 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json @@ -1,20 +1,20 @@ [ { - "id": "89575381.22e988", + "id": "a336222.57d48e", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 825, - "y": 430, - "z": "b2abc2ea.cc1c28", + "x": 223.03125, + "y": 256.03125, + "z": "aab7ce65.cac3d", "wires": [ [ - "62fc8ed2.1c1c7" + "825ef52.3a00b08" ] ] }, { - "id": "62fc8ed2.1c1c7", + "id": "825ef52.3a00b08", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,522 +22,603 @@ "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": 1184.9996490478516, - "y": 431.0000219345093, - "z": "b2abc2ea.cc1c28", + "x": 583.0308990478516, + "y": 257.0312719345093, + "z": "aab7ce65.cac3d", "wires": [ [ - "9c1ae725.2fe18" + "b1e4bf68.32817" ] ] }, { - "id": "9c1ae725.2fe18", + "id": "b1e4bf68.32817", "type": "method", "name": "method:bbs-internet-profile-network-topology-operation-create-huawei", "xml": "<method rpc='bbs-internet-profile-network-topology-operation-create-huawei' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 1182.9996643066406, - "y": 651.0000991821289, - "z": "b2abc2ea.cc1c28", + "x": 581.0309143066406, + "y": 477.0313491821289, + "z": "aab7ce65.cac3d", "wires": [ [ - "11984569.4d6beb" + "5c27c5cc.716a9c" ] ] }, { - "id": "11984569.4d6beb", + "id": "5c27c5cc.716a9c", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1606.9998626708984, - "y": 650.0000991821289, - "z": "b2abc2ea.cc1c28", + "x": 1005.0311126708984, + "y": 476.0313491821289, + "z": "aab7ce65.cac3d", "wires": [ [ - "673fbee.7c17dc", - "3a7cb4b2.9f805c", - "9d9c04a.550a178", - "7117f977.4492b8" + "df661865.6ac258", + "ace54c5f.9cbb7", + "b56478eb.baf7f8", + "67bc1d3.308aae4" ] ] }, { - "id": "673fbee.7c17dc", + "id": "df661865.6ac258", "type": "call", "name": "call:bbs-internet-profile-network-topology-operation-common-huawei", "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 2123.0001525878906, - "y": 563.0000190734863, - "z": "b2abc2ea.cc1c28", + "x": 1521.0314025878906, + "y": 389.0312690734863, + "z": "aab7ce65.cac3d", "wires": [ [] ] }, { - "id": "3a7cb4b2.9f805c", + "id": "ace54c5f.9cbb7", "type": "execute", "name": "execute:CreateInternetProfileInstance", "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`\" />\n <parameter name=\"contentType\" value=\"application/json\"/>\n <parameter name=\"httpMethod\" value=\"post\"/>\n <parameter name=\"responsePrefix\" value=\"service-result\"/>", "comments": "", "outputs": 1, - "x": 2012.6507873535156, - "y": 648.9608345031738, - "z": "b2abc2ea.cc1c28", + "x": 1410.6820373535156, + "y": 474.9920845031738, + "z": "aab7ce65.cac3d", "wires": [ [ - "5cb835fe.0ebfdc", - "4e297705.0757e8" + "d900182d.b78f38", + "632d7421.f9066c" ] ] }, { - "id": "4e297705.0757e8", + "id": "632d7421.f9066c", "type": "outcome", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2313.9837684631348, - "y": 648.9608345031738, - "z": "b2abc2ea.cc1c28", + "x": 1712.0150184631348, + "y": 474.9920845031738, + "z": "aab7ce65.cac3d", "wires": [ [ - "340c0c87.92c8b4" + "ab6b3ce2.e4f21" ] ] }, { - "id": "5cb835fe.0ebfdc", + "id": "d900182d.b78f38", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2322.9836807250977, - "y": 723.9608364105225, - "z": "b2abc2ea.cc1c28", + "x": 1721.0149307250977, + "y": 549.9920864105225, + "z": "aab7ce65.cac3d", "wires": [ [ - "8f2db25f.f4b24" + "3236773.1989488" ] ] }, { - "id": "8f2db25f.f4b24", + "id": "3236773.1989488", "type": "switchNode", "name": "switch:service-result", "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n", "comments": "", "outputs": 1, - "x": 2557.999801635742, - "y": 723.0001316070557, - "z": "b2abc2ea.cc1c28", + "x": 1956.0310516357422, + "y": 549.0313816070557, + "z": "aab7ce65.cac3d", "wires": [ [ - "d3ab0cf2.457f3", - "dee7fa1f.4d78b" + "1a5d7765.109479", + "57a6d69.9382728" ] ] }, { - "id": "340c0c87.92c8b4", + "id": "ab6b3ce2.e4f21", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call CreateInternetProfileInstance\" />\n", "comments": "", - "x": 2826.250898361206, - "y": 649.250337600708, - "z": "b2abc2ea.cc1c28", + "x": 2224.282148361206, + "y": 475.281587600708, + "z": "aab7ce65.cac3d", "wires": [] }, { - "id": "d3ab0cf2.457f3", + "id": "1a5d7765.109479", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2784.000141143799, - "y": 724.0002250671387, - "z": "b2abc2ea.cc1c28", + "x": 2182.031391143799, + "y": 550.0314750671387, + "z": "aab7ce65.cac3d", "wires": [ [ - "957b2d71.78c288" + "8eb57923.9623f8" ] ] }, { - "id": "dee7fa1f.4d78b", + "id": "57a6d69.9382728", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2793.9998474121094, - "y": 810.0000915527344, - "z": "b2abc2ea.cc1c28", + "x": 2192.0310974121094, + "y": 636.0313415527344, + "z": "aab7ce65.cac3d", "wires": [ [ - "e5fb5f82.18f85" + "4e694f8b.fdd2b" ] ] }, { - "id": "957b2d71.78c288", + "id": "8eb57923.9623f8", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error CreateInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n", "comments": "", - "x": 2970.4998092651367, - "y": 724.0000619888306, - "z": "b2abc2ea.cc1c28", + "x": 2368.5310592651367, + "y": 550.0313119888306, + "z": "aab7ce65.cac3d", "wires": [] }, { - "id": "e5fb5f82.18f85", + "id": "4e694f8b.fdd2b", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2952.166477203369, - "y": 811.0000667572021, - "z": "b2abc2ea.cc1c28", + "x": 2350.197727203369, + "y": 637.0313167572021, + "z": "aab7ce65.cac3d", "wires": [ [] ] }, { - "id": "9d9c04a.550a178", + "id": "b56478eb.baf7f8", "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": 1917.4999237060547, - "y": 1448.000192642212, - "z": "b2abc2ea.cc1c28", + "x": 1315.5311737060547, + "y": 1274.031442642212, + "z": "aab7ce65.cac3d", "wires": [] }, { - "id": "c44ed27a.d90d8", + "id": "7577071d.7f2498", "type": "save", "name": "save:generic-vnf", - "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $vnf-id\" >\n<parameter name= \"vnf-id\" value = \"`$vnf-id`\"/>\n<parameter name= \"vnf-name\" value = \"`$vnf-name`\"/>\n<parameter name= \"vnf-type\" value = \"InternetProfile\"/>\n<parameter name= \"service-id\" value = \"`$network-topology-operation-input.service-information.service-id`\"/><!--to be clarified,service-id different from service-instance-id -->\n<parameter name= \"prov-status\" value = \"ACTIVE\"/>\n<parameter name= \"orchestration-status\" value = \"Active\"/>\n<parameter name= \"ipv4-oam-address\" value = \"169.254.236.13\"/>\n<parameter name= \"in-maint\" value = \"false\" />\n<parameter name= \"is-closed-loop-disabled\" value = \"false\" />\n<parameter name= \"model-invariant-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name= \"model-version-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-uuid`\"/>\n<parameter name= \"model-customization-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`\"/>", + "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $vnf-id\" >\n<parameter name= \"vnf-id\" value = \"`$vnf-id`\"/>\n<parameter name= \"vnf-name\" value = \"`$vnf-name`\"/>\n<parameter name= \"vnf-type\" value = \"InternetProfile\"/>\n<parameter name= \"service-id\" value = \"`$network-topology-operation-input.service-information.service-id`\"/>\n<parameter name= \"prov-status\" value = \"ACTIVE\"/>\n<parameter name= \"orchestration-status\" value = \"Active\"/>\n<parameter name= \"is-closed-loop-disabled\" value = \"false\" />\n<parameter name= \"model-invariant-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name= \"model-version-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-uuid`\"/>\n<parameter name= \"model-customization-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`\"/>", "comments": "", "outputs": 1, - "x": 2196.0312366485596, - "y": 1114.031213760376, - "z": "b2abc2ea.cc1c28", + "x": 1594.0624866485596, + "y": 940.062463760376, + "z": "aab7ce65.cac3d", "wires": [ [ - "30abcda.3452c32", - "d057da2e.575678", - "d2286b35.a71d48" + "de67643d.0a9048", + "508bcbf7.e76f04", + "840edff8.2907d" ] ] }, { - "id": "30abcda.3452c32", + "id": "de67643d.0a9048", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2432.253091812134, - "y": 985.9199714660645, - "z": "b2abc2ea.cc1c28", + "x": 1830.2843418121338, + "y": 811.9512214660645, + "z": "aab7ce65.cac3d", "wires": [ [ - "819a16a6.0c9978" + "fe5bd03.02c593" ] ] }, { - "id": "d057da2e.575678", + "id": "508bcbf7.e76f04", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 2443.228910446167, - "y": 1045.9358277320862, - "z": "b2abc2ea.cc1c28", + "x": 1841.260160446167, + "y": 871.9670777320862, + "z": "aab7ce65.cac3d", "wires": [ [ - "c90efb31.bd2ff8" + "703dd65f.36e058" ] ] }, { - "id": "819a16a6.0c9978", + "id": "fe5bd03.02c593", "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=\"Failure calling AAI to save generic-vnf\" />\n", "comments": "", - "x": 2668.3956394195557, - "y": 985.4914364814758, - "z": "b2abc2ea.cc1c28", + "x": 2066.4268894195557, + "y": 811.5226864814758, + "z": "aab7ce65.cac3d", "wires": [] }, { - "id": "c90efb31.bd2ff8", + "id": "703dd65f.36e058", "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=\"generic-vnf instance does not exist in AAI\" />\n", "comments": "", - "x": 2663.2764377593994, - "y": 1046.412142276764, - "z": "b2abc2ea.cc1c28", + "x": 2061.3076877593994, + "y": 872.4433922767639, + "z": "aab7ce65.cac3d", "wires": [] }, { - "id": "d2286b35.a71d48", + "id": "840edff8.2907d", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2436.8397159576416, - "y": 1111.0623078346252, - "z": "b2abc2ea.cc1c28", + "x": 1834.8709659576416, + "y": 937.0935578346252, + "z": "aab7ce65.cac3d", "wires": [ - [ - "cc6c45ae.c943c8" - ] + [] ] }, { - "id": "cc6c45ae.c943c8", + "id": "d7aa4847.5acd58", "type": "record", "name": "log file", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"save generic-vnf success!\" />\n ", "comments": "", "outputs": 1, - "x": 2644.8399696350098, - "y": 1109.0624370574951, - "z": "b2abc2ea.cc1c28", + "x": 2042.8712196350098, + "y": 935.0936870574951, + "z": "aab7ce65.cac3d", "wires": [ [] ] }, { - "id": "b746f152.4e5ac", + "id": "5fc61219.65927c", "type": "save", "name": "save:metadata", "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id \n\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id\n\t AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type\n\t AND service-instance.service-instance-id = $network-topology-operation-input.service-information.service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\">\n <parameter name=\"metadata.metadatum[0].metaname\" value=\"service-type\" />\n <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$prop.bbs.service_type`\" />\n <parameter name=\"metadata.metadatum[1].metaname\" value=\"up-speed\" />\n <parameter name=\"metadata.metadatum[1].metaval\" value=\"`$prop.bbs.up_speed`\" />\n <parameter name=\"metadata.metadatum[2].metaname\" value=\"down-speed\" />\n <parameter name=\"metadata.metadatum[2].metaval\" value=\"`$prop.bbs.down_speed`\" />\n <parameter name=\"metadata.metadatum[3].metaname\" value=\"cvlan\" />\n <parameter name=\"metadata.metadatum[3].metaval\" value=\"`$prop.bbs.c_vlan`\" />\n <parameter name=\"metadata.metadatum[4].metaname\" value=\"svlan\" />\n <parameter name=\"metadata.metadatum[4].metaval\" value=\"`$prop.bbs.s_vlan`\" />\n <parameter name=\"metadata.metadatum[5].metaname\" value=\"expected-ont-id\" />\n <parameter name=\"metadata.metadatum[5].metaval\" value=\"`$prop.bbs.ont_sn`\" />\n <parameter name=\"metadata.metadatum[6].metaname\" value=\"rgw-mac-address\" />\n <parameter name=\"metadata.metadatum[6].metaval\" value=\"`$prop.bbs.mac`\" />", "comments": "", "outputs": 1, - "x": 2194.5305881500244, - "y": 1266.0309810638428, - "z": "b2abc2ea.cc1c28", + "x": 1592.5618381500244, + "y": 1092.0622310638428, + "z": "aab7ce65.cac3d", "wires": [ [ - "260fcebb.248022", - "e5ef08e9.671048", - "a5459cad.aad38" + "9b60d426.7e33d8", + "c2480a0e.1b1478", + "a17ec97.b6aa738" ] ] }, { - "id": "260fcebb.248022", + "id": "9b60d426.7e33d8", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2425.006097793579, - "y": 1197.3955845832825, - "z": "b2abc2ea.cc1c28", + "x": 1823.037347793579, + "y": 1023.4268345832825, + "z": "aab7ce65.cac3d", "wires": [ [ - "e624300e.f97b6" + "54deb41c.97ae6c" ] ] }, { - "id": "e5ef08e9.671048", + "id": "c2480a0e.1b1478", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 2436.982259750366, - "y": 1267.4115180969238, - "z": "b2abc2ea.cc1c28", + "x": 1835.0135097503662, + "y": 1093.4427680969238, + "z": "aab7ce65.cac3d", "wires": [ [ - "15c9d9c7.1da386" + "15a91907.6a2f77" ] ] }, { - "id": "e624300e.f97b6", + "id": "54deb41c.97ae6c", "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=\"Failure calling AAI to save metadatum\" />\n", "comments": "", - "x": 2665.1488933563232, - "y": 1195.967086315155, - "z": "b2abc2ea.cc1c28", + "x": 2063.1801433563232, + "y": 1021.998336315155, + "z": "aab7ce65.cac3d", "wires": [] }, { - "id": "15c9d9c7.1da386", + "id": "15a91907.6a2f77", "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=\"metadatum instance does not exist in AAI\" />\n", "comments": "", - "x": 2662.0297927856445, - "y": 1266.8877544403076, - "z": "b2abc2ea.cc1c28", + "x": 2060.0610427856445, + "y": 1092.9190044403076, + "z": "aab7ce65.cac3d", "wires": [] }, { - "id": "a5459cad.aad38", + "id": "a17ec97.b6aa738", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2431.592969894409, - "y": 1337.5379576683044, - "z": "b2abc2ea.cc1c28", + "x": 1829.6242198944092, + "y": 1163.5692076683044, + "z": "aab7ce65.cac3d", "wires": [ - [ - "6f08d5bf.9a889c" - ] + [] ] }, { - "id": "6f08d5bf.9a889c", + "id": "e577d9f5.accf98", "type": "record", "name": "log file", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"save metadatum success!\" />\n ", "comments": "", "outputs": 1, - "x": 2642.592969894409, - "y": 1337.5379576683044, - "z": "b2abc2ea.cc1c28", + "x": 2040.6242198944092, + "y": 1163.5692076683044, + "z": "aab7ce65.cac3d", "wires": [ [] ] }, { - "id": "7117f977.4492b8", + "id": "67bc1d3.308aae4", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1891.164836883545, - "y": 987.9997653961182, - "z": "b2abc2ea.cc1c28", + "x": 1289.196086883545, + "y": 814.0310153961182, + "z": "aab7ce65.cac3d", "wires": [ [ - "c44ed27a.d90d8", - "b746f152.4e5ac", - "d803f78c.61a4a8", - "a1487411.171428" + "7577071d.7f2498", + "5fc61219.65927c", + "6fa2d919.edbe98", + "a47acb9b.a35478", + "3aa091fc.f969ae" ] ] }, { - "id": "d803f78c.61a4a8", + "id": "6fa2d919.edbe98", "type": "set", "name": "set:variables", "xml": "<set>\n<parameter name='vnf-id' value=\"`$prop.random-data-list[3]`\"/>\n<parameter name='vnf-name' value=\"`'vnf-'+$prop.random-data-list[4]`\"/>\n", "comments": "", - "x": 2179.1651859283447, - "y": 984.332763671875, - "z": "b2abc2ea.cc1c28", + "x": 1577.1964359283447, + "y": 810.364013671875, + "z": "aab7ce65.cac3d", "wires": [] }, { - "id": "a1487411.171428", + "id": "a47acb9b.a35478", "type": "execute", "name": "execute:generate", "xml": " <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\">\n <parameter name=\"ctx-destination\" value=\"prop.random-data\"/>", "comments": "", "outputs": 1, - "x": 2200.529399871826, - "y": 910.030613899231, - "z": "b2abc2ea.cc1c28", + "x": 1598.5606498718262, + "y": 736.061863899231, + "z": "aab7ce65.cac3d", "wires": [ [ - "916e0fd0.b9f37" + "b904a8e6.00ba98" ] ] }, { - "id": "916e0fd0.b9f37", + "id": "b904a8e6.00ba98", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2429.529342651367, - "y": 911.0305881500244, - "z": "b2abc2ea.cc1c28", + "x": 1827.5605926513672, + "y": 737.0618381500244, + "z": "aab7ce65.cac3d", "wires": [ [ - "8e69817d.115b9" + "973e3b14.e96fb8" ] ] }, { - "id": "8e69817d.115b9", + "id": "973e3b14.e96fb8", "type": "execute", "name": "execute", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n <parameter name=\"ctx_memory_result_key\" value=\"prop.random-data-list\"/>\n <parameter name=\"original_string\" value=\"`$prop.random-data`\"/>\n <parameter name=\"regex\" value=\"-\"/>\n", "comments": "", "outputs": 1, - "x": 2620.529399871826, - "y": 909.0305881500244, - "z": "b2abc2ea.cc1c28", + "x": 2018.5606498718262, + "y": 735.0618381500244, + "z": "aab7ce65.cac3d", "wires": [ [ - "52b18bce.20b054" + "dd3fe058.06716" ] ] }, { - "id": "3a61e04b.9260a", + "id": "61f078a0.340828", "type": "record", "name": "log file", "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"`$prop.random-data`\" />\n ", "comments": "", "outputs": 1, - "x": 2952.529462814331, - "y": 907.0306491851807, - "z": "b2abc2ea.cc1c28", + "x": 2350.560712814331, + "y": 733.0618991851807, + "z": "aab7ce65.cac3d", "wires": [ [] ] }, { - "id": "52b18bce.20b054", + "id": "dd3fe058.06716", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2787.52933883667, - "y": 908.0306186676025, - "z": "b2abc2ea.cc1c28", + "x": 2185.56058883667, + "y": 734.0618686676025, + "z": "aab7ce65.cac3d", + "wires": [ + [] + ] + }, + { + "id": "3aa091fc.f969ae", + "type": "save", + "name": "save:relationship", + "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:relationship-list\" \n key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id\n AND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id\n AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type \n AND service-instance.service-instance-id = $network-topology-operation-input.service-information.service-instance-id\" 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/' + $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=\"`$vnf-id`\" />", + "comments": "", + "outputs": 1, + "x": 1538.03125, + "y": 1312.03125, + "z": "aab7ce65.cac3d", + "wires": [ + [ + "3b4ae4d5.3b347c", + "987fe733.92a5d8", + "73836da.8f43494" + ] + ] + }, + { + "id": "3b4ae4d5.3b347c", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 1768.5067596435547, + "y": 1243.3958535194397, + "z": "aab7ce65.cac3d", + "wires": [ + [ + "2856d517.9eb7ba" + ] + ] + }, + { + "id": "987fe733.92a5d8", + "type": "failure", + "name": "not-found", + "xml": "<outcome value='not-found'>\n", + "comments": "", + "outputs": 1, + "x": 1780.4829216003418, + "y": 1313.411787033081, + "z": "aab7ce65.cac3d", "wires": [ [ - "3a61e04b.9260a" + "43a5ebe7.d55dc4" ] ] + }, + { + "id": "2856d517.9eb7ba", + "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=\"Failure calling AAI to save metadatum\" />\n", + "comments": "", + "x": 2008.6495552062988, + "y": 1241.9673552513123, + "z": "aab7ce65.cac3d", + "wires": [] + }, + { + "id": "43a5ebe7.d55dc4", + "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=\"metadatum instance does not exist in AAI\" />\n", + "comments": "", + "x": 2005.5304546356201, + "y": 1312.8880233764648, + "z": "aab7ce65.cac3d", + "wires": [] + }, + { + "id": "73836da.8f43494", + "type": "outcome", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 1775.0936317443848, + "y": 1383.5382266044617, + "z": "aab7ce65.cac3d", + "wires": [ + [] + ] } ]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml index 0137e010..94173333 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml @@ -156,11 +156,6 @@ <set> <parameter name='prop.bbs.serviceID' value="`$service-result.accessE2Eservice.serviceID`"/> </set> - <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/oak/logx.txt" /> - <parameter name="field1" value="createAccessConnectivityService success!" /> - <parameter name="field2" value="`$service-result.accessE2Eservice.serviceID`" /> - </record> </block> </outcome> </switch> @@ -174,12 +169,7 @@ <parameter name="ctx_memory_result_key" value="prop.random-data-list"/> <parameter name="original_string" value="`$prop.random-data`"/> <parameter name="regex" value="-"/> - <outcome value='success'> - <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/oak/logx.txt" /> - <parameter name="field1" value="`$prop.random-data`" /> - </record> - </outcome> + <outcome value='success'></outcome> </execute> </outcome> </execute> @@ -194,8 +184,6 @@ <parameter name= "service-id" value = "`$network-topology-operation-input.service-information.service-id`"/> <parameter name= "prov-status" value = "ACTIVE"/> <parameter name= "orchestration-status" value = "Active"/> - <parameter name= "ipv4-oam-address" value = "169.254.236.13"/> - <parameter name= "in-maint" value = "false" /> <parameter name= "is-closed-loop-disabled" value = "false" /> <parameter name= "model-invariant-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`"/> <parameter name= "model-version-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-uuid`"/> @@ -214,12 +202,7 @@ <parameter name="error-message" value="generic-vnf instance does not exist in AAI" /> </return> </outcome> - <outcome value='success'> - <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/oak/logx.txt" /> - <parameter name="field1" value="save generic-vnf success!" /> - </record> - </outcome> + <outcome value='success'></outcome> </save> <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata" key="service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id @@ -245,12 +228,32 @@ <parameter name="error-message" value="metadatum instance does not exist in AAI" /> </return> </outcome> - <outcome value='success'> - <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/oak/logx.txt" /> - <parameter name="field1" value="save metadatum success!" /> - </record> + <outcome value='success'></outcome> + </save> + <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" + key="service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id + AND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id + AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type + AND service-instance.service-instance-id = $network-topology-operation-input.service-information.service-instance-id" 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/' + $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="`$vnf-id`" /> + <outcome value='failure'> + <return status='failure'> + <parameter name='ack-final' value='Y'/> + <parameter name="error-code" value="500" /> + <parameter name="error-message" value="Failure calling AAI to save metadatum" /> + </return> + </outcome> + <outcome value='not-found'> + <return status='failure'> + <parameter name='ack-final' value='Y'/> + <parameter name="error-code" value="500" /> + <parameter name="error-message" value="metadatum instance does not exist in AAI" /> + </return> </outcome> + <outcome value='success'></outcome> </save> </block> <return status='success'> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml index 732f4f39..ef6ba0ba 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml @@ -94,12 +94,7 @@ </return> </outcome> <outcome value=''> - <block> - <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/oak/logx.txt" /> - <parameter name="field1" value="deleteAccessConnectivityService success!" /> - </record> - </block> + <block></block> </outcome> </switch> </block> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml index 0eea0e09..d41dfd50 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml @@ -161,19 +161,6 @@ </switch> </block> </for> - <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/oak/logx.txt" /> - <parameter name="field1" value="bbs-internet-profile-common" /> - <parameter name="field2" value="`$prop.bbs.service_id`" /> - <parameter name="field3" value="`$prop.bbs.remote_id`" /> - <parameter name="field4" value="`$prop.bbs.ont_sn`" /> - <parameter name="field5" value="`$prop.bbs.service_type`" /> - <parameter name="field6" value="`$prop.bbs.mac`" /> - <parameter name="field7" value="`$prop.bbs.up_speed`" /> - <parameter name="field8" value="`$prop.bbs.down_speed`" /> - <parameter name="field9" value="`$prop.bbs.s_vlan`" /> - <parameter name="field10" value="`$prop.bbs.c_vlan`" /> - </record> </block> </method> </service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml index b6ec9d95..2d88b3f4 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml @@ -40,12 +40,7 @@ <parameter name="ctx_memory_result_key" value="prop.random-data-list"/> <parameter name="original_string" value="`$prop.random-data`"/> <parameter name="regex" value="-"/> - <outcome value='success'> - <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/oak/logx.txt" /> - <parameter name="field1" value="`$prop.random-data`" /> - </record> - </outcome> + <outcome value='success'></outcome> </execute> </outcome> </execute> @@ -60,8 +55,6 @@ <parameter name= "service-id" value = "`$network-topology-operation-input.service-information.service-id`"/> <parameter name= "prov-status" value = "ACTIVE"/> <parameter name= "orchestration-status" value = "Active"/> - <parameter name= "ipv4-oam-address" value = "169.254.236.13"/> - <parameter name= "in-maint" value = "false" /> <parameter name= "is-closed-loop-disabled" value = "false" /> <parameter name= "model-invariant-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`"/> <parameter name= "model-version-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-uuid`"/> @@ -80,12 +73,7 @@ <parameter name="error-message" value="generic-vnf instance does not exist in AAI" /> </return> </outcome> - <outcome value='success'> - <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/oak/logx.txt" /> - <parameter name="field1" value="save generic-vnf success!" /> - </record> - </outcome> + <outcome value='success'></outcome> </save> <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata" key="service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id @@ -120,12 +108,32 @@ <parameter name="error-message" value="metadatum instance does not exist in AAI" /> </return> </outcome> - <outcome value='success'> - <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> - <parameter name="file" value="/opt/oak/logx.txt" /> - <parameter name="field1" value="save metadatum success!" /> - </record> + <outcome value='success'></outcome> + </save> + <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" + key="service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id + AND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id + AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type + AND service-instance.service-instance-id = $network-topology-operation-input.service-information.service-instance-id" 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/' + $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="`$vnf-id`" /> + <outcome value='failure'> + <return status='failure'> + <parameter name='ack-final' value='Y'/> + <parameter name="error-code" value="500" /> + <parameter name="error-message" value="Failure calling AAI to save metadatum" /> + </return> + </outcome> + <outcome value='not-found'> + <return status='failure'> + <parameter name='ack-final' value='Y'/> + <parameter name="error-code" value="500" /> + <parameter name="error-message" value="metadatum instance does not exist in AAI" /> + </return> </outcome> + <outcome value='success'></outcome> </save> </block> <return status='success'> diff --git a/platform-logic/restapi-templates/src/main/json/bbs-access-connectivity-create.json b/platform-logic/restapi-templates/src/main/json/bbs-access-connectivity-create.json index a8039313..0cab56ef 100644 --- a/platform-logic/restapi-templates/src/main/json/bbs-access-connectivity-create.json +++ b/platform-logic/restapi-templates/src/main/json/bbs-access-connectivity-create.json @@ -2,7 +2,7 @@ "accessE2Eservice" : { "serviceID" : "", "subscriberInfo" : { - "remote_id" : "", + "accessID" : "", "extendParas" : {}, "dpName":"" }, |