generic-resource-api DG enhancement

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
index e39ba78..d2bb3a0 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
@@ -161,7 +161,7 @@
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\r
   value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\r
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\r
-  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
+  value='`$vf-module-topology-operation-input.request-information.request-action`' />\r
                         </set>\r
                         <set>\r
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.sdnc-generated-cloud-resources' \r
@@ -189,6 +189,14 @@
                 <parameter name='ss.capability.execution-order[12]' value='aai-vf-module-put' />\r
                 <parameter name='ss.capability.execution-order_length' value='13' />\r
             </set>\r
+            <switch test='`$prop.controller.user`'>\r
+                <outcome value=''>\r
+                    <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                        <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                        <parameter name='contextPrefix' value='prop' />\r
+                    </execute>\r
+                </outcome>\r
+            </switch>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>\r
                 <outcome value=''>\r
                     <block atomic='true'>\r
@@ -204,6 +212,10 @@
                                 </return>\r
                             </outcome>\r
                         </call>\r
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                            <parameter name="logger" value="message-log"/>\r
+                            <parameter name="field1" value="DONE with vfmodule-ra-assignment"/>\r
+                        </record>\r
                     </block>\r
                 </outcome>\r
             </switch>\r
@@ -226,170 +238,62 @@ ss.capability.execution-order
                     </set>\r
                     <switch test='`$ss.capability-name == $tmp.param.capability-name`'>\r
                         <outcome value='true'>\r
-                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>\r
-                                <outcome value='PENDING'>\r
-                                    <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\r
-                                        <outcome value='failure'>\r
-                                            <block atomic='true'>\r
-                                                <set>\r
-                                                    <parameter name='vf.vf-module-id'\r
-    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />\r
-                                                    <parameter name='vf.vf-module-data.sdnc-request-header.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />\r
-                                                    <parameter name='vf.vf-module-data.request-information.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.service-information.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vnf-information.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-information.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-topology.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-level-oper-status.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.request-version'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.tenant'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />\r
-                                                </set>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{service-instance-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{vnf-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{vf-module-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />\r
-                                                    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />\r
-                                                    <parameter name='restapiUser' value='`$prop.controller.user`' />\r
-                                                    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\r
-                                                    <parameter name='format' value='json' />\r
-                                                    <parameter name='httpMethod' value='PUT' />\r
-                                                    <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />\r
-                                                    <outcome value='failure'>\r
-                                                        <set>\r
-                                                            <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />\r
-                                                        </set>\r
-                                                    </outcome>\r
-                                                    <outcome value='not-found'>\r
-                                                        <set>\r
-                                                            <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />\r
-                                                        </set>\r
-                                                    </outcome>\r
-                                                </execute>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='error-code' value='500' />\r
-                                                    <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />\r
-                                                </return>\r
-                                            </block>\r
-                                        </outcome>\r
-                                    </call>\r
-                                </outcome>\r
-                                <outcome value='FAILED'>\r
-                                    <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\r
-                                        <outcome value='failure'>\r
-                                            <block atomic='true'>\r
-                                                <set>\r
-                                                    <parameter name='vf.vf-module-id'\r
-    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />\r
-                                                    <parameter name='vf.vf-module-data.sdnc-request-header.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />\r
-                                                    <parameter name='vf.vf-module-data.request-information.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.service-information.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vnf-information.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-information.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-topology.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-level-oper-status.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.request-version'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.tenant'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\r
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />\r
-                                                </set>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{service-instance-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{vnf-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{vf-module-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />\r
-                                                    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />\r
-                                                    <parameter name='restapiUser' value='`$prop.controller.user`' />\r
-                                                    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\r
-                                                    <parameter name='format' value='json' />\r
-                                                    <parameter name='httpMethod' value='PUT' />\r
-                                                    <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />\r
-                                                    <outcome value='failure'>\r
-                                                        <set>\r
-                                                            <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />\r
-                                                        </set>\r
-                                                    </outcome>\r
-                                                    <outcome value='not-found'>\r
-                                                        <set>\r
-                                                            <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />\r
-                                                        </set>\r
-                                                    </outcome>\r
-                                                </execute>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='error-code' value='500' />\r
-                                                    <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />\r
-                                                </return>\r
-                                            </block>\r
-                                        </outcome>\r
-                                    </call>\r
-                                </outcome>\r
-                            </switch>\r
+                            <block atomic='true'>\r
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>\r
+                                    <outcome value='PENDING'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\r
+                                            <outcome value='failure'>\r
+                                                <block atomic='true'>\r
+                                                    <set>\r
+                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />\r
+                                                    </set>\r
+                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' ></call>\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-message`" />\r
+                                                    </return>\r
+                                                </block>\r
+                                            </outcome>\r
+                                            <outcome value='success'>\r
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                    <parameter name="logger" value="message-log"/>\r
+                                                    <parameter name="field1" value="`'DONE: ' + $ss.capability-dg`"/>\r
+                                                </record>\r
+                                            </outcome>\r
+                                        </call>\r
+                                    </outcome>\r
+                                    <outcome value='FAILED'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\r
+                                            <outcome value='failure'>\r
+                                                <block atomic='true'>\r
+                                                    <set>\r
+                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />\r
+                                                    </set>\r
+                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' ></call>\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-message`" />\r
+                                                    </return>\r
+                                                </block>\r
+                                            </outcome>\r
+                                            <outcome value='success'>\r
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                    <parameter name="logger" value="message-log"/>\r
+                                                    <parameter name="field1" value="`'DONE: ' + $ss.capability-dg`"/>\r
+                                                </record>\r
+                                            </outcome>\r
+                                        </call>\r
+                                    </outcome>\r
+                                </switch>\r
+                                <break/>\r
+                            </block>\r
                         </outcome>\r
                     </switch>\r
                 </for>\r
             </for>\r
+            <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' ></call>\r
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\r
                 <parameter name='filename' value='/var/tmp/ss-vf-assign.log' />\r
             </execute>\r