SDWAN flow based end-end test and issue fix

[sdnc/oam.git] / 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 02e6d23..137a148 100644 (file)
--- 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>\r
                         <parameter name="`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`" value='`$param-prefix[$param-prefix_length -1]`'/>\r
                     </set>\r
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">\r
-                        <outcome value='true'>\r
-                            <set>\r
-                                <parameter name='prop.site.name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
-                            </set>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'location-name'`">\r
-                        <outcome value='true'>\r
-                            <set>\r
-                                <parameter name='prop.site.location-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
-                            </set>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'address'`">\r
-                        <outcome value='true'>\r
-                            <set>\r
-                                <parameter name='prop.site.location-address' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
-                            </set>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'postcode'`">\r
-                        <outcome value='true'>\r
-                            <set>\r
-                                <parameter name='prop.site.location-postcode' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
-                            </set>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'latitude'`">\r
-                        <outcome value='true'>\r
-                            <set>\r
-                                <parameter name='prop.site.location-latitude' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
-                            </set>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'longitude'`">\r
-                        <outcome value='true'>\r
-                            <set>\r
-                                <parameter name='prop.site.location-latitude' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
-                            </set>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'emails'`">\r
-                        <outcome value='true'>\r
-                            <block atomic="true">\r
-                                <set>\r
-                                    <parameter name='prop.site.emails' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
-                                </set>\r
-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                                    <parameter name="original_string" value='`$prop.site.emails`'/>\r
-                                    <parameter name="regex" value=","/>\r
-                                    <parameter name="ctx_memory_result_key" value="prop.site.email"/>\r
-                                </execute>\r
-                            </block>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'type'`">\r
-                        <outcome value='true'>\r
-                            <set>\r
-                                <parameter name='prop.site.type' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
-                                <parameter name='prop.site.sdwan' value="true" />\r
-                            </set>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'role'`">\r
-                        <outcome value='true'>\r
-                            <block atomic="true">\r
-                                <set>\r
-                                    <parameter name='prop.site.role' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
-                                    <parameter name='prop.site.sdwan' value="true" />\r
-                                </set>\r
-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                                    <parameter name="original_string" value='`$prop.site.role`'/>\r
-                                    <parameter name="regex" value=","/>\r
-                                    <parameter name="ctx_memory_result_key" value="prop.site.roles"/>\r
-                                </execute>\r
-                            </block>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'controlPoints'`">\r
-                        <outcome value='true'>\r
-                            <block atomic="true">\r
-                                <set>\r
-                                    <parameter name='prop.site.controlPoint' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
-                                </set>\r
-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                                    <parameter name="original_string" value='`$prop.site.controlPoint`'/>\r
-                                    <parameter name="regex" value=","/>\r
-                                    <parameter name="ctx_memory_result_key" value="prop.site.controlpoints"/>\r
-                                </execute>\r
-                            </block>\r
-                        </outcome>\r
-                    </switch>\r
                 </block>\r
             </for>\r
+            <set>\r
+                <parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\r
+            </set>\r
+            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-site-param' mode='sync' ></call>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\r
             </set>\r
@@ -148,9 +59,6 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\r
             </set>\r
-            <set>\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />\r
-            </set>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\r