<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />
<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
+ <!--<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.service-instance.service-instance-id`' />-->
+ <parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.uni.data-owner`' />
<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />
</set>
<set>
<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />
<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />
<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />
- <parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+ <!--<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->
<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->
<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
<!--<parameter name='index-number' value='0' />-->
<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />
<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
+ <!--<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.service-instance.service-instance-id`' />-->
+ <parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.uni.data-owner`' />
<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />
</set>
<set>
<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />
<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />
<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />
- <parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+ <!--<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->
<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->
<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
<!--<parameter name='index-number' value='0' />-->