X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fsotn_nni%2FGENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml;h=406f52c0c8a16bed1ec8bbca3d57d44a506e629e;hb=f515a8831e0036414d69d73030e871dec88180f8;hp=c1e677ba1758da137a20379f3ee0dc2058b4cfb7;hpb=84477fc8f92e417f809ffe040ffb12de46a43a77;p=sdnc%2Foam.git

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 c1e677ba..406f52c0 100644
--- 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
@@ -61,7 +61,6 @@
                                         <set>
                                             <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />
                                         </set>
-                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>
                                     </block>
                                 </outcome>
                             </switch>
@@ -71,147 +70,128 @@
             </switch>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="generic-vnf" 
-		key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' 
-		AND depth = '0'"
+		key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id"
         pfx='tmp.aai.generic-vnf' local-only='false' >
-                <block>
-                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >
-                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
-                            <outcome value='uni'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
-                                    </set>
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                        <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>
-                                        <parameter name="regex" value="nodeId"/>
-                                        <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />
-                                                <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />
-                                            </set>
-                                        </outcome>
-                                        <outcome value='failure'>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='' />
-                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                            </return>
-                                        </outcome>
-                                    </execute>
-                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="pnf" 
-		key="`pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name AND depth = '0'`"
-        pfx='tmp.aai.pnf' local-only='false' >
-                                        <outcome value='success'>
-                                            <block>
+                <!--AND depth = '0'"-->
+                <outcome value='success'>
+                    <block>
+                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >
+                            <switch test='`$tmp.aai.generic-vnf.relationship-list.relationship[$vidx].related-to`'>
+                                <outcome value='uni'>
+                                    <block atomic="true">
+                                        <set>
+                                            <!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />-->
+                                            <parameter name='tmp.tpId' value="`$tmp.aai.uni.tpId`" />
+                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                            <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>
+                                            <parameter name="regex" value="nodeId"/>
+                                            <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>
+                                            <outcome value='success'>
                                                 <set>
-                                                    <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />
+                                                    <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />
+                                                    <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />
                                                 </set>
-                                                <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >
-                                                    <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
-                                                        <outcome value='thirdparty-controller'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='network-resource'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
-                                                                </set>
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+                                            </outcome>
+                                            <outcome value='failure'>
+                                                <return status='failure'>
+                                                    <parameter name='error-code' value='' />
+                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                </return>
+                                            </outcome>
+                                        </execute>
+                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'
+		AND depth = '0'"
+        pfx='tmp.aai.pnf' local-only='false' >
+                                            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                            <!--		resource="generic-vnf" -->
+                                            <!--		key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->
+                                            <!--		AND depth = '0'"-->
+                                            <!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->
+                                            <outcome value='success'>
+                                                <block>
+                                                    <set>
+                                                        <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />
+                                                    </set>
+                                                    <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >
+                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
+                                                            <outcome value='thirdparty-controller'>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
+                                                                    </set>
+                                                                </block>
+                                                            </outcome>
+                                                            <outcome value='network-resource'>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
+                                                                    </set>
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="network-resource" 
-		key="`network-resource.network-id = $tmp.unis.uni[$vidx].network-id AND depth = '0'`"
+		key="'network-resource.network-id = $tmp.unis.uni[$vidx].network-id'
+		AND depth = '0'"
         pfx='tmp.aai.network-resource' local-only='false' >
-                                                                    <outcome value='success'>
-                                                                        <set>
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />
-                                                                        </set>
-                                                                    </outcome>
-                                                                </get-resource>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </get-resource>
-                                </block>
+                                                                        <outcome value='success'>
+                                                                            <set>
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />
+                                                                            </set>
+                                                                        </outcome>
+                                                                    </get-resource>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
+                                                    </for>
+                                                </block>
+                                            </outcome>
+                                        </get-resource>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$tmp.unis.uni_length &lt; 2`' >
+                            <outcome value='true'>
+                                <return status='success'>
+                                    <parameter name="ack-final-indicator" value="Y" />
+                                    <parameter name="error-code" value="200" />
+                                    <parameter name="error-message" value="`$error-message`" />
+                                </return>
                             </outcome>
                         </switch>
-                    </for>
-                    <switch test='`$tmp.unis.uni_length < 2`' >
-                        <outcome value='true'>
-                            <return status='success'>
-                                <parameter name='' value='' />
-                            </return>
-                        </outcome>
-                    </switch>
-                </block>
+                    </block>
+                </outcome>
             </get-resource>
             <call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' ></call>
+            <set>
+                <parameter name='tmp.unis.uni[0].id' value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />
+                <parameter name='tmp.unis.uni[0].tp-id' value="networkId-providerId-5555-clientId-6666-topologyId-11-nodeId-0.190.0.1" />
+                <parameter name='tmp.unis.uni[0].access-provider-id' value="`$domain-A.provider-id`" />
+                <parameter name='tmp.unis.uni[0].access-client-id' value="`$domain-A.client-id`" />
+                <parameter name='tmp.unis.uni[0].access-topology-id' value="`$domain-A.topology-id`" />
+                <parameter name='tmp.unis.uni[0].access-node-id' value="" />
+                <parameter name='tmp.unis.uni[0].src-access-ltp-id' value="" />
+                <parameter name='tmp.unis.uni[0].dst-access-ltp-id' value="" />
+                <parameter name='tmp.unis.uni[1].id' value="5642e9dd-496c-4ef6-be97-5caf4e9beec9" />
+                <parameter name='tmp.unis.uni[1].tp-id' value="networkId-domain2-providerId-5555-clientId-6666-topologyId-11-nodeId-0.191.0.4" />
+                <parameter name='tmp.unis.uni[1].access-provider-id' value="`$domain-B.provider-id`" />
+                <parameter name='tmp.unis.uni[1].access-client-id' value="`$domain-B.client-id`" />
+                <parameter name='tmp.unis.uni[1].access-topology-id' value="`$domain-B.topology-id`" />
+                <parameter name='tmp.unis.uni[1].access-node-id' value="" />
+                <parameter name='tmp.unis.uni[1].src-access-ltp-id' value="" />
+                <parameter name='tmp.unis.uni[1].dst-access-ltp-id' value="" />
+                <parameter name='tmp.unis.uni_length' value="2" />
+            </set>
             <for index='vidx' start='0' end='`$tmp.unis.uni_length`' >
                 <block atomic="true">
                     <set>
                         <parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />
                     </set>
-                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $oof.vpn.thirdparty-sdnc-id AND 
-		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-                        <outcome value='success'>
-                            <set>
-                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                            </set>
-                        </outcome>
-                        <outcome value='not-found'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                            </return>
-                        </outcome>
-                        <outcome value='Other'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                            </return>
-                        </outcome>
-                    </get-resource>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
-                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
-                        <parameter name="format" value="json"/>
-                        <parameter name="httpMethod" value="post"/>
-                        <parameter name="responsePrefix" value="token-result"/>
-                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                        <parameter name="trustStorePassword" value="adminadmin"/>
-                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                        <parameter name="keyStorePassword" value="adminadmin"/>
-                        <outcome value='success'>
-                            <set>
-                                <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
-                            </set>
-                        </outcome>
-                        <outcome value='failure'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="Error executing get token rest api" />
-                            </return>
-                        </outcome>
-                    </execute>
                     <call module='GENERIC-RESOURCE-API' rpc='sotn-create-otn-tunnel' mode='sync' ></call>
                     <set>
                         <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />