From 807e81260d9d2b905489e88b4d42f763e1961e47 Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Wed, 15 Aug 2018 01:47:48 +0530
Subject: SDWAN Site DGs update

SDWAN site DG issue fix and update based on controlpoints modifications

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

Former-commit-id: b7fdeb59f9c50c690d6f388cb9967c0f1da4c5ef
---
 ...URCE-API_site-vnf-topology-operation-create.xml | 97 +---------------------
 1 file changed, 4 insertions(+), 93 deletions(-)

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
index 02e6d237..865aa42b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
@@ -39,101 +39,12 @@
                     <set>
                         <parameter name="`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
                     </set>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.site.name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'location-name'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.site.location-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'address'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.site.location-address' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'postcode'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.site.location-postcode' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'latitude'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.site.location-latitude' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'longitude'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.site.location-latitude' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'emails'`">
-                        <outcome value='true'>
-                            <block atomic="true">
-                                <set>
-                                    <parameter name='prop.site.emails' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
-                                </set>
-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                    <parameter name="original_string" value='`$prop.site.emails`'/>
-                                    <parameter name="regex" value=","/>
-                                    <parameter name="ctx_memory_result_key" value="prop.site.email"/>
-                                </execute>
-                            </block>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'type'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.site.type' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
-                                <parameter name='prop.site.sdwan' value="true" />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'role'`">
-                        <outcome value='true'>
-                            <block atomic="true">
-                                <set>
-                                    <parameter name='prop.site.role' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
-                                    <parameter name='prop.site.sdwan' value="true" />
-                                </set>
-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                    <parameter name="original_string" value='`$prop.site.role`'/>
-                                    <parameter name="regex" value=","/>
-                                    <parameter name="ctx_memory_result_key" value="prop.site.roles"/>
-                                </execute>
-                            </block>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'controlPoints'`">
-                        <outcome value='true'>
-                            <block atomic="true">
-                                <set>
-                                    <parameter name='prop.site.controlPoint' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
-                                </set>
-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                    <parameter name="original_string" value='`$prop.site.controlPoint`'/>
-                                    <parameter name="regex" value=","/>
-                                    <parameter name="ctx_memory_result_key" value="prop.site.controlpoints"/>
-                                </execute>
-                            </block>
-                        </outcome>
-                    </switch>
                 </block>
             </for>
+            <set>
+                <parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />
+            </set>
+            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-site-param' mode='sync' ></call>
             <set>
                 <parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />
             </set>
-- 
cgit 1.2.3-korg