Inter Domain DG'S modified

Change-Id: I9f1653ae010fe9d0a06b32ee5818147af685c015
Issue-ID: SDNC-1144
Signed-off-by: Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>

Former-commit-id: 4ec43a3a9a249c104281dbfb4318848ca224185c

7 files changed, 80 insertions, 18 deletions

diff --git a/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml b/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
index e11d061b..c817cee6 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
@@ -66,4 +66,4 @@ service-instance.service-instance-id = $output.service-instance-id'></delete>
     key="DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id"></delete>

         </block>

     </method>

-</service-logic>

+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml b/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml
index eb1ef93f..4e712ea0 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml
@@ -26,7 +26,7 @@ pfx='inter' local-only='false' >
                         <for index='ida' start='0' end='`$inter.logical-link_length`' >

                             <switch test='`$inter.logical-link[$ida].link-type`'>

                                 <outcome value='inter-domain'>

-                                    <switch test='`$inter.logical-link[$ida].available-capacity == 0`'>

+                                    <switch test='`$inter.logical-link[$ida].operational-status == occupied`'>

                                         <outcome value='true'></outcome>

                                         <outcome value='false'>

                                             <block atomic="true">

@@ -69,7 +69,7 @@ pfx='inter' local-only='false' >
                                                     <set>

                                                         <parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-aend`' />

                                                         <parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-bend`' />

-                                                        <parameter name='optical-service-create-input.payload.service-name' value="`$access-service-name + '_' + 'MDONS-OTN-TAPI-1'`" />

+                                                        <parameter name='optical-service-create-input.payload.service-name' value="`$access-service-name +  '_MDONS-OTN'`" />

                                                         <parameter name='domain-type' value="TAPI" />

                                                         <parameter name='optical-service-create-input.request-id' value="`$service1-request-id`" />

                                                         <parameter name='optical-service-create-input.service-id' value="`$service1-svc-instance-id`" />

@@ -109,7 +109,7 @@ pfx='inter' local-only='false' >
                                                     <set>

                                                         <parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-cend`' />

                                                         <parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-zend`' />

-                                                        <parameter name='optical-service-create-input.payload.service-name' value="`$access-service-name + '_' + 'MDONS-OTN-TAPI-2'`" />

+                                                        <parameter name='optical-service-create-input.payload.service-name' value="`$access-service-name + '_MDONS-OTN'`" />

                                                         <parameter name='domain-type' value="TAPI" />

                                                         <parameter name='optical-service-create-input.request-id' value="`$service2-request-id`" />

                                                         <parameter name='optical-service-create-input.service-id' value="`$service2-svc-instance-id`" />

@@ -161,7 +161,7 @@ force='true'
 resource='logical-link'

      key='logical-link.link-name = $inter.logical-link[$ida].link-name '

       local-only='false'>

-                                                    <parameter name='available-capacity' value='0' />

+                                                    <parameter name='operational-status' value='occupied' />

                                                 </update>

                                                 <call module='optical-service' rpc='create-service-relationship' mode='sync' ></call>

                                                 <return status='success'>

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
index 91062b0f..541e0279 100644
--- 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
@@ -57,6 +57,9 @@ pfx='db-zend'>
             <switch test='`$domain-type`'>

                 <outcome value='MSA'>

                     <block atomic='true'>

+                        <set>

+                            <parameter name='optical-service-create-input.payload.service-name' value="`$optical-service-create-input.payload.service-name + '_' + $param-prefix[2]`"/>

+                        </set>

                         <call module='optical-service' rpc='service-create-msa' mode='sync' ></call>

                     </block>

                 </outcome>

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 ce1937f3..2bbd79e3 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
@@ -15,6 +15,7 @@ pfx='detail-db'>
                 <outcome value='success'>

                     <set>

                         <parameter name='domain-req' value='`$detail-db.domain-requests`' />

+                        <parameter name='delete-acc-svc-id' value='`$detail-db.service-instance-id`' />

                     </set>

                 </outcome>

             </get-resource>

@@ -28,9 +29,6 @@ pfx='detail-db'>
                 <parameter name='domain-service1' value='`$param-prefix1[0]`' />

                 <parameter name='domain-service2' value='`$param-prefix1[1]`' />

             </set>

-            <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'>

@@ -55,7 +53,7 @@ pfx='detail-db1'>
                                 <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'`"/>

+                                <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'>

@@ -128,7 +126,7 @@ pfx='detail-db11'>
                                     </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='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`"/>

                                         <parameter name='domain-type' value='`$domain1[0]`' />

                                         <parameter name='controller-ip' value='`$domain1[1]`' />

                                     </set>

@@ -182,7 +180,7 @@ pfx='detail-db22'>
                                     </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='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`"/>

                                         <parameter name='domain-type' value='`$domain2[0]`' />

                                         <parameter name='controller-ip' value='`$domain2[1]`' />

                                     </set>

@@ -256,6 +254,28 @@ pfx='detail-db22'>
                                     <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'

     resource="SQL"

     key="DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id"></delete>

+                                    <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="`'domain rquest_' + $domain-requests`"/>

+                                        <parameter name="field2" value="`'Access rquest_' + $as-request-id`"/>

+                                    </record>

+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"

+resource="service-instance"

+ key='customer.global-customer-id = $output.global-customer-id AND

+     service-subscription.service-type = $output.service-type AND

+     service-instance.service-instance-id = $delete-acc-svc-id' 

+pfx='acc-serv-dl'      local-only='false'></get-resource>

+                                    <set>

+                                        <parameter name='link-name' value='`$acc-serv-dl.relationship-list.relationship[0].relationship-data[0].relationship-value`' />

+                                    </set>

+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 

+force='true'

+resource='logical-link'

+     key='logical-link.link-name = $link-name '

+      local-only='false'>

+                                        <parameter name='operational-status' value='available' />

+                                    </update>

                                     <return status='success'>

                                         <parameter name="error-code" value="200" />

                                         <parameter name="error-message" value="Service Deleted Successfully" />

diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml
index 11b729e0..5f87c54d 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml
@@ -24,6 +24,7 @@ pfx='db-aend'>
                         <parameter name='aend-cep-list' value='`$db-aend.connection-point`' />

                         <parameter name='aend-nep' value='`$db-aend.interface-name`' />

                         <parameter name='aend-rate' value='`$db-aend.rate`' />

+                        <parameter name='esr-id' value='`$db-aend.controller-id`' />

                     </set>

                 </outcome>

             </get-resource>

@@ -322,8 +323,13 @@ pfx='zend'      local-only='false'></get-resource>
                     </block>

                 </outcome>

             </switch>

+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >

+                <parameter name="original_string" value='`$esr-id`'/>

+                <parameter name="regex" value="_"/>

+                <parameter name="ctx_memory_result_key" value="new-esr"/>

+            </execute>

             <set>

-                <parameter name='service-name' value="`$optical-service-create-input.payload.service-name`" />

+                <parameter name='service-name' value="`$optical-service-create-input.payload.service-name +'_' + $new-esr[2]`"/>

                 <parameter name='svc-action' value="CREATE" />

             </set>

             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">

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
index a4233171..2eb38164 100644
--- 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
@@ -3,6 +3,28 @@
     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">

+            <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="`$service-name + $param-prefix[2]`"/>

+            </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`"/>

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 24b52fbb..0d17afd2 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
@@ -3,16 +3,30 @@
     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-tapi' mode='sync'>

         <block atomic="true">

+            <set>

+                <parameter name='request-id' value='`$optical-service-delete-input.request-id`' />

+            </set>

             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">

                 <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />

                 <parameter name="level" value="info" />

                 <parameter name="field1" value="Inside optical service delete tapi"/>

             </record>

+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 

+key='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '

+pfx='output'></get-resource>

             <set>

-                <parameter name='request-id' value='`$optical-service-delete-input.request-id`' />

+                <parameter name='esr-id' value='`$output.controller-id`' />

+            </set>

+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >

+                <parameter name="original_string" value='`$esr-id`'/>

+                <parameter name="regex" value="_"/>

+                <parameter name="ctx_memory_result_key" value="new-esr"/>

+            </execute>

+            <set>

+                <parameter name='service-name' value="`$optical-service-delete-input.payload.service-name +  $new-esr[2]`" />

             </set>

             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-                <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.get.services.url + $optical-service-delete-input.payload.service-name`" />

+                <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.get.services.url + $service-name`" />

                 <parameter name="restapiUser" value="admin"/>

                 <parameter name="restapiPassword" value="admin"/>

                 <parameter name="httpMethod" value="GET"/>

@@ -43,7 +57,7 @@ from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
 WHERE interface_name = $zend-nep'

 pfx='db-zend'></get-resource>

                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-                            <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.delete.service.url + $optical-service-delete-input.payload.service-name`" />

+                            <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.delete.service.url + $service-name`" />

                             <parameter name="restapiUser" value="admin"/>

                             <parameter name="restapiPassword" value="admin"/>

                             <parameter name="httpMethod" value="DELETE"/>

@@ -125,9 +139,6 @@ pfx='zend'      local-only='false'></get-resource>
 resource='SQL' 

 key='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $zend-new WHERE interface_name = $zend-nep'

 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 = $request-id '

-pfx='output'></get-resource>

                                     <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"

 resource="service-instance"

 key='customer.global-customer-id = $output.global-customer-id AND