1 files changed, 23 insertions, 26 deletions
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 58bfc12e..3e3b395c 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,13 +188,10 @@
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`">
                                                 <outcome value='true'>
                                                     <set>
-                                                        <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`' />
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name='ietf-eth-tran-service:etht-svc.etht-svc-instances[0].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-eth-tran-service:etht-svc.etht-svc-instances[0].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>
@@ -222,28 +219,28 @@
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'cir'`">
                                                 <outcome value='true'>
                                                     <set>
-                                                        <parameter name="`$ietf-bw-profile0 + 'CIR'`" value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].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="`$ietf-bw-profile0 + 'EIR'`" value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].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="`$ietf-bw-profile0 + 'color-aware'`" value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].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="`$ietf-bw-profile0 + 'coupling-flag'`" value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].coupling-flag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
                                                     </set>
                                                 </outcome>
                                             </switch>
@@ -460,22 +457,22 @@
                                         </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' />
+                                        <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' />
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />
+                                        <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-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`' />
+                                        <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=''>
@@ -531,7 +528,7 @@
                                         </outcome>
                                     </switch>
                                     <set>
-                                        <parameter name='tmp.vpnName' value="`$oof.vpn.access-node-id + '-' + $ietf-etht-svc-name`" />
+                                        <parameter name='tmp.vpnName' value="`$oof.vpn.access-node-id + '-' + $ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-name`" />
                                     </set>
                                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
       key='vpn-binding.vpn-id = $tmp.vpnName' >