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-activate.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
index d8233da..90ce0e8 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
@@ -27,7 +27,7 @@
                             <parameter name='prop.site.deviceId_length' value='0' />\r
                         </set>\r
                         <for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                            <block>\r
+                            <block atomic="true">\r
                                 <switch test="`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">\r
                                     <outcome value='true'>\r
                                         <block atomic="true">\r
@@ -39,12 +39,6 @@
                                                 <parameter name='vnf-request-input.' value='`$ctx.vnf-data.vnf-data.vnf-request-input.`' />\r
                                             </set>\r
                                             <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-site-param' mode='sync' ></call>\r
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>\r
-                                                <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                                <parameter name="field2" value="sdwan-site-activateeeee-delete"/>\r
-                                                <parameter name="field3" value='`$prop.site.sdwan`'/>\r
-                                            </record>\r
                                         </block>\r
                                     </outcome>\r
                                 </switch>\r
@@ -56,7 +50,7 @@
                                                     <switch test="`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].name == 'deviceId'`">\r
                                                         <outcome value='true'>\r
                                                             <set>\r
-                                                                <parameter name='prop.site.deviceId[$prop.site.deviceId_length]' value='`$service-data.vnfs.vnf[$tmp.deviceVidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\r
+                                                                <parameter name='prop.site.deviceId[$prop.site.deviceId_length]' value='`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\r
                                                                 <parameter name='prop.site.deviceId_length' value='`$prop.site.deviceId_length + 1`' />\r
                                                             </set>\r
                                                         </outcome>\r
@@ -89,43 +83,23 @@
                     <block atomic="true">\r
                         <for index='cpidx' start='0' end='`$prop.site.controlpoints_length`' >\r
                             <block atomic="true">\r
-                                <for index='cpvidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                                    <block>\r
-                                        <switch test="`$service-data.vnfs.vnf[$vidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`">\r
-                                            <outcome value='true'>\r
-                                                <block atomic="true">\r
-                                                    <for index="sidx" start="0" end="`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`">\r
-                                                        <block>\r
-                                                            <switch test="`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'name'`">\r
-                                                                <outcome value='true'>\r
-                                                                    <block atomic="true">\r
-                                                                        <switch test="`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value == $prop.site.controlpoints[$cpidx]`">\r
-                                                                            <outcome value='true'>\r
-                                                                                <block atomic="true">\r
-                                                                                    <for index="lidx" start="0" end="`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`">\r
-                                                                                        <block>\r
-                                                                                            <switch test="`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$lidx].name == 'siteId'`">\r
-                                                                                                <outcome value='true'>\r
-                                                                                                    <set>\r
-                                                                                                        <parameter name='prop.site.controlpoints[$cpidx]' value='`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$lidx].value`' />\r
-                                                                                                    </set>\r
-                                                                                                </outcome>\r
-                                                                                            </switch>\r
-                                                                                        </block>\r
-                                                                                    </for>\r
-                                                                                </block>\r
-                                                                            </outcome>\r
-                                                                        </switch>\r
-                                                                    </block>\r
-                                                                </outcome>\r
-                                                            </switch>\r
-                                                        </block>\r
-                                                    </for>\r
-                                                </block>\r
-                                            </outcome>\r
-                                        </switch>\r
-                                    </block>\r
-                                </for>\r
+                                <set>\r
+                                    <parameter name='prop.controlPtId' value='`$prop.site.controlpoints[$cpidx]`' />\r
+                                </set>\r
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+               resource="site-resource" \r
+               key="site-resource.name = $prop.controlPtId AND \r
+                    depth = '1'"\r
+        pfx='tmp.aai.controlPoints' local-only='false' >\r
+                                    <outcome value='success'>\r
+                                        <set>\r
+                                            <parameter name='prop.site.controlpoints[$cpidx]' value='`$tmp.aai.controlPoints.generated-site-id`' />\r
+                                        </set>\r
+                                    </outcome>\r
+                                    <outcome value='failure'>\r
+                                        <block></block>\r
+                                    </outcome>\r
+                                </get-resource>\r
                             </block>\r
                         </for>\r
                         <set>\r
@@ -133,7 +107,7 @@
                         </set>\r
                         <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="esr-thirdparty-sdnc" \r
-               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWAN-Controller AND \r
+               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \r
                     depth = '1'"\r
         pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
                             <outcome value='success'>\r
@@ -193,20 +167,26 @@
                             <outcome value='success'>\r
                                 <block atomic="true"></block>\r
                             </outcome>\r
+                            <outcome value='failure'>\r
+                                <return status='failure'>\r
+                                    <parameter name='ack-final' value='Y'/>\r
+                                    <parameter name="error-code" value="500" />\r
+                                    <parameter name="error-message" value="Error executing Create vpn rest api" />\r
+                                </return>\r
+                            </outcome>\r
                         </execute>\r
                     </block>\r
                 </outcome>\r
             </switch>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' />\r
+                <!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' /-->\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='siteId' />\r
-                <!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$site-result[0].id`' /-->\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
+                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$site-result.success[0].id`' />\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\r
             </set>\r
             <set>\r
                 <parameter name='vnfId' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' />\r
-                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$tmp.vidx].vnf-id  + '/vnf-data/'` " />\r
+                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />\r
             </set>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\r
@@ -214,15 +194,15 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\r
             </set>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' />\r
+                <!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\r
             </set>\r
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \r
-      key='site-resource.id = $service-data.vnfs.vnf[$tmp.vidx].vnf-id' >\r
-                <parameter name='id' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' />\r
-                <parameter name='generated-site-id' value='`$site-result[0].site-id`' />\r
+      key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id' >\r
+                <parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
+                <parameter name='generated-site-id' value='`$site-result.success[0].id`' />\r
                 <parameter name='operational-status' value='Active' />\r
             </save>\r
             <return status='success'>\r