Revert "GRAPI DG enhancement"

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
index efc55ab..c8b52b2 100644 (file)
--- 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' />\r
                 <parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\r
                 <parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\r
-                <parameter name='ss.capability.execution-order[4]' value='eipam-ip-assign' />\r
-                <parameter name='ss.capability.execution-order[5]' value='eipam-create-pool"' />\r
-                <parameter name='ss.capability.execution-order[6]' value='mac-address-assign' />\r
-                <parameter name='ss.capability.execution-order[7]' value='create-vpe-pool' />\r
-                <parameter name='ss.capability.execution-order[8]' value='unresolved-composite-data' />\r
-                <parameter name='ss.capability.execution-order_length' value='9' />\r
+                <parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\r
+                <parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\r
+                <parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\r
+                <parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\r
+                <parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\r
+                <parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\r
+                <parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\r
+                <parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\r
+                <parameter name='ss.capability.execution-order[12]' value='aai-vnf-put' />\r
+                <parameter name='ss.capability.execution-order_length' value='13' />\r
             </set>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources' value='true' />\r
@@ -210,23 +214,9 @@ ss.capability.execution-order[]
                 <set>\r
                     <parameter name='ss.capability-action' value='assign' />\r
                 </set>\r
-                <switch test='`$ss.capability-name`'>\r
-                    <outcome value='alts-entitlement-assign'>\r
-                        <set>\r
-                            <parameter name='ss.capability-dg' value='self-serve-alts-assignment' />\r
-                        </set>\r
-                    </outcome>\r
-                    <outcome value='alts-license-assign'>\r
-                        <set>\r
-                            <parameter name='ss.capability-dg' value='self-serve-alts-assignment' />\r
-                        </set>\r
-                    </outcome>\r
-                    <outcome value='Other'>\r
-                        <set>\r
-                            <parameter name='ss.capability-dg' value="`'self-serve-' + $ss.capability.execution-order[$cidx]`" />\r
-                        </set>\r
-                    </outcome>\r
-                </switch>\r
+                <set>\r
+                    <parameter name='ss.capability-dg' value="`'self-serve-' + $ss.capability.execution-order[$cidx]`" />\r
+                </set>\r
                 <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\r
                     <set>\r
                         <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`' />\r
@@ -234,11 +224,6 @@ ss.capability.execution-order[]
                     <switch test='`$ss.capability-name == $tmp.param.capability-name`'>\r
                         <outcome value='true'>\r
                             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>\r
-                                <outcome value='SUCCESS'>\r
-                                    <set>\r
-                                        <parameter name='`$ss.capability-dg`' value='ASSIGNED' />\r
-                                    </set>\r
-                                </outcome>\r
                                 <outcome value='PENDING'>\r
                                     <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\r
                                         <outcome value='failure'>\r
@@ -291,22 +276,15 @@ ss.capability.execution-order[]
                                                     <parameter name='format' value='json' />\r
                                                     <parameter name='httpMethod' value='PUT' />\r
                                                     <parameter name="responsePrefix" value="mdsal-ss-vnf" />\r
-                                                    <outcome value='success'>\r
-                                                        <block></block>\r
-                                                    </outcome>\r
                                                     <outcome value='failure'>\r
-                                                        <block atomic="true">\r
-                                                            <set>\r
-                                                                <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />\r
-                                                            </set>\r
-                                                        </block>\r
+                                                        <set>\r
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />\r
+                                                        </set>\r
                                                     </outcome>\r
                                                     <outcome value='not-found'>\r
-                                                        <block atomic="true">\r
-                                                            <set>\r
-                                                                <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />\r
-                                                            </set>\r
-                                                        </block>\r
+                                                        <set>\r
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />\r
+                                                        </set>\r
                                                     </outcome>\r
                                                 </execute>\r
                                                 <return status='failure'>\r
@@ -315,11 +293,6 @@ ss.capability.execution-order[]
                                                 </return>\r
                                             </block>\r
                                         </outcome>\r
-                                        <outcome value='success'>\r
-                                            <set>\r
-                                                <parameter name='`$ss.capability-dg`' value='ASSIGNED' />\r
-                                            </set>\r
-                                        </outcome>\r
                                     </call>\r
                                 </outcome>\r
                                 <outcome value='FAILED'>\r
@@ -374,22 +347,15 @@ ss.capability.execution-order[]
                                                     <parameter name='format' value='json' />\r
                                                     <parameter name='httpMethod' value='PUT' />\r
                                                     <parameter name="responsePrefix" value="mdsal-ss-vnf" />\r
-                                                    <outcome value='success'>\r
-                                                        <block></block>\r
-                                                    </outcome>\r
                                                     <outcome value='failure'>\r
-                                                        <block atomic="true">\r
-                                                            <set>\r
-                                                                <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />\r
-                                                            </set>\r
-                                                        </block>\r
+                                                        <set>\r
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />\r
+                                                        </set>\r
                                                     </outcome>\r
                                                     <outcome value='not-found'>\r
-                                                        <block atomic="true">\r
-                                                            <set>\r
-                                                                <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />\r
-                                                            </set>\r
-                                                        </block>\r
+                                                        <set>\r
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />\r
+                                                        </set>\r
                                                     </outcome>\r
                                                 </execute>\r
                                                 <return status='failure'>\r
@@ -398,11 +364,6 @@ ss.capability.execution-order[]
                                                 </return>\r
                                             </block>\r
                                         </outcome>\r
-                                        <outcome value='success'>\r
-                                            <set>\r
-                                                <parameter name='`$ss.capability-dg`' value='ASSIGNED' />\r
-                                            </set>\r
-                                        </outcome>\r
                                     </call>\r
                                 </outcome>\r
                             </switch>\r
@@ -410,78 +371,6 @@ ss.capability.execution-order[]
                     </switch>\r
                 </for>\r
             </for>\r
-            <switch test="`$self-serve-generate-name == 'ASSIGNED'`">\r
-                <outcome value='false'>\r
-                    <block atomic='true'>\r
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                            <parameter name="logger" value="message-log"/>\r
-                            <parameter name="field1" value="`'SS: self-serve-generate-name status: ' + $self-serve-generate-name`"/>\r
-                        </record>\r
-                        <return status='failure'>\r
-                            <parameter name='error-code' value='500' />\r
-                            <parameter name='error-message' value="`'AAI Put is being skipped because NOT all capability components have SUCCESS status; '+ $error-message`" />\r
-                        </return>\r
-                    </block>\r
-                </outcome>\r
-                <outcome value='true'>\r
-                    <switch test="`$self-serve-unresolved-composite-data == 'ASSIGNED' or $self-serve-unresolved-composite-data == ''`">\r
-                        <outcome value='false'>\r
-                            <block atomic='true'>\r
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                                    <parameter name="logger" value="message-log"/>\r
-                                    <parameter name="field1" value="`'SS: self-serve-unresolved-composite-data: ' + $self-serve-unresolved-composite-data`"/>\r
-                                </record>\r
-                                <return status='failure'>\r
-                                    <parameter name='error-code' value='500' />\r
-                                    <parameter name='error-message' value="`'AAI Put is being skipped because NOT all capability components have SUCCESS status; '+ $error-message`" />\r
-                                </return>\r
-                            </block>\r
-                        </outcome>\r
-                        <outcome value='true'>\r
-                            <block atomic='true'>\r
-                                <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\r
-                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].name`'>\r
-                                        <outcome value='vnf_name'>\r
-                                            <block atomic='true'>\r
-                                                <set>\r
-                                                    <parameter name='tmp.ss.vnf-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].value`' />\r
-                                                </set>\r
-                                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-       resource="generic-vnf"\r
-               key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id "\r
-       pfx="tmp.aai.update.vnf" >\r
-                                                    <parameter name="vnf-name" value='`$tmp.ss.vnf-name`' />\r
-                                                    <outcome value='failure'>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='error-code' value='500' />\r
-                                                            <parameter name='error-message' value="`'Failed to update generic-vnf.vnf-name in AnAI with vnf-name=' + $tmp.ss.vnf-name`" />\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                    <outcome value='not-found'>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='error-code' value='500' />\r
-                                                            <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'`" />\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                </update>\r
-                                                <break/>\r
-                                            </block>\r
-                                        </outcome>\r
-                                    </switch>\r
-                                </for>\r
-                                <switch test='`$tmp.ss.vnf-name`'>\r
-                                    <outcome value=''>\r
-                                        <return status='failure'>\r
-                                            <parameter name='error-code' value='500' />\r
-                                            <parameter name='error-message' value="`'generic-vnf not updated because vnf-name param.value is null; '+ $error-message`" />\r
-                                        </return>\r
-                                    </outcome>\r
-                                </switch>\r
-                            </block>\r
-                        </outcome>\r
-                    </switch>\r
-                </outcome>\r
-            </switch>\r
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\r
                 <parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />\r
             </execute>\r