[EVPN VXLAN]: DM pushing incorrect VNI value for EVPN vni-options

When VxLAN Identifier Mode is configured as User Defined, DM pushing incorrect value for VNI under protocols evpn vni-options. In this case vxlan_id should be used as VNI. Instead vn index is being used.

Diff what need to be pushed:

root@5b11-qfx2# show | compare rollback 1
[edit groups __contrail__ protocols evpn vni-options vni 4] >>>> Instead of VNI 12345 VN Index 4 is used
- vrf-target target:65000:8000002;
[edit groups __contrail__ protocols evpn vni-options]
+ vni 12345 {
+ vrf-target target:65000:8000002;
+ }

Complete config pushed by DM
-------------------------------

root@5b11-qfx2# run show configuration groups __contrail__ | display set
set groups __contrail__ interfaces lo0 unit 0 family inet address 172.16.2.1/32 primary
set groups __contrail__ interfaces lo0 unit 0 family inet address 172.16.2.1/32 preferred
set groups __contrail__ interfaces xe-0/0/46 flexible-vlan-tagging
set groups __contrail__ interfaces xe-0/0/46 encapsulation extended-vlan-bridge
set groups __contrail__ interfaces xe-0/0/46 unit 6 vlan-id 6
set groups __contrail__ routing-options router-id 172.16.2.1
set groups __contrail__ routing-options route-distinguisher-id 172.16.2.1
set groups __contrail__ routing-options autonomous-system 65000
set groups __contrail__ routing-options resolution rib bgp.rtarget.0 resolution-ribs inet.0
set groups __contrail__ protocols bgp group _contrail_asn-65000 type internal
set groups __contrail__ protocols bgp group _contrail_asn-65000 local-address 172.16.2.1
set groups __contrail__ protocols bgp group _contrail_asn-65000 hold-time 90
set groups __contrail__ protocols bgp group _contrail_asn-65000 family evpn signaling
set groups __contrail__ protocols bgp group _contrail_asn-65000 family route-target
set groups __contrail__ protocols bgp group _contrail_asn-65000 neighbor 172.16.5.10 peer-as 65000
set groups __contrail__ protocols bgp group _contrail_asn-65000 neighbor 172.16.180.101 peer-as 65000
set groups __contrail__ protocols bgp group _contrail_asn-65000 neighbor 172.16.3.1 peer-as 65000
set groups __contrail__ protocols evpn vni-options vni 4********** Wrong value
set groups __contrail__ protocols evpn vni-options vni 12345 vrf-target target:65000:8000002
set groups __contrail__ protocols evpn encapsulation vxlan
set groups __contrail__ protocols evpn multicast-mode ingress-replication
set groups __contrail__ protocols evpn extended-vni-list all
set groups __contrail__ policy-options policy-statement _contrail_vn-try-l2-4-import term _contrail_switch_policy_ from community _contrail_switch_policy_
set groups __contrail__ policy-options policy-statement _contrail_vn-try-l2-4-import term _contrail_switch_policy_ then accept
set groups __contrail__ policy-options policy-statement _contrail_vn-try-l2-4-import term t1 from community _contrail_target_65000_8000002
set groups __contrail__ policy-options policy-statement _contrail_vn-try-l2-4-import term t1 then accept
set groups __contrail__ policy-options community _contrail_target_65000_8000002 members target:65000:8000002
set groups __contrail__ policy-options community _contrail_switch_policy_ members target:65000:1
set groups __contrail__ switch-options vtep-source-interface lo0.0
set groups __contrail__ switch-options route-distinguisher 172.16.2.1:1
set groups __contrail__ switch-options vrf-import _contrail_vn-try-l2-4-import
set groups __contrail__ switch-options vrf-target target:65000:1
set groups __contrail__ switch-options vrf-target auto
set groups __contrail__ vlans contrail_vn-try-l2-4 interface xe-0/0/46.6
set groups __contrail__ vlans contrail_vn-try-l2-4 vxlan vni 12345