CCVPN extension site resource DGs

DEVICE and SITE VF-topology-operation DGs

Change-Id: Ieb9fdfed7918489ce56d10e848663f81e56445e7
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: 11f5aef76dcff7ceadaa240c068c727793c7d64a

1 files changed, 51 insertions, 30 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml
index 68980ec4..e42b3bda 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml
@@ -3,103 +3,124 @@
     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='sdwan-get-wan-param' mode='sync'>

         <block atomic="true">

-            <for index='idx' start='0' end='`$vnf-request-input.vnf-input-parameters.param_length`' >

+            <for index="idx" start="0" end="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`">

                 <block>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'id'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name  == 'id'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.id' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.id' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.name' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'description'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name  == 'description'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.description' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.description' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'deviceName'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'deviceName'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.deviceName' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.deviceName' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'portType'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'portType'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.portType' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.portType' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'portNumber'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'apn'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.portNumber' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.apn-name' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'ipAddress'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'portNumber'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.ipAddress' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.portNumber' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'providerIpAddress'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'ipAddress'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.providerIpAddress' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.ipAddress' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'vlanId'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'providerIpAddress'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.vlanId' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.providerIpAddress' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'transportNetworkName'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'vlanId'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.transportNetworkName' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.vlanId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'inputBandwidth'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'transportNetworkName'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.inputBandwidth' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.transportNetworkName' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'outputBandwidth'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'inputBandwidth'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.outputBandwidth' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.inputBandwidth' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'devicePortId'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'outputBandwidth'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.devicePortId' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.outputBandwidth' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

-                    <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'wanPortId'`">

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'devicePortId'`">

                         <outcome value='true'>

                             <set>

-                                <parameter name='prop.wan.wanPortId' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />

+                                <parameter name='prop.wan.devicePortId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

+                            </set>

+                        </outcome>

+                    </switch>

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'wanPortId'`">

+                        <outcome value='true'>

+                            <set>

+                                <parameter name='prop.wan.wanPortId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

+                            </set>

+                        </outcome>

+                    </switch>

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'publicIP'`">

+                        <outcome value='true'>

+                            <set>

+                                <parameter name='prop.wan.publicIP' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

+                            </set>

+                        </outcome>

+                    </switch>

+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'IPMode'`">

+                        <outcome value='true'>

+                            <set>

+                                <parameter name='prop.wan.IPMode' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />

                             </set>

                         </outcome>

                     </switch>

@@ -112,4 +133,4 @@
             </for>

         </block>

     </method>

-</service-logic>

+</service-logic>
\ No newline at end of file