self-serve DG for Casablanca

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
index 968a459..517948e 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
@@ -5,12 +5,14 @@
         <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='vlan-tag-assign' />\r
+                <parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\r
+                <parameter name='ss.capability.execution-order[5]' value='alts-license-assign' />\r
+                <parameter name='ss.capability.execution-order[6]' value='alts-entitlement-assign' />\r
+                <parameter name='ss.capability.execution-order[7]' value='generate-name' />\r
+                <parameter name='ss.capability.execution-order_length' value='8' />\r
             </set>\r
             <set>\r
                 <parameter name='ss.capability-type' value='vnf' />\r
@@ -25,23 +27,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.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
@@ -51,11 +39,6 @@ ss.capability.execution-order[]
                             <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
                                     <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
@@ -98,9 +81,6 @@ 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
@@ -145,6 +125,29 @@ ss.capability.execution-order[]
                     </switch>\r
                 </for>\r
             </for>\r
+            <switch test='`$service-data.vnfs.vnf_length`'>\r
+                <outcome value='1'>\r
+                    <set>\r
+                        <parameter name="service-data.vnfs." value=""/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value='Other'>\r
+                    <block atomic="true">\r
+                        <for index='idx' start='`$vnf-index + 1`' end='`$service-data.vnfs.vnf_length`' >\r
+                            <set>\r
+                                <parameter name="$tmpidx" value="`$idx - 1`"/>\r
+                                <parameter name="service-data.vnfs.vnf[$tmpidx]." value="$service-data.vnfs.vnf[$idx]." />\r
+                            </set>\r
+                        </for>\r
+                        <set>\r
+                            <parameter name="service-data.vnfs.vnf[$service-data.vnfs.vnf_length-1]." value=""/>\r
+                        </set>\r
+                        <set>\r
+                            <parameter name="service-data.vnfs.vnf_length" value="`$service-data.vnfs.vnf_length - 1`"/>\r
+                        </set>\r
+                    </block>\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