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-mS-vlan-tag-assign.xml;h=0b2cde916bedfeb4d3e165104bfa9fe0d5554f02;hb=edfd51b6ac224d8d4eef723f109c78a532684a74;hp=ce0905a8fe3bc9a0cfa058e4e61050fb3b3bcf07;hpb=9c6b8f607007cd5236b5e4904647d1f9ea454df3;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-mS-vlan-tag-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-mS-vlan-tag-assign.xml
index ce0905a8..0b2cde91 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-mS-vlan-tag-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-mS-vlan-tag-assign.xml
@@ -156,10 +156,15 @@
                                 <switch test='`$vtResp.error-code`'>
                                     <outcome value='500'>
                                         <block atomic='true'>
-                                            <set>
-                                                <parameter name='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[$vt-index].resource-resolution-data.status' 
+                                            <for index="i" start="0" end="`$ss.vt.param_length`">
+                                                <set>
+                                                    <parameter name='vt-index' value='`$ss.vt.param[$i].index`' />
+                                                </set>
+                                                <set>
+                                                    <parameter name='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[$vt-index].resource-resolution-data.status' 
 	value='FAILED' />
-                                            </set>
+                                                </set>
+                                            </for>
                                             <return status='failure'>
                                                 <parameter name='error-code' value='500'/>
                                                 <parameter name='error-message' value="`'Encountered error from mS-vlan-tag-assign with error-code = ' + $vtResp.error-code + ' and error-message = ' + $vtResp.error-message`" />
@@ -246,10 +251,74 @@
                                                             </block>
                                                             <switch test='`$ss.param.vnfc-name`'>
                                                                 <outcome value=''>
-                                                                    <return status='failure'>
-                                                                        <parameter name='error-code' value='500' />
-                                                                        <parameter name='error-message' value='Unable to resolve vnfc-name' />
-                                                                    </return>
+                                                                    <block atomic='true'>
+                                                                        <block atomic="true">
+                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                                                <parameter name="logger" value="message-log"/>
+                                                                                <parameter name="field1" value="ROLLBACK: self-serve-mS-vlan-tag-assign"/>
+                                                                            </record>
+                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                                                <parameter name="source" value="`$prop.restapi.ss-mS-vlan-tag-assign`"/>
+                                                                                <parameter name="outputPath" value="tmp.ss-vlan-tag-url"/>
+                                                                                <parameter name="target" value="{action}"/>
+                                                                                <parameter name="replacement" value="unassign"/>
+                                                                            </execute>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.mS.vlan.tag.unassign.templatefile`" />
+                                                                                <parameter name='restapiUrl' value='`$prop.vt.mS.url + $tmp.ss-vlan-tag-url`' />
+                                                                                <parameter name='restapiUser' value='`$prop.vt.mS.user`' />
+                                                                                <parameter name='restapiPassword' value='`$prop.vt.mS.pwd`' />
+                                                                                <parameter name='format' value='json' />
+                                                                                <parameter name='httpMethod' value='POST' />
+                                                                                <parameter name="responsePrefix" value="vtResp" />
+                                                                                <outcome value='failure'>
+                                                                                    <set>
+                                                                                        <parameter name="error-message" 
+	value="Failed to rollback vlan-tag from mS. vlan-tag MUST BE ROLLBACK MANUALLY!!!" />
+                                                                                    </set>
+                                                                                </outcome>
+                                                                                <outcome value='not-found'>
+                                                                                    <set>
+                                                                                        <parameter name="error-message" 
+	value="Failed to rollback vlan-tag from mS. vlan-tag MUST BE ROLLBACK MANUALLY!!!" />
+                                                                                    </set>
+                                                                                </outcome>
+                                                                                <outcome value='success'>
+                                                                                    <switch test='`$vtResp.error-code`'>
+                                                                                        <outcome value='500'>
+                                                                                            <set>
+                                                                                                <parameter name="error-message" 
+	value="`'Received error from mS with error-code = ' + $vtResp.error-code + ' and error-message = ' + $vtResp.error-message + '; vlan-tag MUST BE ROLLBACK MANUALLY!!!'`" />
+                                                                                            </set>
+                                                                                        </outcome>
+                                                                                        <outcome value='200'>
+                                                                                            <block>
+                                                                                                <for silentFailure='true' index="oidx" start="0" end="`$vtResp.output_length`">
+                                                                                                    <for silentFailure='true' index="i" start="0" end="`$ss.vt.param_length`">
+                                                                                                        <set>
+                                                                                                            <parameter name='vt-index' value='`$ss.vt.param[$i].index`' />
+                                                                                                        </set>
+                                                                                                        <set>
+                                                                                                            <parameter name='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[$vt-index].resource-resolution-data.status' 
+	value='PENDING' />
+                                                                                                        </set>
+                                                                                                    </for>
+                                                                                                </for>
+                                                                                                <set>
+                                                                                                    <parameter name="error-message" 
+	value="vlan tags were rolled back from mS successfully." />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </outcome>
+                                                                            </execute>
+                                                                        </block>
+                                                                        <return status='failure'>
+                                                                            <parameter name='error-code' value='500' />
+                                                                            <parameter name='error-message' value="`'Unable to resolve vnfc-name; ' + $error-message`" />
+                                                                        </return>
+                                                                    </block>
                                                                 </outcome>
                                                             </switch>
                                                         </block>
@@ -297,10 +366,74 @@
                                                                                         </set>
                                                                                         <call module="GENERIC-RESOURCE-API" rpc="generate-cp-instance-id" mode="sync" >
                                                                                             <outcome value='failure'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='error-code' value='500'/>
-                                                                                                    <parameter name='error-message' value="`'Error in generating cp-instance-id in SDNC; ' + $error-message.generate-cp-instance-id`" />
-                                                                                                </return>
+                                                                                                <block atomic='true'>
+                                                                                                    <block atomic="true">
+                                                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                                                                            <parameter name="logger" value="message-log"/>
+                                                                                                            <parameter name="field1" value="ROLLBACK: self-serve-mS-vlan-tag-assign"/>
+                                                                                                        </record>
+                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                                                                            <parameter name="source" value="`$prop.restapi.ss-mS-vlan-tag-assign`"/>
+                                                                                                            <parameter name="outputPath" value="tmp.ss-vlan-tag-url"/>
+                                                                                                            <parameter name="target" value="{action}"/>
+                                                                                                            <parameter name="replacement" value="unassign"/>
+                                                                                                        </execute>
+                                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.mS.vlan.tag.unassign.templatefile`" />
+                                                                                                            <parameter name='restapiUrl' value='`$prop.vt.mS.url + $tmp.ss-vlan-tag-url`' />
+                                                                                                            <parameter name='restapiUser' value='`$prop.vt.mS.user`' />
+                                                                                                            <parameter name='restapiPassword' value='`$prop.vt.mS.pwd`' />
+                                                                                                            <parameter name='format' value='json' />
+                                                                                                            <parameter name='httpMethod' value='POST' />
+                                                                                                            <parameter name="responsePrefix" value="vtResp" />
+                                                                                                            <outcome value='failure'>
+                                                                                                                <set>
+                                                                                                                    <parameter name="error-message" 
+	value="Failed to rollback vlan-tag from mS. vlan-tag MUST BE ROLLBACK MANUALLY!!!" />
+                                                                                                                </set>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='not-found'>
+                                                                                                                <set>
+                                                                                                                    <parameter name="error-message" 
+	value="Failed to rollback vlan-tag from mS. vlan-tag MUST BE ROLLBACK MANUALLY!!!" />
+                                                                                                                </set>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='success'>
+                                                                                                                <switch test='`$vtResp.error-code`'>
+                                                                                                                    <outcome value='500'>
+                                                                                                                        <set>
+                                                                                                                            <parameter name="error-message" 
+	value="`'Received error from mS with error-code = ' + $vtResp.error-code + ' and error-message = ' + $vtResp.error-message + '; vlan-tag MUST BE ROLLBACK MANUALLY!!!'`" />
+                                                                                                                        </set>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='200'>
+                                                                                                                        <block>
+                                                                                                                            <for silentFailure='true' index="oidx" start="0" end="`$vtResp.output_length`">
+                                                                                                                                <for silentFailure='true' index="i" start="0" end="`$ss.vt.param_length`">
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='vt-index' value='`$ss.vt.param[$i].index`' />
+                                                                                                                                    </set>
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='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[$vt-index].resource-resolution-data.status' 
+	value='PENDING' />
+                                                                                                                                    </set>
+                                                                                                                                </for>
+                                                                                                                            </for>
+                                                                                                                            <set>
+                                                                                                                                <parameter name="error-message" 
+	value="vlan tags were rolled back from mS successfully." />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
+                                                                                                            </outcome>
+                                                                                                        </execute>
+                                                                                                    </block>
+                                                                                                    <return status='failure'>
+                                                                                                        <parameter name='error-code' value='500'/>
+                                                                                                        <parameter name='error-message' value="`'Error in generating cp-instance-id in SDNC; ' + $error-message.generate-cp-instance-id + $error-message`" />
+                                                                                                    </return>
+                                                                                                </block>
                                                                                             </outcome>
                                                                                         </call>
                                                                                         <for silentFailure='true' index="sidx" start="0" end="`$vtResp.output[$oidx].stored-elements_length`">
@@ -344,10 +477,74 @@
                                                                                             </set>
                                                                                             <call module="GENERIC-RESOURCE-API" rpc="generate-cp-instance-id" mode="sync" >
                                                                                                 <outcome value='failure'>
-                                                                                                    <return status='failure'>
-                                                                                                        <parameter name='error-code' value='500'/>
-                                                                                                        <parameter name='error-message' value="`'Error in generating cp-instance-id in SDNC; ' + $error-message.generate-cp-instance-id`" />
-                                                                                                    </return>
+                                                                                                    <block atomic='true'>
+                                                                                                        <block atomic="true">
+                                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                                                                                <parameter name="logger" value="message-log"/>
+                                                                                                                <parameter name="field1" value="ROLLBACK: self-serve-mS-vlan-tag-assign"/>
+                                                                                                            </record>
+                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                                                                                <parameter name="source" value="`$prop.restapi.ss-mS-vlan-tag-assign`"/>
+                                                                                                                <parameter name="outputPath" value="tmp.ss-vlan-tag-url"/>
+                                                                                                                <parameter name="target" value="{action}"/>
+                                                                                                                <parameter name="replacement" value="unassign"/>
+                                                                                                            </execute>
+                                                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.mS.vlan.tag.unassign.templatefile`" />
+                                                                                                                <parameter name='restapiUrl' value='`$prop.vt.mS.url + $tmp.ss-vlan-tag-url`' />
+                                                                                                                <parameter name='restapiUser' value='`$prop.vt.mS.user`' />
+                                                                                                                <parameter name='restapiPassword' value='`$prop.vt.mS.pwd`' />
+                                                                                                                <parameter name='format' value='json' />
+                                                                                                                <parameter name='httpMethod' value='POST' />
+                                                                                                                <parameter name="responsePrefix" value="vtResp" />
+                                                                                                                <outcome value='failure'>
+                                                                                                                    <set>
+                                                                                                                        <parameter name="error-message" 
+	value="Failed to rollback vlan-tag from mS. vlan-tag MUST BE ROLLBACK MANUALLY!!!" />
+                                                                                                                    </set>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='not-found'>
+                                                                                                                    <set>
+                                                                                                                        <parameter name="error-message" 
+	value="Failed to rollback vlan-tag from mS. vlan-tag MUST BE ROLLBACK MANUALLY!!!" />
+                                                                                                                    </set>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='success'>
+                                                                                                                    <switch test='`$vtResp.error-code`'>
+                                                                                                                        <outcome value='500'>
+                                                                                                                            <set>
+                                                                                                                                <parameter name="error-message" 
+	value="`'Received error from mS with error-code = ' + $vtResp.error-code + ' and error-message = ' + $vtResp.error-message + '; vlan-tag MUST BE ROLLBACK MANUALLY!!!'`" />
+                                                                                                                            </set>
+                                                                                                                        </outcome>
+                                                                                                                        <outcome value='200'>
+                                                                                                                            <block>
+                                                                                                                                <for silentFailure='true' index="oidx" start="0" end="`$vtResp.output_length`">
+                                                                                                                                    <for silentFailure='true' index="i" start="0" end="`$ss.vt.param_length`">
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='vt-index' value='`$ss.vt.param[$i].index`' />
+                                                                                                                                        </set>
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='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[$vt-index].resource-resolution-data.status' 
+	value='PENDING' />
+                                                                                                                                        </set>
+                                                                                                                                    </for>
+                                                                                                                                </for>
+                                                                                                                                <set>
+                                                                                                                                    <parameter name="error-message" 
+	value="vlan tags were rolled back from mS successfully." />
+                                                                                                                                </set>
+                                                                                                                            </block>
+                                                                                                                        </outcome>
+                                                                                                                    </switch>
+                                                                                                                </outcome>
+                                                                                                            </execute>
+                                                                                                        </block>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='error-code' value='500'/>
+                                                                                                            <parameter name='error-message' value="`'Error in generating cp-instance-id in SDNC; ' + $error-message.generate-cp-instance-id + $error-message`" />
+                                                                                                        </return>
+                                                                                                    </block>
                                                                                                 </outcome>
                                                                                             </call>
                                                                                             <for silentFailure='true' index="sidx" start="0" end="`$vtResp.output[$oidx].stored-elements_length`">
@@ -452,9 +649,9 @@
                         </execute>
                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.mS.vlan.tag.unassign.templatefile`" />
-                            <parameter name='restapiUrl' value='`$prop.controller.url + $prop.restapi.ss-mS-vlan-tag-assign`' />
-                            <parameter name='restapiUser' value='`$prop.controller.user`' />
-                            <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                            <parameter name='restapiUrl' value='`$prop.vt.mS.url + $tmp.ss-vlan-tag-url`' />
+                            <parameter name='restapiUser' value='`$prop.vt.mS.user`' />
+                            <parameter name='restapiPassword' value='`$prop.vt.mS.pwd`' />
                             <parameter name='format' value='json' />
                             <parameter name='httpMethod' value='POST' />
                             <parameter name="responsePrefix" value="vtResp" />
@@ -471,7 +668,7 @@
                                     </for>
                                     <return status='failure'>
                                         <parameter name='error-code' value='500' />
-                                        <parameter name='error-message' value="Failed to get vlan-tag assisgnment from mS" />
+                                        <parameter name='error-message' value="Failed to unassign vlan-tag from mS" />
                                     </return>
                                 </block>
                             </outcome>
@@ -488,7 +685,7 @@
                                     </for>
                                     <return status='failure'>
                                         <parameter name='error-code' value='500' />
-                                        <parameter name='error-message' value="Failed to get vlan-tag assisgnment from mS" />
+                                        <parameter name='error-message' value="Failed to unassign vlan-tag from mS" />
                                     </return>
                                 </block>
                             </outcome>
@@ -496,13 +693,18 @@
                                 <switch test='`$vtResp.error-code`'>
                                     <outcome value='500'>
                                         <block atomic="true">
-                                            <set>
-                                                <parameter name='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[$vt-index].resource-resolution-data.status' 
+                                            <for index="i" start="0" end="`$ss.vt.param_length`">
+                                                <set>
+                                                    <parameter name='vt-index' value='`$ss.vt.param[$i].index`' />
+                                                </set>
+                                                <set>
+                                                    <parameter name='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[$vt-index].resource-resolution-data.status' 
 	value='FAILED' />
-                                            </set>
+                                                </set>
+                                            </for>
                                             <return status='failure'>
                                                 <parameter name='error-code' value='500'/>
-                                                <parameter name='error-message' value="`'Encountered error from mS-vlan-tag-assign with error-code = ' + $vtResp.error-code + ' and error-message = ' + $vtResp.error-message`" />
+                                                <parameter name='error-message' value="`'Encountered error while unassigning mS-vlan-tag with error-code = ' + $vtResp.error-code + ' and error-message = ' + $vtResp.error-message`" />
                                             </return>
                                         </block>
                                     </outcome>
@@ -510,7 +712,7 @@
                                         <for silentFailure='true' index="oidx" start="0" end="`$vtResp.output_length`">
                                             <for silentFailure='true' index="i" start="0" end="`$ss.vt.param_length`">
                                                 <set>
-                                                    <parameter name='vt-index' value='`$ss.vt.param[$i]-index`' />
+                                                    <parameter name='vt-index' value='`$ss.vt.param[$i].index`' />
                                                 </set>
                                                 <set>
                                                     <parameter name='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[$vt-index].resource-resolution-data.status' 
@@ -525,9 +727,18 @@
                     </block>
                 </outcome>
             </switch>
+            <set>
+                <parameter name='pathname' 
+	value="`'/var/tmp/ss-mS-vlan-tag-' + $ss.capability-action + '-' + 
+	$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.vf-module-id + '.log'`" />
+            </set>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                <parameter name='filename' value='/var/tmp/ss.ms-vlan-tag.log' />
+                <parameter name='filename' value='`$pathname`' />
             </execute>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value="DONE: mS-vlan-tag-assign"/>
+            </record>
         </block>
     </method>
 </service-logic>
\ No newline at end of file