X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_self-serve-vf-module-assign.xml;h=d2bb3a0ce57283f0d1741330d503065282bb9994;hb=49752d7a66e8edf73e94fd2f7c6191dba1d2d2fc;hp=de88ad7dce5d403f98324d5b37655b025b0ac364;hpb=ef33fe4448b2060b25ba6641ad931116e0c23a36;p=sdnc%2Foam.git

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 de88ad7d..d2bb3a0c 100644
--- 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
@@ -245,75 +245,13 @@ ss.capability.execution-order
                                             <outcome value='failure'>
                                                 <block atomic='true'>
                                                     <set>
-                                                        <parameter name='vf.vf-module-id'
-    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />
-                                                        <parameter name='vf.vf-module-data.sdnc-request-header.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />
-                                                        <parameter name='vf.vf-module-data.request-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />
-                                                        <parameter name='vf.vf-module-data.service-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />
-                                                        <parameter name='vf.vf-module-data.vnf-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-topology.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-level-oper-status.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'
-  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.`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.request-version'
-  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`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'
-  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`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.tenant'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'
-  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`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'
-  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`' />
+                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
                                                     </set>
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                        <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>
-                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                                                        <parameter name="target" value="{service-instance-id}"/>
-                                                        <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`"/>
-                                                    </execute>
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
-                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                                                        <parameter name="target" value="{vnf-id}"/>
-                                                        <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`"/>
-                                                    </execute>
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
-                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                                                        <parameter name="target" value="{vf-module-id}"/>
-                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>
-                                                    </execute>
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />
-                                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-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-vfmodule" />
-                                                        <outcome value='failure'>
-                                                            <set>
-                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='not-found'>
-                                                            <set>
-                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
-                                                            </set>
-                                                        </outcome>
-                                                    </execute>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-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="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
+                                                        <parameter name='error-message' value="`$error-message`" />
                                                     </return>
                                                 </block>
                                             </outcome>
@@ -330,75 +268,13 @@ ss.capability.execution-order
                                             <outcome value='failure'>
                                                 <block atomic='true'>
                                                     <set>
-                                                        <parameter name='vf.vf-module-id'
-    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />
-                                                        <parameter name='vf.vf-module-data.sdnc-request-header.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />
-                                                        <parameter name='vf.vf-module-data.request-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />
-                                                        <parameter name='vf.vf-module-data.service-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />
-                                                        <parameter name='vf.vf-module-data.vnf-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-topology.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-level-oper-status.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'
-  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.`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.request-version'
-  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`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'
-  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`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.tenant'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'
-  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`' />
-                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'
-  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`' />
+                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
                                                     </set>
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                        <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>
-                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                                                        <parameter name="target" value="{service-instance-id}"/>
-                                                        <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`"/>
-                                                    </execute>
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
-                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                                                        <parameter name="target" value="{vnf-id}"/>
-                                                        <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`"/>
-                                                    </execute>
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
-                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                                                        <parameter name="target" value="{vf-module-id}"/>
-                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>
-                                                    </execute>
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />
-                                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-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-vfmodule" />
-                                                        <outcome value='failure'>
-                                                            <set>
-                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='not-found'>
-                                                            <set>
-                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
-                                                            </set>
-                                                        </outcome>
-                                                    </execute>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-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="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
+                                                        <parameter name='error-message' value="`$error-message`" />
                                                     </return>
                                                 </block>
                                             </outcome>
@@ -417,6 +293,7 @@ ss.capability.execution-order
                     </switch>
                 </for>
             </for>
+            <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' ></call>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                 <parameter name='filename' value='/var/tmp/ss-vf-assign.log' />
             </execute>