diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-05-05 23:02:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-05 23:02:28 +0000 |
| commit | 34982feb952498df25a7e836909a20a78d1a9abd (patch) | |
| tree | 17cb3f3c3cdd9f014935662d44f6049fa46ff9bf /platform-logic/generic-resource-api/src/main/xml | |
| parent | 1b928100e82c9c6857aa217452cea333ea42b1f3 (diff) | |
| parent | cb27b38f922fc90c47cb4fa71d6677b5392e29f1 (diff) | |
Merge "Replace access_id with remote_id"
Former-commit-id: d902998d6dfe7f6141c7d6c6dde86e4e43a07afa
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
2 files changed, 8 insertions, 8 deletions
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 b207014c..0137e010 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 @@ -16,7 +16,7 @@ </execute> <for index='idx' start='0' end='`$network-input-parameters.param_length`' > <block> - <switch test="`$network-input-parameters.param[$idx].name == 'accessID'`"> + <switch test="`$network-input-parameters.param[$idx].name == 'remote_id'`"> <outcome value='true'> <switch test='`$network-input-parameters.param[$idx].value`'> <outcome value=''> @@ -28,7 +28,7 @@ </outcome> <outcome value='Other'> <set> - <parameter name='prop.bbs.accessID' value='`$network-input-parameters.param[$idx].value`' /> + <parameter name='prop.bbs.remote_id' value='`$network-input-parameters.param[$idx].value`' /> </set> </outcome> </switch> @@ -228,7 +228,7 @@ AND service-instance.service-instance-id = $network-topology-operation-input.service-information.service-instance-id" force="true" pfx="tmp.AnAI-data" > <parameter name="metadata.metadatum[0].metaname" value="remote-id" /> - <parameter name="metadata.metadatum[0].metaval" value="`$prop.bbs.accessID`" /> + <parameter name="metadata.metadatum[0].metaval" value="`$prop.bbs.remote_id`" /> <parameter name="metadata.metadatum[1].metaname" value="controller-service-id" /> <parameter name="metadata.metadatum[1].metaval" value="`$prop.bbs.serviceID`" /> <outcome value='failure'> @@ -260,4 +260,4 @@ </return> </block> </method> -</service-logic>
\ No newline at end of file +</service-logic> 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 95a3ac11..0eea0e09 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 @@ -15,7 +15,7 @@ </execute> <for index='idx' start='0' end='`$network-input-parameters.param_length`' > <block> - <switch test="`$network-input-parameters.param[$idx].name == 'ip_access_id'`"> + <switch test="`$network-input-parameters.param[$idx].name == 'ip_remote_id'`"> <outcome value='true'> <switch test='`$network-input-parameters.param[$idx].value`'> <outcome value=''> @@ -27,7 +27,7 @@ </outcome> <outcome value='Other'> <set> - <parameter name='prop.bbs.access_id' value='`$network-input-parameters.param[$idx].value`' /> + <parameter name='prop.bbs.remote_id' value='`$network-input-parameters.param[$idx].value`' /> </set> </outcome> </switch> @@ -165,7 +165,7 @@ <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="field3" value="`$prop.bbs.remote_id`" /> <parameter name="field4" value="`$prop.bbs.ont_sn`" /> <parameter name="field5" value="`$prop.bbs.service_type`" /> <parameter name="field6" value="`$prop.bbs.mac`" /> @@ -176,4 +176,4 @@ </record> </block> </method> -</service-logic>
\ No newline at end of file +</service-logic> |