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=c8b52b29dc1b2dc374cf361348a67da1c134b530;hb=8e136272ffd5555c66ac4b8b6310eb974ca86e19;hp=efc55ab8d43b9f0a43ae082036970421098d8f36;hpb=cf7061dedbb8318083cb9519295419c479391915;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..c8b52b29 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,23 +214,9 @@ 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`' />
@@ -234,11 +224,6 @@ ss.capability.execution-order[]
                     <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'>
@@ -291,22 +276,15 @@ ss.capability.execution-order[]
                                                     <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>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
                                                     </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>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
                                                     </outcome>
                                                 </execute>
                                                 <return status='failure'>
@@ -315,11 +293,6 @@ ss.capability.execution-order[]
                                                 </return>
                                             </block>
                                         </outcome>
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='`$ss.capability-dg`' value='ASSIGNED' />
-                                            </set>
-                                        </outcome>
                                     </call>
                                 </outcome>
                                 <outcome value='FAILED'>
@@ -374,22 +347,15 @@ ss.capability.execution-order[]
                                                     <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>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
                                                     </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>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
                                                     </outcome>
                                                 </execute>
                                                 <return status='failure'>
@@ -398,11 +364,6 @@ ss.capability.execution-order[]
                                                 </return>
                                             </block>
                                         </outcome>
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='`$ss.capability-dg`' value='ASSIGNED' />
-                                            </set>
-                                        </outcome>
                                     </call>
                                 </outcome>
                             </switch>
@@ -410,78 +371,6 @@ ss.capability.execution-order[]
                     </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>
-                                    </outcome>
-                                </switch>
-                            </block>
-                        </outcome>
-                    </switch>
-                </outcome>
-            </switch>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                 <parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />
             </execute>