Reviewed:  https://review.opencontrail.org/37416
Committed: http://github.com/Juniper/contrail-controller/commit/ad7c7eaeaf390b86274d8220c8fa2d19e744e15e
Submitter: Zuul (<email address hidden>)
Branch:    master

commit ad7c7eaeaf390b86274d8220c8fa2d19e744e15e
Author: sbalineni <email address hidden>
Date:   Fri Nov 10 15:50:41 2017 -0800

[DM]: QFX 10K Fixes, push irb interface config

- QFX devices: dynamic tunnels not supported, removed
- QFX 10K - L2 routing instances not needed. Removed
- No VNI options needed for internal vn ri's config
- Place client VNs (l2+l3 mode) irb interfaces on Internal VN RI.
- Create bridges (vlans) for each client VN, and place irb interface
- Unit Tests are added for checking Spine Config (above stuff)

set groups __contrail__ interfaces irb unit 5 proxy-macip-advertisement
set groups __contrail__ interfaces irb unit 5 family inet address 2.2.2.57/24 virtual-gateway-address 2.2.2.1
set groups __contrail__ interfaces irb unit 4 proxy-macip-advertisement
set groups __contrail__ interfaces irb unit 4 family inet address 1.1.1.57/24 virtual-gateway-address 1.1.1.1

set groups __contrail__ vlans contrail_vn-test-2-l2-5 vlan-id 5
set groups __contrail__ vlans contrail_vn-test-2-l2-5 interface xe-0/0/0:0.200
set groups __contrail__ vlans contrail_vn-test-2-l2-5 l3-interface irb.5
set groups __contrail__ vlans contrail_vn-test-2-l2-5 vxlan vni 5
set groups __contrail__ vlans contrail_vn-test1-l2-4 vlan-id 4
set groups __contrail__ vlans contrail_vn-test1-l2-4 interface xe-0/0/0:0.100
set groups __contrail__ vlans contrail_vn-test1-l2-4 l3-interface irb.4
set groups __contrail__ vlans contrail_vn-test1-l2-4 vxlan vni 4

Generated full config for two client vns (vn-test1, vn-test2 extended to QFX10K via LR)

root@5b11-qfx4# show groups __contrail__ | display set
set groups __contrail__ interfaces lo0 unit 0 family inet address 172.16.4.1/32 primary
set groups __contrail__ interfaces lo0 unit 0 family inet address 172.16.4.1/32 preferred
set groups __contrail__ interfaces irb gratuitous-arp-reply
set groups __contrail__ interfaces irb unit 5 proxy-macip-advertisement
set groups __contrail__ interfaces irb unit 5 family inet address 2.2.2.57/24 virtual-gateway-address 2.2.2.1
set groups __contrail__ interfaces irb unit 4 proxy-macip-advertisement
set groups __contrail__ interfaces irb unit 4 family inet address 1.1.1.57/24 virtual-gateway-address 1.1.1.1
set groups __contrail__ interfaces xe-0/0/0:0 flexible-vlan-tagging
set groups __contrail__ interfaces xe-0/0/0:0 encapsulation extended-vlan-bridge
set groups __contrail__ interfaces xe-0/0/0:0 unit 200 vlan-id 200
set groups __contrail__ interfaces xe-0/0/0:0 unit 100 vlan-id 100
set groups __contrail__ routing-options router-id 172.16.4.1
set groups __contrail__ routing-options route-distinguisher-id 172.16.4.1
set groups __contrail__ routing-options autonomous-system 65000
set groups __contrail__ protocols bgp group _contrail_asn-65000 type internal
set groups __contrail__ protocols bgp group _contrail_asn-65000 local-address 172.16.4.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 export _contrail_ibgp_export_policy
set groups __contrail__ protocols bgp group _contrail_asn-65000 neighbor 172.16.2.1 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 5 vrf-target target:65000:8000004
set groups __contrail__ protocols evpn vni-options vni 4 vrf-target target:65000:8000004
set groups __contrail__ protocols evpn encapsulation vxlan
set groups __contrail__ protocols evpn default-gateway no-gateway-community
set groups __contrail__ protocols evpn extended-vni-list all
set groups __contrail__ policy-options policy-statement _contrail_ibgp_export_policy term inet-vpn from family inet-vpn
set groups __contrail__ policy-options policy-statement _contrail_ibgp_export_policy term inet-vpn then next-hop self
set groups __contrail__ policy-options policy-statement _contrail_ibgp_export_policy term inet6-vpn from family inet6-vpn
set groups __contrail__ policy-options policy-statement _contrail_ibgp_export_policy term inet6-vpn then next-hop self
set groups __contrail__ policy-options policy-statement _contrail_vn-test-2-l2-5-export term t1 then community add _contrail_target_65000_8000003
set groups __contrail__ policy-options policy-statement _contrail_vn-test-2-l2-5-export term t1 then community add _contrail_target_65000_8000004
set groups __contrail__ policy-options policy-statement _contrail_vn-test-2-l2-5-export term t1 then accept
set groups __contrail__ policy-options policy-statement _contrail_vn-test-2-l2-5-import term _contrail_switch_policy_ from community _contrail_switch_policy_
set groups __contrail__ policy-options policy-statement _contrail_vn-test-2-l2-5-import term _contrail_switch_policy_ then accept
set groups __contrail__ policy-options policy-statement _contrail_vn-test-2-l2-5-import term t1 from community _contrail_target_65000_8000003
set groups __contrail__ policy-options policy-statement _contrail_vn-test-2-l2-5-import term t1 from community _contrail_target_65000_8000004
set groups __contrail__ policy-options policy-statement _contrail_vn-test-2-l2-5-import term t1 then accept
set groups __contrail__ policy-options policy-statement _contrail_vn-test1-l2-4-export term t1 then community add _contrail_target_65000_8000002
set groups __contrail__ policy-options policy-statement _contrail_vn-test1-l2-4-export term t1 then community add _contrail_target_65000_8000004
set groups __contrail__ policy-options policy-statement _contrail_vn-test1-l2-4-export term t1 then accept
set groups __contrail__ policy-options policy-statement _contrail_vn-test1-l2-4-import term _contrail_switch_policy_ from community _contrail_switch_policy_
set groups __contrail__ policy-options policy-statement _contrail_vn-test1-l2-4-import term _contrail_switch_policy_ then accept
set groups __contrail__ policy-options policy-statement _contrail_vn-test1-l2-4-import term t1 from community _contrail_target_65000_8000002
set groups __contrail__ policy-options policy-statement _contrail_vn-test1-l2-4-import term t1 from community _contrail_target_65000_8000004
set groups __contrail__ policy-options policy-statement _contrail_vn-test1-l2-4-import term t1 then accept
set groups __contrail__ policy-options policy-statement _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6-export term t1 then community add _contrail_target_65000_8000005
set groups __contrail__ policy-options policy-statement _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6-export term t1 then accept
set groups __contrail__ policy-options policy-statement _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6-import term _contrail_switch_policy_ from community _contrail_switch_policy_
set groups __contrail__ policy-options policy-statement _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6-import term _contrail_switch_policy_ then accept
set groups __contrail__ policy-options policy-statement _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6-import term t1 from community _contrail_target_65000_8000005
set groups __contrail__ policy-options policy-statement _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6-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_target_65000_8000003 members target:65000:8000003
set groups __contrail__ policy-options community _contrail_target_65000_8000004 members target:65000:8000004
set groups __contrail__ policy-options community _contrail_target_65000_8000005 members target:65000:8000005
set groups __contrail__ policy-options community _contrail_switch_policy_ members target:65000:1
set groups __contrail__ routing-instances _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6 instance-type vrf
set groups __contrail__ routing-instances _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6 interface irb.5
set groups __contrail__ routing-instances _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6 interface irb.4
set groups __contrail__ routing-instances _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6 vrf-import _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6-import
set groups __contrail__ routing-instances _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6 vrf-export _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6-export
set groups __contrail__ switch-options vtep-source-interface lo0.0
set groups __contrail__ switch-options route-distinguisher 172.16.4.1:1
set groups __contrail__ switch-options vrf-import _contrail_vn-test-2-l2-5-import
set groups __contrail__ switch-options vrf-import _contrail_vn-test1-l2-4-import
set groups __contrail__ switch-options vrf-import _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6-import
set groups __contrail__ switch-options vrf-export _contrail_vn-test-2-l2-5-export
set groups __contrail__ switch-options vrf-export _contrail_vn-test1-l2-4-export
set groups __contrail__ switch-options vrf-export _contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6-export
set groups __contrail__ switch-options vrf-target target:65000:1
set groups __contrail__ switch-options vrf-target auto
set groups __contrail__ vlans contrail_vn-test-2-l2-5 vlan-id 5
set groups __contrail__ vlans contrail_vn-test-2-l2-5 interface xe-0/0/0:0.200
set groups __contrail__ vlans contrail_vn-test-2-l2-5 l3-interface irb.5
set groups __contrail__ vlans contrail_vn-test-2-l2-5 vxlan vni 5
set groups __contrail__ vlans contrail_vn-test1-l2-4 vlan-id 4
set groups __contrail__ vlans contrail_vn-test1-l2-4 interface xe-0/0/0:0.100
set groups __contrail__ vlans contrail_vn-test1-l2-4 l3-interface irb.4
set groups __contrail__ vlans contrail_vn-test1-l2-4 vxlan vni 4

{master:0}[edit]
root@5b11-qfx4#
root@5b11-qfx4# run show route table ?
Possible completions:
<table>              Name of routing table
:vxlan.inet.0
__default_evpn__.evpn.0
_contrail___contrail_lr_internal_vn_726f5a7b-b26f-4635-98ae-c972c284d1fc__-l3-6.inet.0

root@5b11-qfx4# run show interfaces irb terse
Interface               Admin Link Proto    Local                 Remote
irb                     up    up
irb.4                   up    up   inet     1.1.1.57/24
irb.5                   up    up   inet     2.2.2.57/24

Closes-Bug: #1730020
Closes-Bug: #1730017

Change-Id: I875100f9c6800c2a116ae030d222cd169c8b5ba3