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=67331673496db788f450b8a3acfc8f268ded354f;hp=7a4eedf379c8086fdbee90ad92537dc1e21ed576;hpb=fb18306b26c323d9f0fbe8e0b5f049e9ed85f75e;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 7a4eedf3..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
@@ -89,18 +89,13 @@
                                                         <!--<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>
-                                                    <!--<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >-->
-                                                    <!--<parameter name="original_string" value='`tmp.unis.uni[$vidx].tp-id`'/>-->
-                                                    <!--<parameter name="regex" value="nodeId"/>-->
-                                                    <!--<parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>-->
                                                     <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="nodeId"/>
-                                                        <parameter name="tmp.aai.uni.pnf-name" value=""/>
+                                                        <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='prop.lan.ip-address' value='`$ipandMask[0]`' />
-                                                                <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />
+                                                                <parameter name='tmp.src.ltpId' value='`$param-prefix[$param-prefix_length -1]`' />
                                                             </set>
                                                         </outcome>
                                                         <outcome value='failure'>
@@ -181,27 +176,6 @@
                 </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="0.190.0.1" />
-                <parameter name='tmp.unis.uni[0].src-access-ltp-id' value="1234" />
-                <parameter name='tmp.unis.uni[0].dst-access-ltp-id' value="5678" />
-                <parameter name='tmp.unis.uni[0].network-id' value="domain2-providerId-5555-clientId-6666-topologyId-11" />
-                <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="0.190.0.3" />
-                <parameter name='tmp.unis.uni[1].src-access-ltp-id' value="9123" />
-                <parameter name='tmp.unis.uni[1].dst-access-ltp-id' value="4567" />
-                <parameter name='tmp.unis.uni[1].network-id' value="domain2-providerId-5555-clientId-6666-topologyId-11" />
-                <parameter name='tmp.unis.uni_length' value="2" />
-            </set>
             <for index='vidx' start='0' end='`$tmp.unis.uni_length`' >
                 <block atomic="true">
                     <set>
@@ -277,6 +251,29 @@
                             </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' />
@@ -287,6 +284,70 @@
                         <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />
                         <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />
                     </set>
+                    <set>
+                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />
+                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />
+                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />
+                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />
+                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
+                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />
+                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
+                    </set>
+                    <switch test="`$prop.sdncRestApi.token_id`">
+                        <outcome value=''>
+                            <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/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"/>
+                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                <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 Create vpn rest api" />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block atomic="true"></block>
+                                </outcome>
+                            </execute>
+                        </outcome>
+                        <outcome value='Other'>
+                            <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/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"/>
+                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                <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 Create vpn rest api" />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block atomic="true"></block>
+                                </outcome>
+                            </execute>
+                        </outcome>
+                    </switch>
                 </block>
             </for>
             <return status='success'>