diff options
author | Dan Timoney <dtimoney@att.com> | 2020-03-20 12:15:01 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-03-20 12:15:01 +0000 |
commit | 803e7a177bcc3d0d418f7a442164b4c8122b8314 (patch) | |
tree | 2a40a8927801549b8c2bd9e1281f569040bd9a7a /platform-logic/optical-service/src/main/xml | |
parent | c9aafee35e88ddfb36df63d28b71d08b8db63725 (diff) | |
parent | c84a2dfd4b8f935909eccac4ba18848e6b37d169 (diff) |
Merge "TAPI and MSA create and delete service changes"
Former-commit-id: 6e8a70acfd0c060a7af9d549fc9656bad2fa326c
Diffstat (limited to 'platform-logic/optical-service/src/main/xml')
4 files changed, 404 insertions, 88 deletions
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml b/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml new file mode 100644 index 00000000..91062b0f --- /dev/null +++ b/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml @@ -0,0 +1,71 @@ +<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>
+ <method rpc='main-create' mode='sync'>
+ <block atomic='true'>
+ <call module='optical-service' rpc='optical-validate-input-params' mode='sync' ></call>
+ <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+ <parameter name='fileName' value='/opt/onap/sdnc/data/properties/optical-service-dg.properties' />
+ <parameter name='contextPrefix' value='prop' />
+ </execute>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT controller_id
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE interface_name = $optical-service-create-input.payload.service-aend.port-id'
+pfx='controllerid'>
+ <outcome value='success'>
+ <set>
+ <parameter name='controller-id' value='`$controllerid.controller-id`' />
+ </set>
+ </outcome>
+ </get-resource>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`$controller-id`'/>
+ <parameter name="regex" value="_"/>
+ <parameter name="ctx_memory_result_key" value="param-prefix"/>
+ </execute>
+ <set>
+ <parameter name='controller-ip' value='`$param-prefix[1]`' />
+ <parameter name='domain-type' value='`$param-prefix[0]`' />
+ </set>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT *
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE interface_name = $optical-service-create-input.payload.service-aend.port-id'
+pfx='db-aend'>
+ <outcome value='success'>
+ <set>
+ <parameter name='aend-nodeid' value='`$db-aend.pnf-id`' />
+ <parameter name='a-end-pnf-name' value='`$db-aend.pnf-name`' />
+ <parameter name='aend-clli' value='`$db-aend.clli`' />
+ </set>
+ </outcome>
+ </get-resource>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT *
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE interface_name = $optical-service-create-input.payload.service-zend.port-id'
+pfx='db-zend'>
+ <outcome value='success'>
+ <set>
+ <parameter name='zend-nodeid' value='`$db-zend.pnf-id`' />
+ <parameter name='z-end-pnf-name' value='`$db-zend.pnf-name`' />
+ <parameter name='zend-clli' value='`$db-zend.clli`' />
+ </set>
+ </outcome>
+ </get-resource>
+ <switch test='`$domain-type`'>
+ <outcome value='MSA'>
+ <block atomic='true'>
+ <call module='optical-service' rpc='service-create-msa' mode='sync' ></call>
+ </block>
+ </outcome>
+ <outcome value='TAPI'>
+ <block atomic='true'>
+ <call module='optical-service' rpc='service-create-tapi' mode='sync' ></call>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </method>
+</service-logic>
\ No newline at end of file diff --git a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml index 4b42278c..ce1937f3 100644 --- a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml +++ b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml @@ -8,113 +8,271 @@ <parameter name='contextPrefix' value='prop' />
</execute>
<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-key='SELECT controller_id
+key='SELECT *
from REQUEST_DETAILS
WHERE request_id = $optical-service-delete-input.request-id'
-pfx='controllerid'>
+pfx='detail-db'>
<outcome value='success'>
<set>
- <parameter name='controller-id' value='`$controllerid.controller-id`' />
+ <parameter name='domain-req' value='`$detail-db.domain-requests`' />
</set>
</outcome>
</get-resource>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
- <parameter name="original_string" value='`$controller-id`'/>
- <parameter name="regex" value="_"/>
- <parameter name="ctx_memory_result_key" value="param-prefix"/>
+ <parameter name="original_string" value='`$domain-req`'/>
+ <parameter name="regex" value=","/>
+ <parameter name="ctx_memory_result_key" value="param-prefix1"/>
</execute>
<set>
- <parameter name='controller-ip' value='`$param-prefix[1]`' />
- <parameter name='domain-type' value='`$param-prefix[0]`' />
- <parameter name='notification-url' value="`$prop.controller.url + '/' + $prop.sdnc.async.url`" />
+ <parameter name='notification-url' value="http://167.254.204.152:31817/asyncNotification" />
+ <parameter name='domain-service1' value='`$param-prefix1[0]`' />
+ <parameter name='domain-service2' value='`$param-prefix1[1]`' />
</set>
- <switch test='`$domain-type`'>
- <outcome value='MSA'>
- <block>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`" />
- <parameter name="restapiUrl" value="`$controller-ip + '/cxf/openroadm/openroadm-services/' + $optical-service-delete-input.payload.service-name`"/>
- <parameter name='restapiUser' value='admin' />
- <parameter name='restapiPassword' value='admin' />
- <parameter name="httpMethod" value="DELETE"/>
- <parameter name="responsePrefix" value="service-delete-response"/>
- <parameter name='contentType' value='application/json' />
- <parameter name='format' value='json' />
- <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.msa.jks"/>
- <parameter name="trustStorePassword" value="adminadmin"/>
- <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
- <parameter name="keyStorePassword" value="adminadmin"/>
- <outcome value='failure'>
- <block atomic='true'>
- <return status='failure'>
- <parameter name='error-code' value='500' />
- <parameter name='error-message' value='Error deleting the Service' />
- </return>
- </block>
- </outcome>
- <outcome value='success'>
- <block atomic='true'>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="Successfully sent the request"/>
- </record>
- <switch test='`$service-delete-response.configuration-response-common.response-code`'>
- <outcome value='Other'>
+ <set>
+ <parameter name='access-id' value="`$optical-service-delete-input.request-id`" />
+ </set>
+ <for index='ppx' start='0' end='`$param-prefix1_length`' >
+ <switch test='`$param-prefix1_length`'>
+ <outcome value='1'>
+ <block atomic='true'>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT controller_id
+from REQUEST_DETAILS
+WHERE request_id = $domain-service1'
+pfx='detail-db1'>
+ <outcome value='success'>
+ <set>
+ <parameter name='controller-id1' value='`$detail-db1.controller-id`' />
+ </set>
+ </outcome>
+ </get-resource>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`$controller-id1`'/>
+ <parameter name="regex" value="_"/>
+ <parameter name="ctx_memory_result_key" value="param-prefix"/>
+ </execute>
+ <set>
+ <parameter name='domain-type' value='`$param-prefix[0]`' />
+ <parameter name='controller-ip' value='`$param-prefix[1]`' />
+ <parameter name='optical-service-delete-input.request-id' value="`$domain-service1`" />
+ <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN'`"/>
+ </set>
+ <switch test='`$domain-type`'>
+ <outcome value='MSA'>
+ <block>
+ <call module='optical-service' rpc='service-delete-msa' mode='sync' >
+ <outcome value='success'>
+ <block atomic='true'>
+ <set>
+ <parameter name='service1-status' value='`$final-response-code`' />
+ </set>
+ </block>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='500' />
+ <parameter name='error-message' value='Failed to call MSA DG' />
+ <parameter name='ack-final-indicator' value="Y" />
+ </return>
+ </outcome>
+ </call>
+ </block>
+ </outcome>
+ <outcome value='TAPI'>
+ <block>
+ <call module='optical-service' rpc='service-delete-tapi' mode='sync' >
+ <outcome value='success'>
+ <block>
+ <set>
+ <parameter name='service1-status' value='`$final-response-code`' />
+ </set>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/service-delete-tapi.log" />
+ <parameter name="level" value="info" />
+ <parameter name="field1" value="`$service1-status`"/>
+ </record>
+ </block>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='500' />
+ <parameter name='error-message' value='Failed to call MSA DG' />
+ <parameter name='ack-final-indicator' value="Y" />
+ </return>
+ </outcome>
+ </call>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='2'>
+ <switch test='`$ppx`'>
+ <outcome value='0'>
+ <block>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT controller_id
+from REQUEST_DETAILS
+WHERE request_id = $domain-service1'
+pfx='detail-db11'>
+ <outcome value='success'>
+ <set>
+ <parameter name='controller-id11' value='`$detail-db11.controller-id`' />
+ </set>
+ </outcome>
+ </get-resource>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`$controller-id11`'/>
+ <parameter name="regex" value="_"/>
+ <parameter name="ctx_memory_result_key" value="domain1"/>
+ </execute>
+ <set>
+ <parameter name='optical-service-delete-input.request-id' value="`$domain-service1`" />
+ <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-TAPI-1'`"/>
+ <parameter name='domain-type' value='`$domain1[0]`' />
+ <parameter name='controller-ip' value='`$domain1[1]`' />
+ </set>
+ <call module='optical-service' rpc='service-delete-tapi' mode='sync' >
+ <outcome value='success'>
+ <block>
+ <set>
+ <parameter name='service1-status' value='`$final-response-code`' />
+ </set>
+ <switch test='`$service1-status == 200`'>
+ <outcome value='true'>
+ <set>
+ <parameter name='service1' value='success' />
+ </set>
+ </outcome>
+ <outcome value='false'>
+ <set>
+ <parameter name='service1' value='failure' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='failure'>
<return status='failure'>
- <parameter name='error-code' value='`$service-delete-response.configuration-response-common.response-code`' />
- <parameter name='error-message' value='`$service-delete-response.configuration-response-common.response-message`' />
+ <parameter name='error-code' value='500' />
+ <parameter name='error-message' value='Main Delete Dg not available' />
+ <parameter name='ack-final-indicator' value="Y" />
</return>
</outcome>
- <outcome value='200'>
- <block atomic='true'>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="Inside controller"/>
- </record>
- <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
-resource='SQL'
-key='UPDATE REQUEST_DETAILS SET status = "DELETING" WHERE request_id = $optical-service-delete-input.request-id'
-force='true' pfx='save-result'></save>
- <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-key='SELECT *
-from REQUEST_DETAILS
-WHERE request_id = $optical-service-delete-input.request-id'
-pfx='db.request-details'>
- <outcome value='success'>
+ </call>
+ </block>
+ </outcome>
+ <outcome value='1'>
+ <block>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT controller_id
+from REQUEST_DETAILS
+WHERE request_id = $domain-service2'
+pfx='detail-db22'>
+ <outcome value='success'>
+ <set>
+ <parameter name='controller-id22' value='`$detail-db22.controller-id`' />
+ </set>
+ </outcome>
+ </get-resource>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`$controller-id22`'/>
+ <parameter name="regex" value="_"/>
+ <parameter name="ctx_memory_result_key" value="domain2"/>
+ </execute>
+ <set>
+ <parameter name='optical-service-delete-input.request-id' value="`$domain-service2`" />
+ <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-TAPI-2'`"/>
+ <parameter name='domain-type' value='`$domain2[0]`' />
+ <parameter name='controller-ip' value='`$domain2[1]`' />
+ </set>
+ <call module='optical-service' rpc='service-delete-tapi' mode='sync' >
+ <outcome value='success'>
+ <block>
+ <set>
+ <parameter name='service2-status' value='`$final-response-code`' />
+ </set>
+ <switch test='`$service2-status == 200`'>
+ <outcome value='true'>
<set>
- <parameter name='instance-id' value='`$db.request-details.service-instance-id`' />
- <parameter name='customer-id' value='`$db.request-details.global-customer-id`' />
- <parameter name='service-id' value='`$db.request-details.service-type`' />
+ <parameter name='service2' value='success' />
</set>
</outcome>
- </get-resource>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService'
-force='true'
-resource='service-instance'
-key = 'customer.global-customer-id = $customer-id AND
- service-subscription.service-type = $service-id AND
- service-instance.service-instance-id = $instance-id'
-local-only='false'>
- <parameter name='orchestration-status' value='DELETING' />
- </update>
- <return status='success'>
- <parameter name="error-code" value="200" />
- <parameter name="error-message" value="Service Deletion in Progress" />
- <parameter name='ack-final-indicator' value='N' />
- </return>
+ <outcome value='false'>
+ <set>
+ <parameter name='service2' value='failure' />
+ </set>
+ </outcome>
+ </switch>
</block>
</outcome>
- </switch>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='500' />
+ <parameter name='error-message' value='Main Delete Dg not available' />
+ <parameter name='ack-final-indicator' value="Y" />
+ </return>
+ </outcome>
+ </call>
+ </block>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
+ </for>
+ <switch test='`$ppx`'>
+ <outcome value='0'>
+ <block>
+ <switch test='`$service1-status`'>
+ <outcome value='200'>
+ <block>
+ <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+ resource="SQL"
+ key="DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id"></delete>
+ <return status='success'>
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="Service Deleted Successfully" />
+ <parameter name='ack-final-indicator' value='Y' />
+ </return>
</block>
</outcome>
- </execute>
+ <outcome value='Other'>
+ <block>
+ <return status='failure'>
+ <parameter name='error-code' value='500' />
+ <parameter name='error-message' value='Access service request entry cannot be deleted' />
+ <parameter name='ack-final-indicator' value="Y" />
+ </return>
+ </block>
+ </outcome>
+ </switch>
</block>
</outcome>
- <outcome value='TAPI'>
+ <outcome value='1'>
<block>
- <call module='optical-service' rpc='service-delete-tapi' mode='sync' ></call>
+ <switch test='`$service1-status == $service2-status == 200`'>
+ <outcome value='true'>
+ <block>
+ <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+ resource="SQL"
+ key="DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id"></delete>
+ <return status='success'>
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="Service Deleted Successfully" />
+ <parameter name='ack-final-indicator' value='Y' />
+ </return>
+ </block>
+ </outcome>
+ <outcome value='false'>
+ <block>
+ <return status='failure'>
+ <parameter name='error-code' value='500' />
+ <parameter name='error-message' value='Access service request entry cannot be deleted' />
+ <parameter name='ack-final-indicator' value="Y" />
+ </return>
+ </block>
+ </outcome>
+ </switch>
</block>
</outcome>
</switch>
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml new file mode 100644 index 00000000..562195a0 --- /dev/null +++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml @@ -0,0 +1,89 @@ +<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>
+ <method rpc='service-delete-msa' mode='sync'>
+ <block atomic="true">
+ <set>
+ <parameter name='optical-service-create-input.request-id' value="`$domain-service1`" />
+ <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-MSA'`"/>
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`" />
+ <parameter name="restapiUrl" value="`$controller-ip + '/cxf/openroadm/openroadm-services/' + $optical-service-delete-input.payload.service-name`"/>
+ <parameter name='restapiUser' value='admin' />
+ <parameter name='restapiPassword' value='admin' />
+ <parameter name="httpMethod" value="DELETE"/>
+ <parameter name="responsePrefix" value="service-delete-response"/>
+ <parameter name='contentType' value='application/json' />
+ <parameter name='format' value='json' />
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.msa.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <outcome value='failure'>
+ <block atomic='true'>
+ <return status='failure'>
+ <parameter name='error-code' value='500' />
+ <parameter name='error-message' value='Error deleting the Service' />
+ </return>
+ </block>
+ </outcome>
+ <outcome value='success'>
+ <block atomic='true'>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />
+ <parameter name="level" value="info" />
+ <parameter name="field1" value="Successfully sent the request"/>
+ </record>
+ <switch test='`$service-delete-response.configuration-response-common.response-code`'>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='error-code' value='`$service-delete-response.configuration-response-common.response-code`' />
+ <parameter name='error-message' value='`$service-delete-response.configuration-response-common.response-message`' />
+ </return>
+ </outcome>
+ <outcome value='200'>
+ <block atomic='true'>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />
+ <parameter name="level" value="info" />
+ <parameter name="field1" value="Inside controller"/>
+ </record>
+ <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+resource='SQL'
+key='UPDATE REQUEST_DETAILS SET status = "DELETING" WHERE request_id = $optical-service-delete-input.request-id'
+force='true' pfx='save-result'></save>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT *
+from REQUEST_DETAILS
+WHERE request_id = $optical-service-delete-input.request-id'
+pfx='db.request-details'>
+ <outcome value='success'>
+ <set>
+ <parameter name='instance-id' value='`$db.request-details.service-instance-id`' />
+ <parameter name='customer-id' value='`$db.request-details.global-customer-id`' />
+ <parameter name='service-id' value='`$db.request-details.service-type`' />
+ </set>
+ </outcome>
+ </get-resource>
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService'
+force='true'
+resource='service-instance'
+key = 'customer.global-customer-id = $customer-id AND
+ service-subscription.service-type = $service-id AND
+ service-instance.service-instance-id = $instance-id'
+local-only='false'>
+ <parameter name='orchestration-status' value='DELETING' />
+ </update>
+ <set>
+ <parameter name='final-response-code' value="200" />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </execute>
+ </block>
+ </method>
+</service-logic>
\ No newline at end of file diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml index 919c5548..24b52fbb 100644 --- a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml +++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml @@ -136,11 +136,9 @@ service-instance.service-instance-id = $output.service-instance-id'></delete> <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
resource="SQL"
key="DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id"></delete>
- <return status='success'>
- <parameter name='error-code' value='200' />
- <parameter name='error-message' value='Service deleted successfully' />
- <parameter name='ack-final-indicator' value="Y" />
- </return>
+ <set>
+ <parameter name='final-response-code' value="200" />
+ </set>
</block>
</outcome>
</execute>
|