diff options
Diffstat (limited to 'platform-logic/generic-resource-api/src')
2 files changed, 326 insertions, 331 deletions
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 e844cf7a..4d6235cc 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": "f10269e9.df7498", + "id": "1e347aad.d3338d", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 775.6666870117188, - "y": 312, - "z": "55c43f0b.2cfc8", + "x": 880, + "y": 429, + "z": "2edf7d59.cf16ea", "wires": [ [ - "c12bcf3b.bb05e" + "842aa2b0.9a6e38" ] ] }, { - "id": "c12bcf3b.bb05e", + "id": "842aa2b0.9a6e38", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,852 +22,851 @@ "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": 1083.6663360595703, - "y": 312.0000219345093, - "z": "55c43f0b.2cfc8", + "x": 1187.9996490478516, + "y": 429.0000219345093, + "z": "2edf7d59.cf16ea", "wires": [ [ - "d31f19c6.9a2f48" + "fd3c684f.426a28" ] ] }, { - "id": "d31f19c6.9a2f48", + "id": "fd3c684f.426a28", "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": 1081.6663513183594, - "y": 532.0000991821289, - "z": "55c43f0b.2cfc8", + "x": 1185.9996643066406, + "y": 649.0000991821289, + "z": "2edf7d59.cf16ea", "wires": [ [ - "e74f77eb.1000f8" + "2175700f.c2f0c8" ] ] }, { - "id": "e74f77eb.1000f8", + "id": "2175700f.c2f0c8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1505.6665496826172, - "y": 531.0000991821289, - "z": "55c43f0b.2cfc8", + "x": 1609.9998626708984, + "y": 648.0000991821289, + "z": "2edf7d59.cf16ea", "wires": [ [ - "da3c5279.38fd5", - "134f88fe.350da7", - "5508b339.a1114c", - "af4311d2.58cf3" + "4127c3fa.9673b4", + "1d343f0c.026059", + "eab220b4.352a5", + "55d0514e.620318", + "38f1d224.3b5b8e" ] ] }, { - "id": "da3c5279.38fd5", + "id": "4127c3fa.9673b4", "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": 1971.6667175292969, - "y": 210.00000953674316, - "z": "55c43f0b.2cfc8", + "x": 2076.000030517578, + "y": 327.00000953674316, + "z": "2edf7d59.cf16ea", "wires": [ [] ] }, { - "id": "134f88fe.350da7", + "id": "1d343f0c.026059", "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\n", + "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": 1861.6672172546387, - "y": 316.00020599365234, - "z": "55c43f0b.2cfc8", + "x": 1966.00053024292, + "y": 433.00020599365234, + "z": "2edf7d59.cf16ea", "wires": [] }, { - "id": "5508b339.a1114c", + "id": "eab220b4.352a5", "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": 1888.6666870117188, - "y": 426.1111707687378, - "z": "55c43f0b.2cfc8", + "x": 1993, + "y": 543.1111707687378, + "z": "2edf7d59.cf16ea", "wires": [ [] ] }, { - "id": "af4311d2.58cf3", + "id": "55d0514e.620318", "type": "for", "name": "for:network-input-paramters", "xml": "<for index='idx' start='0' end='`$network-input-parameters.param_length`' >\n", "comments": "", "outputs": 1, - "x": 1905.1670532226562, - "y": 525.0001726150513, - "z": "55c43f0b.2cfc8", + "x": 2009.5003662109375, + "y": 642.0001726150513, + "z": "2edf7d59.cf16ea", "wires": [ [ - "d398654e.b34478" + "7929126f.1978ec" ] ] }, { - "id": "9d40c0ce.78fd9", + "id": "8a494a8.20a8bb8", "type": "switchNode", - "name": "switch:access_id", - "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'access_id'`\">\n", + "name": "switch:ip_access_id", + "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_access_id'`\">\n", "comments": "", "outputs": 1, - "x": 2502.1671142578125, - "y": 306.00020694732666, - "z": "55c43f0b.2cfc8", + "x": 2606.5004272460938, + "y": 423.00020694732666, + "z": "2edf7d59.cf16ea", "wires": [ [ - "73200882.d46168" + "fe05659d.525818" ] ] }, { - "id": "73200882.d46168", + "id": "fe05659d.525818", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2706.16703414917, - "y": 306.00017833709717, - "z": "55c43f0b.2cfc8", + "x": 2810.500347137451, + "y": 423.00017833709717, + "z": "2edf7d59.cf16ea", "wires": [ [ - "ef73e02f.cdd2b" + "8225c847.1697b" ] ] }, { - "id": "7fb39d4.2f12264", + "id": "a7d3481c.08f7b8", "type": "set", "name": "set:access_id", "xml": "<set>\n<parameter name='prop.bbs.access_id' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3425.16739654541, - "y": 299.60026264190674, - "z": "55c43f0b.2cfc8", + "x": 3529.5007095336914, + "y": 416.60026264190674, + "z": "2edf7d59.cf16ea", "wires": [] }, { - "id": "d398654e.b34478", + "id": "7929126f.1978ec", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2151.167095184326, - "y": 524.0001811981201, - "z": "55c43f0b.2cfc8", + "x": 2255.5004081726074, + "y": 641.0001811981201, + "z": "2edf7d59.cf16ea", "wires": [ [ - "9d40c0ce.78fd9", - "b543b4c2.8bc0f8", - "e879270a.b17da8", - "59bd1f4a.c9cda", - "8cdcb93e.555918", - "6098eadd.045e54", - "71c4f1fc.edbb3", - "7561ea5b.dc7884", - "9b583213.a2a04" + "8a494a8.20a8bb8", + "c33f3624.738b68", + "e50f084d.3dcf38", + "19d2ce64.f177ba", + "d857f73d.adc418", + "17321748.f836a9", + "80e0672.33dd098", + "9ec2e808.aa4ef" ] ] }, { - "id": "b543b4c2.8bc0f8", + "id": "c33f3624.738b68", "type": "switchNode", "name": "switch:ont_sn", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ont_sn'`\">\n", "comments": "", "outputs": 1, - "x": 2502.0189094543457, - "y": 367.0002088546753, - "z": "55c43f0b.2cfc8", + "x": 2606.352222442627, + "y": 484.0002088546753, + "z": "2edf7d59.cf16ea", "wires": [ [ - "d486cb64.e5cc88" + "91cb6667.0e6f38" ] ] }, { - "id": "d486cb64.e5cc88", + "id": "91cb6667.0e6f38", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2705.0188121795654, - "y": 367.0002727508545, - "z": "55c43f0b.2cfc8", + "x": 2809.3521251678467, + "y": 484.0002727508545, + "z": "2edf7d59.cf16ea", "wires": [ [ - "ec7666af.6addb8" + "2781aecd.a647d2" ] ] }, { - "id": "b9b321b1.332a6", + "id": "98c0b103.95e21", "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": 3424.019702911377, - "y": 361.60032749176025, - "z": "55c43f0b.2cfc8", + "x": 3528.353015899658, + "y": 478.60032749176025, + "z": "2edf7d59.cf16ea", "wires": [] }, { - "id": "e879270a.b17da8", + "id": "e50f084d.3dcf38", "type": "switchNode", "name": "switch:c_vlan", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'c_vlan'`\">\n", "comments": "", "outputs": 1, - "x": 2497.0191650390625, - "y": 726.0003833770752, - "z": "55c43f0b.2cfc8", + "x": 2601.3524780273438, + "y": 843.0003833770752, + "z": "2edf7d59.cf16ea", "wires": [ [ - "69b98671.7d9698" + "cc2858fe.effe8" ] ] }, { - "id": "69b98671.7d9698", + "id": "cc2858fe.effe8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2700.0190238952637, - "y": 726.000394821167, - "z": "55c43f0b.2cfc8", + "x": 2804.352336883545, + "y": 843.000394821167, + "z": "2edf7d59.cf16ea", "wires": [ [ - "d82c6439.435768" + "9cd70077.ad156" ] ] }, { - "id": "9515222a.16723", + "id": "484906a8.869108", "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": 3419.0197143554688, - "y": 722.6004438400269, - "z": "55c43f0b.2cfc8", + "x": 3523.35302734375, + "y": 839.6004438400269, + "z": "2edf7d59.cf16ea", "wires": [] }, { - "id": "59bd1f4a.c9cda", + "id": "19d2ce64.f177ba", "type": "switchNode", "name": "switch:s_vlan", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 's_vlan'`\">\n", "comments": "", "outputs": 1, - "x": 2492.019172668457, - "y": 669.2226104736328, - "z": "55c43f0b.2cfc8", + "x": 2596.3524856567383, + "y": 786.2226104736328, + "z": "2edf7d59.cf16ea", "wires": [ [ - "f5723673.bf6868" + "63ab238d.357434" ] ] }, { - "id": "f5723673.bf6868", + "id": "63ab238d.357434", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2701.0190572738647, - "y": 668.2226085662842, - "z": "55c43f0b.2cfc8", + "x": 2805.352370262146, + "y": 785.2226085662842, + "z": "2edf7d59.cf16ea", "wires": [ [ - "d2a653cd.d6a14" + "79609442.62289c" ] ] }, { - "id": "ddf0943.130d368", + "id": "1dc9c73a.36a871", "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": 3421.019630432129, - "y": 662.8226985931396, - "z": "55c43f0b.2cfc8", + "x": 3525.35294342041, + "y": 779.8226985931396, + "z": "2edf7d59.cf16ea", "wires": [] }, { - "id": "ef73e02f.cdd2b", + "id": "8225c847.1697b", "type": "switchNode", - "name": "switch:accecc_id value", + "name": "switch:ip_access_id value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2917.16703414917, - "y": 305.0002088546753, - "z": "55c43f0b.2cfc8", + "x": 3021.500347137451, + "y": 422.0002088546753, + "z": "2edf7d59.cf16ea", "wires": [ [ - "355a14da.2c5f3c", - "54ae716c.b1246" + "f6d633a5.8dcd68", + "c415f41b.dc79" ] ] }, { - "id": "54ae716c.b1246", + "id": "c415f41b.dc79", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3218.1674423217773, - "y": 299.00030040740967, - "z": "55c43f0b.2cfc8", + "x": 3322.5007553100586, + "y": 416.00030040740967, + "z": "2edf7d59.cf16ea", "wires": [ [ - "7fb39d4.2f12264" + "a7d3481c.08f7b8" ] ] }, { - "id": "ec7666af.6addb8", + "id": "2781aecd.a647d2", "type": "switchNode", "name": "switch:ont_sn value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2917.16703414917, - "y": 367.0002088546753, - "z": "55c43f0b.2cfc8", + "x": 3021.500347137451, + "y": 484.0002088546753, + "z": "2edf7d59.cf16ea", "wires": [ [ - "355a14da.2c5f3c", - "28d7a120.f6fdbe" + "f6d633a5.8dcd68", + "68a8565a.8b2ef" ] ] }, { - "id": "28d7a120.f6fdbe", + "id": "68a8565a.8b2ef", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3220.1674423217773, - "y": 362.00030040740967, - "z": "55c43f0b.2cfc8", + "x": 3324.5007553100586, + "y": 479.00030040740967, + "z": "2edf7d59.cf16ea", "wires": [ [ - "b9b321b1.332a6" + "98c0b103.95e21" ] ] }, { - "id": "d82c6439.435768", + "id": "9cd70077.ad156", "type": "switchNode", "name": "switch:c_vlan value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2915.1672172546387, - "y": 727.0003337860107, - "z": "55c43f0b.2cfc8", + "x": 3019.50053024292, + "y": 844.0003337860107, + "z": "2edf7d59.cf16ea", "wires": [ [ - "355a14da.2c5f3c", - "ec5e8e39.5e084" + "f6d633a5.8dcd68", + "5078e952.0204f8" ] ] }, { - "id": "ec5e8e39.5e084", + "id": "5078e952.0204f8", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3219.1678161621094, - "y": 724.0004281997681, - "z": "55c43f0b.2cfc8", + "x": 3323.5011291503906, + "y": 841.0004281997681, + "z": "2edf7d59.cf16ea", "wires": [ [ - "9515222a.16723" + "484906a8.869108" ] ] }, { - "id": "d2a653cd.d6a14", + "id": "79609442.62289c", "type": "switchNode", "name": "switch:s_vlan value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2914.1672172546387, - "y": 668.0002937316895, - "z": "55c43f0b.2cfc8", + "x": 3018.50053024292, + "y": 785.0002937316895, + "z": "2edf7d59.cf16ea", "wires": [ [ - "355a14da.2c5f3c", - "8b4cb76b.dd9ee8" + "f6d633a5.8dcd68", + "4f84a1a2.f9dfb8" ] ] }, { - "id": "8b4cb76b.dd9ee8", + "id": "4f84a1a2.f9dfb8", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3217.167625427246, - "y": 664.0003852844238, - "z": "55c43f0b.2cfc8", + "x": 3321.5009384155273, + "y": 781.0003852844238, + "z": "2edf7d59.cf16ea", "wires": [ [ - "ddf0943.130d368" + "1dc9c73a.36a871" ] ] }, { - "id": "355a14da.2c5f3c", + "id": "f6d633a5.8dcd68", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 3230.1674194335938, - "y": 142.0002098083496, - "z": "55c43f0b.2cfc8", + "x": 3334.500732421875, + "y": 259.0002098083496, + "z": "2edf7d59.cf16ea", "wires": [ [ - "e20e053a.4de768" + "7c23f619.45f3b8" ] ] }, { - "id": "6098eadd.045e54", + "id": "d857f73d.adc418", "type": "switchNode", - "name": "switch:service_type", - "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'service_type'`\">\n", + "name": "switch:ip_service_type", + "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_service_type'`\">\n", "comments": "", "outputs": 1, - "x": 2499.0002975463867, - "y": 427.00010681152344, - "z": "55c43f0b.2cfc8", + "x": 2603.333610534668, + "y": 544.0001068115234, + "z": "2edf7d59.cf16ea", "wires": [ [ - "6659ed9b.487de4" + "3b602ed0.d84d6a" ] ] }, { - "id": "6659ed9b.487de4", + "id": "3b602ed0.d84d6a", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2708.0001821517944, - "y": 426.0001049041748, - "z": "55c43f0b.2cfc8", + "x": 2812.3334951400757, + "y": 543.0001049041748, + "z": "2edf7d59.cf16ea", "wires": [ [ - "e9936527.8493c8" + "a24014b6.22fb98" ] ] }, { - "id": "1c7da636.5cc66a", + "id": "c455421d.7c5a78", "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": 3428.0007553100586, - "y": 420.6001949310303, - "z": "55c43f0b.2cfc8", + "x": 3532.33406829834, + "y": 537.6001949310303, + "z": "2edf7d59.cf16ea", "wires": [] }, { - "id": "e9936527.8493c8", + "id": "a24014b6.22fb98", "type": "switchNode", - "name": "switch:service_type value", + "name": "switch:ip_service_type value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2921.1483421325684, - "y": 425.7777900695801, - "z": "55c43f0b.2cfc8", + "x": 3025.4816551208496, + "y": 542.7777900695801, + "z": "2edf7d59.cf16ea", "wires": [ [ - "66781327.c6dddc", - "355a14da.2c5f3c" + "dae0bd9.b9c44c", + "f6d633a5.8dcd68" ] ] }, { - "id": "66781327.c6dddc", + "id": "dae0bd9.b9c44c", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3224.148750305176, - "y": 421.77788162231445, - "z": "55c43f0b.2cfc8", + "x": 3328.482063293457, + "y": 538.7778816223145, + "z": "2edf7d59.cf16ea", "wires": [ [ - "1c7da636.5cc66a" + "c455421d.7c5a78" ] ] }, { - "id": "71c4f1fc.edbb3", + "id": "17321748.f836a9", "type": "switchNode", - "name": "switch:mac", - "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'mac'`\">\n", + "name": "switch:ip_rg_mac_addr", + "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_rg_mac_addr'`\">\n", "comments": "", "outputs": 1, - "x": 2497.0002975463867, - "y": 487.00010871887207, - "z": "55c43f0b.2cfc8", + "x": 2601.333610534668, + "y": 604.0001087188721, + "z": "2edf7d59.cf16ea", "wires": [ [ - "de221b93.5fc2f8" + "2e394322.e3b494" ] ] }, { - "id": "de221b93.5fc2f8", + "id": "2e394322.e3b494", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2706.0001821517944, - "y": 486.00010681152344, - "z": "55c43f0b.2cfc8", + "x": 2810.3334951400757, + "y": 603.0001068115234, + "z": "2edf7d59.cf16ea", "wires": [ [ - "e7646b83.e7a718" + "f5b4bf6e.71b26" ] ] }, { - "id": "f8a1e6ae.961418", + "id": "b4892f9a.ccf8d8", "type": "set", "name": "set:mac", "xml": "<set>\n<parameter name='prop.bbs.mac' value='`$network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 3415.0006713867188, - "y": 480.6002368927002, - "z": "55c43f0b.2cfc8", + "x": 3519.333984375, + "y": 597.6002368927002, + "z": "2edf7d59.cf16ea", "wires": [] }, { - "id": "e7646b83.e7a718", + "id": "f5b4bf6e.71b26", "type": "switchNode", - "name": "switch:mac value", + "name": "switch:ip_rg_mac_addr value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2919.1483421325684, - "y": 485.7777919769287, - "z": "55c43f0b.2cfc8", + "x": 3023.4816551208496, + "y": 602.7777919769287, + "z": "2edf7d59.cf16ea", "wires": [ [ - "75a2ecd5.593954", - "355a14da.2c5f3c" + "6b930f07.9c92d", + "f6d633a5.8dcd68" ] ] }, { - "id": "75a2ecd5.593954", + "id": "6b930f07.9c92d", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3222.148750305176, - "y": 481.7778835296631, - "z": "55c43f0b.2cfc8", + "x": 3326.482063293457, + "y": 598.7778835296631, + "z": "2edf7d59.cf16ea", "wires": [ [ - "f8a1e6ae.961418" + "b4892f9a.ccf8d8" ] ] }, { - "id": "9b583213.a2a04", + "id": "9ec2e808.aa4ef", "type": "switchNode", - "name": "switch:down_speed", - "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'down_speed'`\">\n", + "name": "switch:ip_downstream_speed", + "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_downstream_speed'`\">\n", "comments": "", "outputs": 1, - "x": 2496.000457763672, - "y": 609.0002136230469, - "z": "55c43f0b.2cfc8", + "x": 2600.333770751953, + "y": 726.0002136230469, + "z": "2edf7d59.cf16ea", "wires": [ [ - "839f1adb.47c768" + "af0e2874.cdaf58" ] ] }, { - "id": "839f1adb.47c768", + "id": "af0e2874.cdaf58", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2705.0003423690796, - "y": 608.0002117156982, - "z": "55c43f0b.2cfc8", + "x": 2809.333655357361, + "y": 725.0002117156982, + "z": "2edf7d59.cf16ea", "wires": [ [ - "ed0be0e1.46321" + "5343752.1ca258c" ] ] }, { - "id": "1e0d2a0e.760fd6", + "id": "93741b2.676f168", "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": 3425.0009155273438, - "y": 602.6003017425537, - "z": "55c43f0b.2cfc8", + "x": 3529.334228515625, + "y": 719.6003017425537, + "z": "2edf7d59.cf16ea", "wires": [] }, { - "id": "ed0be0e1.46321", + "id": "5343752.1ca258c", "type": "switchNode", - "name": "switch:down_speed value", + "name": "switch:ip_downstream_speed value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2918.1485023498535, - "y": 607.7778968811035, - "z": "55c43f0b.2cfc8", + "x": 3022.4818153381348, + "y": 724.7778968811035, + "z": "2edf7d59.cf16ea", "wires": [ [ - "ff264a18.42cc48", - "355a14da.2c5f3c" + "4ea44007.a38f9", + "f6d633a5.8dcd68" ] ] }, { - "id": "ff264a18.42cc48", + "id": "4ea44007.a38f9", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3221.148910522461, - "y": 603.7779884338379, - "z": "55c43f0b.2cfc8", + "x": 3325.482223510742, + "y": 720.7779884338379, + "z": "2edf7d59.cf16ea", "wires": [ [ - "1e0d2a0e.760fd6" + "93741b2.676f168" ] ] }, { - "id": "8cdcb93e.555918", + "id": "df5d55aa.feb328", "type": "switchNode", "name": "switch:service_id", "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'service_id'`\">\n", "comments": "", "outputs": 1, - "x": 2507.0001487731934, - "y": 248.0000114440918, - "z": "55c43f0b.2cfc8", + "x": 2611.3334617614746, + "y": 365.0000114440918, + "z": "2edf7d59.cf16ea", "wires": [ [ - "33540082.2a40f" + "915b1f59.98c2" ] ] }, { - "id": "33540082.2a40f", + "id": "915b1f59.98c2", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2711.000068664551, - "y": 247.9999828338623, - "z": "55c43f0b.2cfc8", + "x": 2815.333381652832, + "y": 364.9999828338623, + "z": "2edf7d59.cf16ea", "wires": [ [ - "fe661f10.07386" + "97d5893.0c105f8" ] ] }, { - "id": "4530ebf6.2aea14", + "id": "bd2c3108.5e8e4", "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": 3430.000431060791, - "y": 241.60006713867188, - "z": "55c43f0b.2cfc8", + "x": 3534.3337440490723, + "y": 358.6000671386719, + "z": "2edf7d59.cf16ea", "wires": [] }, { - "id": "fe661f10.07386", + "id": "97d5893.0c105f8", "type": "switchNode", "name": "switch:service_id value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2922.000068664551, - "y": 247.00001335144043, - "z": "55c43f0b.2cfc8", + "x": 3026.333381652832, + "y": 364.00001335144043, + "z": "2edf7d59.cf16ea", "wires": [ [ - "a6af343c.4c8b58", - "355a14da.2c5f3c" + "c8da08c5.7c8588" ] ] }, { - "id": "a6af343c.4c8b58", + "id": "c8da08c5.7c8588", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3223.000476837158, - "y": 241.0001049041748, - "z": "55c43f0b.2cfc8", + "x": 3327.3337898254395, + "y": 358.0001049041748, + "z": "2edf7d59.cf16ea", "wires": [ [ - "4530ebf6.2aea14" + "bd2c3108.5e8e4" ] ] }, { - "id": "7561ea5b.dc7884", + "id": "80e0672.33dd098", "type": "switchNode", - "name": "switch:up_speed", - "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'up_speed'`\">\n", + "name": "switch:ip_upstream_speed", + "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_upstream_speed'`\">\n", "comments": "", "outputs": 1, - "x": 2496.000617980957, - "y": 548.0001907348633, - "z": "55c43f0b.2cfc8", + "x": 2600.3339309692383, + "y": 665.0001907348633, + "z": "2edf7d59.cf16ea", "wires": [ [ - "d4e39c0e.85738" + "20277844.76ed4" ] ] }, { - "id": "d4e39c0e.85738", + "id": "20277844.76ed4", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2705.0005025863647, - "y": 547.0001888275146, - "z": "55c43f0b.2cfc8", + "x": 2809.333815574646, + "y": 664.0001888275146, + "z": "2edf7d59.cf16ea", "wires": [ [ - "b7e84644.caee48" + "1e51a898.1b496f" ] ] }, { - "id": "414afbc2.506fc4", + "id": "204cebd9.88796c", "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": 3425.001075744629, - "y": 541.6002788543701, - "z": "55c43f0b.2cfc8", + "x": 3529.33438873291, + "y": 658.6002788543701, + "z": "2edf7d59.cf16ea", "wires": [] }, { - "id": "b7e84644.caee48", + "id": "1e51a898.1b496f", "type": "switchNode", - "name": "switch:up_speed value", + "name": "switch:ip_upstream_speed value", "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n", "comments": "", "outputs": 1, - "x": 2918.1486625671387, - "y": 546.7778739929199, - "z": "55c43f0b.2cfc8", + "x": 3022.48197555542, + "y": 663.7778739929199, + "z": "2edf7d59.cf16ea", "wires": [ [ - "c8f1867c.dd8f78", - "355a14da.2c5f3c" + "cf0ce51.5cc7b18", + "f6d633a5.8dcd68" ] ] }, { - "id": "c8f1867c.dd8f78", + "id": "cf0ce51.5cc7b18", "type": "outcome", "name": "Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 3221.149070739746, - "y": 542.7779655456543, - "z": "55c43f0b.2cfc8", + "x": 3325.4823837280273, + "y": 659.7779655456543, + "z": "2edf7d59.cf16ea", "wires": [ [ - "414afbc2.506fc4" + "204cebd9.88796c" ] ] }, { - "id": "e20e053a.4de768", + "id": "7c23f619.45f3b8", "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": 3416.9999389648438, - "y": 141, - "z": "55c43f0b.2cfc8", + "x": 3521.333251953125, + "y": 258, + "z": "2edf7d59.cf16ea", "wires": [] }, { - "id": "8b23f70.e290f08", + "id": "38f1d224.3b5b8e", "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.access_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`\" />", + "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.access_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": 1837.6666259765625, - "y": 656, - "z": "55c43f0b.2cfc8", + "x": 1944.222095489502, + "y": 748.5555591583252, + "z": "2edf7d59.cf16ea", "wires": [ [] ] 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 0fbd2f2c..95a3ac11 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 @@ -7,6 +7,7 @@ <set> <parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' /> <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='http://172.30.0.121:5000' /> + <parameter name='prop.bbs.service_id' value='`$network-topology-operation-input.service-information.service-id`' /> </set> <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' > <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' /> @@ -14,25 +15,7 @@ </execute> <for index='idx' start='0' end='`$network-input-parameters.param_length`' > <block> - <switch test="`$network-input-parameters.param[$idx].name == 'service_id'`"> - <outcome value='true'> - <switch test='`$network-input-parameters.param[$idx].value`'> - <outcome value=''> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`$network-input-parameters.param[$idx].name +' value is null, please check it.'`" /> - </return> - </outcome> - <outcome value='Other'> - <set> - <parameter name='prop.bbs.service_id' value='`$network-input-parameters.param[$idx].value`' /> - </set> - </outcome> - </switch> - </outcome> - </switch> - <switch test="`$network-input-parameters.param[$idx].name == 'access_id'`"> + <switch test="`$network-input-parameters.param[$idx].name == 'ip_access_id'`"> <outcome value='true'> <switch test='`$network-input-parameters.param[$idx].value`'> <outcome value=''> @@ -68,7 +51,7 @@ </switch> </outcome> </switch> - <switch test="`$network-input-parameters.param[$idx].name == 'service_type'`"> + <switch test="`$network-input-parameters.param[$idx].name == 'ip_service_type'`"> <outcome value='true'> <switch test='`$network-input-parameters.param[$idx].value`'> <outcome value=''> @@ -86,7 +69,7 @@ </switch> </outcome> </switch> - <switch test="`$network-input-parameters.param[$idx].name == 'mac'`"> + <switch test="`$network-input-parameters.param[$idx].name == 'ip_rg_mac_addr'`"> <outcome value='true'> <switch test='`$network-input-parameters.param[$idx].value`'> <outcome value=''> @@ -104,7 +87,7 @@ </switch> </outcome> </switch> - <switch test="`$network-input-parameters.param[$idx].name == 'up_speed'`"> + <switch test="`$network-input-parameters.param[$idx].name == 'ip_upstream_speed'`"> <outcome value='true'> <switch test='`$network-input-parameters.param[$idx].value`'> <outcome value=''> @@ -122,7 +105,7 @@ </switch> </outcome> </switch> - <switch test="`$network-input-parameters.param[$idx].name == 'down_speed'`"> + <switch test="`$network-input-parameters.param[$idx].name == 'ip_downstream_speed'`"> <outcome value='true'> <switch test='`$network-input-parameters.param[$idx].value`'> <outcome value=''> @@ -178,6 +161,19 @@ </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.access_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>
\ No newline at end of file |