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=04395f27a1db01b6ef26b86c9c147d39aded111e;hb=refs%2Fheads%2Fmaster;hp=ec76dae88f9595d06619698bd4fdac52b3c009f7;hpb=c9aafee35e88ddfb36df63d28b71d08b8db63725;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 ec76dae8..04395f27 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,83 +70,92 @@
             </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' >
+                <!--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.src-pnf.relationship-list.relationship[$vidx].related-to`'>
+                            <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`" />
-                                        </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' >
-                                            <!--<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' >-->
+		resource="uni" 
+		key="uni.id = $tmp.aai.generic-vnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value"
+        pfx='tmp.aai.uni' local-only='false' >
                                             <outcome value='success'>
                                                 <block>
                                                     <set>
-                                                        <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />
+                                                        <!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />-->
+                                                        <parameter name='`tmp.unis.uni[$vidx].`' value="`$tmp.aai.uni.`" />
                                                     </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" 
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                        <parameter name="original_string" value='`$tmp.aai.uni.tp-id`'/>
+                                                        <parameter name="regex" value="[^-]+$"/>
+                                                        <parameter name="ctx_memory_result_key" value="param-prefix"/>
+                                                        <outcome value='success'>
+                                                            <set>
+                                                                <parameter name='tmp.src.ltpId' value='`$param-prefix[$param-prefix_length -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' >
+                                                        <!--<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'"
         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 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>
-                                                                    </get-resource>
-                                                                </block>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
+                                                                    </switch>
+                                                                </for>
+                                                            </block>
+                                                        </outcome>
+                                                    </get-resource>
                                                 </block>
                                             </outcome>
                                         </get-resource>
@@ -174,8 +182,40 @@
                         <parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />
                     </set>
                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="network-resource" 
+		key="network-resource.network-id = $oof.vpn.network-id"
+        pfx='tmp.aai.network-resource' local-only='false' >
+                        <outcome value='success'>
+                            <block>
+                                <for index='ridx' start='0' end='`$tmp.aai.network-resource.relationship-list.relationship_length`' >
+                                    <switch test='`$tmp.aai.network-resource.relationship-list.relationship[$ridx].related-to`'>
+                                        <outcome value='esr-thirdparty-sdnc'>
+                                            <set>
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.id' value="`$tmp.aai.network-resource.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
+                                            </set>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </block>
+                        </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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                            </return>
+                        </outcome>
+                    </get-resource>
+                    <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 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND 
 		     depth = '1'"
         pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
                         <outcome value='success'>
@@ -183,6 +223,17 @@
                                 <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`" />
+                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                <!--<parameter name="format" value="json"/>-->
+                                <!--<parameter name="httpMethod" value="get"/>-->
+                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                <!--<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"/>-->
                             </set>
                         </outcome>
                         <outcome value='not-found'>
@@ -244,13 +295,14 @@
                     </set>
                     <switch test="`$prop.sdncRestApi.token_id`">
                         <outcome value=''>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestApiCallNode' method='sendRequest' >
                                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
                                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                 <parameter name="format" value="json"/>
                                 <parameter name="httpMethod" value="patch"/>
-                                <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
+                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
                                 <parameter name="responsePrefix" value="vpn-result"/>
                                 <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                                 <parameter name="trustStorePassword" value="adminadmin"/>
@@ -269,13 +321,14 @@
                             </execute>
                         </outcome>
                         <outcome value='Other'>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestApiCallNode' method='sendRequest' >
                                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
                                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                 <parameter name="format" value="json"/>
                                 <parameter name="httpMethod" value="patch"/>
-                                <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
+                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
                                 <parameter name="responsePrefix" value="vpn-result"/>
                                 <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                                 <parameter name="trustStorePassword" value="adminadmin"/>