diff options
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
2 files changed, 54 insertions, 43 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 0137e010..94173333 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 @@ -156,11 +156,6 @@ <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> @@ -174,12 +169,7 @@ <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> + <outcome value='success'></outcome> </execute> </outcome> </execute> @@ -194,8 +184,6 @@ <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`"/> @@ -214,12 +202,7 @@ <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> + <outcome value='success'></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 @@ -245,12 +228,32 @@ <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 value='success'></outcome> + </save> + <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" + 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="relationship-list.relationship[0].related-to" value="generic-vnf" /> + <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $vnf-id`" /> + <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" /> + <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$vnf-id`" /> + <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'></outcome> </save> </block> <return status='success'> 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 index b6ec9d95..2d88b3f4 100644 --- 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 @@ -40,12 +40,7 @@ <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> + <outcome value='success'></outcome> </execute> </outcome> </execute> @@ -60,8 +55,6 @@ <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`"/> @@ -80,12 +73,7 @@ <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> + <outcome value='success'></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 @@ -120,12 +108,32 @@ <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 value='success'></outcome> + </save> + <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" + 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="relationship-list.relationship[0].related-to" value="generic-vnf" /> + <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $vnf-id`" /> + <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" /> + <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$vnf-id`" /> + <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'></outcome> </save> </block> <return status='success'> |