summaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api
diff options
context:
space:
mode:
authorBryan Guo <guofengbei@huawei.com>2019-03-22 17:32:44 +0800
committerGxxxx <guofengbei@huawei.com>2019-03-22 17:32:58 +0800
commitdfe82e2ec91671d419f2d8af66764fa4c4d3406e (patch)
tree54be926fa2d1cdd31a3aa7439baec0ff90998fc5 /platform-logic/generic-resource-api
parent5b76e35d9e435241cbf991ec0ad3ad49d178c06c (diff)
Fix bugs in BBS DGs
Issue-ID: SDNC-698,SDNC-699,SDNC-700 Change-Id: I7e3891a25baf3864368a281165da70999313d6ce Signed-off-by: Gxxxx <guofengbei@huawei.com> Former-commit-id: b29c2cdabddc4b982b597fa9cc7d845f0d0b403a
Diffstat (limited to 'platform-logic/generic-resource-api')
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.json2
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json2
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json10
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml2
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml2
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml4
6 files changed, 11 insertions, 11 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 2fa02b5e..dbcec847 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
@@ -271,7 +271,7 @@
"id": "983471bb.6920f",
"type": "set",
"name": "set:variables",
- "xml": "<set>\n<parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://swisscom.onap.inhuawei.com:26335' />\n<parameter name='prop.bbs.HsiPackage' value='50M' />\n<parameter name='prop.bbs.HsiType' value='IPoE' />\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='https://172.30.0.55:26335' />\n<parameter name='prop.bbs.HsiPackage' value='50M' />\n<parameter name='prop.bbs.HsiType' value='IPoE' />\n",
"comments": "",
"x": 1314.5008506774902,
"y": 288.0002107620239,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json
index 6e56cc62..17a2dfe3 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json
@@ -238,7 +238,7 @@
"id": "c4d9d4a8.396518",
"type": "set",
"name": "set:variables",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://swisscom.onap.inhuawei.com:26335' />\n<parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />\n",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />\n<parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />\n",
"comments": "",
"x": 1446.5004043579102,
"y": 328.0001735687256,
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 0643b698..e844cf7a 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
@@ -698,8 +698,8 @@
{
"id": "8cdcb93e.555918",
"type": "switchNode",
- "name": "switch:service-id",
- "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'service-id'`\">\n",
+ "name": "switch:service_id",
+ "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'service_id'`\">\n",
"comments": "",
"outputs": 1,
"x": 2507.0001487731934,
@@ -730,8 +730,8 @@
{
"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",
+ "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,
@@ -741,7 +741,7 @@
{
"id": "fe661f10.07386",
"type": "switchNode",
- "name": "switch:service-id value",
+ "name": "switch:service_id value",
"xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
"comments": "",
"outputs": 1,
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml
index 14564b93..ae4e0f96 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
@@ -6,7 +6,7 @@
<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='https://swisscom.onap.inhuawei.com:26335' />
+ <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />
<parameter name='prop.bbs.HsiPackage' value='50M' />
<parameter name='prop.bbs.HsiType' value='IPoE' />
</set>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
index b0dc0c9d..e5b59771 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
@@ -5,7 +5,7 @@
<block atomic="true">
<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-network-input-parameters' mode='sync' ></call>
<set>
- <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://swisscom.onap.inhuawei.com:26335' />
+ <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />
<parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
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 d13c0fd1..0fbd2f2c 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
@@ -14,7 +14,7 @@
</execute>
<for index='idx' start='0' end='`$network-input-parameters.param_length`' >
<block>
- <switch test="`$network-input-parameters.param[$idx].name == 'service-id'`">
+ <switch test="`$network-input-parameters.param[$idx].name == 'service_id'`">
<outcome value='true'>
<switch test='`$network-input-parameters.param[$idx].value`'>
<outcome value=''>
@@ -26,7 +26,7 @@
</outcome>
<outcome value='Other'>
<set>
- <parameter name='prop.bbs.service-id' value='`$network-input-parameters.param[$idx].value`' />
+ <parameter name='prop.bbs.service_id' value='`$network-input-parameters.param[$idx].value`' />
</set>
</outcome>
</switch>