summaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api/src
diff options
context:
space:
mode:
authorBryan Guo <guofengbei@huawei.com>2019-03-21 15:05:07 +0800
committerGxxxx <guofengbei@huawei.com>2019-03-21 15:45:25 +0800
commitab5ec38462597f0f3a01f3d74b676efc3cfcbbdd (patch)
tree45251b3a1becaebd4ba007863f51f32307559b62 /platform-logic/generic-resource-api/src
parentf5263394426fc4021179da8135c16f33e9bb2bd8 (diff)
add DGs for BBS usecase
Issue-ID: SDNC-698,SDNC-699,SDNC-700 Change-Id: Iac71c3ad2a42def4bf1fd0e3464f028dae5a5414 Signed-off-by: Gxxxx <guofengbei@huawei.com> Former-commit-id: 05ccc1879959d01720065f633d08e68ede2c04aa
Diffstat (limited to 'platform-logic/generic-resource-api/src')
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.json24
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.json229
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json875
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json229
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json229
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json94
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.json4
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml8
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml46
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml183
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml46
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml46
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml54
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.xml2
14 files changed, 1994 insertions, 75 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 5666e420..2fa02b5e 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
@@ -636,7 +636,7 @@
"z": "f55e2a79.4bc078",
"wires": [
[
- "4f3170f0.17c66"
+ "3b95a67d.17872a"
]
]
},
@@ -740,17 +740,6 @@
]
},
{
- "id": "4f3170f0.17c66",
- "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-create\" />\n",
- "comments": "",
- "x": 2518.001079559326,
- "y": 221.00018119812012,
- "z": "f55e2a79.4bc078",
- "wires": []
- },
- {
"id": "424890ee.daa33",
"type": "returnSuccess",
"name": "return success",
@@ -786,5 +775,16 @@
"y": 998.0000295639038,
"z": "f55e2a79.4bc078",
"wires": []
+ },
+ {
+ "id": "3b95a67d.17872a",
+ "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",
+ "wires": []
}
] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.json
new file mode 100644
index 00000000..d8498007
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.json
@@ -0,0 +1,229 @@
+[
+ {
+ "id": "6fc09f6d.0870b",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 395,
+ "y": 364,
+ "z": "42dfc057.bac69",
+ "wires": [
+ [
+ "17053a75.1de276"
+ ]
+ ]
+ },
+ {
+ "id": "17053a75.1de276",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+ "outputs": 1,
+ "x": 702.9996490478516,
+ "y": 364.0000219345093,
+ "z": "42dfc057.bac69",
+ "wires": [
+ [
+ "31b28a93.bc7546"
+ ]
+ ]
+ },
+ {
+ "id": "31b28a93.bc7546",
+ "type": "method",
+ "name": "method:bbs-internet-profile-network-topology-operation-change-huawei",
+ "xml": "<method rpc='bbs-internet-profile-network-topology-operation-change-huawei' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 700.9996490478516,
+ "y": 560.0000619888306,
+ "z": "42dfc057.bac69",
+ "wires": [
+ [
+ "6078be8e.3dc1b"
+ ]
+ ]
+ },
+ {
+ "id": "6078be8e.3dc1b",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1107.9998626708984,
+ "y": 561.0000619888306,
+ "z": "42dfc057.bac69",
+ "wires": [
+ [
+ "18b0a0e1.bc2b9f",
+ "d8d2c4cf.831298",
+ "a7f761b1.d0d6"
+ ]
+ ]
+ },
+ {
+ "id": "d8d2c4cf.831298",
+ "type": "execute",
+ "name": "execute:ChangeInternetProfileInstance",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ChangeInternetProfileInstance'`\" />\n <parameter name=\"contentType\" value=\"application/json\"/>\n <parameter name=\"httpMethod\" value=\"post\"/>\n <parameter name=\"responsePrefix\" value=\"service-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\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1435,
+ "y": 562,
+ "z": "42dfc057.bac69",
+ "wires": [
+ [
+ "6653aa52.b5a3e4",
+ "5cfea4a3.4063fc"
+ ]
+ ]
+ },
+ {
+ "id": "5cfea4a3.4063fc",
+ "type": "outcome",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1736.3329811096191,
+ "y": 562,
+ "z": "42dfc057.bac69",
+ "wires": [
+ [
+ "18532102.a9364f"
+ ]
+ ]
+ },
+ {
+ "id": "6653aa52.b5a3e4",
+ "type": "outcome",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1745.332893371582,
+ "y": 637.0000019073486,
+ "z": "42dfc057.bac69",
+ "wires": [
+ [
+ "fee00388.9b406"
+ ]
+ ]
+ },
+ {
+ "id": "fee00388.9b406",
+ "type": "switchNode",
+ "name": "switch:service-result",
+ "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1980.3490142822266,
+ "y": 636.0392971038818,
+ "z": "42dfc057.bac69",
+ "wires": [
+ [
+ "842854c5.b1e1c8",
+ "e77a86f6.1bffc8"
+ ]
+ ]
+ },
+ {
+ "id": "18532102.a9364f",
+ "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=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ChangeInternetProfileInstance'`\" />\n",
+ "comments": "",
+ "x": 2245.2665939331055,
+ "y": 562.289547920227,
+ "z": "42dfc057.bac69",
+ "wires": []
+ },
+ {
+ "id": "842854c5.b1e1c8",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2206.349353790283,
+ "y": 637.0393905639648,
+ "z": "42dfc057.bac69",
+ "wires": [
+ [
+ "b066a3a6.b8196"
+ ]
+ ]
+ },
+ {
+ "id": "e77a86f6.1bffc8",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2216.3490600585938,
+ "y": 723.0392570495605,
+ "z": "42dfc057.bac69",
+ "wires": [
+ [
+ "cf2d9b30.93fde8"
+ ]
+ ]
+ },
+ {
+ "id": "b066a3a6.b8196",
+ "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 ChangeInternetProfileInstance failed: '+$service-result.errors.error[0].error-message`\" />\n\n",
+ "comments": "",
+ "x": 2392.849021911621,
+ "y": 637.0392274856567,
+ "z": "42dfc057.bac69",
+ "wires": []
+ },
+ {
+ "id": "cf2d9b30.93fde8",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2374.5156898498535,
+ "y": 724.0392322540283,
+ "z": "42dfc057.bac69",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "a7f761b1.d0d6",
+ "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": 1350.8489570617676,
+ "y": 644.0393257141113,
+ "z": "42dfc057.bac69",
+ "wires": []
+ },
+ {
+ "id": "18b0a0e1.bc2b9f",
+ "type": "call",
+ "name": "call:bbs-internet-profile-network-topology-operation-common-huawei",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1537.015869140625,
+ "y": 476.03915786743164,
+ "z": "42dfc057.bac69",
+ "wires": [
+ []
+ ]
+ }
+] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json
new file mode 100644
index 00000000..0643b698
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json
@@ -0,0 +1,875 @@
+[
+ {
+ "id": "f10269e9.df7498",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 775.6666870117188,
+ "y": 312,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "c12bcf3b.bb05e"
+ ]
+ ]
+ },
+ {
+ "id": "c12bcf3b.bb05e",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+ "outputs": 1,
+ "x": 1083.6663360595703,
+ "y": 312.0000219345093,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "d31f19c6.9a2f48"
+ ]
+ ]
+ },
+ {
+ "id": "d31f19c6.9a2f48",
+ "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",
+ "wires": [
+ [
+ "e74f77eb.1000f8"
+ ]
+ ]
+ },
+ {
+ "id": "e74f77eb.1000f8",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1505.6665496826172,
+ "y": 531.0000991821289,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "da3c5279.38fd5",
+ "134f88fe.350da7",
+ "5508b339.a1114c",
+ "af4311d2.58cf3"
+ ]
+ ]
+ },
+ {
+ "id": "da3c5279.38fd5",
+ "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",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "134f88fe.350da7",
+ "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",
+ "comments": "",
+ "x": 1861.6672172546387,
+ "y": 316.00020599365234,
+ "z": "55c43f0b.2cfc8",
+ "wires": []
+ },
+ {
+ "id": "5508b339.a1114c",
+ "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",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "af4311d2.58cf3",
+ "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",
+ "wires": [
+ [
+ "d398654e.b34478"
+ ]
+ ]
+ },
+ {
+ "id": "9d40c0ce.78fd9",
+ "type": "switchNode",
+ "name": "switch:access_id",
+ "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'access_id'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2502.1671142578125,
+ "y": 306.00020694732666,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "73200882.d46168"
+ ]
+ ]
+ },
+ {
+ "id": "73200882.d46168",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2706.16703414917,
+ "y": 306.00017833709717,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "ef73e02f.cdd2b"
+ ]
+ ]
+ },
+ {
+ "id": "7fb39d4.2f12264",
+ "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",
+ "wires": []
+ },
+ {
+ "id": "d398654e.b34478",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2151.167095184326,
+ "y": 524.0001811981201,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "9d40c0ce.78fd9",
+ "b543b4c2.8bc0f8",
+ "e879270a.b17da8",
+ "59bd1f4a.c9cda",
+ "8cdcb93e.555918",
+ "6098eadd.045e54",
+ "71c4f1fc.edbb3",
+ "7561ea5b.dc7884",
+ "9b583213.a2a04"
+ ]
+ ]
+ },
+ {
+ "id": "b543b4c2.8bc0f8",
+ "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",
+ "wires": [
+ [
+ "d486cb64.e5cc88"
+ ]
+ ]
+ },
+ {
+ "id": "d486cb64.e5cc88",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2705.0188121795654,
+ "y": 367.0002727508545,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "ec7666af.6addb8"
+ ]
+ ]
+ },
+ {
+ "id": "b9b321b1.332a6",
+ "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",
+ "wires": []
+ },
+ {
+ "id": "e879270a.b17da8",
+ "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",
+ "wires": [
+ [
+ "69b98671.7d9698"
+ ]
+ ]
+ },
+ {
+ "id": "69b98671.7d9698",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2700.0190238952637,
+ "y": 726.000394821167,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "d82c6439.435768"
+ ]
+ ]
+ },
+ {
+ "id": "9515222a.16723",
+ "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",
+ "wires": []
+ },
+ {
+ "id": "59bd1f4a.c9cda",
+ "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",
+ "wires": [
+ [
+ "f5723673.bf6868"
+ ]
+ ]
+ },
+ {
+ "id": "f5723673.bf6868",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2701.0190572738647,
+ "y": 668.2226085662842,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "d2a653cd.d6a14"
+ ]
+ ]
+ },
+ {
+ "id": "ddf0943.130d368",
+ "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",
+ "wires": []
+ },
+ {
+ "id": "ef73e02f.cdd2b",
+ "type": "switchNode",
+ "name": "switch:accecc_id value",
+ "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2917.16703414917,
+ "y": 305.0002088546753,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "355a14da.2c5f3c",
+ "54ae716c.b1246"
+ ]
+ ]
+ },
+ {
+ "id": "54ae716c.b1246",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3218.1674423217773,
+ "y": 299.00030040740967,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "7fb39d4.2f12264"
+ ]
+ ]
+ },
+ {
+ "id": "ec7666af.6addb8",
+ "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",
+ "wires": [
+ [
+ "355a14da.2c5f3c",
+ "28d7a120.f6fdbe"
+ ]
+ ]
+ },
+ {
+ "id": "28d7a120.f6fdbe",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3220.1674423217773,
+ "y": 362.00030040740967,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "b9b321b1.332a6"
+ ]
+ ]
+ },
+ {
+ "id": "d82c6439.435768",
+ "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",
+ "wires": [
+ [
+ "355a14da.2c5f3c",
+ "ec5e8e39.5e084"
+ ]
+ ]
+ },
+ {
+ "id": "ec5e8e39.5e084",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3219.1678161621094,
+ "y": 724.0004281997681,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "9515222a.16723"
+ ]
+ ]
+ },
+ {
+ "id": "d2a653cd.d6a14",
+ "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",
+ "wires": [
+ [
+ "355a14da.2c5f3c",
+ "8b4cb76b.dd9ee8"
+ ]
+ ]
+ },
+ {
+ "id": "8b4cb76b.dd9ee8",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3217.167625427246,
+ "y": 664.0003852844238,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "ddf0943.130d368"
+ ]
+ ]
+ },
+ {
+ "id": "355a14da.2c5f3c",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3230.1674194335938,
+ "y": 142.0002098083496,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "e20e053a.4de768"
+ ]
+ ]
+ },
+ {
+ "id": "6098eadd.045e54",
+ "type": "switchNode",
+ "name": "switch:service_type",
+ "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'service_type'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2499.0002975463867,
+ "y": 427.00010681152344,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "6659ed9b.487de4"
+ ]
+ ]
+ },
+ {
+ "id": "6659ed9b.487de4",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2708.0001821517944,
+ "y": 426.0001049041748,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "e9936527.8493c8"
+ ]
+ ]
+ },
+ {
+ "id": "1c7da636.5cc66a",
+ "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",
+ "wires": []
+ },
+ {
+ "id": "e9936527.8493c8",
+ "type": "switchNode",
+ "name": "switch: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",
+ "wires": [
+ [
+ "66781327.c6dddc",
+ "355a14da.2c5f3c"
+ ]
+ ]
+ },
+ {
+ "id": "66781327.c6dddc",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3224.148750305176,
+ "y": 421.77788162231445,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "1c7da636.5cc66a"
+ ]
+ ]
+ },
+ {
+ "id": "71c4f1fc.edbb3",
+ "type": "switchNode",
+ "name": "switch:mac",
+ "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'mac'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2497.0002975463867,
+ "y": 487.00010871887207,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "de221b93.5fc2f8"
+ ]
+ ]
+ },
+ {
+ "id": "de221b93.5fc2f8",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2706.0001821517944,
+ "y": 486.00010681152344,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "e7646b83.e7a718"
+ ]
+ ]
+ },
+ {
+ "id": "f8a1e6ae.961418",
+ "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",
+ "wires": []
+ },
+ {
+ "id": "e7646b83.e7a718",
+ "type": "switchNode",
+ "name": "switch:mac value",
+ "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2919.1483421325684,
+ "y": 485.7777919769287,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "75a2ecd5.593954",
+ "355a14da.2c5f3c"
+ ]
+ ]
+ },
+ {
+ "id": "75a2ecd5.593954",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3222.148750305176,
+ "y": 481.7778835296631,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "f8a1e6ae.961418"
+ ]
+ ]
+ },
+ {
+ "id": "9b583213.a2a04",
+ "type": "switchNode",
+ "name": "switch:down_speed",
+ "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'down_speed'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2496.000457763672,
+ "y": 609.0002136230469,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "839f1adb.47c768"
+ ]
+ ]
+ },
+ {
+ "id": "839f1adb.47c768",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2705.0003423690796,
+ "y": 608.0002117156982,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "ed0be0e1.46321"
+ ]
+ ]
+ },
+ {
+ "id": "1e0d2a0e.760fd6",
+ "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",
+ "wires": []
+ },
+ {
+ "id": "ed0be0e1.46321",
+ "type": "switchNode",
+ "name": "switch:down_speed value",
+ "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2918.1485023498535,
+ "y": 607.7778968811035,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "ff264a18.42cc48",
+ "355a14da.2c5f3c"
+ ]
+ ]
+ },
+ {
+ "id": "ff264a18.42cc48",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3221.148910522461,
+ "y": 603.7779884338379,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "1e0d2a0e.760fd6"
+ ]
+ ]
+ },
+ {
+ "id": "8cdcb93e.555918",
+ "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",
+ "wires": [
+ [
+ "33540082.2a40f"
+ ]
+ ]
+ },
+ {
+ "id": "33540082.2a40f",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2711.000068664551,
+ "y": 247.9999828338623,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "fe661f10.07386"
+ ]
+ ]
+ },
+ {
+ "id": "4530ebf6.2aea14",
+ "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",
+ "wires": []
+ },
+ {
+ "id": "fe661f10.07386",
+ "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",
+ "wires": [
+ [
+ "a6af343c.4c8b58",
+ "355a14da.2c5f3c"
+ ]
+ ]
+ },
+ {
+ "id": "a6af343c.4c8b58",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3223.000476837158,
+ "y": 241.0001049041748,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "4530ebf6.2aea14"
+ ]
+ ]
+ },
+ {
+ "id": "7561ea5b.dc7884",
+ "type": "switchNode",
+ "name": "switch:up_speed",
+ "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'up_speed'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2496.000617980957,
+ "y": 548.0001907348633,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "d4e39c0e.85738"
+ ]
+ ]
+ },
+ {
+ "id": "d4e39c0e.85738",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2705.0005025863647,
+ "y": 547.0001888275146,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "b7e84644.caee48"
+ ]
+ ]
+ },
+ {
+ "id": "414afbc2.506fc4",
+ "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",
+ "wires": []
+ },
+ {
+ "id": "b7e84644.caee48",
+ "type": "switchNode",
+ "name": "switch:up_speed value",
+ "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2918.1486625671387,
+ "y": 546.7778739929199,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "c8f1867c.dd8f78",
+ "355a14da.2c5f3c"
+ ]
+ ]
+ },
+ {
+ "id": "c8f1867c.dd8f78",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3221.149070739746,
+ "y": 542.7779655456543,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ [
+ "414afbc2.506fc4"
+ ]
+ ]
+ },
+ {
+ "id": "e20e053a.4de768",
+ "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",
+ "wires": []
+ },
+ {
+ "id": "8b23f70.e290f08",
+ "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`\" />",
+ "comments": "",
+ "outputs": 1,
+ "x": 1837.6666259765625,
+ "y": 656,
+ "z": "55c43f0b.2cfc8",
+ "wires": [
+ []
+ ]
+ }
+] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json
new file mode 100644
index 00000000..dd449497
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json
@@ -0,0 +1,229 @@
+[
+ {
+ "id": "2d7f5053.43f88",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 161,
+ "y": 430,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ [
+ "72df2435.5886ec"
+ ]
+ ]
+ },
+ {
+ "id": "72df2435.5886ec",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+ "outputs": 1,
+ "x": 468.99964904785156,
+ "y": 430.0000219345093,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ [
+ "ffb91d40.32d4b"
+ ]
+ ]
+ },
+ {
+ "id": "ffb91d40.32d4b",
+ "type": "method",
+ "name": "method:bbs-internet-profile-network-topology-operation-create-huawei",
+ "xml": "<method rpc='bbs-internet-profile-network-topology-operation-create-huawei' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 466.9996643066406,
+ "y": 650.0000991821289,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ [
+ "53f797bd.cfd8e8"
+ ]
+ ]
+ },
+ {
+ "id": "53f797bd.cfd8e8",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 890.9998626708984,
+ "y": 649.0000991821289,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ [
+ "370af337.5154fc",
+ "4e0ef08b.97054",
+ "f93c1da.de250e"
+ ]
+ ]
+ },
+ {
+ "id": "370af337.5154fc",
+ "type": "call",
+ "name": "call:bbs-internet-profile-network-topology-operation-common-huawei",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1407.0001525878906,
+ "y": 562.0000190734863,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "4e0ef08b.97054",
+ "type": "execute",
+ "name": "execute:CreateInternetProfileInstance",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`\" />\n <parameter name=\"contentType\" value=\"application/json\"/>\n <parameter name=\"httpMethod\" value=\"post\"/>\n <parameter name=\"responsePrefix\" value=\"service-result\"/>\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": 1296.6507873535156,
+ "y": 647.9608345031738,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ [
+ "e4c140e5.037d7",
+ "d8bbe45d.2352e8"
+ ]
+ ]
+ },
+ {
+ "id": "d8bbe45d.2352e8",
+ "type": "outcome",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1597.9837684631348,
+ "y": 647.9608345031738,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ [
+ "1df15208.d8ff4e"
+ ]
+ ]
+ },
+ {
+ "id": "e4c140e5.037d7",
+ "type": "outcome",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1606.9836807250977,
+ "y": 722.9608364105225,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ [
+ "facb658d.68f2f8"
+ ]
+ ]
+ },
+ {
+ "id": "facb658d.68f2f8",
+ "type": "switchNode",
+ "name": "switch:service-result",
+ "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1841.9998016357422,
+ "y": 722.0001316070557,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ [
+ "6422cd06.ccef54",
+ "d37ab755.7eae88"
+ ]
+ ]
+ },
+ {
+ "id": "1df15208.d8ff4e",
+ "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=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`\" />\n",
+ "comments": "",
+ "x": 2106.917381286621,
+ "y": 648.2503824234009,
+ "z": "ad27a06a.ac6cb",
+ "wires": []
+ },
+ {
+ "id": "6422cd06.ccef54",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2068.000141143799,
+ "y": 723.0002250671387,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ [
+ "8b2e9879.6244c8"
+ ]
+ ]
+ },
+ {
+ "id": "d37ab755.7eae88",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2077.9998474121094,
+ "y": 809.0000915527344,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ [
+ "684bf460.d7a28c"
+ ]
+ ]
+ },
+ {
+ "id": "8b2e9879.6244c8",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error CreateInternetProfileInstance failed: '+$service-result.errors.error[0].error-message`\" />\n\n",
+ "comments": "",
+ "x": 2254.4998092651367,
+ "y": 723.0000619888306,
+ "z": "ad27a06a.ac6cb",
+ "wires": []
+ },
+ {
+ "id": "684bf460.d7a28c",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2236.166477203369,
+ "y": 810.0000667572021,
+ "z": "ad27a06a.ac6cb",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "f93c1da.de250e",
+ "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": 1217.4998321533203,
+ "y": 742.0001058578491,
+ "z": "ad27a06a.ac6cb",
+ "wires": []
+ }
+] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json
new file mode 100644
index 00000000..3d478c21
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json
@@ -0,0 +1,229 @@
+[
+ {
+ "id": "5e265471.e67f7c",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 344,
+ "y": 400,
+ "z": "5f22295c.f35688",
+ "wires": [
+ [
+ "d75b37ac.e738e8"
+ ]
+ ]
+ },
+ {
+ "id": "d75b37ac.e738e8",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+ "outputs": 1,
+ "x": 651.9996490478516,
+ "y": 400.0000219345093,
+ "z": "5f22295c.f35688",
+ "wires": [
+ [
+ "f2820cf8.0bd53"
+ ]
+ ]
+ },
+ {
+ "id": "f2820cf8.0bd53",
+ "type": "method",
+ "name": "method:bbs-internet-profile-network-topology-operation-delete-huawei",
+ "xml": "<method rpc='bbs-internet-profile-network-topology-operation-delete-huawei' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 649.9996337890625,
+ "y": 596.0000982284546,
+ "z": "5f22295c.f35688",
+ "wires": [
+ [
+ "9b232b7e.58e2b8"
+ ]
+ ]
+ },
+ {
+ "id": "9b232b7e.58e2b8",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1056.9998626708984,
+ "y": 597.0000619888306,
+ "z": "5f22295c.f35688",
+ "wires": [
+ [
+ "9eb1d9e6.392fa8",
+ "7617ea2e.9a48d4",
+ "5d716cef.c08464"
+ ]
+ ]
+ },
+ {
+ "id": "9eb1d9e6.392fa8",
+ "type": "execute",
+ "name": "execute:DeleteInternetProfileInstance",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`\" />\n <parameter name=\"contentType\" value=\"application/json\"/>\n <parameter name=\"httpMethod\" value=\"post\"/>\n <parameter name=\"responsePrefix\" value=\"service-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\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1445.6509246826172,
+ "y": 600.9608850479126,
+ "z": "5f22295c.f35688",
+ "wires": [
+ [
+ "2862e76.2bc8318",
+ "a6a0cc88.189c9"
+ ]
+ ]
+ },
+ {
+ "id": "a6a0cc88.189c9",
+ "type": "outcome",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1746.9839057922363,
+ "y": 600.9608850479126,
+ "z": "5f22295c.f35688",
+ "wires": [
+ [
+ "68923169.94f92"
+ ]
+ ]
+ },
+ {
+ "id": "2862e76.2bc8318",
+ "type": "outcome",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1755.9838180541992,
+ "y": 675.9608869552612,
+ "z": "5f22295c.f35688",
+ "wires": [
+ [
+ "de6ab4f4.b99d68"
+ ]
+ ]
+ },
+ {
+ "id": "de6ab4f4.b99d68",
+ "type": "switchNode",
+ "name": "switch:service-result",
+ "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1990.9999389648438,
+ "y": 675.0001821517944,
+ "z": "5f22295c.f35688",
+ "wires": [
+ [
+ "4603a7e2.b0ee88",
+ "e87dbd8d.effaf"
+ ]
+ ]
+ },
+ {
+ "id": "68923169.94f92",
+ "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=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`\" />\n",
+ "comments": "",
+ "x": 2255.9175186157227,
+ "y": 601.2504329681396,
+ "z": "5f22295c.f35688",
+ "wires": []
+ },
+ {
+ "id": "4603a7e2.b0ee88",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2217.0002784729004,
+ "y": 676.0002756118774,
+ "z": "5f22295c.f35688",
+ "wires": [
+ [
+ "43e7a5db.efe9bc"
+ ]
+ ]
+ },
+ {
+ "id": "e87dbd8d.effaf",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2226.999984741211,
+ "y": 762.0001420974731,
+ "z": "5f22295c.f35688",
+ "wires": [
+ [
+ "22f84f13.a10ce"
+ ]
+ ]
+ },
+ {
+ "id": "43e7a5db.efe9bc",
+ "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 DeleteInternetProfileInstance failed: '+$service-result.errors.error[0].error-message`\" />\n\n",
+ "comments": "",
+ "x": 2403.4999465942383,
+ "y": 676.0001125335693,
+ "z": "5f22295c.f35688",
+ "wires": []
+ },
+ {
+ "id": "22f84f13.a10ce",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2385.1666145324707,
+ "y": 763.0001173019409,
+ "z": "5f22295c.f35688",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "7617ea2e.9a48d4",
+ "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": 1365.4999160766602,
+ "y": 685.0001831054688,
+ "z": "5f22295c.f35688",
+ "wires": []
+ },
+ {
+ "id": "5d716cef.c08464",
+ "type": "call",
+ "name": "call:bbs-internet-profile-network-topology-operation-common-huawei",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1557.6669082641602,
+ "y": 517.0000553131104,
+ "z": "5f22295c.f35688",
+ "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 290ff485..c122c541 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
@@ -109,7 +109,7 @@
"cddace48.d73d5",
"33ae8b87.cdb6f4",
"c9c439a4.644948",
- "f54feb4a.839528"
+ "f1964d76.299a5"
]
]
},
@@ -2050,8 +2050,8 @@
{
"id": "89198a1c.591aa8",
"type": "call",
- "name": "call GENERIC-RESOURCE-API:bbs-internet-network-topology-operation-create-huawei",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-create-huawei' mode='sync' >\n",
+ "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-network-topology-operation-create-huawei",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-create-huawei' mode='sync' >\n",
"comments": "",
"outputs": 1,
"x": 3139.510673522949,
@@ -2080,8 +2080,8 @@
{
"id": "8096a9b3.539768",
"type": "call",
- "name": "call GENERIC-RESOURCE-API:bbs-internet-network-topology-operation-delete-huawei",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-delete-huawei' mode='sync' >\n",
+ "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-network-topology-operation-delete-huawei",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-delete-huawei' mode='sync' >\n",
"comments": "",
"outputs": 1,
"x": 3231.510498046875,
@@ -2098,8 +2098,8 @@
"xml": "<outcome value='ChangeInternetProfileInstance'>\n",
"comments": "",
"outputs": 1,
- "x": 869.5104484558105,
- "y": 1329.0105285644531,
+ "x": 1242.5105171203613,
+ "y": 1339.0106048583984,
"z": "8219a869.858648",
"wires": [
[
@@ -2110,12 +2110,12 @@
{
"id": "3cb12a93.93f446",
"type": "call",
- "name": "call GENERIC-RESOURCE-API:bbs-internet-network-topology-operation-change-huawei",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-change-huawei' mode='sync' >\n",
+ "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-network-topology-operation-change-huawei",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-change-huawei' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2568.511257171631,
- "y": 1264.01070022583,
+ "x": 2928.5113372802734,
+ "y": 1267.0107669830322,
"z": "8219a869.858648",
"wires": [
[]
@@ -2365,8 +2365,8 @@
"xml": "<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1206.6666526794434,
- "y": 1335.0002002716064,
+ "x": 1566.666732788086,
+ "y": 1338.0002670288086,
"z": "8219a869.858648",
"wires": [
[
@@ -2381,8 +2381,8 @@
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1453.8329429626465,
- "y": 1335.0002174377441,
+ "x": 1813.833023071289,
+ "y": 1338.0002841949463,
"z": "8219a869.858648",
"wires": [
[
@@ -2397,8 +2397,8 @@
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1641.8328285217285,
- "y": 1337.000379562378,
+ "x": 2001.832908630371,
+ "y": 1340.00044631958,
"z": "8219a869.858648",
"wires": [
[
@@ -2413,8 +2413,8 @@
"xml": "<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>\n",
"comments": "",
"outputs": 1,
- "x": 1852.8334693908691,
- "y": 1337.0007047653198,
+ "x": 2212.8335494995117,
+ "y": 1340.000771522522,
"z": "8219a869.858648",
"wires": [
[
@@ -2431,8 +2431,8 @@
"xml": "<outcome value='HUAWEI'>\n",
"comments": "",
"outputs": 1,
- "x": 2104.666702270508,
- "y": 1263.0003681182861,
+ "x": 2464.6667823791504,
+ "y": 1266.0004348754883,
"z": "8219a869.858648",
"wires": [
[
@@ -2447,8 +2447,8 @@
"xml": "<outcome value='NOKIA'>\n",
"comments": "",
"outputs": 1,
- "x": 2102.666702270508,
- "y": 1338.0003700256348,
+ "x": 2462.6667823791504,
+ "y": 1341.000436782837,
"z": "8219a869.858648",
"wires": [
[
@@ -2655,8 +2655,8 @@
{
"id": "3ee98359.6c3dac",
"type": "call",
- "name": "call GENERIC-RESOURCE-API:bbs-internet-network-topology-operation-create-nokia",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-create-nokia' mode='sync' >\n",
+ "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-network-topology-operation-create-nokia",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-create-nokia' mode='sync' >\n",
"comments": "",
"outputs": 1,
"x": 3141.6669311523438,
@@ -2669,8 +2669,8 @@
{
"id": "bad37761.4aea08",
"type": "call",
- "name": "call GENERIC-RESOURCE-API:bbs-internet-network-topology-operation-delete-nokia",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-delete-nokia' mode='sync' >\n",
+ "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-network-topology-operation-delete-nokia",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-delete-nokia' mode='sync' >\n",
"comments": "",
"outputs": 1,
"x": 3221.666748046875,
@@ -2683,12 +2683,12 @@
{
"id": "f5c766f7.632b38",
"type": "call",
- "name": "call GENERIC-RESOURCE-API:bbs-internet-network-topology-operation-change-nokia",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-change-nokia' mode='sync' >\n",
+ "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-network-topology-operation-change-nokia",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-change-nokia' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2563.666774749756,
- "y": 1335.0002002716064,
+ "x": 2923.6668548583984,
+ "y": 1338.0002670288086,
"z": "8219a869.858648",
"wires": [
[]
@@ -2707,5 +2707,37 @@
"wires": [
[]
]
+ },
+ {
+ "id": "f1964d76.299a5",
+ "type": "other",
+ "name": "update",
+ "xml": "<outcome value='update'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 641.0000152587891,
+ "y": 1336.0000400543213,
+ "z": "8219a869.858648",
+ "wires": [
+ [
+ "e4d29c5d.bd523"
+ ]
+ ]
+ },
+ {
+ "id": "e4d29c5d.bd523",
+ "type": "switchNode",
+ "name": "switch request-action",
+ "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 873.0000152587891,
+ "y": 1337.00004196167,
+ "z": "8219a869.858648",
+ "wires": [
+ [
+ "f54feb4a.839528"
+ ]
+ ]
}
] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.json
index d64a5640..ae60784e 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.json
@@ -423,8 +423,8 @@
{
"id": "f069bb63.bbd458",
"type": "outcome",
- "name": "change",
- "xml": "<outcome value='change'>\n",
+ "name": "update",
+ "xml": "<outcome value='update'>\n",
"comments": "",
"outputs": 1,
"x": 707.0000190734863,
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 c7374bee..14564b93 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
@@ -23,7 +23,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-create" />
+ <parameter name="error-message" value="`$network-input-parameters.param[$idx].name +' value is null, please check it.'`" />
</return>
</outcome>
<outcome value='Other'>
@@ -41,7 +41,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-create" />
+ <parameter name="error-message" value="`$network-input-parameters.param[$idx].name +' value is null, please check it.'`" />
</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-create" />
+ <parameter name="error-message" value="`$network-input-parameters.param[$idx].name +' value is null, please check it.'`" />
</return>
</outcome>
<outcome value='Other'>
@@ -77,7 +77,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-create" />
+ <parameter name="error-message" value="`$network-input-parameters.param[$idx].name +' value is null, please check it.'`" />
</return>
</outcome>
<outcome value='Other'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml
new file mode 100644
index 00000000..21936173
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml
@@ -0,0 +1,46 @@
+<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}'>
+ <method rpc='bbs-internet-profile-network-topology-operation-change-huawei' mode='sync'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' ></call>
+ <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/ChangeInternetProfileInstance'`" />
+ <parameter name="contentType" value="application/json"/>
+ <parameter name="httpMethod" value="post"/>
+ <parameter name="responsePrefix" value="service-result"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/ChangeInternetProfileInstance'`" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <switch test="`$service-result.errors.error[0].error-message`">
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Error ChangeInternetProfileInstance failed: '+$service-result.errors.error[0].error-message`" />
+ </return>
+ </outcome>
+ <outcome value=''>
+ <block></block>
+ </outcome>
+ </switch>
+ </outcome>
+ </execute>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
+</service-logic> \ No newline at end of file
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
new file mode 100644
index 00000000..d13c0fd1
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml
@@ -0,0 +1,183 @@
+<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}'>
+ <method rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='validate-bbs-network-input-parameters' mode='sync' ></call>
+ <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' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+ <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+ <parameter name='contextPrefix' value='prop' />
+ </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'`">
+ <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.access_id' value='`$network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
+ <switch test="`$network-input-parameters.param[$idx].name == 'ont_sn'`">
+ <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.ont_sn' value='`$network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
+ <switch test="`$network-input-parameters.param[$idx].name == 'service_type'`">
+ <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_type' value='`$network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
+ <switch test="`$network-input-parameters.param[$idx].name == 'mac'`">
+ <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.mac' value='`$network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
+ <switch test="`$network-input-parameters.param[$idx].name == 'up_speed'`">
+ <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.up_speed' value='`$network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
+ <switch test="`$network-input-parameters.param[$idx].name == 'down_speed'`">
+ <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.down_speed' value='`$network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
+ <switch test="`$network-input-parameters.param[$idx].name == 's_vlan'`">
+ <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.s_vlan' value='`$network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
+ <switch test="`$network-input-parameters.param[$idx].name == 'c_vlan'`">
+ <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.c_vlan' value='`$network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ </block>
+ </method>
+</service-logic> \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml
new file mode 100644
index 00000000..386adf5b
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml
@@ -0,0 +1,46 @@
+<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}'>
+ <method rpc='bbs-internet-profile-network-topology-operation-create-huawei' mode='sync'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' ></call>
+ <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`" />
+ <parameter name="contentType" value="application/json"/>
+ <parameter name="httpMethod" value="post"/>
+ <parameter name="responsePrefix" value="service-result"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <switch test="`$service-result.errors.error[0].error-message`">
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Error CreateInternetProfileInstance failed: '+$service-result.errors.error[0].error-message`" />
+ </return>
+ </outcome>
+ <outcome value=''>
+ <block></block>
+ </outcome>
+ </switch>
+ </outcome>
+ </execute>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
+</service-logic> \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml
new file mode 100644
index 00000000..10da0f80
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml
@@ -0,0 +1,46 @@
+<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}'>
+ <method rpc='bbs-internet-profile-network-topology-operation-delete-huawei' mode='sync'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' ></call>
+ <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`" />
+ <parameter name="contentType" value="application/json"/>
+ <parameter name="httpMethod" value="post"/>
+ <parameter name="responsePrefix" value="service-result"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <switch test="`$service-result.errors.error[0].error-message`">
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Error DeleteInternetProfileInstance failed: '+$service-result.errors.error[0].error-message`" />
+ </return>
+ </outcome>
+ <outcome value=''>
+ <block></block>
+ </outcome>
+ </switch>
+ </outcome>
+ </execute>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
+</service-logic> \ No newline at end of file
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 9b7f57e9..06456da7 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
@@ -376,28 +376,32 @@
</switch>
</block>
</outcome>
- <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'`">
- <outcome value='true'>
- <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
- <outcome value='HUAWEI'>
- <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-change-huawei' mode='sync' ></call>
- </outcome>
- <outcome value='NOKIA'>
- <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-change-nokia' mode='sync' ></call>
- </outcome>
- <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!'`" />
- </return>
+ <outcome value='update'>
+ <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'`">
+ <outcome value='true'>
+ <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
+ <outcome value='HUAWEI'>
+ <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-change-huawei' mode='sync' ></call>
+ </outcome>
+ <outcome value='NOKIA'>
+ <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-change-nokia' mode='sync' ></call>
+ </outcome>
+ <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!'`" />
+ </return>
+ </outcome>
+ </switch>
</outcome>
</switch>
- </outcome>
- </switch>
- </for>
+ </for>
+ </outcome>
+ </switch>
</outcome>
<outcome value='create'>
<switch test='`$network-topology-operation-input.request-information.request-action`'>
@@ -427,10 +431,10 @@
<outcome value='true'>
<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
<outcome value='HUAWEI'>
- <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-create-huawei' mode='sync' ></call>
+ <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-create-huawei' mode='sync' ></call>
</outcome>
<outcome value='NOKIA'>
- <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-create-nokia' mode='sync' ></call>
+ <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-create-nokia' mode='sync' ></call>
</outcome>
<outcome value='Other'>
<return status='failure'>
@@ -527,10 +531,10 @@
</return>
</outcome>
<outcome value='HUAWEI'>
- <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-delete-huawei' mode='sync' ></call>
+ <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-delete-huawei' mode='sync' ></call>
</outcome>
<outcome value='NOKIA'>
- <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-network-topology-operation-delete-nokia' mode='sync' ></call>
+ <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-delete-nokia' mode='sync' ></call>
</outcome>
</switch>
</outcome>
@@ -564,4 +568,4 @@
</return>
</block>
</method>
-</service-logic>
+</service-logic> \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.xml
index 207a338c..73bb52d6 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.xml
@@ -74,7 +74,7 @@
</switch>
</block>
</outcome>
- <outcome value='change'>
+ <outcome value='update'>
<block atomic="true">
<switch test='`$network-topology-operation-input.request-information.request-action`'>
<outcome value='Other'>