diff options
Diffstat (limited to 'platform-logic/generic-resource-api')
6 files changed, 967 insertions, 495 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 dbcec847..d02c6c82 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": "a54774d9.aada78", + "id": "69df8be4.4c3cb4", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 324.50035095214844, - "y": 302.0000333786011, - "z": "f55e2a79.4bc078", + "x": 894.000244140625, + "y": 493.0001220703125, + "z": "b55dc3b9.0674e8", "wires": [ [ - "34dc66ca.55442a" + "96779afc.eefcf8" ] ] }, { - "id": "34dc66ca.55442a", + "id": "96779afc.eefcf8", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,769 +22,1116 @@ "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": 632.5, - "y": 302.00005531311035, - "z": "f55e2a79.4bc078", + "x": 1186.9996490478516, + "y": 493.0000219345093, + "z": "b55dc3b9.0674e8", "wires": [ [ - "c70722ad.71e9d" + "22e6483c.f93448" ] ] }, { - "id": "c70722ad.71e9d", + "id": "22e6483c.f93448", "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": 630.5, - "y": 498.00009536743164, - "z": "f55e2a79.4bc078", + "x": 1184.9996490478516, + "y": 689.0000619888306, + "z": "b55dc3b9.0674e8", "wires": [ [ - "425fe8.32825018" + "cecb6fa.14b431" ] ] }, { - "id": "425fe8.32825018", + "id": "cecb6fa.14b431", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1037.5002136230469, - "y": 499.00009536743164, - "z": "f55e2a79.4bc078", + "x": 1591.9998626708984, + "y": 690.0000619888306, + "z": "b55dc3b9.0674e8", "wires": [ [ - "4e95f514.5341fc", - "95f559b6.afb318", - "983471bb.6920f", - "424890ee.daa33", - "e118a9e4.09bbf8", - "fedbef6e.9dc7a", - "723fb390.b4b4fc" + "ca1c14e4.4d339", + "3b41cd0b.76074a", + "1552bd19.8bb8f3", + "f5dbdf79.0f05b8", + "8cf2e6de.4d3138", + "fe430565.3e4f9", + "f837852c.dfc578", + "ffa77aae.f154d" ] ] }, { - "id": "4e95f514.5341fc", + "id": "ca1c14e4.4d339", "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": 1341.5003204345703, - "y": 398.1111755371094, - "z": "f55e2a79.4bc078", + "x": 2024.0000915527344, + "y": 584.1111812591553, + "z": "b55dc3b9.0674e8", "wires": [ [] ] }, { - "id": "95f559b6.afb318", + "id": "3b41cd0b.76074a", "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": 1415.5003204345703, - "y": 182.00000476837158, - "z": "f55e2a79.4bc078", + "x": 2105, + "y": 366.99999237060547, + "z": "b55dc3b9.0674e8", "wires": [ [] ] }, { - "id": "fedbef6e.9dc7a", + "id": "ffa77aae.f154d", "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": 1424.1510467529297, - "y": 922.9608020782471, - "z": "f55e2a79.4bc078", + "x": 2082.6510620117188, + "y": 1139.9608306884766, + "z": "b55dc3b9.0674e8", "wires": [ [ - "1e3eeee0.ada741", - "b6d7fd8.04aea" + "40de66ad.cee7a8", + "694a1aa1.ee44dc" ] ] }, { - "id": "1e3eeee0.ada741", + "id": "40de66ad.cee7a8", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1734.4839401245117, - "y": 997.9608039855957, - "z": "f55e2a79.4bc078", + "x": 2427.983829498291, + "y": 1229.9607305526733, + "z": "b55dc3b9.0674e8", "wires": [ [ - "f3966fd0.78da2" + "7c823c35.187454" ] ] }, { - "id": "b6d7fd8.04aea", + "id": "694a1aa1.ee44dc", "type": "outcome", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1725.4840278625488, - "y": 922.9608020782471, - "z": "f55e2a79.4bc078", + "x": 2419.893310546875, + "y": 1138.142593383789, + "z": "b55dc3b9.0674e8", "wires": [ [ - "1dd43d47.6553e3" + "69e343d2.09328c" ] ] }, { - "id": "723fb390.b4b4fc", + "id": "fe430565.3e4f9", "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": 1352.500576019287, - "y": 747.000186920166, - "z": "f55e2a79.4bc078", + "x": 2018.2224426269531, + "y": 941.5557956695557, + "z": "b55dc3b9.0674e8", "wires": [ [ - "7cf66799.d744a8", - "c263919e.a1402" + "985f7741.c62248", + "4862a7fc.da72" ] ] }, { - "id": "c263919e.a1402", + "id": "4862a7fc.da72", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1652.6673698425293, - "y": 744.2501883506775, - "z": "f55e2a79.4bc078", + "x": 2306.167236328125, + "y": 941.2501926422119, + "z": "b55dc3b9.0674e8", "wires": [ [ - "779dec10.3fa0e4" + "43ef79ed.dece58" ] ] }, { - "id": "7cf66799.d744a8", + "id": "985f7741.c62248", "type": "outcome", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1845.6674880981445, - "y": 822.250186920166, - "z": "f55e2a79.4bc078", + "x": 2304.4402465820312, + "y": 1014.6138677597046, + "z": "b55dc3b9.0674e8", "wires": [ [ - "1dd43d47.6553e3" + "464505a9.92b4fc" ] ] }, { - "id": "1dd43d47.6553e3", + "id": "52c062b7.adf254", "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 Get token rest api\" />\n", + "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": 2234.417640686035, - "y": 923.2503499984741, - "z": "f55e2a79.4bc078", + "x": 2925.281051635742, + "y": 1008.1595916748047, + "z": "b55dc3b9.0674e8", "wires": [] }, { - "id": "6d927619.f2a628", + "id": "da4c9472.fb8c58", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2024.5006675720215, - "y": 816.0003490447998, - "z": "f55e2a79.4bc078", + "x": 2709.000461578369, + "y": 1010.0004034042358, + "z": "b55dc3b9.0674e8", "wires": [ [ - "1dd43d47.6553e3" + "52c062b7.adf254" ] ] }, { - "id": "779dec10.3fa0e4", + "id": "43ef79ed.dece58", "type": "switchNode", "name": "switch:token ", "xml": "<switch test='`$token-result.accessSession`'>\n", "comments": "", "outputs": 1, - "x": 1842.500545501709, - "y": 743.0001888275146, - "z": "f55e2a79.4bc078", + "x": 2520.0002937316895, + "y": 940.0001783370972, + "z": "b55dc3b9.0674e8", "wires": [ [ - "6d927619.f2a628", - "5f896a8b.ae7194" + "da4c9472.fb8c58", + "30ae394a.e0a3b6" ] ] }, { - "id": "5f896a8b.ae7194", + "id": "30ae394a.e0a3b6", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2029.5005531311035, - "y": 742.0001859664917, - "z": "f55e2a79.4bc078", + "x": 2707.000301361084, + "y": 939.0001754760742, + "z": "b55dc3b9.0674e8", "wires": [ [ - "99e97b64.61ea78" + "969c3ea5.479ec" ] ] }, { - "id": "99e97b64.61ea78", + "id": "969c3ea5.479ec", "type": "set", "name": "set:token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\n", "comments": "", - "x": 2240.000560760498, - "y": 742.250186920166, - "z": "f55e2a79.4bc078", + "x": 2917.5003089904785, + "y": 939.2501764297485, + "z": "b55dc3b9.0674e8", "wires": [] }, { - "id": "983471bb.6920f", + "id": "1552bd19.8bb8f3", "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": 1314.5008506774902, - "y": 288.0002107620239, - "z": "f55e2a79.4bc078", + "x": 1983.0006408691406, + "y": 479.0002498626709, + "z": "b55dc3b9.0674e8", "wires": [] }, { - "id": "2cc6bd19.ab2f32", + "id": "1c40c39.920b2bc", "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.accessID`\" />\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": 1292.5006484985352, - "y": 556.0001792907715, - "z": "f55e2a79.4bc078", + "x": 1973.0005187988281, + "y": 772.0001878738403, + "z": "b55dc3b9.0674e8", "wires": [ [] ] }, { - "id": "173959a3.be4fe6", + "id": "5d75b0e5.89aa78", "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": 2563.500068664551, - "y": 1083.0000324249268, - "z": "f55e2a79.4bc078", + "x": 3246.0002841949463, + "y": 1299.0002943873405, + "z": "b55dc3b9.0674e8", "wires": [ [] ] }, { - "id": "f3966fd0.78da2", + "id": "7c823c35.187454", "type": "switchNode", "name": "switch:service-result", "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n", "comments": "", "outputs": 1, - "x": 1969.5000610351562, - "y": 997.0000991821289, - "z": "f55e2a79.4bc078", + "x": 2662.9999504089355, + "y": 1229.0000257492065, + "z": "b55dc3b9.0674e8", "wires": [ [ - "f5e2fc15.e5fc2", - "1933683f.76be88" + "a213720b.ac45d", + "3e855bfc.b9a11c" ] ] }, { - "id": "f5e2fc15.e5fc2", + "id": "a213720b.ac45d", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2195.500400543213, - "y": 998.0001926422119, - "z": "f55e2a79.4bc078", + "x": 2884.000255584717, + "y": 1151.0002088546753, + "z": "b55dc3b9.0674e8", "wires": [ [ - "4dab1db0.0ecf64" + "a83a86bf.d38c58" ] ] }, { - "id": "1933683f.76be88", + "id": "3e855bfc.b9a11c", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2205.5001068115234, - "y": 1084.0000591278076, - "z": "f55e2a79.4bc078", + "x": 2884.9998779296875, + "y": 1227.0000076293945, + "z": "b55dc3b9.0674e8", "wires": [ [ - "4496d8e0.3fa648" + "68a87be6.e042a4" ] ] }, { - "id": "44c00950.df1618", + "id": "9642119f.73843", "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": 2698.500556945801, - "y": 1000.0001926422119, - "z": "f55e2a79.4bc078", + "x": 3422.0002822875977, + "y": 1189.000202178955, + "z": "b55dc3b9.0674e8", "wires": [ [] ] }, { - "id": "38713ccb.cc7554", - "type": "save", - "name": "save:serviceID", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='cp' key='$ltp.ltp-role = \"UNI\" AND cp.pon-uni.oltName = $ltp.ne-id' >\n<parameter name=\"cp.pon-uni.oltName\" value=\"`$ltp.ne-id`\"/>\n<parameter name=\"xxx.serviceID\" value=\"`$service-result.accessE2Eservice.serviceID`\"/>", - "comments": "", - "outputs": 1, - "x": 2768.5003967285156, - "y": 1086.0002756118774, - "z": "f55e2a79.4bc078", - "wires": [ - [] - ] - }, - { - "id": "e118a9e4.09bbf8", + "id": "8cf2e6de.4d3138", "type": "for", "name": "for:network-input-paramters", "xml": "<for index='idx' start='0' end='`$network-input-parameters.param_length`' >\n", "comments": "", "outputs": 1, - "x": 1358.0006866455078, - "y": 497.00017738342285, - "z": "f55e2a79.4bc078", + "x": 2047.5003662109375, + "y": 682.0001649856567, + "z": "b55dc3b9.0674e8", "wires": [ [ - "7e281c4.73218e4" + "98d94257.11223" ] ] }, { - "id": "96ad937a.4c8ed", + "id": "ab021836.64d55", "type": "switchNode", "name": "switch:accessID", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'accessID'`\">\n", "comments": "", "outputs": 1, - "x": 1779.000659942627, - "y": 294.00020027160645, - "z": "f55e2a79.4bc078", + "x": 2588.5004920959473, + "y": 483.00021839141846, + "z": "b55dc3b9.0674e8", "wires": [ [ - "6420de27.c79da" + "97011d1b.729758" ] ] }, { - "id": "6420de27.c79da", + "id": "97011d1b.729758", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1947.0005798339844, - "y": 294.00017166137695, - "z": "f55e2a79.4bc078", + "x": 2791.5004119873047, + "y": 483.00018978118896, + "z": "b55dc3b9.0674e8", "wires": [ [ - "56e09421.b99cfc" + "6416001f.b55fe8" ] ] }, { - "id": "827faee2.62b61", + "id": "c399b374.94be5", "type": "set", "name": "set:accessID", "xml": "<set>\n<parameter name='prop.bbs.accessID' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 2517.0003356933594, - "y": 292.6001777648926, - "z": "f55e2a79.4bc078", + "x": 3509.5001678466797, + "y": 481.6001958847046, + "z": "b55dc3b9.0674e8", "wires": [] }, { - "id": "7e281c4.73218e4", + "id": "98d94257.11223", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1569.000732421875, - "y": 495.0002145767212, - "z": "f55e2a79.4bc078", + "x": 2302.500663757324, + "y": 683.0002040863037, + "z": "b55dc3b9.0674e8", "wires": [ [ - "96ad937a.4c8ed", - "a0441e4c.12a32", - "409981ac.caf34", - "402634ee.c9d2ec" + "ab021836.64d55", + "ad1f45c9.ae1e", + "2107c7fb.ef7398", + "bd0fc4cf.4ad23" ] ] }, { - "id": "a0441e4c.12a32", + "id": "ad1f45c9.ae1e", "type": "switchNode", "name": "switch:ONTSN", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ONTSN'`\">\n", "comments": "", "outputs": 1, - "x": 1778.8524551391602, - "y": 355.0002021789551, - "z": "f55e2a79.4bc078", + "x": 2588.3522872924805, + "y": 544.0002202987671, + "z": "b55dc3b9.0674e8", "wires": [ [ - "db7da2f9.db5f7" + "2e18f3ad.687b94" ] ] }, { - "id": "db7da2f9.db5f7", + "id": "2e18f3ad.687b94", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1945.8523578643799, - "y": 355.0002660751343, - "z": "f55e2a79.4bc078", + "x": 2790.3521900177, + "y": 544.0002841949463, + "z": "b55dc3b9.0674e8", "wires": [ [ - "57debd41.98bbf4" + "96c33b24.ac61b8" ] ] }, { - "id": "4de1ae6e.627d3", + "id": "56ad068a.96a788", "type": "set", "name": "set:ONTSN", "xml": "<set>\n<parameter name='prop.bbs.ONTSN' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 2515.852642059326, - "y": 354.6002426147461, - "z": "f55e2a79.4bc078", + "x": 3508.3524742126465, + "y": 543.6002607345581, + "z": "b55dc3b9.0674e8", "wires": [] }, { - "id": "409981ac.caf34", + "id": "2107c7fb.ef7398", "type": "switchNode", "name": "switch:CVLAN", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'CVLAN'`\">\n", "comments": "", "outputs": 1, - "x": 1778.8525276184082, - "y": 415.00025177001953, - "z": "f55e2a79.4bc078", + "x": 2588.3523597717285, + "y": 604.0002698898315, + "z": "b55dc3b9.0674e8", "wires": [ [ - "98222b2b.1be258" + "92e83b0.845cd48" ] ] }, { - "id": "98222b2b.1be258", + "id": "92e83b0.845cd48", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1945.8523864746094, - "y": 415.0002632141113, - "z": "f55e2a79.4bc078", + "x": 2790.3522186279297, + "y": 604.0002813339233, + "z": "b55dc3b9.0674e8", "wires": [ [ - "1a88c40e.919bec" + "fd2b5da0.8a0b98" ] ] }, { - "id": "af00f8ef.c77b28", + "id": "dd448b5e.614c78", "type": "set", "name": "set:CVLAN", "xml": "<set>\n<parameter name='prop.bbs.CVLAN' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 2513.8523864746094, - "y": 415.6002388000488, - "z": "f55e2a79.4bc078", + "x": 3506.3522186279297, + "y": 604.6002569198608, + "z": "b55dc3b9.0674e8", "wires": [] }, { - "id": "402634ee.c9d2ec", + "id": "bd0fc4cf.4ad23", "type": "switchNode", "name": "switch:SVLAN", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'SVLAN'`\">\n", "comments": "", "outputs": 1, - "x": 1775.8525352478027, - "y": 491.22251892089844, - "z": "f55e2a79.4bc078", + "x": 2585.352367401123, + "y": 680.2225370407104, + "z": "b55dc3b9.0674e8", "wires": [ [ - "640c1f16.f13d" + "b390ab14.2876" ] ] }, { - "id": "640c1f16.f13d", + "id": "b390ab14.2876", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1948.8524198532104, - "y": 490.2225170135498, - "z": "f55e2a79.4bc078", + "x": 2793.3522520065308, + "y": 679.2225351333618, + "z": "b55dc3b9.0674e8", "wires": [ [ - "9452bbef.1a7198" + "6efee915.b74488" ] ] }, { - "id": "7fc6d5a6.6ec01c", + "id": "8e8664b6.96a008", "type": "set", "name": "set:SVLAN", "xml": "<set>\n<parameter name='prop.bbs.SVLAN' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 2519.8523864746094, - "y": 489.8225288391113, - "z": "f55e2a79.4bc078", + "x": 3512.3522186279297, + "y": 678.8225469589233, + "z": "b55dc3b9.0674e8", "wires": [] }, { - "id": "56e09421.b99cfc", + "id": "6416001f.b55fe8", "type": "switchNode", - "name": "switch:acceccID value", + "name": "switch:accessID value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2126.0005798339844, - "y": 293.0002021789551, - "z": "f55e2a79.4bc078", + "x": 3036.5004119873047, + "y": 482.0002202987671, + "z": "b55dc3b9.0674e8", "wires": [ [ - "894b7143.02cc3", - "7eedfab0.187154" + "8f779a47.45116", + "ffdee3f4.53697" ] ] }, { - "id": "7eedfab0.187154", + "id": "ffdee3f4.53697", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2332.0005798339844, - "y": 292.0002021789551, - "z": "f55e2a79.4bc078", + "x": 3324.5004119873047, + "y": 481.0002202987671, + "z": "b55dc3b9.0674e8", "wires": [ [ - "827faee2.62b61" + "c399b374.94be5" ] ] }, { - "id": "894b7143.02cc3", + "id": "8f779a47.45116", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2330.000988006592, - "y": 223.00018119812012, - "z": "f55e2a79.4bc078", + "x": 3322.500820159912, + "y": 412.00019931793213, + "z": "b55dc3b9.0674e8", "wires": [ [ - "3b95a67d.17872a" + "2d4312f0.72e22e" ] ] }, { - "id": "57debd41.98bbf4", + "id": "96c33b24.ac61b8", "type": "switchNode", "name": "switch:ONTSN value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2126.0005798339844, - "y": 355.0002021789551, - "z": "f55e2a79.4bc078", + "x": 3036.5004119873047, + "y": 544.0002202987671, + "z": "b55dc3b9.0674e8", "wires": [ [ - "894b7143.02cc3", - "4b80652a.e00c7c" + "8f779a47.45116", + "226a5e32.f325da" ] ] }, { - "id": "4b80652a.e00c7c", + "id": "226a5e32.f325da", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2334.0005798339844, - "y": 355.0002021789551, - "z": "f55e2a79.4bc078", + "x": 3326.5004119873047, + "y": 544.0002202987671, + "z": "b55dc3b9.0674e8", "wires": [ [ - "4de1ae6e.627d3" + "56ad068a.96a788" ] ] }, { - "id": "1a88c40e.919bec", + "id": "fd2b5da0.8a0b98", "type": "switchNode", "name": "switch:CVLAN value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2129.0005798339844, - "y": 416.0002021789551, - "z": "f55e2a79.4bc078", + "x": 3039.5004119873047, + "y": 605.0002202987671, + "z": "b55dc3b9.0674e8", "wires": [ [ - "894b7143.02cc3", - "798d2c51.91beb4" + "8f779a47.45116", + "c05bd1ad.17646" ] ] }, { - "id": "798d2c51.91beb4", + "id": "c05bd1ad.17646", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2335.0005798339844, - "y": 415.0002021789551, - "z": "f55e2a79.4bc078", + "x": 3327.5004119873047, + "y": 604.0002202987671, + "z": "b55dc3b9.0674e8", "wires": [ [ - "af00f8ef.c77b28" + "dd448b5e.614c78" ] ] }, { - "id": "9452bbef.1a7198", + "id": "6efee915.b74488", "type": "switchNode", "name": "switch:SVLAN value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2130.0005798339844, - "y": 490.0002021789551, - "z": "f55e2a79.4bc078", + "x": 3040.5004119873047, + "y": 679.0002202987671, + "z": "b55dc3b9.0674e8", "wires": [ [ - "894b7143.02cc3", - "acd0ac82.71cb3" + "8f779a47.45116", + "f6e1110f.5f2e3" ] ] }, { - "id": "acd0ac82.71cb3", + "id": "f6e1110f.5f2e3", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2338.0005798339844, - "y": 491.0002021789551, - "z": "f55e2a79.4bc078", + "x": 3330.5004119873047, + "y": 680.0002202987671, + "z": "b55dc3b9.0674e8", "wires": [ [ - "7fc6d5a6.6ec01c" + "8e8664b6.96a008" ] ] }, { - "id": "424890ee.daa33", + "id": "f5dbdf79.0f05b8", "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", + "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": 1326.9999923706055, - "y": 1098.000036239624, - "z": "f55e2a79.4bc078", + "x": 1956.0554504394531, + "y": 1723.7781028747559, + "z": "b55dc3b9.0674e8", "wires": [] }, { - "id": "4496d8e0.3fa648", + "id": "68a87be6.e042a4", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2363.666736602783, - "y": 1085.0000343322754, - "z": "f55e2a79.4bc078", + "x": 3043.1665077209473, + "y": 1227.9999828338623, + "z": "b55dc3b9.0674e8", "wires": [ - [] + [ + "5d75b0e5.89aa78", + "95ed41fa.e44ec" + ] ] }, { - "id": "4dab1db0.0ecf64", + "id": "a83a86bf.d38c58", "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 failed: '+$service-result.errors.error[0].error-message`\" />\n\n", + "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": 2382.000068664551, - "y": 998.0000295639038, - "z": "f55e2a79.4bc078", + "x": 3070.4999237060547, + "y": 1151.0000457763672, + "z": "b55dc3b9.0674e8", "wires": [] }, { - "id": "3b95a67d.17872a", + "id": "2d4312f0.72e22e", "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": 2513.0000762939453, - "y": 223.0000057220459, - "z": "f55e2a79.4bc078", + "x": 3505.4999084472656, + "y": 412.0000238418579, + "z": "b55dc3b9.0674e8", + "wires": [] + }, + { + "id": "464505a9.92b4fc", + "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", + "wires": [] + }, + { + "id": "69e343d2.09328c", + "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", + "wires": [] + }, + { + "id": "97d94787.251f08", + "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`\"/>", + "comments": "", + "outputs": 1, + "x": 2279.533456802368, + "y": 1579.0320892333984, + "z": "b55dc3b9.0674e8", + "wires": [ + [ + "a3497f20.d7ea3", + "9efe9955.3e7888", + "58b775d1.206ccc" + ] + ] + }, + { + "id": "a3497f20.d7ea3", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 2515.7553119659424, + "y": 1450.920846939087, + "z": "b55dc3b9.0674e8", + "wires": [ + [ + "bebc769c.0837e8" + ] + ] + }, + { + "id": "9efe9955.3e7888", + "type": "failure", + "name": "not-found", + "xml": "<outcome value='not-found'>\n", + "comments": "", + "outputs": 1, + "x": 2526.7311305999756, + "y": 1510.9367032051086, + "z": "b55dc3b9.0674e8", + "wires": [ + [ + "e37c929.c92107" + ] + ] + }, + { + "id": "bebc769c.0837e8", + "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", + "wires": [] + }, + { + "id": "e37c929.c92107", + "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", + "wires": [] + }, + { + "id": "58b775d1.206ccc", + "type": "outcome", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 2520.34193611145, + "y": 1576.0631833076477, + "z": "b55dc3b9.0674e8", + "wires": [ + [ + "23816cea.e07514" + ] + ] + }, + { + "id": "23816cea.e07514", + "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", + "wires": [ + [] + ] + }, + { + "id": "116359fa.597806", + "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.accessID`\" />\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", + "wires": [ + [ + "835155a5.b67df8", + "c341fca3.24318", + "eea59fae.70bf9" + ] + ] + }, + { + "id": "835155a5.b67df8", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 2491.5082931518555, + "y": 1673.3965210914612, + "z": "b55dc3b9.0674e8", + "wires": [ + [ + "ce09f6b.b604008" + ] + ] + }, + { + "id": "c341fca3.24318", + "type": "failure", + "name": "not-found", + "xml": "<outcome value='not-found'>\n", + "comments": "", + "outputs": 1, + "x": 2503.4844551086426, + "y": 1743.4124546051025, + "z": "b55dc3b9.0674e8", + "wires": [ + [ + "356aae98.7445f2" + ] + ] + }, + { + "id": "ce09f6b.b604008", + "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", + "wires": [] + }, + { + "id": "356aae98.7445f2", + "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", + "wires": [] + }, + { + "id": "eea59fae.70bf9", + "type": "outcome", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 2498.0951652526855, + "y": 1813.5388941764832, + "z": "b55dc3b9.0674e8", + "wires": [ + [ + "8a223ca4.509e4" + ] + ] + }, + { + "id": "8a223ca4.509e4", + "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", + "wires": [ + [] + ] + }, + { + "id": "f837852c.dfc578", + "type": "block", + "name": "block", + "xml": "<block>\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1974.6670570373535, + "y": 1453.0006408691406, + "z": "b55dc3b9.0674e8", + "wires": [ + [ + "97d94787.251f08", + "116359fa.597806", + "306a1b6e.90a264", + "53d01937.c7f688" + ] + ] + }, + { + "id": "306a1b6e.90a264", + "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", + "wires": [] + }, + { + "id": "53d01937.c7f688", + "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", + "wires": [ + [ + "d511316d.80f4c" + ] + ] + }, + { + "id": "d511316d.80f4c", + "type": "success", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 2520.031665802002, + "y": 1377.0315704345703, + "z": "b55dc3b9.0674e8", + "wires": [ + [ + "350eef68.69f9e" + ] + ] + }, + { + "id": "350eef68.69f9e", + "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", + "wires": [ + [ + "abdff798.71d8c8" + ] + ] + }, + { + "id": "52dff766.2dd2d8", + "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", + "wires": [ + [] + ] + }, + { + "id": "abdff798.71d8c8", + "type": "outcome", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 2874.031660079956, + "y": 1375.031509399414, + "z": "b55dc3b9.0674e8", + "wires": [ + [ + "52dff766.2dd2d8" + ] + ] + }, + { + "id": "95ed41fa.e44ec", + "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", + "wires": [] + }, + { + "id": "fa43c07a.448fc", + "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", "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 17a2dfe3..1dd2f320 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": "9258ad5d.d05ba", + "id": "32e79365.f9a674", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 289.50011825561523, - "y": 436.0000114440918, - "z": "828aeb02.de4ff8", + "x": 585, + "y": 664, + "z": "e7492f37.77e028", "wires": [ [ - "377de850.27cec8" + "b127d6e2.ff9c7" ] ] }, { - "id": "377de850.27cec8", + "id": "b127d6e2.ff9c7", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,524 +22,548 @@ "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": 677.5, - "y": 436.0000162124634, - "z": "828aeb02.de4ff8", + "x": 972.9998817443848, + "y": 664.0000047683716, + "z": "e7492f37.77e028", "wires": [ [ - "7334f5ac.b08f4c" + "2c85dd35.2b753a" ] ] }, { - "id": "7334f5ac.b08f4c", + "id": "2c85dd35.2b753a", "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": 640.5, - "y": 555.0000162124634, - "z": "828aeb02.de4ff8", + "x": 935.9998817443848, + "y": 783.0000047683716, + "z": "e7492f37.77e028", "wires": [ [ - "a88453d9.f253b" + "ef9e0c93.94adf8" ] ] }, { - "id": "a88453d9.f253b", + "id": "ef9e0c93.94adf8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1038.5001068115234, - "y": 554.0000162124634, - "z": "828aeb02.de4ff8", + "x": 1333.9999885559082, + "y": 782.0000047683716, + "z": "e7492f37.77e028", "wires": [ [ - "cb91ee20.76b95", - "ca9aad5d.392e5", - "c4485241.e819a", - "c4d9d4a8.396518", - "2637d1ad.97175e", - "bc596678.34ee28", - "c3d1b49e.311728" + "267997b8.e9b0d", + "f1c69874.61cb9", + "7e468fe4.3b77e8", + "68d0163d.33ab6", + "1d5f9b67.3462ad", + "5f5fa66b.a3a898", + "a5de3800.3f3c9" ] ] }, { - "id": "cb91ee20.76b95", + "id": "267997b8.e9b0d", "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": 1480.5004043579102, - "y": 408.11109733581543, - "z": "828aeb02.de4ff8", + "x": 1776.000286102295, + "y": 636.1110858917236, + "z": "e7492f37.77e028", "wires": [ [] ] }, { - "id": "bc596678.34ee28", + "id": "5f5fa66b.a3a898", "type": "for", "name": "for:network-input-paramters", "xml": "<for index='idx' start='0' end='`$network-input-parameters.param_length`' >\n", "comments": "", "outputs": 1, - "x": 1484.5004272460938, - "y": 629.999942779541, - "z": "828aeb02.de4ff8", + "x": 1780.0003089904785, + "y": 857.9999313354492, + "z": "e7492f37.77e028", "wires": [ [ - "e67c3291.c9f3e" + "a2cbb6ad.9498d8" ] ] }, { - "id": "2637d1ad.97175e", + "id": "1d5f9b67.3462ad", "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": 1475.5004272460938, - "y": 540.0000190734863, - "z": "828aeb02.de4ff8", + "x": 1771.0003089904785, + "y": 768.0000076293945, + "z": "e7492f37.77e028", "wires": [ [ - "3ddf50e9.7ad19", - "6fb4fdec.445914" + "2b64faec.a1d51e", + "15bc857f.bafd43" ] ] }, { - "id": "6fb4fdec.445914", + "id": "15bc857f.bafd43", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1774.6670532226562, - "y": 536.2500190734863, - "z": "828aeb02.de4ff8", + "x": 2070.166934967041, + "y": 764.2500076293945, + "z": "e7492f37.77e028", "wires": [ [ - "bb09478d.013828" + "c730ec93.32f82" ] ] }, { - "id": "3ddf50e9.7ad19", + "id": "2b64faec.a1d51e", "type": "outcome", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1770.6670532226562, - "y": 430.2499885559082, - "z": "828aeb02.de4ff8", + "x": 2066.166934967041, + "y": 658.2499771118164, + "z": "e7492f37.77e028", "wires": [ [ - "cafa7f31.58fb9" + "20d8621f.db8eee" ] ] }, { - "id": "cafa7f31.58fb9", + "id": "5704a92f.4d6488", "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 Get token rest api\" />\n", + "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": 2341.4171752929688, - "y": 422.2499885559082, - "z": "828aeb02.de4ff8", + "x": 2613.2807388305664, + "y": 706.6136617660522, + "z": "e7492f37.77e028", "wires": [] }, { - "id": "b7ad2681.5938c8", + "id": "a55c0e66.2654c8", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2141.5004348754883, - "y": 478.9999752044678, - "z": "828aeb02.de4ff8", + "x": 2437.000316619873, + "y": 706.999963760376, + "z": "e7492f37.77e028", "wires": [ [ - "cafa7f31.58fb9" + "5704a92f.4d6488" ] ] }, { - "id": "bb09478d.013828", + "id": "c730ec93.32f82", "type": "switchNode", "name": "switch:token ", "xml": "<switch test='`$token-result.accessSession`'>\n", "comments": "", "outputs": 1, - "x": 1973.5004348754883, - "y": 536.9999752044678, - "z": "828aeb02.de4ff8", + "x": 2269.000316619873, + "y": 764.999963760376, + "z": "e7492f37.77e028", "wires": [ [ - "b7ad2681.5938c8", - "c64cc196.0b01" + "a55c0e66.2654c8", + "72281c79.15bf7c" ] ] }, { - "id": "c64cc196.0b01", + "id": "72281c79.15bf7c", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2142.5004348754883, - "y": 535.9999752044678, - "z": "828aeb02.de4ff8", + "x": 2438.000316619873, + "y": 763.999963760376, + "z": "e7492f37.77e028", "wires": [ [ - "4a6b446f.138e7c" + "85cd43c3.a877f8" ] ] }, { - "id": "4a6b446f.138e7c", + "id": "85cd43c3.a877f8", "type": "set", "name": "set:token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\n", "comments": "", - "x": 2317.0004272460938, - "y": 535.2500190734863, - "z": "828aeb02.de4ff8", + "x": 2612.5003089904785, + "y": 763.2500076293945, + "z": "e7492f37.77e028", "wires": [] }, { - "id": "69330fca.c0655", + "id": "cf8179f9.6c703", "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": 2528.5004272460938, - "y": 532.9999580383301, - "z": "828aeb02.de4ff8", + "x": 2824.0003089904785, + "y": 760.9999465942383, + "z": "e7492f37.77e028", "wires": [ [] ] }, { - "id": "c4d9d4a8.396518", + "id": "68d0163d.33ab6", "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": 1446.5004043579102, - "y": 328.0001735687256, - "z": "828aeb02.de4ff8", + "x": 1742.000286102295, + "y": 556.0001621246338, + "z": "e7492f37.77e028", "wires": [] }, { - "id": "c3d1b49e.311728", + "id": "a5de3800.3f3c9", "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": 1536.500690460205, - "y": 810.0001218318939, - "z": "828aeb02.de4ff8", + "x": 1832.0005722045898, + "y": 1038.0001103878021, + "z": "e7492f37.77e028", "wires": [ [ - "5321d4ef.5d4d2c", - "d9cf5692.a52db8" + "5b7315a4.8b9d54", + "b2a61f83.59c088" ] ] }, { - "id": "5321d4ef.5d4d2c", + "id": "5b7315a4.8b9d54", "type": "outcome", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1841.5007057189941, - "y": 750.0001029968262, - "z": "828aeb02.de4ff8", + "x": 2137.000587463379, + "y": 978.0000915527344, + "z": "e7492f37.77e028", "wires": [ [ - "b0348a26.8427e8" + "218de6d2.4c392a" ] ] }, { - "id": "d9cf5692.a52db8", + "id": "b2a61f83.59c088", "type": "outcome", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1841.5006790161133, - "y": 809.0001027584076, - "z": "828aeb02.de4ff8", + "x": 2137.000560760498, + "y": 1037.0000913143158, + "z": "e7492f37.77e028", "wires": [ [ - "de1193ab.e5312" + "ce8b9653.804e" ] ] }, { - "id": "1e90d7c8.353078", + "id": "67d761ed.040b7", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2327.500789642334, - "y": 706.0000369548798, - "z": "828aeb02.de4ff8", + "x": 2623.0006713867188, + "y": 934.000025510788, + "z": "e7492f37.77e028", "wires": [ [ - "b0348a26.8427e8" + "f6e3cbc5.9d1b18" ] ] }, { - "id": "b0348a26.8427e8", + "id": "f6e3cbc5.9d1b18", "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=\"invalid network-input-parameters.param in bbs-access-connectivity-network-topology-operation-delete\" />\n", + "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": 2531.5006313323975, - "y": 745.0000369548798, - "z": "828aeb02.de4ff8", + "x": 2807.9096183776855, + "y": 933.9090785980225, + "z": "e7492f37.77e028", "wires": [] }, { - "id": "e67c3291.c9f3e", + "id": "a2cbb6ad.9498d8", "type": "switchNode", "name": "switch:serviceID", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'serviceID'`\">\n", "comments": "", "outputs": 1, - "x": 1759.5004539489746, - "y": 629.0000305175781, - "z": "828aeb02.de4ff8", + "x": 2055.0003356933594, + "y": 857.0000190734863, + "z": "e7492f37.77e028", "wires": [ [ - "fb75295a.8000b8" + "8cd031d1.154ec8" ] ] }, { - "id": "fb75295a.8000b8", + "id": "8cd031d1.154ec8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1932.5003385543823, - "y": 628.0000286102295, - "z": "828aeb02.de4ff8", + "x": 2228.000220298767, + "y": 856.0000171661377, + "z": "e7492f37.77e028", "wires": [ [ - "c27015c2.2e9f58" + "9ffc371.a8c8ec8" ] ] }, { - "id": "7c852ec3.9bf23", + "id": "7e9b3155.7cd6d", "type": "set", "name": "set:serviceID", "xml": "<set>\n<parameter name='prop.bbs.serviceID' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 2503.5003051757812, - "y": 627.600040435791, - "z": "828aeb02.de4ff8", + "x": 2799.000186920166, + "y": 855.6000289916992, + "z": "e7492f37.77e028", "wires": [] }, { - "id": "c27015c2.2e9f58", + "id": "9ffc371.a8c8ec8", "type": "switchNode", "name": "switch:serviceID value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2113.6484985351562, - "y": 627.7777137756348, - "z": "828aeb02.de4ff8", + "x": 2409.148380279541, + "y": 855.777702331543, + "z": "e7492f37.77e028", "wires": [ [ - "9c90b9c1.bc3cb8", - "1e90d7c8.353078" + "46008887.d0731", + "67d761ed.040b7" ] ] }, { - "id": "9c90b9c1.bc3cb8", + "id": "46008887.d0731", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2321.6484985351562, - "y": 628.7777137756348, - "z": "828aeb02.de4ff8", + "x": 2617.148380279541, + "y": 856.777702331543, + "z": "e7492f37.77e028", "wires": [ [ - "7c852ec3.9bf23" + "7e9b3155.7cd6d" ] ] }, { - "id": "ca9aad5d.392e5", + "id": "f1c69874.61cb9", "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": 1558.0000305175781, - "y": 247.00002479553223, - "z": "828aeb02.de4ff8", + "x": 1853.499912261963, + "y": 475.00001335144043, + "z": "e7492f37.77e028", "wires": [ [] ] }, { - "id": "477b70c6.2a5c9", + "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 <parameter name=\"field2\" value=\"`$service-result.accessE2Eservice.serviceID`\" />\n ", + "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": 2885.0005645751953, - "y": 911.0001068115234, - "z": "828aeb02.de4ff8", + "x": 3170.500503540039, + "y": 1121.0001611709595, + "z": "e7492f37.77e028", "wires": [ [] ] }, { - "id": "de1193ab.e5312", + "id": "ce8b9653.804e", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2018.0004768371582, - "y": 810.0002808570862, - "z": "828aeb02.de4ff8", + "x": 2313.500358581543, + "y": 1038.0002694129944, + "z": "e7492f37.77e028", "wires": [ [ - "754aabd8.cabdb4" + "558a111d.84c158" ] ] }, { - "id": "754aabd8.cabdb4", + "id": "558a111d.84c158", "type": "switchNode", "name": "switch:service-result", "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n", "comments": "", "outputs": 1, - "x": 2236.0003547668457, - "y": 809.0001282691956, - "z": "828aeb02.de4ff8", + "x": 2531.5002365112305, + "y": 1037.0001168251038, + "z": "e7492f37.77e028", "wires": [ [ - "2dd16d0d.e63022", - "c62a673d.9cf0e8" + "3ed23c26.7d9344", + "3b7a58ab.469a28" ] ] }, { - "id": "2dd16d0d.e63022", + "id": "3ed23c26.7d9344", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2470.000400543213, - "y": 810.0000882148743, - "z": "828aeb02.de4ff8", + "x": 2765.5002822875977, + "y": 1038.0000767707825, + "z": "e7492f37.77e028", "wires": [ [ - "6c15beca.e4e8a" + "a4966b56.feb3a" ] ] }, { - "id": "c62a673d.9cf0e8", + "id": "3b7a58ab.469a28", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2472.000400543213, - "y": 896.0000882148743, - "z": "828aeb02.de4ff8", + "x": 2767.5002822875977, + "y": 1124.0000767707825, + "z": "e7492f37.77e028", "wires": [ [ - "c04ee5c.68b7018" + "f89a532c.628618" ] ] }, { - "id": "5e21416c.565be", + "id": "daa9ee04.8494a8", "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": 2910.0005645751953, - "y": 797.0001049041748, - "z": "828aeb02.de4ff8", + "x": 3205.50044631958, + "y": 1025.000093460083, + "z": "e7492f37.77e028", "wires": [ [] ] }, { - "id": "c4485241.e819a", + "id": "7e468fe4.3b77e8", "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": 1438.000244140625, - "y": 948.0000305175781, - "z": "828aeb02.de4ff8", + "x": 1733.5001258850098, + "y": 1176.0000190734863, + "z": "e7492f37.77e028", "wires": [] }, { - "id": "6c15beca.e4e8a", + "id": "a4966b56.feb3a", "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 failed: '+$service-result.errors.error[0].error-message`\" />\n\n", + "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": 2670.0000762939453, - "y": 810.0000228881836, - "z": "828aeb02.de4ff8", + "x": 2965.49995803833, + "y": 1038.0000114440918, + "z": "e7492f37.77e028", "wires": [] }, { - "id": "c04ee5c.68b7018", + "id": "f89a532c.628618", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2656.0000762939453, - "y": 898.0000267028809, - "z": "828aeb02.de4ff8", + "x": 2951.4999771118164, + "y": 1123.2726850509644, + "z": "e7492f37.77e028", "wires": [ - [] + [ + "fca294fa.de967" + ] ] + }, + { + "id": "20d8621f.db8eee", + "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", + "wires": [] + }, + { + "id": "218de6d2.4c392a", + "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", + "wires": [] } ]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json index c122c541..2440c43c 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json @@ -2140,8 +2140,8 @@ { "id": "2daf54e0.ce83cc", "type": "switchNode", - "name": "switch:vendor", - "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`\">\n", + "name": "switch:manufacturer", + "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`\">\n", "comments": "", "outputs": 1, "x": 2033.5001487731934, @@ -2172,7 +2172,7 @@ { "id": "b35e15c3.b29238", "type": "switchNode", - "name": "switch:vendor value", + "name": "switch:manufacturer value", "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, @@ -2252,8 +2252,8 @@ { "id": "1fcee7a4.020b98", "type": "switchNode", - "name": "switch:vendor", - "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`\">\n", + "name": "switch:manufacturer", + "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`\">\n", "comments": "", "outputs": 1, "x": 2062.4994201660156, @@ -2284,7 +2284,7 @@ { "id": "949f9c2f.46255", "type": "switchNode", - "name": "switch:vendor value", + "name": "switch:manufacturer value", "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, @@ -2351,7 +2351,7 @@ "id": "247872c4.a3df6e", "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=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`\" />", + "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=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`\" />", "comments": "", "x": 3051.666831970215, "y": 2025.6670513153076, @@ -2377,8 +2377,8 @@ { "id": "94d7db37.7a3d78", "type": "switchNode", - "name": "switch:vendor", - "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`\">\n", + "name": "switch:manufacturer", + "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`\">\n", "comments": "", "outputs": 1, "x": 1813.833023071289, @@ -2409,7 +2409,7 @@ { "id": "30948650.291b5a", "type": "switchNode", - "name": "switch:vendor value", + "name": "switch:manufacturer value", "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, @@ -2475,8 +2475,8 @@ { "id": "da232470.f93ec8", "type": "switchNode", - "name": "switch:vendor", - "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`\">\n", + "name": "switch:manufacturer", + "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`\">\n", "comments": "", "outputs": 1, "x": 2058.832878112793, @@ -2507,7 +2507,7 @@ { "id": "247f3edd.baaa82", "type": "switchNode", - "name": "switch:vendor value", + "name": "switch:manufacturer value", "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, @@ -2573,8 +2573,8 @@ { "id": "3c9fb8cf.9cb2f8", "type": "switchNode", - "name": "switch:vendor", - "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`\">\n", + "name": "switch:manufacturer", + "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`\">\n", "comments": "", "outputs": 1, "x": 2030.833065032959, @@ -2605,7 +2605,7 @@ { "id": "2f27817.d741d7e", "type": "switchNode", - "name": "switch:vendor value", + "name": "switch:manufacturer value", "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, 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 ae4e0f96..b207014c 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 @@ -111,7 +111,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error executing Get token rest api" /> + <parameter name="error-message" value="Error executing queryTokenID,vaule is null" /> </return> </outcome> </switch> @@ -120,7 +120,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error executing Get token rest api" /> + <parameter name="error-message" value="Error failed to call queryTokenID" /> </return> </outcome> </execute> @@ -139,7 +139,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error executing Get token rest api" /> + <parameter name="error-message" value="Error failed to call createAccessConnectivityService" /> </return> </outcome> <outcome value='success'> @@ -148,15 +148,111 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'Error createAccessConnectivityService failed: '+$service-result.errors.error[0].error-message`" /> + <parameter name="error-message" value="`'Error createAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" /> </return> </outcome> <outcome value=''> - <block></block> + <block> + <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> </outcome> </execute> + <block> + <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID"> + <parameter name="ctx-destination" value="prop.random-data"/> + <outcome value='success'> + <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' > + <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> + </execute> + </outcome> + </execute> + <set> + <parameter name='vnf-id' value="`$prop.random-data-list[3]`"/> + <parameter name='vnf-name' value="`'vnf-'+$prop.random-data-list[4]`"/> + </set> + <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $vnf-id" > + <parameter name= "vnf-id" value = "`$vnf-id`"/> + <parameter name= "vnf-name" value = "`$vnf-name`"/> + <parameter name= "vnf-type" value = "AccessConnectivity"/> + <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`"/> + <parameter name= "model-customization-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`"/> + <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 generic-vnf" /> + </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="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> + </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 + 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="metadata.metadatum[0].metaname" value="remote-id" /> + <parameter name="metadata.metadatum[0].metaval" value="`$prop.bbs.accessID`" /> + <parameter name="metadata.metadatum[1].metaname" value="controller-service-id" /> + <parameter name="metadata.metadatum[1].metaval" value="`$prop.bbs.serviceID`" /> + <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'> + <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> + </save> + </block> <return status='success'> <parameter name="ack-final-indicator" value="Y" /> <parameter name="error-code" value="200" /> 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 e5b59771..732f4f39 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 @@ -26,7 +26,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error executing Get token rest api" /> + <parameter name="error-message" value="Error failed to call queryTokenID" /> </return> </outcome> <outcome value='success'> @@ -35,7 +35,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error executing Get token rest api" /> + <parameter name="error-message" value="Error executing queryTokenID,vaule is null" /> </return> </outcome> <outcome value='Other'> @@ -59,7 +59,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="invalid network-input-parameters.param in bbs-access-connectivity-network-topology-operation-delete" /> + <parameter name="error-message" value="$network-input-parameters.param[$idx].name +' value is null, please check it.'" /> </return> </outcome> </switch> @@ -80,7 +80,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="invalid network-input-parameters.param in bbs-access-connectivity-network-topology-operation-delete" /> + <parameter name="error-message" value="Error failed to call deleteAccessConnectivityService" /> </return> </outcome> <outcome value='success'> @@ -90,11 +90,16 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'Error deleteAccessConnectivityService failed: '+$service-result.errors.error[0].error-message`" /> + <parameter name="error-message" value="`'Error deleteAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" /> </return> </outcome> <outcome value=''> - <block></block> + <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> </outcome> </switch> </block> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml index 06456da7..51d6b6a8 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml @@ -380,7 +380,7 @@ <switch test='`$network-topology-operation-input.request-information.request-action`'> <outcome value='ChangeInternetProfileInstance'> <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' > - <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`"> + <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`"> <outcome value='true'> <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'> <outcome value='HUAWEI'> @@ -393,7 +393,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" /> + <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" /> </return> </outcome> </switch> @@ -427,7 +427,7 @@ </outcome> <outcome value='CreateInternetProfileInstance'> <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' > - <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`"> + <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`"> <outcome value='true'> <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'> <outcome value='HUAWEI'> @@ -440,7 +440,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" /> + <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" /> </return> </outcome> </switch> @@ -450,7 +450,7 @@ </outcome> <outcome value='CreateAccessConnectivityInstance'> <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' > - <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`"> + <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`"> <outcome value='true'> <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'> <outcome value='HUAWEI'> @@ -463,7 +463,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" /> + <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" /> </return> </outcome> </switch> @@ -497,14 +497,14 @@ </outcome> <outcome value='DeleteAccessConnectivityInstance'> <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' > - <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`"> + <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`"> <outcome value='true'> <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'> <outcome value='Other'> <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" /> + <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" /> </return> </outcome> <outcome value='HUAWEI'> @@ -520,14 +520,14 @@ </outcome> <outcome value='DeleteInternetProfileInstance'> <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' > - <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`"> + <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`"> <outcome value='true'> <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'> <outcome value='Other'> <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" /> + <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" /> </return> </outcome> <outcome value='HUAWEI'> |