From 7857803caf2b274c5e1ee817e1c2032908cd57f5 Mon Sep 17 00:00:00 2001
From: "ramu.n" <ramu.n@huawei.com>
Date: Fri, 29 Sep 2017 11:06:42 +0530
Subject: Update underlay DG for VoLTE use case

*Replace openecomp schema with onap
*fix plugin references
*fix svc-action type issue
*Add rest call for site & vrf configuration
*Get ip-prfix & next-hop from route string

Change-Id: I697fb76ab42a7fcb304df19733ac50eef7953f4f
Issue-Id: SDNC-105
Signed-off-by: Ramu N <ramu.n@huawei.com>

Former-commit-id: 3948576d2ce46e492cfead3efd0aa883c280bd30
---
 ...OURCE-API_network-topology-operation-delete.xml | 111 ++++++++++++---------
 1 file changed, 64 insertions(+), 47 deletions(-)

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
index ca5fa9df..019f4dab 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
@@ -1,47 +1,64 @@
-<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='network-topology-operation-delete' mode='sync'>
-<block atomic="true">
-<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >
-</call><for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-<block>
-<switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
-<outcome value='true'>
-<set>
-<parameter name='prop.l3vpn.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-</set></outcome></switch><switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">
-<outcome value='true'>
-<set>
-<parameter name='prop.l3vpn.service-type' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-</set></outcome></switch></block></for><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
-		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-
-<outcome value='success'>
-<block atomic="true"></block></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="Network model is_bound_to_vpn=true but no vpn_binding is present" />
-
-</return></outcome><outcome value='Other'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="Unexpected error retrieving vpn binding" />
-
-</return></outcome></get-resource><set>
-<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
-<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />
-<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" />
-<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
-</set><switch test="`$prop.l3vpn.service-type`">
-<outcome value='l3vpn-ipwan'>
-<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-<parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'"/>
-<parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice='+$prop.l3vpn.name'"/>
-<parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user"/>
-<parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password"/>
-<parameter name="format" value="json"/>
-<parameter name="httpMethod" value="delete"/>
-<parameter name="responsePrefix" value="restapi-result"/></execute></outcome></switch></block></method></service-logic>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<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="network-topology-operation-delete" mode="sync">
+        <block atomic="true">
+            <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
+            <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+                <block>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
+                        <outcome value="true">
+                            <set>
+                                <parameter name="prop.l3vpn.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">
+                        <outcome value="true">
+                            <set>
+                                <parameter name="prop.l3vpn.service-type" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                            </set>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+                <outcome value="success">
+                    <block atomic="true" />
+                </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="Network model is_bound_to_vpn=true but no vpn_binding is present" />
+                    </return>
+                </outcome>
+                <outcome value="Other">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y" />
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Unexpected error retrieving vpn binding" />
+                    </return>
+                </outcome>
+            </get-resource>
+            <set>
+                <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
+                <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
+                <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" />
+                <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
+            </set>
+            <switch test="`$prop.l3vpn.service-type`">
+                <outcome value="l3vpn-ipwan">
+                    <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                        <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'" />
+                        <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice='+$prop.l3vpn.name'" />
+                        <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
+                        <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                        <parameter name="format" value="json" />
+                        <parameter name="httpMethod" value="delete" />
+                        <parameter name="responsePrefix" value="restapi-result" />
+                    </execute>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
-- 
cgit 1.2.3-korg