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-vnf-assign.xml;h=96db3efe7a81e75a01614504b533085341ec7f14;hb=refs%2Fheads%2Fmaster;hp=efc55ab8d43b9f0a43ae082036970421098d8f36;hpb=5a41e5c15bdbfba0e84e89e13bb06d9930988e77;p=sdnc%2Foam.git

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 efc55ab8..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
@@ -169,12 +169,16 @@
                 <parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />
                 <parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />
                 <parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />
-                <parameter name='ss.capability.execution-order[4]' value='eipam-ip-assign' />
-                <parameter name='ss.capability.execution-order[5]' value='eipam-create-pool"' />
-                <parameter name='ss.capability.execution-order[6]' value='mac-address-assign' />
-                <parameter name='ss.capability.execution-order[7]' value='create-vpe-pool' />
-                <parameter name='ss.capability.execution-order[8]' value='unresolved-composite-data' />
-                <parameter name='ss.capability.execution-order_length' value='9' />
+                <parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />
+                <parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />
+                <parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />
+                <parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />
+                <parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />
+                <parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />
+                <parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />
+                <parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />
+                <parameter name='ss.capability.execution-order[12]' value='aai-vnf-put' />
+                <parameter name='ss.capability.execution-order_length' value='13' />
             </set>
             <set>
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources' value='true' />
@@ -210,278 +214,71 @@ ss.capability.execution-order[]
                 <set>
                     <parameter name='ss.capability-action' value='assign' />
                 </set>
-                <switch test='`$ss.capability-name`'>
-                    <outcome value='alts-entitlement-assign'>
-                        <set>
-                            <parameter name='ss.capability-dg' value='self-serve-alts-assignment' />
-                        </set>
-                    </outcome>
-                    <outcome value='alts-license-assign'>
-                        <set>
-                            <parameter name='ss.capability-dg' value='self-serve-alts-assignment' />
-                        </set>
-                    </outcome>
-                    <outcome value='Other'>
-                        <set>
-                            <parameter name='ss.capability-dg' value="`'self-serve-' + $ss.capability.execution-order[$cidx]`" />
-                        </set>
-                    </outcome>
-                </switch>
+                <set>
+                    <parameter name='ss.capability-dg' value="`'self-serve-' + $ss.capability.execution-order[$cidx]`" />
+                </set>
                 <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
                     <set>
                         <parameter name='tmp.param.capability-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />
                     </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='SUCCESS'>
-                                    <set>
-                                        <parameter name='`$ss.capability-dg`' value='ASSIGNED' />
-                                    </set>
-                                </outcome>
-                                <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='success'>
-                                                        <block></block>
-                                                    </outcome>
-                                                    <outcome value='failure'>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
-                                                            </set>
-                                                        </block>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
-                                                            </set>
-                                                        </block>
-                                                    </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>
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='`$ss.capability-dg`' value='ASSIGNED' />
-                                            </set>
-                                        </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='success'>
-                                                        <block></block>
-                                                    </outcome>
-                                                    <outcome value='failure'>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
-                                                            </set>
-                                                        </block>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
-                                                            </set>
-                                                        </block>
-                                                    </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>
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='`$ss.capability-dg`' value='ASSIGNED' />
-                                            </set>
-                                        </outcome>
-                                    </call>
-                                </outcome>
-                            </switch>
-                        </outcome>
-                    </switch>
-                </for>
-            </for>
-            <switch test="`$self-serve-generate-name == 'ASSIGNED'`">
-                <outcome value='false'>
-                    <block atomic='true'>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="`'SS: self-serve-generate-name status: ' + $self-serve-generate-name`"/>
-                        </record>
-                        <return status='failure'>
-                            <parameter name='error-code' value='500' />
-                            <parameter name='error-message' value="`'AAI Put is being skipped because NOT all capability components have SUCCESS status; '+ $error-message`" />
-                        </return>
-                    </block>
-                </outcome>
-                <outcome value='true'>
-                    <switch test="`$self-serve-unresolved-composite-data == 'ASSIGNED' or $self-serve-unresolved-composite-data == ''`">
-                        <outcome value='false'>
-                            <block atomic='true'>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                    <parameter name="logger" value="message-log"/>
-                                    <parameter name="field1" value="`'SS: self-serve-unresolved-composite-data: ' + $self-serve-unresolved-composite-data`"/>
-                                </record>
-                                <return status='failure'>
-                                    <parameter name='error-code' value='500' />
-                                    <parameter name='error-message' value="`'AAI Put is being skipped because NOT all capability components have SUCCESS status; '+ $error-message`" />
-                                </return>
-                            </block>
-                        </outcome>
                         <outcome value='true'>
                             <block atomic='true'>
-                                <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].name`'>
-                                        <outcome value='vnf_name'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='tmp.ss.vnf-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].value`' />
-                                                </set>
-                                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-	resource="generic-vnf"
-		key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id "
-	pfx="tmp.aai.update.vnf" >
-                                                    <parameter name="vnf-name" value='`$tmp.ss.vnf-name`' />
-                                                    <outcome value='failure'>
-                                                        <return status='failure'>
-                                                            <parameter name='error-code' value='500' />
-                                                            <parameter name='error-message' value="`'Failed to update generic-vnf.vnf-name in AnAI with vnf-name=' + $tmp.ss.vnf-name`" />
-                                                        </return>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <return status='failure'>
-                                                            <parameter name='error-code' value='500' />
-                                                            <parameter name='error-message' value="`'Failed to update generic-vnf.vnf-name because generic-vnf with vnf-name=' + $tmp.ss.vnf-name + ' is not found in AAI'`" />
-                                                        </return>
-                                                    </outcome>
-                                                </update>
-                                                <break/>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </for>
-                                <switch test='`$tmp.ss.vnf-name`'>
-                                    <outcome value=''>
-                                        <return status='failure'>
-                                            <parameter name='error-code' value='500' />
-                                            <parameter name='error-message' value="`'generic-vnf not updated because vnf-name param.value is null; '+ $error-message`" />
-                                        </return>
+                                <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>
-                </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>