X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fsotn%2FGENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml;h=58bfc12e1ede4d9f33d79b4b3c9b7af2d7514d1f;hb=40cf8fa7974b7493c55c38d7ec7c455ebf7497be;hp=3e4a32f2ddd43bcea968673909b2f70cd8f085b1;hpb=392a1f2f8bc0977ae9522d5bbc8e9ed16dc30ae1;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
index 3e4a32f2..58bfc12e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
@@ -188,8 +188,13 @@
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`">
                                                 <outcome value='true'>
                                                     <set>
-                                                        <parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
-                                                        <parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name='ietf-etht-instance0' value='ietf-eth-tran-service:etht-svc.etht-svc-instances[0].' />
+                                                        <parameter name='ietf-bw-profile0' value='ietf-eth-tran-service:etht-svc.globals.etht-svc-bandwidth-profiles[0].' />
+                                                        <parameter name='ietf-etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name="`$ietf-etht-instance0 + 'etht-svc-name'`" value='`$ietf-etht-svc-name`' />
+                                                        <parameter name="`$ietf-bw-profile0 + 'bandwidth-profile-name'`" value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name="`$ietf-etht-instance0 + 'etht-svc-access-ports[0].ingress-egress-bandwidth-profile-name'`" value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name="`$ietf-etht-instance0 + 'etht-svc-access-ports[1].ingress-egress-bandwidth-profile-name'`" value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
                                                     </set>
                                                 </outcome>
                                             </switch>
@@ -217,28 +222,28 @@
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'cir'`">
                                                 <outcome value='true'>
                                                     <set>
-                                                        <parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name="`$ietf-bw-profile0 + 'CIR'`" value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
                                                     </set>
                                                 </outcome>
                                             </switch>
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'eir'`">
                                                 <outcome value='true'>
                                                     <set>
-                                                        <parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name="`$ietf-bw-profile0 + 'EIR'`" value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
                                                     </set>
                                                 </outcome>
                                             </switch>
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'colorAware'`">
                                                 <outcome value='true'>
                                                     <set>
-                                                        <parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name="`$ietf-bw-profile0 + 'color-aware'`" value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
                                                     </set>
                                                 </outcome>
                                             </switch>
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'couplingFlag'`">
                                                 <outcome value='true'>
                                                     <set>
-                                                        <parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name="`$ietf-bw-profile0 + 'coupling-flag'`" value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
                                                     </set>
                                                 </outcome>
                                             </switch>
@@ -447,18 +452,40 @@
                                             </set>
                                         </outcome>
                                         <outcome value='failure'>
-                                            <block></block>
+                                            <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>
+                                    <set>
+                                        <parameter name="`$ietf-bw-profile0 + 'bandwidth-profile-type'`" value='ietf-eth-tran-types:mef-10-bwp' />
+                                        <parameter name="`$ietf-etht-instance0 + 'etht-svc-type'`" value='ietf-eth-tran-types:p2p-svc' />
+                                        <parameter name="`$ietf-etht-instance0 + 'admin-status'`" value='ietf-te-types:tunnel-state-up' />
+                                        <parameter name="`$ietf-etht-instance0 + 'etht-svc-access-ports[0].access-port-id'`" value='0' />
+                                        <parameter name="`$ietf-etht-instance0 + 'etht-svc-access-ports[0].service-classification-type'`" value='ietf-eth-tran-types:port-classification' />
+                                        <parameter name="`$ietf-etht-instance0 + 'etht-svc-access-ports[1].access-port-id'`" value='1' />
+                                        <parameter name="`$ietf-etht-instance0 + 'etht-svc-access-ports[1].service-classification-type'`" value='ietf-eth-tran-types:port-classification' />
+                                    </set>
+                                    <set>
+                                        <parameter name="`$ietf-etht-instance0 + 'access-provider-id'`" value='`$oof.vpn.access-provider-id`' />
+                                        <parameter name="`$ietf-etht-instance0 + 'access-client-id'`" value='`$oof.vpn.access-client-id`' />
+                                        <parameter name="`$ietf-etht-instance0 + 'access-topology-id'`" value='`$oof.vpn.access-topology-id`' />
+                                        <parameter name="`$ietf-etht-instance0 + 'etht-svc-access-ports[0].access-node-id'`" value='`$oof.vpn.access-node-id`' />
+                                        <parameter name="`$ietf-etht-instance0 + 'etht-svc-access-ports[0].access-ltp-id'`" value='`$oof.vpn.src-access-ltp-id`' />
+                                        <parameter name="`$ietf-etht-instance0 + 'etht-svc-access-ports[1].access-node-id'`" value='`$oof.vpn.access-node-id`' />
+                                        <parameter name="`$ietf-etht-instance0 + '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="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
                                                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
                                                 <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="responsePrefix" value="vpn-result"/>
                                                 <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                                                 <parameter name="trustStorePassword" value="adminadmin"/>
@@ -477,13 +504,13 @@
                                             </execute>
                                         </outcome>
                                         <outcome value='Other'>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
                                                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
                                                 <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="responsePrefix" value="vpn-result"/>
                                                 <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                                                 <parameter name="trustStorePassword" value="adminadmin"/>
@@ -504,7 +531,7 @@
                                         </outcome>
                                     </switch>
                                     <set>
-                                        <parameter name='tmp.vpnName' value="`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`" />
+                                        <parameter name='tmp.vpnName' value="`$oof.vpn.access-node-id + '-' + $ietf-etht-svc-name`" />
                                     </set>
                                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
       key='vpn-binding.vpn-id = $tmp.vpnName' >