self-serve dg patch

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-unassign.xml
index 5cece27..28735a9 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-unassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-unassign.xml
@@ -5,12 +5,15 @@
         <block atomic='true'>\r
             <set>\r
                 <parameter name='ss.capability.execution-order[0]' value='mac-address-assign' />\r
-                <parameter name='ss.capability.execution-order[1]' value='eipam-ip-assign' />\r
-                <parameter name='ss.capability.execution-order[2]' value='vlan-tag-assign' />\r
-                <parameter name='ss.capability.execution-order[3]' value='alts-license-assign' />\r
-                <parameter name='ss.capability.execution-order[4]' value='alts-entitlement-assign' />\r
-                <parameter name='ss.capability.execution-order[5]' value='generate-name' />\r
-                <parameter name='ss.capability.execution-order_length' value='6' />\r
+                <parameter name='ss.capability.execution-order[1]' value='mS-mac-address-assign' />\r
+                <parameter name='ss.capability.execution-order[2]' value='eipam-ip-assign' />\r
+                <parameter name='ss.capability.execution-order[3]' value='netbox-ip-assign' />\r
+                <parameter name='ss.capability.execution-order[4]' value='vlan-tag-assign' />\r
+                <parameter name='ss.capability.execution-order[5]' value='mS-vlan-tag-assign' />\r
+                <parameter name='ss.capability.execution-order[6]' value='alts-license-assign' />\r
+                <parameter name='ss.capability.execution-order[7]' value='alts-entitlement-assign' />\r
+                <parameter name='ss.capability.execution-order[8]' value='generate-name' />\r
+                <parameter name='ss.capability.execution-order_length' value='9' />\r
             </set>\r
             <set>\r
                 <parameter name='ss.capability-type' value='vf-module' />\r
@@ -25,23 +28,9 @@ ss.capability.execution-order
                 <set>\r
                     <parameter name='ss.capability-action' value='unassign' />\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.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\r
                     <set>\r
                         <parameter name='tmp.param.capability-name' value='`$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.capability-name`' />\r
@@ -51,11 +40,6 @@ ss.capability.execution-order
                             <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='SUCCESS'>\r
                                     <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\r
-                                        <outcome value='success'>\r
-                                            <set>\r
-                                                <parameter name='`$ss.capability-dg`' value='UNASSIGNED' />\r
-                                            </set>\r
-                                        </outcome>\r
                                         <outcome value='failure'>\r
                                             <block atomic='true'>\r
                                                 <set>\r
@@ -114,9 +98,6 @@ ss.capability.execution-order
                                                     <parameter name='format' value='json' />\r
                                                     <parameter name='httpMethod' value='PUT' />\r
                                                     <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />\r
-                                                    <outcome value='success'>\r
-                                                        <block></block>\r
-                                                    </outcome>\r
                                                     <outcome value='failure'>\r
                                                         <block atomic="true">\r
                                                             <set>\r
@@ -141,16 +122,7 @@ ss.capability.execution-order
                                     </call>\r
                                 </outcome>\r
                                 <outcome value='DELETED'>\r
-                                    <block>\r
-                                        <set>\r
-                                            <parameter name='`$ss.capability-dg`' value='UNASSIGNED' />\r
-                                        </set>\r
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                                            <parameter name="logger" value="message-log"/>\r
-                                            <parameter name="field1" value="`'SS: resource-resolution-data.status: ' + $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
-                                            <parameter name="field2" value="`'SS: ss.capability-name: ' + $ss.capability-name`"/>\r
-                                        </record>\r
-                                    </block>\r
+                                    <block></block>\r
                                 </outcome>\r
                                 <outcome value='Other'>\r
                                     <block atomic='true'>\r
@@ -170,49 +142,30 @@ ss.capability.execution-order
                     </switch>\r
                 </for>\r
             </for>\r
-            <switch test="`$self-serve-generate-name == 'UNASSIGNED'`">\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
-                            <parameter name="field2" 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
+            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
+                <outcome value='1'>\r
+                    <set>\r
+                        <parameter name="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules." value=""/>\r
+                    </set>\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='vnfc-name'>\r
-                                    <!--\r
-<outcome value='vmxvre_name_0'>\r
--->\r
-                                    <block>\r
-                                        <set>\r
-                                            <parameter name='tmp.ss.vnfc-name' value='`$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[$i].value`' />\r
-                                        </set>\r
-                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="vnfc" \r
-               key="vnfc.vnfc-name = $tmp.ss.vnfc-name" >\r
-                                            <outcome value='failure'>\r
-                                                <set>\r
-                                                    <parameter name='error-message' value='Failed to delete vnfc object in AnAI' />\r
-                                                </set>\r
-                                            </outcome>\r
-                                            <outcome value='not-found'>\r
-                                                <block></block>\r
-                                            </outcome>\r
-                                        </delete>\r
-                                        <break/>\r
-                                    </block>\r
-                                </outcome>\r
-                            </switch>\r
+                <outcome value='Other'>\r
+                    <block atomic="true">\r
+                        <for index='idx' start='`$vf-module-index + 1`' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\r
+                            <set>\r
+                                <parameter name="tmpidx" value="`$idx - 1`"/>\r
+                                <parameter name="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmpidx]." value="$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx]." />\r
+                            </set>\r
                         </for>\r
+                        <!--EIPAM plug-in needs this attribute set with this name-->\r
+                        <set>\r
+                            <parameter name='lastidx' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length - 1`' />\r
+                        </set>\r
+                        <set>\r
+                            <parameter name="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lastidx]." value=""/>\r
+                        </set>\r
+                        <set>\r
+                            <parameter name="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length" value="`$lastidx`"/>\r
+                        </set>\r
                     </block>\r
                 </outcome>\r
             </switch>\r