diff options
| author |   BryanGuo <guofengbei@huawei.com> | 2019-04-04 09:47:02 +0800 |
|---|---|---|
| committer | Gxxxx <guofengbei@huawei.com> | 2019-04-04 09:47:25 +0800 |
| commit | 4b7c33eb555a7a028993cf572b1998a866874c15 (patch) | |
| tree | a3da6c028cf2d0c49bb922e2b521b4f405b104a6 /platform-logic/generic-resource-api/src/main/xml | |
| parent | d475f35701019a37423744544628107f034b4b71 (diff) | |
Fix bbs dgs bug for edge
Issue-ID: SDNC-698,SDNC-699,SDNC-700
Change-Id: I5ba0b5bf99d24fd10175b5eb397b9ff18aa2ae71
Signed-off-by: Gxxxx <guofengbei@huawei.com>
Former-commit-id: 8e5015c79e5d841cc04fa70823ce91ddd10f0492
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
| -rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml | 42 |
1 files changed, 19 insertions, 23 deletions
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 |