Small bug fixes mostly syntax errors in some DGs.

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / sotn_nni / GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
index c1e677b..ec76dae 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
@@ -74,87 +74,98 @@
                key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
                AND depth = '0'"\r
         pfx='tmp.aai.generic-vnf' local-only='false' >\r
-                <block>\r
-                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >\r
-                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
-                            <outcome value='uni'>\r
-                                <block atomic="true">\r
-                                    <set>\r
-                                        <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />\r
-                                    </set>\r
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                                        <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>\r
-                                        <parameter name="regex" value="nodeId"/>\r
-                                        <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>\r
-                                        <outcome value='success'>\r
-                                            <set>\r
-                                                <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
-                                                <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
-                                            </set>\r
-                                        </outcome>\r
-                                        <outcome value='failure'>\r
-                                            <return status='failure'>\r
-                                                <parameter name='error-code' value='' />\r
-                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
-                                            </return>\r
-                                        </outcome>\r
-                                    </execute>\r
-                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="pnf" \r
-               key="`pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name AND depth = '0'`"\r
-        pfx='tmp.aai.pnf' local-only='false' >\r
-                                        <outcome value='success'>\r
-                                            <block>\r
+                <outcome value='success'>\r
+                    <block>\r
+                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >\r
+                            <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
+                                <outcome value='uni'>\r
+                                    <block atomic="true">\r
+                                        <set>\r
+                                            <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />\r
+                                        </set>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                                            <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>\r
+                                            <parameter name="regex" value="nodeId"/>\r
+                                            <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>\r
+                                            <outcome value='success'>\r
                                                 <set>\r
-                                                    <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />\r
+                                                    <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
+                                                    <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
                                                 </set>\r
-                                                <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\r
-                                                    <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
-                                                        <outcome value='thirdparty-controller'>\r
-                                                            <block atomic="true">\r
-                                                                <set>\r
-                                                                    <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
-                                                                </set>\r
-                                                            </block>\r
-                                                        </outcome>\r
-                                                        <outcome value='network-resource'>\r
-                                                            <block atomic="true">\r
-                                                                <set>\r
-                                                                    <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
-                                                                </set>\r
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+                                            </outcome>\r
+                                            <outcome value='failure'>\r
+                                                <return status='failure'>\r
+                                                    <parameter name='error-code' value='' />\r
+                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
+                                                </return>\r
+                                            </outcome>\r
+                                        </execute>\r
+                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+               resource="pnf" \r
+               key="'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'\r
+               AND depth = '0'"\r
+        pfx='tmp.aai.pnf' local-only='false' >\r
+                                            <!--<get-resource 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
+                                            <!--               AND depth = '0'"-->\r
+                                            <!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->\r
+                                            <outcome value='success'>\r
+                                                <block>\r
+                                                    <set>\r
+                                                        <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />\r
+                                                    </set>\r
+                                                    <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\r
+                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
+                                                            <outcome value='thirdparty-controller'>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
+                                                                    </set>\r
+                                                                </block>\r
+                                                            </outcome>\r
+                                                            <outcome value='network-resource'>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
+                                                                    </set>\r
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="network-resource" \r
-               key="`network-resource.network-id = $tmp.unis.uni[$vidx].network-id AND depth = '0'`"\r
+               key="'network-resource.network-id = $tmp.unis.uni[$vidx].network-id'\r
+               AND depth = '0'"\r
         pfx='tmp.aai.network-resource' local-only='false' >\r
-                                                                    <outcome value='success'>\r
-                                                                        <set>\r
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />\r
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />\r
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />\r
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />\r
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />\r
-                                                                        </set>\r
-                                                                    </outcome>\r
-                                                                </get-resource>\r
-                                                            </block>\r
-                                                        </outcome>\r
-                                                    </switch>\r
-                                                </for>\r
-                                            </block>\r
-                                        </outcome>\r
-                                    </get-resource>\r
-                                </block>\r
+                                                                        <outcome value='success'>\r
+                                                                            <set>\r
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />\r
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />\r
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />\r
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />\r
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />\r
+                                                                            </set>\r
+                                                                        </outcome>\r
+                                                                    </get-resource>\r
+                                                                </block>\r
+                                                            </outcome>\r
+                                                        </switch>\r
+                                                    </for>\r
+                                                </block>\r
+                                            </outcome>\r
+                                        </get-resource>\r
+                                    </block>\r
+                                </outcome>\r
+                            </switch>\r
+                        </for>\r
+                        <switch test='`$tmp.unis.uni_length &lt; 2`' >\r
+                            <outcome value='true'>\r
+                                <return status='success'>\r
+                                    <parameter name="ack-final-indicator" value="Y" />\r
+                                    <parameter name="error-code" value="200" />\r
+                                    <parameter name="error-message" value="`$error-message`" />\r
+                                </return>\r
                             </outcome>\r
                         </switch>\r
-                    </for>\r
-                    <switch test='`$tmp.unis.uni_length < 2`' >\r
-                        <outcome value='true'>\r
-                            <return status='success'>\r
-                                <parameter name='' value='' />\r
-                            </return>\r
-                        </outcome>\r
-                    </switch>\r
-                </block>\r
+                    </block>\r
+                </outcome>\r
             </get-resource>\r
             <call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' ></call>\r
             <for index='vidx' start='0' end='`$tmp.unis.uni_length`' >\r