From 103b76b64d93dbbbe0b9f84176fe78546b39d787 Mon Sep 17 00:00:00 2001
From: gaurav <gaurav.agrawal@huawei.com>
Date: Wed, 25 Jul 2018 17:35:50 +0530
Subject: Connecting SOTN sub DGs to network DG

Changes include:
1. Connected SOTN sub DG with network DG
2. Removed hardcoding of version

Change-Id: Iabdbc267434bcef0ce125d166d1c2252fa49ce97
Issue-ID: SDNC-356
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

Former-commit-id: c972410c1bb1faa06155e1aa8126c0849990879a
---
 ...-API_sotn-network-topology-operation-delete.xml | 61 ++++++++++++----------
 1 file changed, 33 insertions(+), 28 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
index b9ad46c5..c2d0c9ab 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
@@ -1,29 +1,34 @@
-<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="GENERIC-RESOURCE-API" version="1.2.1-SNAPSHOT">
-   <method rpc="sotn-network-topology-operation-delete" mode="sync">
-      <block atomic="true">
-         <call module="GENERIC-RESOURCE-API" rpc="validate-sotn-network-input-parameters" mode="sync" />
-         <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-            <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log" />
-            <parameter name="field1" value="__TIMESTAMP__" />
-            <parameter name="field2" value="sotn-network-topology-operation-delete" />
-            <parameter name="field3" value="SOTN-Delete" />
-         </record>
-         <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $network-topology-operation-input.network-information.network-id" />
-         <set>
-            <parameter name="service-data.networks.network_length" value="`$service-data.networks.network_length - 1`" />
-         </set>
-         <set>
-            <parameter name="service-data.networks.network[$nidx]." value="" />
-         </set>
-         <set>
-            <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />
-            <parameter name="service-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/service-topology/'` " />
-         </set>
-         <return status="success">
-            <parameter name="ack-final-indicator" value="Y" />
-            <parameter name="error-code" value="200" />
-            <parameter name="error-message" value="`$error-message`" />
-         </return>
-      </block>
-   </method>
+<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='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='sotn-network-topology-operation-delete' mode='sync'>
+        <block atomic="true">
+            <call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' ></call>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
+                <parameter name="field1" value="__TIMESTAMP__"/>
+                <parameter name="field2" value="sotn-network-topology-operation-delete"/>
+                <parameter name="field3" value="SOTN-Delete"/>
+            </record>
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='configuration' 
+        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'></delete>
+            <set>
+                <parameter name="service-data.networks.network_length" value="`$service-data.networks.network_length - 1`"/>
+            </set>
+            <set>
+                <parameter name="service-data.networks.network[$tmp.nidx]." value=""/>
+            </set>
+            <set>
+                <parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $network-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'` " />
+            </set>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
 </service-logic>
-- 
cgit 1.2.3-korg