diff options
author | 2019-04-03 20:28:53 +0800 | |
---|---|---|
committer | 2019-04-04 08:58:33 +0800 | |
commit | 2f9b38f29d19b4fd8e31ee0a8c34b9b910b0f4f5 (patch) | |
tree | 343a6b29ff9df5fa19abac039ea11b5575763175 /platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml | |
parent | 53fff87e02f797ff117347dc76ed2f9d8262f826 (diff) |
Fix bbs dgs bug,replace 'vendor' by 'manufacturer'
Issue-ID: SDNC-698,SDNC-699,SDNC-700
Change-Id: Ida80d2ca97f786be36e4610ed0e4e18fab15773a
Signed-off-by: Gxxxx <guofengbei@huawei.com>
Former-commit-id: 879baef9f68011412253def6a014fcbfe261c4da
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml')
-rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml | 106 |
1 files changed, 101 insertions, 5 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 ae4e0f96..b207014c 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 @@ -111,7 +111,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error executing Get token rest api" /> + <parameter name="error-message" value="Error executing queryTokenID,vaule is null" /> </return> </outcome> </switch> @@ -120,7 +120,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error executing Get token rest api" /> + <parameter name="error-message" value="Error failed to call queryTokenID" /> </return> </outcome> </execute> @@ -139,7 +139,7 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error executing Get token rest api" /> + <parameter name="error-message" value="Error failed to call createAccessConnectivityService" /> </return> </outcome> <outcome value='success'> @@ -148,15 +148,111 @@ <return status='failure'> <parameter name='ack-final' value='Y'/> <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'Error createAccessConnectivityService failed: '+$service-result.errors.error[0].error-message`" /> + <parameter name="error-message" value="`'Error createAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" /> </return> </outcome> <outcome value=''> - <block></block> + <block> + <set> + <parameter name='prop.bbs.serviceID' value="`$service-result.accessE2Eservice.serviceID`"/> + </set> + <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> + <parameter name="file" value="/opt/oak/logx.txt" /> + <parameter name="field1" value="createAccessConnectivityService success!" /> + <parameter name="field2" value="`$service-result.accessE2Eservice.serviceID`" /> + </record> + </block> </outcome> </switch> </outcome> </execute> + <block> + <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID"> + <parameter name="ctx-destination" value="prop.random-data"/> + <outcome value='success'> + <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' > + <parameter name="ctx_memory_result_key" value="prop.random-data-list"/> + <parameter name="original_string" value="`$prop.random-data`"/> + <parameter name="regex" value="-"/> + <outcome value='success'> + <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> + <parameter name="file" value="/opt/oak/logx.txt" /> + <parameter name="field1" value="`$prop.random-data`" /> + </record> + </outcome> + </execute> + </outcome> + </execute> + <set> + <parameter name='vnf-id' value="`$prop.random-data-list[3]`"/> + <parameter name='vnf-name' value="`'vnf-'+$prop.random-data-list[4]`"/> + </set> + <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $vnf-id" > + <parameter name= "vnf-id" value = "`$vnf-id`"/> + <parameter name= "vnf-name" value = "`$vnf-name`"/> + <parameter name= "vnf-type" value = "AccessConnectivity"/> + <parameter name= "service-id" value = "`$network-topology-operation-input.service-information.service-id`"/> + <parameter name= "prov-status" value = "ACTIVE"/> + <parameter name= "orchestration-status" value = "Active"/> + <parameter name= "ipv4-oam-address" value = "169.254.236.13"/> + <parameter name= "in-maint" value = "false" /> + <parameter name= "is-closed-loop-disabled" value = "false" /> + <parameter name= "model-invariant-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`"/> + <parameter name= "model-version-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-uuid`"/> + <parameter name= "model-customization-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`"/> + <outcome value='failure'> + <return status='failure'> + <parameter name='ack-final' value='Y'/> + <parameter name="error-code" value="500" /> + <parameter name="error-message" value="Failure calling AAI to save generic-vnf" /> + </return> + </outcome> + <outcome value='not-found'> + <return status='failure'> + <parameter name='ack-final' value='Y'/> + <parameter name="error-code" value="500" /> + <parameter name="error-message" value="generic-vnf instance does not exist in AAI" /> + </return> + </outcome> + <outcome value='success'> + <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> + <parameter name="file" value="/opt/oak/logx.txt" /> + <parameter name="field1" value="save generic-vnf success!" /> + </record> + </outcome> + </save> + <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata" + key="service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id + AND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id + AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type + 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[1].metaname" value="controller-service-id" /> + <parameter name="metadata.metadatum[1].metaval" value="`$prop.bbs.serviceID`" /> + <outcome value='failure'> + <return status='failure'> + <parameter name='ack-final' value='Y'/> + <parameter name="error-code" value="500" /> + <parameter name="error-message" value="Failure calling AAI to save metadatum" /> + </return> + </outcome> + <outcome value='not-found'> + <return status='failure'> + <parameter name='ack-final' value='Y'/> + <parameter name="error-code" value="500" /> + <parameter name="error-message" value="metadatum instance does not exist in AAI" /> + </return> + </outcome> + <outcome value='success'> + <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder"> + <parameter name="file" value="/opt/oak/logx.txt" /> + <parameter name="field1" value="save metadatum success!" /> + </record> + </outcome> + </save> + </block> <return status='success'> <parameter name="ack-final-indicator" value="Y" /> <parameter name="error-code" value="200" /> |