--- /dev/null
+*.pyc
+
+# generated files
+*.vat
+*.cli
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
+create_host_iface vpp1 6.0.1.1/24
+create_host_iface intervpp1 6.0.3.1/24
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.2.1/24
+create_host_iface vpp2 6.0.2.1/24
+create_host_iface intervpp2 6.0.3.2/24
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
-set int ip address host-vpp1 6:0:1::1/64
+create_host_iface vpp1 6:0:1::1/64
+set_if_ip host-vpp1 6.0.1.1/24
+create_host_iface intervpp1 6:0:3::1/64
+set_if_ip host-intervpp1 6.0.3.1/24
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
-set int ip address host-intervpp1 6:0:3::1/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1
-lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
-
-lisp_add_del_map_resolver 6.0.3.100
-lisp_add_del_map_resolver 6:0:3::100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.2.1/24
-set int ip address host-vpp2 6:0:2::1/64
+create_host_iface vpp2 6:0:2::1/64
+set_if_ip host-vpp2 6.0.2.1/24
+create_host_iface intervpp2 6:0:3::2/64
+set_if_ip host-intervpp2 6.0.3.2/24
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
-set int ip address host-intervpp2 6:0:3::2/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-
-lisp_add_del_map_resolver 6.0.3.100
-lisp_add_del_map_resolver 6:0:3::100
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
+create_host_iface vpp1 6.0.1.1/24
+create_host_iface intervpp1 6.0.3.1/24
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
+lisp_remote_mapping eid 6.0.2.0/24 rloc 6.0.3.2
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6.0.2.0/24 rloc 6.0.3.2 p 1 w 1
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.2.1/24
+create_host_iface vpp2 6.0.2.1/24
+create_host_iface intervpp2 6.0.3.2/24
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_remote_mapping eid 6.0.1.0/24 rloc 6.0.3.1
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6.0.1.0/24 rloc 6.0.3.1 p 1 w 1
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
+create_host_iface vpp1 6.0.1.1/24
+create_host_iface intervpp1 6:0:3::1/64
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6:0:3::1/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.2.1/24
+create_host_iface vpp2 6.0.2.1/24
+create_host_iface intervpp2 6:0:3::2/64
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6:0:3::2/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6:0:1::1/64
+create_host_iface vpp1 6:0:1::1/64
+create_host_iface intervpp1 6.0.3.1/24
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:2::1/64
+create_host_iface vpp2 6:0:2::1/64
+create_host_iface intervpp2 6.0.3.2/24
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-
-
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6:0:1::1/64
+create_host_iface vpp1 6:0:1::1/64
+create_host_iface intervpp1 6:0:3::1/64
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6:0:3::1/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:2::1/64
+create_host_iface vpp2 6:0:2::1/64
+create_host_iface intervpp2 6:0:3::2/64
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6:0:3::2/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6:0:1::1/64
+create_host_iface vpp1 6:0:1::1/64
+create_host_iface intervpp1 6:0:3::1/64
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6:0:3::1/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
+lisp_remote_mapping eid 6:0:2::0/64 rloc 6:0:3::2
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6:0:2::0/64 rloc 6:0:3::2 p 1 w 1
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:2::1/64
+create_host_iface vpp2 6:0:2::1/64
+create_host_iface intervpp2 6:0:3::2/64
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6:0:3::2/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_remote_mapping eid 6:0:1::0/64 rloc 6:0:3::1
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6:0:1::0/64 rloc 6:0:3::1 p 1 w 1
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
-set interface l2 bridge host-vpp1 10
+create_host_iface vpp1 6.0.1.1/24
+set_if_l2_bridge host-vpp1 10
+create_host_iface intervpp1 6.0.3.1/24
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_eid_map_bd 10 10
+lisp_local_eid vni 10 eid 08:11:11:11:11:11 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_eid_table_add_del_map vni 10 bd_index 10
-lisp_add_del_local_eid vni 10 eid 08:11:11:11:11:11 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.1.2/24
-set interface l2 bridge host-vpp2 10
+create_host_iface vpp2 6.0.1.2/24
+set_if_l2_bridge host-vpp2 10
+create_host_iface intervpp2 6.0.3.2/24
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_eid_map_bd 10 10
+lisp_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_eid_table_add_del_map vni 10 bd_index 10
-lisp_add_del_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-create host-interface name vpp1_cus1
-set int state host-vpp1_cus1 up
-set interface ip table host-vpp1_cus1 100
-set int ip address host-vpp1_cus1 6.0.2.1/24
+create_host_iface_vrf vpp1_cus1 6.0.2.1/24 100
+create_host_iface_vrf vpp1_cus2 6.0.2.1/24 200
+create_host_iface intervpp1 6.0.3.1/24
-create host-interface name vpp1_cus2
-set int state host-vpp1_cus2 up
-set interface ip table host-vpp1_cus2 200
-set int ip address host-vpp1_cus2 6.0.2.1/24
-
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
+lisp_state enable
+lisp_map_resolver 6.0.3.100
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_eid_map_vrf 100 100
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 100 eid 6.0.2.0/24 locator-set ls1
+lisp_local_eid vni 200 eid 6.0.2.0/24 locator-set ls1
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6.0.3.100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator_set locator-set ls2
-
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_locator locator-set ls2 iface host-intervpp1 p 1 w 1
-
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_eid_table_add_del_map vni 100 vrf 100
-
-lisp_add_del_local_eid vni 100 eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_local_eid vni 200 eid 6.0.2.0/24 locator-set ls2
-create host-interface name vpp2_cus1
-set int state host-vpp2_cus1 up
-set interface ip table host-vpp2_cus1 100
-set int ip address host-vpp2_cus1 6.0.4.1/24
+create_host_iface_vrf vpp2_cus1 6.0.4.1/24 100
+create_host_iface_vrf vpp2_cus2 6.0.4.1/24 200
+create_host_iface intervpp2 6.0.3.2/24
-create host-interface name vpp2_cus2
-set int state host-vpp2_cus2 up
-set interface ip table host-vpp2_cus2 200
-set int ip address host-vpp2_cus2 6.0.4.1/24
-
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
+lisp_state enable
+lisp_map_resolver 6.0.3.100
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_eid_map_vrf 100 100
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 100 eid 6.0.4.0/24 locator-set ls1
+lisp_local_eid vni 200 eid 6.0.4.0/24 locator-set ls1
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6.0.3.100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator_set locator-set ls2
-
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_locator locator-set ls2 iface host-intervpp2 p 1 w 1
-
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_eid_table_add_del_map vni 100 vrf 100
-
-lisp_add_del_local_eid vni 100 eid 6.0.4.0/24 locator-set ls1
-lisp_add_del_local_eid vni 200 eid 6.0.4.0/24 locator-set ls2
-create host-interface name vpp1_cus1
-set int state host-vpp1_cus1 up
-set interface ip table host-vpp1_cus1 100
-set int ip address host-vpp1_cus1 6.0.2.1/24
+create_host_iface_vrf vpp1_cus1 6.0.2.1/24 100
+create_host_iface_vrf vpp1_cus2 6.0.2.1/24 200
+create_host_iface intervpp1 6:0:3::1/64
-create host-interface name vpp1_cus2
-set int state host-vpp1_cus2 up
-set interface ip table host-vpp1_cus2 200
-set int ip address host-vpp1_cus2 6.0.2.1/24
-
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6:0:3::1/64
+lisp_state enable
+lisp_map_resolver 6:0:3::100
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_eid_map_vrf 100 100
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 100 eid 6.0.2.0/24 locator-set ls1
+lisp_local_eid vni 200 eid 6.0.2.0/24 locator-set ls1
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6:0:3::100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator_set locator-set ls2
-
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_locator locator-set ls2 iface host-intervpp1 p 1 w 1
-
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_eid_table_add_del_map vni 100 vrf 100
-
-lisp_add_del_local_eid vni 100 eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_local_eid vni 200 eid 6.0.2.0/24 locator-set ls2
-
-create host-interface name vpp2_cus1
-set int state host-vpp2_cus1 up
-set interface ip table host-vpp2_cus1 100
-set int ip address host-vpp2_cus1 6.0.4.1/24
-
-create host-interface name vpp2_cus2
-set int state host-vpp2_cus2 up
-set interface ip table host-vpp2_cus2 200
-set int ip address host-vpp2_cus2 6.0.4.1/24
-
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6:0:3::2/64
-
-lisp enable
-lisp map-resolver add 6:0:3::100
-
-lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
-lisp eid-table map vni 100 vrf 100
-lisp eid-table add vni 100 eid 6.0.4.0/24 locator-set ls1
-
-lisp locator-set add ls2 iface host-intervpp2 p 1 w 1
-lisp eid-table map vni 200 vrf 200
-lisp eid-table add vni 200 eid 6.0.4.0/24 locator-set ls2
+create_host_iface_vrf vpp2_cus1 6.0.4.1/24 100
+create_host_iface_vrf vpp2_cus2 6.0.4.1/24 200
+create_host_iface intervpp2 6:0:3::2/64
+
+lisp_state enable
+lisp_map_resolver 6:0:3::100
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_eid_map_vrf 100 100
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 100 eid 6.0.4.0/24 locator-set ls1
+lisp_local_eid vni 200 eid 6.0.4.0/24 locator-set ls1
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6:0:3::100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator_set locator-set ls2
-
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_locator locator-set ls2 iface host-intervpp2 p 1 w 1
-
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_eid_table_add_del_map vni 100 vrf 100
-
-lisp_add_del_local_eid vni 100 eid 6.0.4.0/24 locator-set ls1
-lisp_add_del_local_eid vni 200 eid 6.0.4.0/24 locator-set ls2
-create host-interface name vpp1_cus1
-set int state host-vpp1_cus1 up
-set interface ip6 table host-vpp1_cus1 100
-set int ip address host-vpp1_cus1 6:0:2::1/64
+create_host_iface_vrf_v6 vpp1_cus1 6:0:2::1/64 100
+create_host_iface_vrf_v6 vpp1_cus2 6:0:2::1/64 200
+create_host_iface intervpp1 6.0.3.1/24
-create host-interface name vpp1_cus2
-set int state host-vpp1_cus2 up
-set interface ip6 table host-vpp1_cus2 200
-set int ip address host-vpp1_cus2 6:0:2::1/64
-
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
+lisp_state enable
+lisp_map_resolver 6.0.3.100
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_eid_map_vrf 100 100
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1
+lisp_local_eid vni 200 eid 6:0:2::0/64 locator-set ls1
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6.0.3.100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator_set locator-set ls2
-
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_locator locator-set ls2 iface host-intervpp1 p 1 w 1
-
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_eid_table_add_del_map vni 100 vrf 100
-
-lisp_add_del_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_local_eid vni 200 eid 6:0:2::0/64 locator-set ls2
-create host-interface name vpp2_cus1
-set int state host-vpp2_cus1 up
-set interface ip6 table host-vpp2_cus1 100
-set int ip address host-vpp2_cus1 6:0:4::1/64
+create_host_iface_vrf_v6 vpp2_cus1 6:0:4::1/64 100
+create_host_iface_vrf_v6 vpp2_cus2 6:0:4::1/64 200
+create_host_iface intervpp2 6.0.3.2/24
-create host-interface name vpp2_cus2
-set int state host-vpp2_cus2 up
-set interface ip6 table host-vpp2_cus2 200
-set int ip address host-vpp2_cus2 6:0:4::1/64
-
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
+lisp_state enable
+lisp_map_resolver 6.0.3.100
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_eid_map_vrf 100 100
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1
+lisp_local_eid vni 200 eid 6:0:4::0/64 locator-set ls1
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6.0.3.100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator_set locator-set ls2
-
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_locator locator-set ls2 iface host-intervpp2 p 1 w 1
-
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_eid_table_add_del_map vni 100 vrf 100
-
-lisp_add_del_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1
-lisp_add_del_local_eid vni 200 eid 6:0:4::0/64 locator-set ls2
-create host-interface name vpp1_cus1
-set int state host-vpp1_cus1 up
-set interface ip6 table host-vpp1_cus1 100
-set int ip address host-vpp1_cus1 6:0:2::1/64
+create_host_iface_vrf_v6 vpp1_cus1 6:0:2::1/64 100
+create_host_iface_vrf_v6 vpp1_cus2 6:0:2::1/64 200
+create_host_iface intervpp1 6:0:3::1/64
-create host-interface name vpp1_cus2
-set int state host-vpp1_cus2 up
-set interface ip6 table host-vpp1_cus2 200
-set int ip address host-vpp1_cus2 6:0:2::1/64
-
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6:0:3::1/64
+lisp_state enable
+lisp_map_resolver 6:0:3::100
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_eid_map_vrf 100 100
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1
+lisp_local_eid vni 200 eid 6:0:2::0/64 locator-set ls1
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6:0:3::100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator_set locator-set ls2
-
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_locator locator-set ls2 iface host-intervpp1 p 1 w 1
-
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_eid_table_add_del_map vni 100 vrf 100
-
-lisp_add_del_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_local_eid vni 200 eid 6:0:2::0/64 locator-set ls2
-create host-interface name vpp2_cus1
-set int state host-vpp2_cus1 up
-set interface ip6 table host-vpp2_cus1 100
-set int ip address host-vpp2_cus1 6:0:4::1/64
+create_host_iface_vrf_v6 vpp2_cus1 6:0:4::1/64 100
+create_host_iface_vrf_v6 vpp2_cus2 6:0:4::1/64 200
+create_host_iface intervpp2 6:0:3::2/64
-create host-interface name vpp2_cus2
-set int state host-vpp2_cus2 up
-set interface ip6 table host-vpp2_cus2 200
-set int ip address host-vpp2_cus2 6:0:4::1/64
-
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6:0:3::2/64
+lisp_state enable
+lisp_map_resolver 6:0:3::100
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_eid_map_vrf 100 100
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1
+lisp_local_eid vni 200 eid 6:0:4::0/64 locator-set ls1
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6:0:3::100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator_set locator-set ls2
-
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_locator locator-set ls2 iface host-intervpp2 p 1 w 1
-
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_eid_table_add_del_map vni 100 vrf 100
-
-lisp_add_del_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1
-lisp_add_del_local_eid vni 200 eid 6:0:4::0/64 locator-set ls2
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
+create_host_iface vpp1 6.0.1.1/24
+create_host_iface intervpp11 6.0.3.1/24
+create_host_iface intervpp21 6.0.4.1/24
-create host-interface name intervpp11
-set int state host-intervpp11 up
-set int ip address host-intervpp11 6.0.3.1/24
-
-create host-interface name intervpp21
-set int state host-intervpp21 up
-set int ip address host-intervpp21 6.0.4.1/24
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 p 1 w 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp11 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-intervpp21 p 1 w 1
-lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.2.1/24
+create_host_iface vpp2 6.0.2.1/24
+create_host_iface intervpp12 6.0.3.2/24
+create_host_iface intervpp22 6.0.4.2/24
-create host-interface name intervpp12
-set int state host-intervpp12 up
-set int ip address host-intervpp12 6.0.3.2/24
-
-create host-interface name intervpp22
-set int state host-intervpp22 up
-set int ip address host-intervpp22 6.0.4.2/24
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 p 1 w 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp12 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-intervpp22 p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6:0:1::1/64
+create_host_iface vpp1 6:0:1::1/64
+create_host_iface intervpp11 6:0:3::1/64
+create_host_iface intervpp21 6:0:4::1/64
-create host-interface name intervpp11
-set int state host-intervpp11 up
-set int ip address host-intervpp11 6:0:3::1/64
-
-create host-interface name intervpp21
-set int state host-intervpp21 up
-set int ip address host-intervpp21 6:0:4::1/64
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 p 1 w 1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp11 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-intervpp21 p 1 w 1
-lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:2::1/64
+create_host_iface vpp2 6:0:2::1/64
+create_host_iface intervpp12 6:0:3::2/64
+create_host_iface intervpp22 6:0:4::2/64
-create host-interface name intervpp12
-set int state host-intervpp12 up
-set int ip address host-intervpp12 6:0:3::2/64
-
-create host-interface name intervpp22
-set int state host-intervpp22 up
-set int ip address host-intervpp22 6:0:4::2/64
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 p 1 w 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp12 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-intervpp22 p 1 w 1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
-set interface l2 bridge host-vpp1 10
+create_host_iface vpp1 6.0.1.1/24
+set_if_l2_bridge host-vpp1 10
+create_host_iface intervpp11 6.0.3.1/24
+create_host_iface intervpp21 6.0.4.1/24
-create host-interface name intervpp11
-set int state host-intervpp11 up
-set int ip address host-intervpp11 6.0.3.1/24
-
-create host-interface name intervpp21
-set int state host-intervpp21 up
-set int ip address host-intervpp21 6.0.4.1/24
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 p 1 w 1
+lisp_eid_map_bd 10 10
+lisp_local_eid vni 10 eid 08:11:11:11:11:11 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6.0.3.100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp11 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-intervpp21 p 1 w 1
-
-lisp_eid_table_add_del_map vni 10 bd_index 10
-lisp_add_del_local_eid vni 10 eid 08:11:11:11:11:11 locator-set ls1
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.1.2/24
-set interface l2 bridge host-vpp2 10
+create_host_iface vpp2 6.0.1.2/24
+set_if_l2_bridge host-vpp2 10
+create_host_iface intervpp12 6.0.3.2/24
+create_host_iface intervpp22 6.0.4.2/24
-create host-interface name intervpp12
-set int state host-intervpp12 up
-set int ip address host-intervpp12 6.0.3.2/24
-
-create host-interface name intervpp22
-set int state host-intervpp22 up
-set int ip address host-intervpp22 6.0.4.2/24
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 p 1 w 1
+lisp_eid_map_bd 10 10
+lisp_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6.0.3.100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp12 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-intervpp22 p 1 w 1
-
-lisp_eid_table_add_del_map vni 10 bd_index 10
-lisp_add_del_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1
+++ /dev/null
-create host-interface name xtr_rtr2
-set int state host-xtr_rtr2 up
-set int ip address host-xtr_rtr2 6.0.3.3/24
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.2.1/24
-create host-interface name xtr_rtr1
-set int state host-xtr_rtr1 up
-set int ip address host-xtr_rtr1 6.0.3.1/24
+create_host_iface vpp1 6.0.2.1/24
+create_host_iface xtr_rtr1 6.0.3.1/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr1 p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.4.1/24
-create host-interface name xtr_rtr3
-set int state host-xtr_rtr3 up
-set int ip address host-xtr_rtr3 6.0.3.2/24
+create_host_iface vpp2 6.0.4.1/24
+create_host_iface xtr_rtr3 6.0.3.2/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1
+lisp_local_eid eid 6.0.4.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr3 p 1 w 1
-lisp_add_del_local_eid eid 6.0.4.0/24 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
--- /dev/null
+create_host_iface xtr_rtr2 6.0.3.3/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1
+lisp_pitr ls1
+lisp_remote_mapping eid 6.0.0.0/16 action send-map-request
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr2 p 1 w 1
-
-lisp_pitr_set_locator_set locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6.0.0.0/16 action 2
-lisp_add_del_map_resolver 6.0.3.100
+++ /dev/null
-create host-interface name xtr_rtr2
-set int state host-xtr_rtr2 up
-set int ip address host-xtr_rtr2 6:0:3::3/64
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.2.1/24
+create_host_iface vpp1 6.0.2.1/24
+create_host_iface xtr_rtr1 6:0:3::1/64
-create host-interface name xtr_rtr1
-set int state host-xtr_rtr1 up
-set int ip address host-xtr_rtr1 6:0:3::1/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr1 p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.4.1/24
+create_host_iface vpp2 6.0.4.1/24
+create_host_iface xtr_rtr3 6:0:3::2/64
-create host-interface name xtr_rtr3
-set int state host-xtr_rtr3 up
-set int ip address host-xtr_rtr3 6:0:3::2/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1
+lisp_local_eid eid 6.0.4.0/24 locator-set ls1
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr3 p 1 w 1
-lisp_add_del_local_eid eid 6.0.4.0/24 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
--- /dev/null
+create_host_iface xtr_rtr2 6:0:3::3/64
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1
+lisp_pitr ls1
+lisp_remote_mapping eid 6.0.0.0/16 action send-map-request
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr2 p 1 w 1
-
-lisp_pitr_set_locator_set locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6.0.0.0/16 action 2
-lisp_add_del_map_resolver 6:0:3::100
+++ /dev/null
-create host-interface name xtr_rtr2
-set int state host-xtr_rtr2 up
-set int ip address host-xtr_rtr2 6.0.3.3/24
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6:0:2::1/64
+create_host_iface vpp1 6:0:2::1/64
+create_host_iface xtr_rtr1 6.0.3.1/24
-create host-interface name xtr_rtr1
-set int state host-xtr_rtr1 up
-set int ip address host-xtr_rtr1 6.0.3.1/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr1 p 1 w 1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:4::1/64
+create_host_iface vpp2 6:0:4::1/64
+create_host_iface xtr_rtr3 6.0.3.2/24
-create host-interface name xtr_rtr3
-set int state host-xtr_rtr3 up
-set int ip address host-xtr_rtr3 6.0.3.2/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1
+lisp_local_eid eid 6:0:4::0/64 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr3 p 1 w 1
-lisp_add_del_local_eid eid 6:0:4::0/64 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
--- /dev/null
+create_host_iface xtr_rtr2 6.0.3.3/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1
+lisp_pitr ls1
+lisp_remote_mapping eid 6:0:0::0/32 action send-map-request
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr2 p 1 w 1
-
-lisp_pitr_set_locator_set locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6:0:0::0/64 action 2
-lisp_add_del_map_resolver 6.0.3.100
+++ /dev/null
-create host-interface name xtr_rtr2
-set int state host-xtr_rtr2 up
-set int ip address host-xtr_rtr2 6:0:3::3/64
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6:0:2::1/64
+create_host_iface vpp1 6:0:2::1/64
+create_host_iface xtr_rtr1 6:0:3::1/64
-create host-interface name xtr_rtr1
-set int state host-xtr_rtr1 up
-set int ip address host-xtr_rtr1 6:0:3::1/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr1 p 1 w 1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:4::1/64
+create_host_iface vpp2 6:0:4::1/64
+create_host_iface xtr_rtr3 6:0:3::2/64
-create host-interface name xtr_rtr3
-set int state host-xtr_rtr3 up
-set int ip address host-xtr_rtr3 6:0:3::2/64
-
-lisp enable
-
-lisp map-resolver add 6:0:3::100
-lisp locator-set add ls1 iface host-xtr_rtr3 p 1 w 1
-lisp eid-table add eid 6:0:4::0/64 locator-set ls1
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1
+lisp_local_eid eid 6:0:4::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr3 p 1 w 1
-lisp_add_del_local_eid eid 6:0:4::0/64 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
--- /dev/null
+create_host_iface xtr_rtr2 6:0:3::3/64
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1
+lisp_pitr ls1
+lisp_remote_mapping eid 6:0:0::0/32 action send-map-request
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr2 p 1 w 1
-
-lisp_pitr_set_locator_set locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6:0:0::0/64 action 2
-lisp_add_del_map_resolver 6:0:3::100
+++ /dev/null
-create host-interface name rtr_vpp1
-set int state host-rtr_vpp1 up
-set int ip address host-rtr_vpp1 6.0.3.2/24
-
-create host-interface name rtr_vpp2
-set int state host-rtr_vpp2 up
-set int ip address host-rtr_vpp2 6.0.5.2/24
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.2.1/24
-create host-interface name vpp1_rtr
-set int state host-vpp1_rtr up
-set int ip address host-vpp1_rtr 6.0.3.1/24
+create_host_iface vpp1 6.0.2.1/24
+create_host_iface vpp1_rtr 6.0.3.1/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-vpp1_rtr 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-vpp1_rtr p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.4.1/24
-create host-interface name vpp2_rtr
-set int state host-vpp2_rtr up
-set int ip address host-vpp2_rtr 6.0.5.1/24
+create_host_iface vpp2 6.0.4.1/24
+create_host_iface vpp2_rtr 6.0.5.1/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-vpp2_rtr 1 1
+lisp_local_eid eid 6.0.4.0/24 locator-set ls1
+lisp_map_resolver 6.0.5.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-vpp2_rtr p 1 w 1
-lisp_add_del_local_eid eid 6.0.4.0/24 locator-set ls1
-lisp_add_del_map_resolver 6.0.5.100
--- /dev/null
+create_host_iface rtr_vpp1 6.0.3.2/24
+create_host_iface rtr_vpp2 6.0.5.2/24
+
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1
+lisp_pitr ls1
+lisp_remote_mapping eid 6.0.0.0/16 action send-map-request
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-rtr_vpp1 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-rtr_vpp2 p 1 w 1
-
-lisp_pitr_set_locator_set locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6.0.0.0/16 action 2
-lisp_add_del_map_resolver 6.0.3.100
+++ /dev/null
-create host-interface name rtr_vpp1
-set int state host-rtr_vpp1 up
-set int ip address host-rtr_vpp1 6:0:3::2/64
-
-create host-interface name rtr_vpp2
-set int state host-rtr_vpp2 up
-set int ip address host-rtr_vpp2 6:0:5::2/64
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.2.1/24
-create host-interface name vpp1_rtr
-set int state host-vpp1_rtr up
-set int ip address host-vpp1_rtr 6:0:3::1/64
+create_host_iface vpp1 6.0.2.1/24
+create_host_iface vpp1_rtr 6:0:3::1/64
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-vpp1_rtr 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-vpp1_rtr p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.4.1/24
-create host-interface name vpp2_rtr
-set int state host-vpp2_rtr up
-set int ip address host-vpp2_rtr 6:0:5::1/64
+create_host_iface vpp2 6.0.4.1/24
+create_host_iface vpp2_rtr 6:0:5::1/64
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-vpp2_rtr 1 1
+lisp_local_eid eid 6.0.4.0/24 locator-set ls1
+lisp_map_resolver 6:0:5::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-vpp2_rtr p 1 w 1
-lisp_add_del_local_eid eid 6.0.4.0/24 locator-set ls1
-lisp_add_del_map_resolver 6:0:5::100
--- /dev/null
+create_host_iface rtr_vpp1 6:0:3::2/64
+create_host_iface rtr_vpp2 6:0:5::2/64
+
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1
+lisp_pitr ls1
+lisp_remote_mapping eid 6.0.0.0/16 action send-map-request
+lisp_map_resolver 6:0:3::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-rtr_vpp1 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-rtr_vpp2 p 1 w 1
-
-lisp_pitr_set_locator_set locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6.0.0.0/16 action 2
-lisp_add_del_map_resolver 6:0:3::100
+++ /dev/null
-create host-interface name rtr_vpp1
-set int state host-rtr_vpp1 up
-set int ip address host-rtr_vpp1 6.0.3.2/24
-
-create host-interface name rtr_vpp2
-set int state host-rtr_vpp2 up
-set int ip address host-rtr_vpp2 6:0:5::2/64
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6:0:2::1/64
-create host-interface name vpp1_rtr
-set int state host-vpp1_rtr up
-set int ip address host-vpp1_rtr 6.0.3.1/24
+create_host_iface vpp1 6:0:2::1/64
+create_host_iface vpp1_rtr 6.0.3.1/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-vpp1_rtr 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-vpp1_rtr p 1 w 1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:4::1/64
-create host-interface name vpp2_rtr
-set int state host-vpp2_rtr up
-set int ip address host-vpp2_rtr 6:0:5::1/64
+create_host_iface vpp2 6:0:4::1/64
+create_host_iface vpp2_rtr 6:0:5::1/64
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-vpp2_rtr 1 1
+lisp_local_eid eid 6:0:4::0/64 locator-set ls1
+lisp_map_resolver 6:0:5::100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-vpp2_rtr p 1 w 1
-lisp_add_del_local_eid eid 6:0:4::0/64 locator-set ls1
-lisp_add_del_map_resolver 6:0:5::100
--- /dev/null
+create_host_iface rtr_vpp1 6.0.3.2/24
+create_host_iface rtr_vpp2 6:0:5::2/64
+
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1
+lisp_pitr ls1
+lisp_remote_mapping eid 6:0:0::0/32 action send-map-request
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-rtr_vpp1 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-rtr_vpp2 p 1 w 1
-
-lisp_pitr_set_locator_set locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6:0:0::0/32 action 2
-lisp_add_del_map_resolver 6.0.3.100
+++ /dev/null
-create host-interface name rtr_vpp1
-set int state host-rtr_vpp1 up
-set int ip address host-rtr_vpp1 6.0.3.2/24
-
-create host-interface name rtr_vpp2
-set int state host-rtr_vpp2 up
-set int ip address host-rtr_vpp2 6:0:5::2/64
-create host-interface name vpp1_cus1
-set int state host-vpp1_cus1 up
-set interface ip6 table host-vpp1_cus1 100
-set int ip address host-vpp1_cus1 6:0:2::1/64
+create_host_iface_vrf_v6 vpp1_cus1 6:0:2::1/64 100
+create_host_iface_vrf_v6 vpp1_cus2 6:0:2::1/64 200
+create_host_iface vpp1_rtr 6.0.3.1/24
-create host-interface name vpp1_cus2
-set int state host-vpp1_cus2 up
-set interface ip6 table host-vpp1_cus2 200
-set int ip address host-vpp1_cus2 6:0:2::1/64
-
-create host-interface name vpp1_rtr
-set int state host-vpp1_rtr up
-set int ip address host-vpp1_rtr 6.0.3.1/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-vpp1_rtr 1 1
+lisp_eid_map_vrf 100 100
+lisp_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1
+lisp_locator_set_with_locator ls2 host-vpp1_rtr 1 1
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 200 eid 6:0:2::0/64 locator-set ls2
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6.0.3.100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-vpp1_rtr p 1 w 1
-lisp_eid_table_add_del_map vni 100 vrf 100
-lisp_add_del_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1
-
-lisp_add_del_locator_set locator-set ls2
-lisp_add_del_locator locator-set ls2 iface host-vpp1_rtr p 1 w 1
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_add_del_local_eid vni 200 eid 6:0:2::0/64 locator-set ls2
-create host-interface name vpp2_cus1
-set int state host-vpp2_cus1 up
-set interface ip6 table host-vpp2_cus1 100
-set int ip address host-vpp2_cus1 6:0:4::1/64
+create_host_iface_vrf_v6 vpp2_cus1 6:0:4::1/64 100
+create_host_iface_vrf_v6 vpp2_cus2 6:0:4::1/64 200
+create_host_iface vpp2_rtr 6:0:5::1/64
-create host-interface name vpp2_cus2
-set interface ip6 table host-vpp2_cus2 200
-set int state host-vpp2_cus2 up
-set int ip address host-vpp2_cus2 6:0:4::1/64
-
-create host-interface name vpp2_rtr
-set int state host-vpp2_rtr up
-set int ip address host-vpp2_rtr 6:0:5::1/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-vpp2_rtr 1 1
+lisp_eid_map_vrf 100 100
+lisp_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1
+lisp_locator_set_with_locator ls2 host-vpp2_rtr 1 1
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 200 eid 6:0:4::0/64 locator-set ls2
+lisp_map_resolver 6:0:5::100
+++ /dev/null
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6:0:5::100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-vpp2_rtr p 1 w 1
-lisp_eid_table_add_del_map vni 100 vrf 100
-lisp_add_del_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1
-
-lisp_add_del_locator_set locator-set ls2
-lisp_add_del_locator locator-set ls2 iface host-vpp2_rtr p 1 w 1
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_add_del_local_eid vni 200 eid 6:0:4::0/64 locator-set ls2
--- /dev/null
+create_host_iface rtr_vpp1 6.0.3.2/24
+create_host_iface rtr_vpp2 6:0:5::2/64
+
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1
+lisp_pitr ls1
+lisp_eid_map_vrf 100 100
+lisp_eid_map_vrf 200 200
+lisp_remote_mapping vni 100 eid 6:0:0::0/32 action send-map-request
+lisp_remote_mapping vni 200 eid 6:0:0::0/32 action send-map-request
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-rtr_vpp1 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-rtr_vpp2 p 1 w 1
-
-lisp_pitr_set_locator_set locator-set ls1
-lisp_eid_table_add_del_map vni 100 vrf 100
-lisp_eid_table_add_del_map vni 200 vrf 200
-
-lisp_add_del_remote_mapping add vni 100 deid 6:0:0::0/32 action 2
-lisp_add_del_remote_mapping add vni 200 deid 6:0:0::0/32 action 2
-lisp_add_del_map_resolver 6.0.3.100
+++ /dev/null
-create host-interface name rtr_wan4
-set int state host-rtr_wan4 up
-set int ip address host-rtr_wan4 6.0.3.2/24
-
-create host-interface name rtr_vpp2
-set int state host-rtr_vpp2 up
-set int ip address host-rtr_vpp2 6:0:5::2/64
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6:0:2::1/64
-create host-interface name vpp1_wan4
-set int state host-vpp1_wan4 up
-set int ip address host-vpp1_wan4 6.0.3.1/24
+create_host_iface vpp1 6:0:2::1/64
+create_host_iface vpp1_wan4 6.0.3.1/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-vpp1_wan4 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-vpp1_wan4 p 1 w 1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:4::1/64
-create host-interface name vpp2_rtr
-set int state host-vpp2_rtr up
-set int ip address host-vpp2_rtr 6:0:5::1/64
-create host-interface name vpp2_wan4
-set int state host-vpp2_wan4 up
-set int ip address host-vpp2_wan4 6.0.3.3/24
+create_host_iface vpp2 6:0:4::1/64
+create_host_iface vpp2_rtr 6:0:5::1/64
+create_host_iface vpp2_wan4 6.0.3.3/24
+
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-vpp2_rtr p 1 w 1 iface host-vpp2_wan4 p 1 w 1
+lisp_local_eid eid 6:0:4::0/64 locator-set ls1
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-vpp2_wan4 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-vpp2_rtr p 1 w 1
-lisp_add_del_local_eid eid 6:0:4::0/64 locator-set ls1
-lisp_add_del_map_resolver 6:0:5::100
--- /dev/null
+create_host_iface rtr_wan4 6.0.3.2/24
+create_host_iface rtr_vpp2 6:0:5::2/64
+
+lisp_state enable
+lisp_ls_multiple_locs ls1 iface host-rtr_wan4 p 1 w 1 iface host-rtr_vpp2 p 1 w 1
+lisp_pitr ls1
+lisp_remote_mapping eid 6:0:0::0/32 action send-map-request
+lisp_map_resolver 6.0.3.100
+++ /dev/null
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-rtr_wan4 p 1 w 1
-lisp_add_del_locator locator-set ls1 iface host-rtr_vpp2 p 1 w 1
-
-lisp_pitr_set_locator_set locator-set ls1
-
-lisp_add_del_remote_mapping add deid 6:0:0::0/32 action 2
-lisp_add_del_map_resolver 6.0.3.100
exit 1
fi
+if [ "${CFG_METHOD}" == '' ] ; then
+ CFG_METHOD=vat
+ echo
+ echo "* INFO: configuration method not selected, defaulting to 'vat'"
+ echo "* To define the method run the test as follows:"
+ echo "* $ sudo CFG_METHOD=vat|cli ./tests/<tc>.sh"
+ echo
+fi
+
function clean_all
{
echo "Clearing all VPP instances.."
if [ "$1" != "no_odl" ] ; then
odl_clear_all
fi
+}
+function maybe_pause
+{
+ if [ "$WAIT" == "1" ] ; then
+ read -p "press any key to continue .." -n1
+ fi
+}
+
+
+function start_vpp
+{
+ # start_vpp port prefix
+ ${VPP_LITE_BIN} \
+ unix { log /tmp/$2.log \
+ full-coredump \
+ cli-listen localhost:$1 } \
+ api-trace { on } api-segment { prefix "$2" }
+}
+
+function print_status
+{
+ # show_status rc error_msg
+ if [ $1 -ne 0 ] ; then
+ echo "Test failed: $2"
+ else
+ echo "Test passed."
+ test_result=0
+ fi
+}
+
+function assert_rc_ok
+{
+ # assert_rc_ok rc cleanup_fcn error_msg
+ if [ $1 -ne 0 ] ; then
+ echo $3
+ $2
+ exit $test_result
+ fi
}
#!/usr/bin/env bash
-source config.sh
source odl_utils.sh
TESTS_DIR=tests
echo
echo This must be run with superuser privileges.
echo "Usage:"
- echo " ./run.sh [vhc]"
+ echo " ./run.sh [vhc] [--config-method vat|cli]"
echo
echo " -v : verbose output"
echo " -c : clean"
echo " -h : show help"
+ echo " --config-method : select configuration method. Default is VAT."
}
+export CFG_METHOD=vat
+source config.sh
+
verbose=0
while [ $# -gt 0 ] ; do
elif [ $arg == "-c" ] ; then
clean_all
exit 0
+ elif [ $arg == "--config-method" ] ; then
+ type=$1
+ shift
+ if [ $type != "vat" -a $type != "cli" ] ; then
+ echo "ERROR: expected one of 'cli' or 'vat' "
+ help
+ exit 1
+ fi
+ export CFG_METHOD=$type
+ else
+ echo "parse error"
+ help
+ exit 1
fi
done
echo
echo "Running VPP lite test suite."
echo
+echo "Config method: $CFG_METHOD"
+echo
for test_case in "$TESTS_DIR"/test_*
do
--- /dev/null
+
+mappings = {}
+
+class SimpleMapping(object):
+
+ def __init__(self, cmd, cli, vat):
+ if cmd in mappings:
+ raise Exception('{} already in cmd db!'.format(cmd))
+
+ self.cmd = cmd
+ self.cli = cli
+ self.vat = vat
+ mappings[cmd] = self
+
+ def generate(self, mode, args):
+ s = ''
+ # simply append arguments string to right command
+ if mode == 'vat':
+ s = self.vat + ' ' + args
+ else:
+ s = self.cli + ' ' + args
+ return s
+
+
+class CustomMapping(SimpleMapping):
+
+ def generate(self, mode, args):
+ s = ''
+ if mode == 'vat':
+ s = self.vat
+ else:
+ s = self.cli
+
+ args = args.split(' ')
+ return s.format(*args)
+
+
+class RepeatableLocators(SimpleMapping):
+
+ def append_locs(self, locs):
+ pass
+
+ def generate(self, mode, args):
+ name = args[:args.index(' ')] # first word is ls name
+ locs = args[args.index(' '):]
+
+ if mode == 'vat':
+ s = self.vat
+ else:
+ s = self.cli
+
+ s = s + ' ' + name + locs
+ return s
+
+
+SimpleMapping('lisp_state', 'lisp', 'lisp_enable_disable')
+SimpleMapping('lisp_map_resolver', 'lisp map-resolver', 'lisp_add_del_map_resolver')
+SimpleMapping('lisp_local_eid', 'lisp eid-table', 'lisp_add_del_local_eid')
+SimpleMapping('lisp_remote_mapping', 'lisp remote-mapping', 'lisp_add_del_remote_mapping')
+SimpleMapping('lisp_pitr', 'lisp pitr ls', 'lisp_pitr_set_locator_set locator-set')
+SimpleMapping('set_if_ip', 'set int ip address', 'sw_interface_add_del_address')
+
+CustomMapping('lisp_eid_map_bd',
+ 'lisp eid-table map vni {0} bd {1}',
+ 'lisp_eid_table_add_del_map vni {0} bd_index {1}')
+CustomMapping('lisp_eid_map_vrf',
+ 'lisp eid-table map vni {0} vrf {1}',
+ 'lisp_eid_table_add_del_map vni {0} vrf {1}')
+CustomMapping('set_if_l2_bridge', 'set interface l2 bridge {0} {1}',
+ 'sw_interface_set_l2_bridge {0} bd_id {1}')
+CustomMapping('set_if_ip_table', 'set interface ip table {0} {1}',
+ 'sw_interface_set_table {0} vrf {1}')
+CustomMapping('lisp_locator_set_with_locator',
+ 'lisp locator-set add {0} iface {1} p {2} w {3}',
+ 'lisp_add_del_locator_set locator-set {0} iface {1} p {2} w {3}')
+CustomMapping('create_host_iface',
+ 'create host-interface name {0}\n'
+ 'set int state host-{0} up\n'
+ 'set int ip address host-{0} {1}',
+
+ 'af_packet_create name {0}\n'
+ 'sw_interface_set_flags host-{0} admin-up link-up\n'
+ 'sw_interface_add_del_address host-{0} {1}')
+
+CustomMapping('create_host_iface_vrf',
+ 'create host-interface name {0}\n'
+ 'set int state host-{0} up\n'
+ 'set interface ip table host-{0} {2}\n'
+ 'set int ip address host-{0} {1}',
+
+ 'af_packet_create name {0}\n'
+ 'sw_interface_set_flags host-{0} admin-up link-up\n'
+ 'sw_interface_set_table host-{0} vrf {2}\n'
+ 'sw_interface_add_del_address host-{0} {1}')
+
+CustomMapping('create_host_iface_vrf_v6',
+ 'create host-interface name {0}\n'
+ 'set int state host-{0} up\n'
+ 'set interface ip6 table host-{0} {2}\n'
+ 'set int ip address host-{0} {1}',
+
+ 'af_packet_create name {0}\n'
+ 'sw_interface_set_flags host-{0} admin-up link-up\n'
+ 'sw_interface_set_table host-{0} vrf {2} ipv6\n'
+ 'sw_interface_add_del_address host-{0} {1}')
+
+RepeatableLocators('lisp_ls_multiple_locs',
+ 'lisp locator-set add',
+ 'lisp_add_del_locator_set locator-set')
+
--- /dev/null
+#!/usr/bin/env python
+
+"""
+generate_config.py - Generate specific configuration file for VPP from
+ generic config file
+
+Usage:
+ ./generate_config.py <directory> <output-file-type>
+
+where <directory> is a system directory containing generic config file(s)
+ (suffixed with *.config)
+ <output-file-type> is one of 'vat' or 'cli'
+
+This script looks for *.config files in provided directory and for each
+generates a specific configuration file based on output file type in form
+'<filename>.cli' or '<filename>.vat' respectively.
+"""
+
+import sys
+import glob
+import cmd_mappings
+
+
+def generate_config(file_name, mode):
+ """
+ param file_name:
+ param mode: one of 'vat' or 'cli'
+ """
+ s = ''
+ f = open(file_name, 'r')
+ line_num = 0
+
+ for line in f:
+ line_num += 1
+ line = line.strip()
+ if line == '' or line[0] == '#':
+ continue
+
+ kw = line[: line.index(' ')]
+ args = line[ line.index(' ') + 1:]
+
+ if kw not in cmd_mappings.mappings:
+ raise Exception('Conversion error at {}:{}:\n > {}\nKeyword not found:'
+ ' {}'.format(file_name, line_num, line, kw))
+
+ mapping = cmd_mappings.mappings[kw]
+ try:
+ s = s + mapping.generate(mode, args) + '\n'
+ except Exception as e:
+ raise Exception('Conversion error at {}:{}:\n > {}'
+ .format(file_name, line_num, line))
+
+ return s
+
+
+def main():
+ if len(sys.argv) != 3:
+ print('Error: expected 2 arguments!')
+ sys.exit(1)
+
+ dir_name = sys.argv[1]
+ config_type = sys.argv[2]
+
+ if config_type != 'vat' and config_type != 'cli':
+ print('Error: expected second parameter one of "vat" or "cli"!')
+ sys.exit(1)
+
+ for f in glob.glob(dir_name + "/*.config"):
+ config = generate_config(f, config_type)
+
+ output_fname = f.replace('.config', '.' + config_type)
+ print('\n* Generated config from {}:'.format(f))
+ print(config)
+ print ('* Saving to {}'.format(output_fname))
+
+ fout = open(output_fname, 'w')
+ fout.write(config);
+
+
+main()
basic_topo_setup
fi
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
-
+ maybe_pause
test_result=1
ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
- rc=$?
- if [ $rc -ne 0 ] ; then
- echo "No response received!"
- basic_topo_clean
- exit $test_result
- fi
-
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ assert_rc_ok $? basic_topo_clean "No ICMP response!"
+ maybe_pause
# change IP addresses of destination RLOC
echo "set int ip address del host-intervpp2 6.0.3.2/24" | nc 0 5003
echo "set int ip address host-intervpp2 6.0.3.20/24" | nc 0 5003
# test done
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
-
+ maybe_pause
basic_topo_clean
- if [ $rc -ne 0 ] ; then
- echo "Test failed: No ICMP response received within specified timeout limit!"
- else
- echo "Test passed."
- test_result=0
- fi
-
+ print_status $rc "No ICMP response!"
exit $test_result
}
basic_topo_setup
fi
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
-
+ maybe_pause
test_result=1
ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
rc=$?
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
-
- if [ $rc -ne 0 ] ; then
- echo "No response received!"
- basic_topo_clean
- exit $test_result
- fi
+ maybe_pause
+ assert_rc_ok $rc basic_topo_clean "No response received!"
# test done
basic_topo_clean
- if [ $rc -ne 0 ] ; then
- echo "Test failed: No ICMP response received within specified timeout limit!"
- else
- echo "Test passed."
- test_result=0
- fi
-
+ print_status $rc "No ICM response!"
exit $test_result
}
test_result=1
- if [ "$5" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
- if [ $? -ne 0 ] ; then
- echo "No response received!"
- basic_topo_clean
- exit $test_result
- fi
+ assert_rc_ok $? basic_topo_clean "No response received!"
ip netns exec vppns1 "${3}" -w 15 -c 1 "${4}"
- if [ $? -ne 0 ] ; then
- echo "No response received!"
- basic_topo_clean
- exit $test_result
- fi
+ assert_rc_ok $? basic_topo_clean "No response received!"
# change IP addresses of destination RLOC
echo "set int ip address del host-intervpp2 6.0.3.2/24" | nc 0 5003
ODL_CONFIG_DIR=`pwd`/../configs/odl/basic/4o4
post_curl "update-mapping" ${ODL_CONFIG_FILE3}
- if [ "$5" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
- if [ $? -ne 0 ] ; then
- echo "No response received!"
- basic_topo_clean
- exit $test_result
- fi
+ assert_rc_ok $? basic_topo_clean "No response received!"
ip netns exec vppns1 "${3}" -w 15 -c 1 "${4}"
rc=$?
- if [ "$5" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
# test done
-
basic_topo_clean
- if [ $rc -ne 0 ] ; then
- echo "Test failed: No ICMP response received within specified timeout limit!"
- else
- echo "Test passed."
- test_result=0
- fi
+ print_status $rc "No ICMP response!"
exit $test_result
}
{
basic_topo_setup no_odl
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
test_result=1
ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
rc=$?
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
# test done
multihoming_topo_setup
fi
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
test_result=1
ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
+ assert_rc_ok $? multihoming_topo_clean "No response received!"
# do some port sweeping to see that load balancing works
ip netns exec vppns1 nc -n -z "${2}" 1-1000 > /dev/null 2>&1
if [ $rc -ne 0 ] ; then
echo "Load balancing doesn't work!"
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
multihoming_topo_clean
exit $test_result
fi
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
# change IP addresses of destination RLOC
echo "set int ip address del host-intervpp12 6.0.3.2/24" | nc 0 5003
# test done
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
multihoming_topo_clean
- if [ $rc -ne 0 ] ; then
- echo "Test failed: No ICMP response received within specified timeout limit!"
- else
- echo "Test passed."
- test_result=0
- fi
-
+ print_status $rc "No ICMP response!"
exit $test_result
}
ODL_CONFIG_FILE2="vpp2.json"
ODL_CONFIG_FILE3="update_vpp2.json"
-function maybe_pause
-{
- if [ "$1" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
-}
-
if [ "$1" == "clean" ] ; then
multihoming_topo_clean
exit 0
maybe_pause $3
multihoming_topo_clean
- if [ $rc -ne 0 ] ; then
- echo "Test failed: No ICMP response received within specified timeout limit!"
- else
- echo "Test passed."
- test_result=0
- fi
-
+ print_status $rc "No ICMP response!"
exit $test_result
}
test_result=1
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
ip netns exec vppns1 "${1}" -w 20 -c 1 "${2}"
rc=$?
# test done
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
basic_two_odls_clean
kill $mr_id
- if [ $rc -ne 0 ] ; then
- echo "Test failed: No ICMP response received within specified timeout limit!"
- else
- echo "Test passed."
- test_result=0
- fi
-
+ print_status $rc "No ICMP response!"
exit $test_result
}
function test_rtr_single_iface {
rtr_single_iface_setup
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
test_result=1
ip netns exec vpp-ns1 "${1}" -w 20 -c 1 "${2}"
rc=$?
+ maybe_pause
rtr_single_iface_clean
- if [ $rc -ne 0 ] ; then
- echo "Test failed: No ICMP response received within specified timeout limit!"
- else
- echo "Test passed."
- test_result=0
- fi
-
+ print_status $rc "No ICMP response!"
exit $test_result
}
function test_rtr_two_iface {
rtr_two_iface_setup
- if [ "$2" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
test_result=1
rc=0
echo "Unrecognized IP format '$1'"
fi
- #ip netns exec vpp1-ns ping -w 15 -c 1 "${1}"
- #rc=$?
-
- if [ "$2" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
rtr_two_iface_clean
-
- if [ $rc -ne 0 ] ; then
- echo "Test failed: No ICMP response received within specified timeout limit!"
- else
- echo "Test passed."
- test_result=0
- fi
-
+ print_status $rc "No ICMP response!"
exit $test_result
}
test_result=0
rc=0
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
ip netns exec vpp1-cus1-ns "${1}" -w 20 -c 1 "${2}"
- rc=$?
- if [ $rc -ne 0 ] ; then
- echo "Error: customer 1 did not receive any response!"
- test_result=1
- fi
+ assert_rc_ok $? rtr_two_iface_two_customers_clean "No response received!"
ip netns exec vpp1-cus2-ns "${1}" -w 20 -c 1 "${2}"
rc=$?
- if [ $rc -ne 0 ] ; then
- echo "Error: customer 2 did not receive any response!"
- test_result=1
- fi
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
rtr_two_iface_two_customers_clean
-
- if [ $rc -ne 0 ] ; then
- echo "Test failed: No ICMP response received within specified timeout limit!"
- else
- echo "Test passed."
- fi
-
+ print_status $rc "No ICMP response!"
exit $test_result
}
# CONFIGURE
smr_rtr_disjoint_setup
- if [ "$2" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
test_result=1
rc=0
# TEST IP6 over IP4
test_ns_ping $1 vpp1-ns
+ assert_rc_ok $? smr_rtr_disjoint_clean "No icmp received!"
- rc=$?
-
- if [ $rc -ne 0 ] ; then
- echo "IPv6 over IPv4 test failed: No ICMP response received within specified timeout limit!"
- else
- echo "IPv6 over IPv4 test passed."
- test_result=0
- fi
-
- if [ "$2" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
# RECONFIGURE
smr_rtr_disjoint_reconfigure
- if [ "$2" == "wait" ] ; then
- read -p "Forwarding reconfigured press any key to continue .." -n1
- fi
+ maybe_pause
# TEST IP6 over disjoint IP4 and IP6 underlay
test_ns_ping $1 vpp1-ns
-
rc=$?
- if [ $rc -ne 0 ] ; then
- echo "SMR + disjoint locators test failed: No ICMP response received within specified timeout limit!"
- else
- echo "SMR + disjoint locators test passed."
- test_result=0
- fi
-
- if [ "$2" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
-
+ maybe_pause
# CLEANUP
smr_rtr_disjoint_clean
-
+ print_status $rc "No ICMP response!"
exit $test_result
}
# init to test failed
test_result=1
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
ip netns exec vpp1-cus1-ns "${1}" -w 20 -c 1 "${2}"
- rc=$?
- if [ $rc -ne 0 ] ; then
- echo "Error: customer 1 did not receive any response!"
- fi
+ assert_rc_ok $? two_customers_topo_clean "No response!"
- #read -p "press any key to continue .." -n1
+ maybe_pause
ip netns exec vpp1-cus2-ns "${1}" -w 20 -c 1 "${2}"
rc=$?
- if [ $rc -ne 0 ] ; then
- echo "Error: customer 2 did not receive any response!"
- fi
- if [ "$3" == "wait" ] ; then
- read -p "press any key to continue .." -n1
- fi
+ maybe_pause
two_customers_topo_clean
-
- if [ $rc -ne 0 ] ; then
- echo "Test failed!";
- else
- echo "Test passed."
- test_result=0
- fi
-
+ print_status $rc "No ICMP response!"
exit $test_result
}
ip addr add 6:0:3::100/64 dev odl
ethtool --offload odl rx off tx off
- # start vpp1 and vpp2 in separate chroot
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp1.log cli-listen \
- localhost:5002 full-coredump \
- exec ${VPP_LITE_CONF}/vpp1.config } \
- api-trace { on } api-segment {prefix xtr1}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp2.log cli-listen \
- localhost:5003 full-coredump \
- exec ${VPP_LITE_CONF}/vpp2.config } \
- api-trace { on } api-segment {prefix xtr2}
-
- sleep 2
- ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat
- ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat
+ # generate config files
+ ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD}
+
+ start_vpp 5002 vpp1
+ start_vpp 5003 vpp2
+
+ echo "* Selected configuration method: $CFG_METHOD"
+ if [ "$CFG_METHOD" == "cli" ] ; then
+ echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
+ echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
+ elif [ "$CFG_METHOD" == "vat" ] ; then
+ sleep 2
+ ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
+ ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
+ else
+ echo "=== WARNING:"
+ echo "=== Invalid configuration method selected!"
+ echo "=== To resolve this set env variable CFG_METHOD to vat or cli."
+ echo "==="
+ fi
if [ "$1" != "no_odl" ] ; then
post_curl "add-mapping" ${ODL_CONFIG_FILE1}
post_curl "add-mapping" ${ODL_CONFIG_FILE2}
fi
}
-
ip addr add 6:0:3::100/64 dev odl
ethtool --offload odl rx off tx off
- # start vpp1 and vpp2 in separate chroot
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp1.log cli-listen \
- localhost:5002 full-coredump \
- exec ${VPP_LITE_CONF}/vpp1.config } \
- api-trace { on } api-segment {prefix xtr1}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp2.log cli-listen \
- localhost:5003 full-coredump \
- exec ${VPP_LITE_CONF}/vpp2.config } \
- api-trace { on } api-segment {prefix xtr2}
-
- sleep 2
- ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat
- ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat
+ # generate config files
+ ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD}
+
+ start_vpp 5002 vpp1
+ start_vpp 5003 vpp2
+
+ echo "* Selected configuration method: $CFG_METHOD"
+ if [ "$CFG_METHOD" == "cli" ] ; then
+ echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
+ echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
+ elif [ "$CFG_METHOD" == "vat" ] ; then
+ sleep 2
+ ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
+ ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
+ else
+ echo "=== WARNING:"
+ echo "=== Invalid configuration method selected!"
+ echo "=== To resolve this set env variable CFG_METHOD to vat or cli."
+ echo "==="
+ fi
if [ "$1" != "no_odl" ] ; then
post_curl "add-mapping" ${ODL_CONFIG_FILE1}
ip addr add 6.0.3.100/24 dev odl1
ethtool --offload odl1 rx off tx off
- #ip addr add 6.0.3.100/24 dev odl2
- #ethtool --offload odl2 rx off tx off
+ # generate config files
+ ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD}
- # start vpp1 and vpp2 in separate chroot
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp1.log cli-listen \
- localhost:5002 full-coredump \
- exec ${VPP_LITE_CONF}/vpp1.config } \
- api-trace { on } api-segment {prefix xtr1}
+ start_vpp 5002 vpp1
+ start_vpp 5003 vpp2
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp2.log cli-listen \
- localhost:5003 full-coredump \
- exec ${VPP_LITE_CONF}/vpp2.config } \
- api-trace { on } api-segment {prefix xtr2}
+ echo "* Selected configuration method: $CFG_METHOD"
+ if [ "$CFG_METHOD" == "cli" ] ; then
+ echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
+ echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
+ elif [ "$CFG_METHOD" == "vat" ] ; then
+ sleep 2
+ ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
+ ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
+ else
+ echo "=== WARNING:"
+ echo "=== Invalid configuration method selected!"
+ echo "=== To resolve this set env variable CFG_METHOD to vat or cli."
+ echo "==="
+ fi
}
ip addr add 6:0:3::100/64 dev odl
ethtool --offload odl rx off tx off
- # start vpp1 and vpp2 in separate chroot
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp1.log cli-listen \
- localhost:5002 full-coredump \
- exec ${VPP_LITE_CONF}/vpp1.config } \
- api-trace { on } api-segment {prefix xtr1}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp2.log cli-listen \
- localhost:5003 full-coredump \
- exec ${VPP_LITE_CONF}/vpp2.config } \
- api-trace { on } api-segment {prefix xtr2}
-
- sleep 2
- ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat
- ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat
+ # generate config files
+ ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD}
+
+ start_vpp 5002 vpp1
+ start_vpp 5003 vpp2
+
+ echo "* Selected configuration method: $CFG_METHOD"
+ if [ "$CFG_METHOD" == "cli" ] ; then
+ echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
+ echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
+ elif [ "$CFG_METHOD" == "vat" ] ; then
+ sleep 2
+ ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
+ ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
+ else
+ echo "=== WARNING:"
+ echo "=== Invalid configuration method selected!"
+ echo "=== To resolve this set env variable CFG_METHOD to vat or cli."
+ echo "==="
+ fi
if [ "$1" != "no_odl" ] ; then
post_curl "add-mapping" ${ODL_CONFIG_FILE1}
ip addr add 6:0:3::100/64 dev odl
ethtool --offload odl rx off tx off
- # start vpp1 and vpp2 in separate chroot
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp1.log cli-listen \
- localhost:5002 full-coredump \
- exec ${VPP_LITE_CONF}/vpp1.config } \
- api-trace { on } api-segment {prefix xtr1}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp2.log cli-listen \
- localhost:5003 full-coredump \
- exec ${VPP_LITE_CONF}/vpp2.config } \
- api-trace { on } api-segment {prefix xtr2}
-
- sleep 2
- ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat
- ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat
+ # generate config files
+ ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD}
+
+ start_vpp 5002 vpp1
+ start_vpp 5003 vpp2
+
+ echo "* Selected configuration method: $CFG_METHOD"
+ if [ "$CFG_METHOD" == "cli" ] ; then
+ echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
+ echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
+ elif [ "$CFG_METHOD" == "vat" ] ; then
+ sleep 2
+ ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
+ ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
+ else
+ echo "=== WARNING:"
+ echo "=== Invalid configuration method selected!"
+ echo "=== To resolve this set env variable CFG_METHOD to vat or cli."
+ echo "==="
+ fi
if [ "$1" != "no_odl" ] ; then
post_curl "add-mapping" ${ODL_CONFIG_FILE1}
ip addr add 6:0:3::100/64 dev odl
ethtool --offload odl rx off tx off
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp1.log cli-listen \
- localhost:5002 full-coredump \
- exec ${VPP_LITE_CONF}/vpp1.config } \
- api-trace { on } api-segment {prefix xtr1}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp2.log cli-listen \
- localhost:5003 full-coredump \
- exec ${VPP_LITE_CONF}/vpp2.config } \
- api-trace { on } api-segment {prefix xtr2}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/rtr.log cli-listen \
- localhost:5004 full-coredump \
- exec ${VPP_LITE_CONF}/rtr.config } \
- api-trace { on } api-segment {prefix rtr}
-
- sleep 2
- ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat
- ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat
- ${VPP_API_TEST} chroot prefix rtr script in ${VPP_LITE_CONF}/vpp3.vat
+ # generate config files
+ ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD}
+
+ start_vpp 5002 vpp1
+ start_vpp 5003 vpp2
+ start_vpp 5004 vpp3
+
+ echo "* Selected configuration method: $CFG_METHOD"
+ if [ "$CFG_METHOD" == "cli" ] ; then
+ echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
+ echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
+ echo "exec ${VPP_LITE_CONF}/vpp3.cli" | nc 0 5004
+ elif [ "$CFG_METHOD" == "vat" ] ; then
+ sleep 2
+ ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
+ ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
+ ${VPP_API_TEST} chroot prefix vpp3 script in ${VPP_LITE_CONF}/vpp3.vat
+ else
+ echo "=== WARNING:"
+ echo "=== Invalid configuration method selected!"
+ echo "=== To resolve this set env variable CFG_METHOD to vat or cli."
+ echo "==="
+ fi
post_curl "add-mapping" ${ODL_CONFIG_FILE1}
post_curl "add-mapping" ${ODL_CONFIG_FILE2}
ip addr add 6:0:5::100/64 dev odl_vpp2
ethtool --offload odl_vpp2 rx off tx off
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp1.log cli-listen \
- localhost:5002 full-coredump \
- exec ${VPP_LITE_CONF}/vpp1.config } \
- api-trace { on } api-segment {prefix xtr1}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp2.log cli-listen \
- localhost:5003 full-coredump \
- exec ${VPP_LITE_CONF}/vpp2.config } \
- api-trace { on } api-segment {prefix xtr2}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/rtr.log cli-listen \
- localhost:5004 full-coredump \
- exec ${VPP_LITE_CONF}/rtr.config } \
- api-trace { on } api-segment {prefix rtr}
-
- sleep 2
- ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat
- ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat
- ${VPP_API_TEST} chroot prefix rtr script in ${VPP_LITE_CONF}/vpp3.vat
-
+ # generate config files
+ ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD}
+
+ start_vpp 5002 vpp1
+ start_vpp 5003 vpp2
+ start_vpp 5004 vpp3
+
+ echo "* Selected configuration method: $CFG_METHOD"
+ if [ "$CFG_METHOD" == "cli" ] ; then
+ echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
+ echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
+ echo "exec ${VPP_LITE_CONF}/vpp3.cli" | nc 0 5004
+ elif [ "$CFG_METHOD" == "vat" ] ; then
+ sleep 2
+ ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
+ ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
+ ${VPP_API_TEST} chroot prefix vpp3 script in ${VPP_LITE_CONF}/vpp3.vat
+ else
+ echo "=== WARNING:"
+ echo "=== Invalid configuration method selected!"
+ echo "=== To resolve this set env variable CFG_METHOD to vat or cli."
+ echo "==="
+ fi
post_curl "add-mapping" ${ODL_CONFIG_FILE1}
post_curl "add-mapping" ${ODL_CONFIG_FILE2}
}
ip addr add 6:0:5::100/64 dev odl_vpp2
ethtool --offload odl_vpp2 rx off tx off
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp1.log cli-listen \
- localhost:5002 full-coredump \
- exec ${VPP_LITE_CONF}/vpp1.config } \
- api-trace { on } api-segment {prefix xtr1}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp2.log cli-listen \
- localhost:5003 full-coredump \
- exec ${VPP_LITE_CONF}/vpp2.config } \
- api-trace { on } api-segment {prefix xtr2}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/rtr.log cli-listen \
- localhost:5004 full-coredump \
- exec ${VPP_LITE_CONF}/rtr.config } \
- api-trace { on } api-segment {prefix rtr}
-
- sleep 2
- ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat
- ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat
- ${VPP_API_TEST} chroot prefix rtr script in ${VPP_LITE_CONF}/vpp3.vat
-
+ # generate config files
+ ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD}
+
+ start_vpp 5002 vpp1
+ start_vpp 5003 vpp2
+ start_vpp 5004 vpp3
+
+ echo "* Selected configuration method: $CFG_METHOD"
+ if [ "$CFG_METHOD" == "cli" ] ; then
+ echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
+ echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
+ echo "exec ${VPP_LITE_CONF}/vpp3.cli" | nc 0 5004
+ elif [ "$CFG_METHOD" == "vat" ] ; then
+ sleep 2
+ ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
+ ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
+ ${VPP_API_TEST} chroot prefix vpp3 script in ${VPP_LITE_CONF}/vpp3.vat
+ else
+ echo "=== WARNING:"
+ echo "=== Invalid configuration method selected!"
+ echo "=== To resolve this set env variable CFG_METHOD to vat or cli."
+ echo "==="
+ fi
post_curl "add-mapping" ${ODL_CONFIG_FILE1}
post_curl "add-mapping" ${ODL_CONFIG_FILE2}
post_curl "add-mapping" ${ODL_CONFIG_FILE3}
ip addr add 6:0:5::100/64 dev odl_vpp2
ethtool --offload odl_vpp2 rx off tx off
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp1.log cli-listen \
- localhost:5002 full-coredump \
- exec ${VPP_LITE_CONF}/vpp1.config } \
- api-trace { on } api-segment {prefix xtr1}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp2.log cli-listen \
- localhost:5003 full-coredump \
- exec ${VPP_LITE_CONF}/vpp2.config } \
- api-trace { on } api-segment {prefix xtr2}
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/rtr.log cli-listen \
- localhost:5004 full-coredump \
- exec ${VPP_LITE_CONF}/rtr.config } \
- api-trace { on } api-segment {prefix rtr}
-
- sleep 2
- ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat
- ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat
- ${VPP_API_TEST} chroot prefix rtr script in ${VPP_LITE_CONF}/vpp3.vat
-
+ # generate config files
+ ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD}
+
+ start_vpp 5002 vpp1
+ start_vpp 5003 vpp2
+ start_vpp 5004 vpp3
+
+ echo "* Selected configuration method: $CFG_METHOD"
+ if [ "$CFG_METHOD" == "cli" ] ; then
+ echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
+ echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
+ echo "exec ${VPP_LITE_CONF}/vpp3.cli" | nc 0 5004
+ elif [ "$CFG_METHOD" == "vat" ] ; then
+ sleep 2
+ ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
+ ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
+ ${VPP_API_TEST} chroot prefix vpp3 script in ${VPP_LITE_CONF}/vpp3.vat
+ else
+ echo "=== WARNING:"
+ echo "=== Invalid configuration method selected!"
+ echo "=== To resolve this set env variable CFG_METHOD to vat or cli."
+ echo "==="
+ fi
post_curl "add-mapping" ${ODL_CONFIG_FILE1}
post_curl "add-mapping" ${ODL_CONFIG_FILE2}
}
ip addr add 6:0:3::100/64 dev odl
ethtool --offload odl rx off tx off
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp1.log cli-listen \
- localhost:5002 full-coredump \
- exec ${VPP_LITE_CONF}/vpp1.config } \
- api-trace { on } api-segment { prefix xtr1 }
-
- ${VPP_LITE_BIN} \
- unix { log /tmp/vpp2.log cli-listen \
- localhost:5003 full-coredump \
- exec ${VPP_LITE_CONF}/vpp2.config } \
- api-trace { on } api-segment { prefix xtr2 }
-
- sleep 2
- ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat
- ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat
+ # generate config files
+ ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD}
+
+ start_vpp 5002 vpp1
+ start_vpp 5003 vpp2
+
+ echo "* Selected configuration method: $CFG_METHOD"
+ if [ "$CFG_METHOD" == "cli" ] ; then
+ echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
+ echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
+ elif [ "$CFG_METHOD" == "vat" ] ; then
+ sleep 2
+ ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
+ ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
+ else
+ echo "=== WARNING:"
+ echo "=== Invalid configuration method selected!"
+ echo "=== To resolve this set env variable CFG_METHOD to vat or cli."
+ echo "==="
+ fi
post_curl "add-mapping" ${ODL_CONFIG_FILE1}
post_curl "add-mapping" ${ODL_CONFIG_FILE2}
Code Review / one.git / commitdiff