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-unassign.xml;h=b640fbfad91fc81facb09ca53fb9354890f5625f;hb=refs%2Fchanges%2F04%2F107604%2F1;hp=517948ee6e33fe288a9f3b972bdc4b188325f077;hpb=a3db1ad8a98342cc1beef1e326d5ee787ef06568;p=sdnc%2Foam.git

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 517948ee..b640fbfa 100644
--- 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
@@ -4,19 +4,28 @@
     <method rpc='self-serve-vnf-unassign' mode='sync'>
         <block atomic='true'>
             <set>
-                <parameter name='ss.capability.execution-order[0]' value='mac-address-assign' />
-                <parameter name='ss.capability.execution-order[1]' value='mS-mac-address-assign' />
-                <parameter name='ss.capability.execution-order[2]' value='eipam-ip-assign' />
-                <parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />
+                <parameter name='ss.capability.execution-order[0]' value='mS-mac-address-assign' />
+                <parameter name='ss.capability.execution-order[1]' value='mac-address-assign' />
+                <parameter name='ss.capability.execution-order[2]' value='netbox-ip-assign' />
+                <parameter name='ss.capability.execution-order[3]' value='eipam-ip-assignment' />
                 <parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />
-                <parameter name='ss.capability.execution-order[5]' value='alts-license-assign' />
-                <parameter name='ss.capability.execution-order[6]' value='alts-entitlement-assign' />
-                <parameter name='ss.capability.execution-order[7]' value='generate-name' />
-                <parameter name='ss.capability.execution-order_length' value='8' />
+                <parameter name='ss.capability.execution-order[5]' value='vlan-tag-assign' />
+                <parameter name='ss.capability.execution-order[6]' value='alts-license-assign' />
+                <parameter name='ss.capability.execution-order[7]' value='alts-entitlement-assign' />
+                <parameter name='ss.capability.execution-order[8]' value='generate-name' />
+                <parameter name='ss.capability.execution-order_length' value='9' />
             </set>
             <set>
                 <parameter name='ss.capability-type' value='vnf' />
             </set>
+            <switch test='`$prop.controller.user`'>
+                <outcome value=''>
+                    <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                        <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                        <parameter name='contextPrefix' value='prop' />
+                    </execute>
+                </outcome>
+            </switch>
             <for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >
                 <set>
                     <parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />
@@ -36,120 +45,98 @@ ss.capability.execution-order[]
                     </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'>
-                                    <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
-                                        <outcome value='failure'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='vf.vnf-id'
+                            <block atomic='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'>
+                                        <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.'
+                                                        <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.'
+                                                        <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.'
+                                                        <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.'
+                                                        <parameter name='vf.vnf-data.vnf-information.'
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.'
+                                                        <parameter name='vf.vnf-data.vnf-request-input.'
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.`' />
-                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'
+                                                        <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-topology.'
+                                                        <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.'
+                                                        <parameter name='vf.vnf-data.vnf-level-oper-status.'
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />
-                                                </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='failure'>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Error persisting self-serve vnf assignments in MD-SAL during unassign" />
-                                                            </set>
-                                                        </block>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Error persisting self-serve vnf assignments in MD-SAL during unassign" />
-                                                            </set>
-                                                        </block>
-                                                    </outcome>
-                                                </execute>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='500' />
-                                                    <parameter name='error-message' value="`'Failed to unassign self-serve vnf assignments for ' + $ss.capability-dg + ' with error: ' + $error-message`" />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                    </call>
-                                </outcome>
-                                <outcome value='DELETED'>
-                                    <block></block>
-                                </outcome>
-                                <outcome value='Other'>
-                                    <block atomic='true'>
+                                                    </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='failure'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name="error-message" value="Error persisting self-serve vnf assignments in MD-SAL during unassign" />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name="error-message" value="Error persisting self-serve vnf assignments in MD-SAL during unassign" />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='500' />
+                                                        <parameter name='error-message' value="`'Failed to unassign self-serve vnf assignments for ' + $ss.capability-dg + ' with error: ' + $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="`'DONE: ' + $ss.capability-dg`"/>
+                                                </record>
+                                            </outcome>
+                                        </call>
+                                    </outcome>
+                                    <outcome value='Other'>
                                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                                             <parameter name="logger" value="message-log"/>
                                             <parameter name="field1" value="`'SS: resource-resolution-data.status: ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`"/>
                                             <parameter name="field2" value="`'SS: ss.capability-name: ' + $ss.capability-name`"/>
+                                            <parameter name="field3" value="`'SS: tmp.param.capability-name: ' + $tmp.param.capability-name`"/>
                                         </record>
-                                        <return status='failure'>
-                                            <parameter name='error-code' value='500' />
-                                            <parameter name='error-message' value="`'Failed to unassign self-serve vnf assignments because the status for ' + $ss.capability-name + ' is '  + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`"/>
-                                        </return>
-                                    </block>
-                                </outcome>
-                            </switch>
+                                    </outcome>
+                                </switch>
+                                <break/>
+                            </block>
                         </outcome>
                     </switch>
                 </for>
             </for>
-            <switch test='`$service-data.vnfs.vnf_length`'>
-                <outcome value='1'>
-                    <set>
-                        <parameter name="service-data.vnfs." value=""/>
-                    </set>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <for index='idx' start='`$vnf-index + 1`' end='`$service-data.vnfs.vnf_length`' >
-                            <set>
-                                <parameter name="$tmpidx" value="`$idx - 1`"/>
-                                <parameter name="service-data.vnfs.vnf[$tmpidx]." value="$service-data.vnfs.vnf[$idx]." />
-                            </set>
-                        </for>
-                        <set>
-                            <parameter name="service-data.vnfs.vnf[$service-data.vnfs.vnf_length-1]." value=""/>
-                        </set>
-                        <set>
-                            <parameter name="service-data.vnfs.vnf_length" value="`$service-data.vnfs.vnf_length - 1`"/>
-                        </set>
-                    </block>
-                </outcome>
-            </switch>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                <parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />
+                <parameter name='filename' value='/var/tmp/ss-vnf-unassign.log' />
             </execute>
         </block>
     </method>