From edfd51b6ac224d8d4eef723f109c78a532684a74 Mon Sep 17 00:00:00 2001
From: "Cheung, Pat (kc1472)" <kc1472@att.com>
Date: Wed, 4 Sep 2019 22:06:21 +0000
Subject: generic-resource-api DG enhancement

Add vnf and vf-module async and concurrency support

Issue-ID: SDNC-854
Signed-off-by: Cheung, Pat (kc1472) <kc1472@att.com>
Change-Id: I2d1ebecca6661ef84d01994a77f5ec2f57c81497

Former-commit-id: 49752d7a66e8edf73e94fd2f7c6191dba1d2d2fc
---
 .../GENERIC-RESOURCE-API_self-serve-vnf-assign.xml | 196 ++++++---------------
 1 file changed, 52 insertions(+), 144 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
index c8b52b29..96db3efe 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
@@ -223,154 +223,62 @@ ss.capability.execution-order[]
                     </set>
                     <switch test='`$ss.capability-name == $tmp.param.capability-name`'>
                         <outcome value='true'>
-                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
-                                <outcome value='PENDING'>
-                                    <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
-                                        <outcome value='failure'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='vf.vnf-id'
-    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />
-                                                    <parameter name='vf.vnf-data.sdnc-request-header.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />
-                                                    <parameter name='vf.vnf-data.request-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />
-                                                    <parameter name='vf.vnf-data.service-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />
-                                                    <parameter name='vf.vnf-data.vnf-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />
-                                                    <parameter name='vf.vnf-data.vnf-topology.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />
-                                                    <parameter name='vf.vnf-data.vnf-level-oper-status.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.request-version'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-name'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.tenant'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-clli'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$prop.restapi.ss-vnf-assignments`"/>
-                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
-                                                    <parameter name="target" value="{service-instance-id}"/>
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`"/>
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$tmp.ss-vnf-url`"/>
-                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
-                                                    <parameter name="target" value="{vnf-id}"/>
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-id`"/>
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`" />
-                                                    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-url`' />
-                                                    <parameter name='restapiUser' value='`$prop.controller.user`' />
-                                                    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                                                    <parameter name='format' value='json' />
-                                                    <parameter name='httpMethod' value='PUT' />
-                                                    <parameter name="responsePrefix" value="mdsal-ss-vnf" />
-                                                    <outcome value='failure'>
-                                                        <set>
-                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
-                                                        </set>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <set>
-                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
-                                                        </set>
-                                                    </outcome>
-                                                </execute>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='500' />
-                                                    <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                    </call>
-                                </outcome>
-                                <outcome value='FAILED'>
-                                    <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
-                                        <outcome value='failure'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='vf.vnf-id'
-    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />
-                                                    <parameter name='vf.vnf-data.sdnc-request-header.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />
-                                                    <parameter name='vf.vnf-data.request-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />
-                                                    <parameter name='vf.vnf-data.service-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />
-                                                    <parameter name='vf.vnf-data.vnf-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />
-                                                    <parameter name='vf.vnf-data.vnf-topology.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />
-                                                    <parameter name='vf.vnf-data.vnf-level-oper-status.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.request-version'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-name'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.tenant'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-clli'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$prop.restapi.ss-vnf-assignments`"/>
-                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
-                                                    <parameter name="target" value="{service-instance-id}"/>
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`"/>
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$tmp.ss-vnf-url`"/>
-                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
-                                                    <parameter name="target" value="{vnf-id}"/>
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-id`"/>
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`" />
-                                                    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-url`' />
-                                                    <parameter name='restapiUser' value='`$prop.controller.user`' />
-                                                    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                                                    <parameter name='format' value='json' />
-                                                    <parameter name='httpMethod' value='PUT' />
-                                                    <parameter name="responsePrefix" value="mdsal-ss-vnf" />
-                                                    <outcome value='failure'>
-                                                        <set>
-                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
-                                                        </set>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <set>
-                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
-                                                        </set>
-                                                    </outcome>
-                                                </execute>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='500' />
-                                                    <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                    </call>
-                                </outcome>
-                            </switch>
+                            <block atomic='true'>
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
+                                    <outcome value='PENDING'>
+                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
+                                            <outcome value='failure'>
+                                                <block atomic='true'>
+                                                    <set>
+                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
+                                                    </set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-mdsal-put' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name='error-code' value='500' />
+                                                        <parameter name='error-message' value="`$error-message`" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='success'>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                    <parameter name="logger" value="message-log"/>
+                                                    <parameter name="field1" value="`'EXECUTION DONE: ' + $ss.capability-dg`"/>
+                                                </record>
+                                            </outcome>
+                                        </call>
+                                    </outcome>
+                                    <outcome value='FAILED'>
+                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
+                                            <outcome value='failure'>
+                                                <block atomic='true'>
+                                                    <set>
+                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
+                                                    </set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-mdsal-put' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name='error-code' value='500' />
+                                                        <parameter name='error-message' value="`$error-message`" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='success'>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                    <parameter name="logger" value="message-log"/>
+                                                    <parameter name="field1" value="`'EXECUTION DONE: ' + $ss.capability-dg`"/>
+                                                </record>
+                                            </outcome>
+                                        </call>
+                                    </outcome>
+                                </switch>
+                                <break/>
+                            </block>
                         </outcome>
                     </switch>
                 </for>
             </for>
+            <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-mdsal-put' mode='sync' ></call>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                 <parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />
             </execute>
-- 
cgit 1.2.3-korg