From 69f2bb83aa1140a117ac79e71e4b51453b3cf11d Mon Sep 17 00:00:00 2001 From: Tomas Markovic Date: Thu, 24 May 2018 17:44:16 +0200 Subject: [PATCH] Add evpn pmsi-tunnel tests Pmsi-tunnel functionality is not covered in current evpn test suite, so adding that. Also some refactoring. Change-Id: Icfc77dddeec511ebeedb3f87b692fe24c7550e5f Signed-off-by: Tomas Markovic --- csit/libraries/BgpRpcClient.py | 2 +- .../bgpfunct/030_bgp_functional_evpn.robot | 198 ++++++++++-------- .../{ => empty_routes}/empty_routes.json | 0 .../announce_pmsi_bidir_pim_tree.hex | 1 + .../pmsi_bidir_pim_tree.json | 37 ++++ .../pmsi_bidir_pim_tree.xml | 31 +++ .../withdraw_pmsi_bidir_pim_tree.hex | 1 + .../announce_pmsi_ingress_replication.hex | 1 + .../pmsi_ingress_replication.json | 36 ++++ .../pmsi_ingress_replication.xml | 31 +++ .../withdraw_pmsi_ingress_replication.hex | 1 + .../announce_pmsi_mldp_mp2mp_lsp.hex | 1 + .../pmsi_mldp_mp2mp_lsp.json | 37 ++++ .../pmsi_mldp_mp2mp_lsp.xml | 32 +++ .../withdraw_pmsi_mldp_mp2mp_lsp.hex | 1 + .../announce_pmsi_mldp_p2mp_lsp.hex | 1 + .../pmsi_mldp_p2mp_lsp.json | 43 ++++ .../pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.xml | 36 ++++ .../withdraw_pmsi_mldp_p2mp_lsp.hex | 1 + .../announce_pmsi_pim_sm_tree.hex | 1 + .../pmsi_pim_sm_tree/pmsi_pim_sm_tree.json | 37 ++++ .../pmsi_pim_sm_tree/pmsi_pim_sm_tree.xml | 32 +++ .../withdraw_pmsi_pim_sm_tree.hex | 1 + .../announce_pmsi_pim_ssm_tree.hex | 1 + .../pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.json | 37 ++++ .../pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.xml | 32 +++ .../withdraw_pmsi_pim_ssm_tree.hex | 1 + .../announce_pmsi_rsvp_te_p2mp_lsp.hex | 1 + .../pmsi_rsvp_te_p2mp_lsp.json | 38 ++++ .../pmsi_rsvp_te_p2mp_lsp.xml | 33 +++ .../withdraw_pmsi_rsvp_te_p2mp_lsp.hex | 1 + .../announce_route_es_arb.hex | 0 .../{ => route_es_arb}/route_es_arb.json | 0 .../{ => route_es_arb}/route_es_arb.xml | 0 .../withdraw_route_es_arb.hex | 0 .../announce_route_es_as.hex | 0 .../{ => route_es_as}/route_es_as.json | 0 .../{ => route_es_as}/route_es_as.xml | 0 .../withdraw_route_es_as.hex | 0 .../announce_route_es_lacp.hex | 0 .../{ => route_es_lacp}/route_es_lacp.json | 0 .../{ => route_es_lacp}/route_es_lacp.xml | 0 .../withdraw_route_es_lacp.hex | 0 .../announce_route_es_lan.hex | 0 .../{ => route_es_lan}/route_es_lan.json | 0 .../{ => route_es_lan}/route_es_lan.xml | 0 .../withdraw_route_es_lan.hex | 0 .../announce_route_es_mac.hex | 0 .../{ => route_es_mac}/route_es_mac.json | 0 .../{ => route_es_mac}/route_es_mac.xml | 0 .../withdraw_route_es_mac.hex | 0 .../announce_route_es_rou.hex | 0 .../{ => route_es_rou}/route_es_rou.json | 0 .../{ => route_es_rou}/route_es_rou.xml | 0 .../withdraw_route_es_rou.hex | 0 .../announce_route_eth_arb.hex | 0 .../{ => route_eth_arb}/route_eth_arb.json | 0 .../{ => route_eth_arb}/route_eth_arb.xml | 0 .../withdraw_route_eth_arb.hex | 0 .../announce_route_eth_as.hex | 0 .../{ => route_eth_as}/route_eth_as.json | 0 .../{ => route_eth_as}/route_eth_as.xml | 0 .../withdraw_route_eth_as.hex | 0 .../announce_route_eth_lacp.hex | 0 .../{ => route_eth_lacp}/route_eth_lacp.json | 0 .../{ => route_eth_lacp}/route_eth_lacp.xml | 0 .../withdraw_route_eth_lacp.hex | 0 .../announce_route_eth_lacp_extdef.hex | 0 .../route_eth_lacp_extdef.json | 0 .../route_eth_lacp_extdef.xml | 0 .../withdraw_route_eth_lacp_extdef.hex | 0 .../announce_route_eth_lacp_extesilab.hex | 0 .../route_eth_lacp_extesilab.json | 0 .../route_eth_lacp_extesilab.xml | 0 .../withdraw_route_eth_lacp_extesilab.hex | 0 .../announce_route_eth_lacp_extesr.hex | 0 .../route_eth_lacp_extesr.json | 0 .../route_eth_lacp_extesr.xml | 0 .../withdraw_route_eth_lacp_extesr.hex | 0 .../announce_route_eth_lacp_extl2.hex | 0 .../route_eth_lacp_extl2.json | 0 .../route_eth_lacp_extl2.xml | 0 .../withdraw_route_eth_lacp_extl2.hex | 0 .../announce_route_eth_lacp_extmac.hex | 0 .../route_eth_lacp_extmac.json | 0 .../route_eth_lacp_extmac.xml | 0 .../withdraw_route_eth_lacp_extmac.hex | 0 .../announce_route_eth_lan.hex | 0 .../{ => route_eth_lan}/route_eth_lan.json | 0 .../{ => route_eth_lan}/route_eth_lan.xml | 0 .../withdraw_route_eth_lan.hex | 0 .../announce_route_eth_mac.hex | 0 .../{ => route_eth_mac}/route_eth_mac.json | 0 .../{ => route_eth_mac}/route_eth_mac.xml | 0 .../withdraw_route_eth_mac.hex | 0 .../announce_route_eth_rou.hex | 0 .../{ => route_eth_rou}/route_eth_rou.json | 0 .../{ => route_eth_rou}/route_eth_rou.xml | 0 .../withdraw_route_eth_rou.hex | 0 .../announce_route_inc_arb.hex | 0 .../{ => route_inc_arb}/route_inc_arb.json | 0 .../{ => route_inc_arb}/route_inc_arb.xml | 0 .../withdraw_route_inc_arb.hex | 0 .../announce_route_inc_as.hex | 0 .../{ => route_inc_as}/route_inc_as.json | 0 .../{ => route_inc_as}/route_inc_as.xml | 0 .../withdraw_route_inc_as.hex | 0 .../announce_route_inc_lacp.hex | 0 .../{ => route_inc_lacp}/route_inc_lacp.json | 0 .../{ => route_inc_lacp}/route_inc_lacp.xml | 0 .../withdraw_route_inc_lacp.hex | 0 .../announce_route_inc_lan.hex | 0 .../{ => route_inc_lan}/route_inc_lan.json | 0 .../{ => route_inc_lan}/route_inc_lan.xml | 0 .../withdraw_route_inc_lan.hex | 0 .../announce_route_inc_mac.hex | 0 .../{ => route_inc_mac}/route_inc_mac.json | 0 .../{ => route_inc_mac}/route_inc_mac.xml | 0 .../withdraw_route_inc_mac.hex | 0 .../announce_route_inc_rou.hex | 0 .../{ => route_inc_rou}/route_inc_rou.json | 0 .../{ => route_inc_rou}/route_inc_rou.xml | 0 .../withdraw_route_inc_rou.hex | 0 .../announce_route_mac_arb.hex | 0 .../{ => route_mac_arb}/route_mac_arb.json | 0 .../{ => route_mac_arb}/route_mac_arb.xml | 0 .../withdraw_route_mac_arb.hex | 0 .../announce_route_mac_as.hex | 0 .../{ => route_mac_as}/route_mac_as.json | 0 .../{ => route_mac_as}/route_mac_as.xml | 0 .../withdraw_route_mac_as.hex | 0 .../announce_route_mac_lacp.hex | 0 .../{ => route_mac_lacp}/route_mac_lacp.json | 0 .../{ => route_mac_lacp}/route_mac_lacp.xml | 0 .../withdraw_route_mac_lacp.hex | 0 .../announce_route_mac_lan.hex | 0 .../{ => route_mac_lan}/route_mac_lan.json | 0 .../{ => route_mac_lan}/route_mac_lan.xml | 0 .../withdraw_route_mac_lan.hex | 0 .../announce_route_mac_mac.hex | 0 .../{ => route_mac_mac}/route_mac_mac.json | 0 .../{ => route_mac_mac}/route_mac_mac.xml | 0 .../withdraw_route_mac_mac.hex | 0 .../announce_route_mac_rou.hex | 0 .../{ => route_mac_rou}/route_mac_rou.json | 0 .../{ => route_mac_rou}/route_mac_rou.xml | 0 .../withdraw_route_mac_rou.hex | 0 147 files changed, 617 insertions(+), 89 deletions(-) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => empty_routes}/empty_routes.json (100%) create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/announce_pmsi_bidir_pim_tree.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.json create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.xml create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/withdraw_pmsi_bidir_pim_tree.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/announce_pmsi_ingress_replication.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.json create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.xml create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/withdraw_pmsi_ingress_replication.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/announce_pmsi_mldp_mp2mp_lsp.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.json create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.xml create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/withdraw_pmsi_mldp_mp2mp_lsp.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/announce_pmsi_mldp_p2mp_lsp.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.json create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.xml create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/withdraw_pmsi_mldp_p2mp_lsp.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/announce_pmsi_pim_sm_tree.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.json create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.xml create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/withdraw_pmsi_pim_sm_tree.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/announce_pmsi_pim_ssm_tree.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.json create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.xml create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/withdraw_pmsi_pim_ssm_tree.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/announce_pmsi_rsvp_te_p2mp_lsp.hex create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.json create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.xml create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/withdraw_pmsi_rsvp_te_p2mp_lsp.hex rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_arb}/announce_route_es_arb.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_arb}/route_es_arb.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_arb}/route_es_arb.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_arb}/withdraw_route_es_arb.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_as}/announce_route_es_as.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_as}/route_es_as.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_as}/route_es_as.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_as}/withdraw_route_es_as.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_lacp}/announce_route_es_lacp.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_lacp}/route_es_lacp.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_lacp}/route_es_lacp.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_lacp}/withdraw_route_es_lacp.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_lan}/announce_route_es_lan.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_lan}/route_es_lan.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_lan}/route_es_lan.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_lan}/withdraw_route_es_lan.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_mac}/announce_route_es_mac.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_mac}/route_es_mac.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_mac}/route_es_mac.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_mac}/withdraw_route_es_mac.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_rou}/announce_route_es_rou.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_rou}/route_es_rou.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_rou}/route_es_rou.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_es_rou}/withdraw_route_es_rou.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_arb}/announce_route_eth_arb.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_arb}/route_eth_arb.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_arb}/route_eth_arb.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_arb}/withdraw_route_eth_arb.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_as}/announce_route_eth_as.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_as}/route_eth_as.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_as}/route_eth_as.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_as}/withdraw_route_eth_as.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp}/announce_route_eth_lacp.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp}/route_eth_lacp.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp}/route_eth_lacp.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp}/withdraw_route_eth_lacp.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extdef}/announce_route_eth_lacp_extdef.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extdef}/route_eth_lacp_extdef.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extdef}/route_eth_lacp_extdef.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extdef}/withdraw_route_eth_lacp_extdef.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extesilab}/announce_route_eth_lacp_extesilab.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extesilab}/route_eth_lacp_extesilab.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extesilab}/route_eth_lacp_extesilab.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extesilab}/withdraw_route_eth_lacp_extesilab.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extesr}/announce_route_eth_lacp_extesr.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extesr}/route_eth_lacp_extesr.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extesr}/route_eth_lacp_extesr.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extesr}/withdraw_route_eth_lacp_extesr.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extl2}/announce_route_eth_lacp_extl2.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extl2}/route_eth_lacp_extl2.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extl2}/route_eth_lacp_extl2.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extl2}/withdraw_route_eth_lacp_extl2.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extmac}/announce_route_eth_lacp_extmac.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extmac}/route_eth_lacp_extmac.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extmac}/route_eth_lacp_extmac.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lacp_extmac}/withdraw_route_eth_lacp_extmac.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lan}/announce_route_eth_lan.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lan}/route_eth_lan.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lan}/route_eth_lan.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_lan}/withdraw_route_eth_lan.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_mac}/announce_route_eth_mac.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_mac}/route_eth_mac.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_mac}/route_eth_mac.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_mac}/withdraw_route_eth_mac.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_rou}/announce_route_eth_rou.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_rou}/route_eth_rou.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_rou}/route_eth_rou.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_eth_rou}/withdraw_route_eth_rou.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_arb}/announce_route_inc_arb.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_arb}/route_inc_arb.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_arb}/route_inc_arb.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_arb}/withdraw_route_inc_arb.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_as}/announce_route_inc_as.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_as}/route_inc_as.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_as}/route_inc_as.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_as}/withdraw_route_inc_as.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_lacp}/announce_route_inc_lacp.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_lacp}/route_inc_lacp.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_lacp}/route_inc_lacp.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_lacp}/withdraw_route_inc_lacp.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_lan}/announce_route_inc_lan.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_lan}/route_inc_lan.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_lan}/route_inc_lan.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_lan}/withdraw_route_inc_lan.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_mac}/announce_route_inc_mac.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_mac}/route_inc_mac.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_mac}/route_inc_mac.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_mac}/withdraw_route_inc_mac.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_rou}/announce_route_inc_rou.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_rou}/route_inc_rou.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_rou}/route_inc_rou.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_inc_rou}/withdraw_route_inc_rou.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_arb}/announce_route_mac_arb.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_arb}/route_mac_arb.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_arb}/route_mac_arb.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_arb}/withdraw_route_mac_arb.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_as}/announce_route_mac_as.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_as}/route_mac_as.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_as}/route_mac_as.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_as}/withdraw_route_mac_as.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_lacp}/announce_route_mac_lacp.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_lacp}/route_mac_lacp.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_lacp}/route_mac_lacp.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_lacp}/withdraw_route_mac_lacp.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_lan}/announce_route_mac_lan.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_lan}/route_mac_lan.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_lan}/route_mac_lan.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_lan}/withdraw_route_mac_lan.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_mac}/announce_route_mac_mac.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_mac}/route_mac_mac.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_mac}/route_mac_mac.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_mac}/withdraw_route_mac_mac.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_rou}/announce_route_mac_rou.hex (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_rou}/route_mac_rou.json (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_rou}/route_mac_rou.xml (100%) rename csit/variables/bgpfunctional/l2vpn_evpn/{ => route_mac_rou}/withdraw_route_mac_rou.hex (100%) diff --git a/csit/libraries/BgpRpcClient.py b/csit/libraries/BgpRpcClient.py index c744fabdfb..b42c43a49c 100644 --- a/csit/libraries/BgpRpcClient.py +++ b/csit/libraries/BgpRpcClient.py @@ -86,7 +86,7 @@ class BgpRpcClient(object): def play_send(self, hexstring): """Sends given hex data, already encoded bgp update message is expected.""" - return self.proxy.send(hexstring) + return self.proxy.send(hexstring.rstrip()) def play_get(self, what='update'): """Gets the last received (update) mesage as hex string.""" diff --git a/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot b/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot index d0aefaad8f..a6cdefc207 100644 --- a/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot +++ b/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot @@ -16,29 +16,26 @@ Suite Setup Start_Suite Suite Teardown Stop_Suite Test Setup Run Keywords SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing ... AND Verify Test Preconditions +Test Template Odl_To_Play_Template Library RequestsLibrary Library SSHLibrary Library String -Resource ${CURDIR}/../../../variables/Variables.robot -Resource ${CURDIR}/../../../libraries/SetupUtils.robot -Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot -Library ${CURDIR}/../../../libraries/BgpRpcClient.py ${TOOLS_SYSTEM_IP} -Resource ${CURDIR}/../../../libraries/BGPcliKeywords.robot -Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot -Resource ${CURDIR}/../../../libraries/SSHKeywords.robot -Resource ${CURDIR}/../../../libraries/CompareStream.robot +Library ../../../libraries/BgpRpcClient.py ${TOOLS_SYSTEM_IP} +Resource ../../../libraries/BGPcliKeywords.robot +Resource ../../../libraries/BGPSpeaker.robot +Resource ../../../libraries/CompareStream.robot +Resource ../../../libraries/SetupUtils.robot +Resource ../../../libraries/SSHKeywords.robot +Resource ../../../libraries/TemplatedRequests.robot +Resource ../../../variables/Variables.robot *** Variables *** ${HOLDTIME} 180 -${DEVICE_NAME} controller-config -${BGP_PEER_NAME} example-bgp-peer -${RIB_INSTANCE} example-bgp-rib -${PROTOCOL_OPENCONFIG} ${RIB_INSTANCE} -${APP_PEER_NAME} example-bgp-peer-app -${BGP_VARIABLES_FOLDER} ${CURDIR}/../../../variables/bgpfunctional +${RIB_NAME} example-bgp-rib +${BGP_DIR} ${CURDIR}/../../../variables/bgpfunctional ${DEFAUTL_RPC_CFG} exa.cfg ${CONFIG_SESSION} config-session -${EVPN_VARIABLES_DIR} ${CURDIR}/../../../variables/bgpfunctional/l2vpn_evpn +${EVPN_DIR} ${CURDIR}/../../../variables/bgpfunctional/l2vpn_evpn ${BGP_TOOL_LOG_LEVEL} debug ${PLAY_SCRIPT} ${CURDIR}/../../../../tools/fastbgp/play.py ${SS} ${SPACE}${SPACE}${SPACE}${SPACE} @@ -49,24 +46,25 @@ ${PATH_ID_XML} ${SS}0${\n} Configure_App_Peer [Documentation] Configures bgp application peer. Openconfig is used for carbon and above. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing - &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} APP_PEER_NAME=${APP_PEER_NAME} RIB_INSTANCE_NAME=${RIB_INSTANCE} APP_PEER_ID=${ODL_SYSTEM_IP} BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} - ... IP=${ODL_SYSTEM_IP} - TemplatedRequests.Put_As_Xml_Templated ${BGP_VARIABLES_FOLDER}/app_peer mapping=${mapping} session=${CONFIG_SESSION} + [Template] NONE + &{mapping} BuiltIn.Create_Dictionary BGP_RIB_OPENCONFIG=${RIB_NAME} IP=${ODL_SYSTEM_IP} + TemplatedRequests.Put_As_Xml_Templated ${BGP_DIR}/app_peer mapping=${mapping} session=${CONFIG_SESSION} Reconfigure_ODL_To_Accept_Connection [Documentation] Configures BGP peer module with initiate-connection set to false. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing - &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} BGP_NAME=${BGP_PEER_NAME} IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} - ... INITIATE=false RIB_INSTANCE_NAME=${RIB_INSTANCE} BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} PASSIVE_MODE=true - TemplatedRequests.Put_As_Xml_Templated ${BGP_VARIABLES_FOLDER}/bgp_peer mapping=${mapping} session=${CONFIG_SESSION} + [Template] NONE + &{mapping} BuiltIn.Create_Dictionary IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} INITIATE=false BGP_RIB_OPENCONFIG=${RIB_NAME} + ... PASSIVE_MODE=true + TemplatedRequests.Put_As_Xml_Templated ${BGP_DIR}/bgp_peer mapping=${mapping} session=${CONFIG_SESSION} Start_Bgp_Peer [Documentation] Start Python speaker to connect to ODL. We need to do WUKS until odl really starts to accept incomming bgp connection. The failure happens if the incomming connection comes too quickly after configuring the peer in the previous test case. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + [Template] NONE BuiltIn.Wait_Until_Keyword_Succeeds 3x 1s Start Bgp Peer Odl_To_Play_route_es_arb - [Template] Odl_To_Play_Template route_es_arb Play_To_Odl_route_es_arb @@ -74,7 +72,6 @@ Play_To_Odl_route_es_arb route_es_arb Odl_To_Play_route_es_as - [Template] Odl_To_Play_Template route_es_as Play_To_Odl_route_es_as @@ -82,7 +79,6 @@ Play_To_Odl_route_es_as route_es_as Odl_To_Play_route_es_lacp - [Template] Odl_To_Play_Template route_es_lacp Play_To_Odl_route_es_lacp @@ -90,7 +86,6 @@ Play_To_Odl_route_es_lacp route_es_lacp Odl_To_Play_route_es_lan - [Template] Odl_To_Play_Template route_es_lan Play_To_Odl_route_es_lan @@ -98,7 +93,6 @@ Play_To_Odl_route_es_lan route_es_lan Odl_To_Play_route_es_mac - [Template] Odl_To_Play_Template route_es_mac Play_To_Odl_route_es_mac @@ -106,7 +100,6 @@ Play_To_Odl_route_es_mac route_es_mac Odl_To_Play_route_es_rou - [Template] Odl_To_Play_Template route_es_rou Play_To_Odl_route_es_rou @@ -114,7 +107,6 @@ Play_To_Odl_route_es_rou route_es_rou Odl_To_Play_route_eth_arb - [Template] Odl_To_Play_Template route_eth_arb Play_To_Odl_route_eth_arb @@ -122,7 +114,6 @@ Play_To_Odl_route_eth_arb route_eth_arb Odl_To_Play_route_eth_as - [Template] Odl_To_Play_Template route_eth_as Play_To_Odl_route_eth_as @@ -130,7 +121,6 @@ Play_To_Odl_route_eth_as route_eth_as Odl_To_Play_route_eth_lacp - [Template] Odl_To_Play_Template route_eth_lacp Play_To_Odl_route_eth_lacp @@ -138,7 +128,6 @@ Play_To_Odl_route_eth_lacp route_eth_lacp Odl_To_Play_route_eth_lacp_extdef - [Template] Odl_To_Play_Template route_eth_lacp_extdef Play_To_Odl_route_eth_lacp_extdef @@ -146,7 +135,6 @@ Play_To_Odl_route_eth_lacp_extdef route_eth_lacp_extdef Odl_To_Play_route_eth_lacp_extesilab - [Template] Odl_To_Play_Template route_eth_lacp_extesilab Play_To_Odl_route_eth_lacp_extesilab @@ -154,7 +142,6 @@ Play_To_Odl_route_eth_lacp_extesilab route_eth_lacp_extesilab Odl_To_Play_route_eth_lacp_extesr - [Template] Odl_To_Play_Template route_eth_lacp_extesr Play_To_Odl_route_eth_lacp_extesr @@ -162,7 +149,6 @@ Play_To_Odl_route_eth_lacp_extesr route_eth_lacp_extesr Odl_To_Play_route_eth_lacp_extl2 - [Template] Odl_To_Play_Template route_eth_lacp_extl2 Play_To_Odl_route_eth_lacp_extl2 @@ -170,7 +156,6 @@ Play_To_Odl_route_eth_lacp_extl2 route_eth_lacp_extl2 Odl_To_Play_route_eth_lacp_extmac - [Template] Odl_To_Play_Template route_eth_lacp_extmac Play_To_Odl_route_eth_lacp_extmac @@ -178,7 +163,6 @@ Play_To_Odl_route_eth_lacp_extmac route_eth_lacp_extmac Odl_To_Play_route_eth_lan - [Template] Odl_To_Play_Template route_eth_lan Play_To_Odl_route_eth_lan @@ -186,7 +170,6 @@ Play_To_Odl_route_eth_lan route_eth_lan Odl_To_Play_route_eth_mac - [Template] Odl_To_Play_Template route_eth_mac Play_To_Odl_route_eth_mac @@ -194,7 +177,6 @@ Play_To_Odl_route_eth_mac route_eth_mac Odl_To_Play_route_eth_rou - [Template] Odl_To_Play_Template route_eth_rou Play_To_Odl_route_eth_rou @@ -202,7 +184,6 @@ Play_To_Odl_route_eth_rou route_eth_rou Odl_To_Play_route_inc_arb - [Template] Odl_To_Play_Template route_inc_arb Play_To_Odl_route_inc_arb @@ -210,7 +191,6 @@ Play_To_Odl_route_inc_arb route_inc_arb Odl_To_Play_route_inc_as - [Template] Odl_To_Play_Template route_inc_as Play_To_Odl_route_inc_as @@ -218,7 +198,6 @@ Play_To_Odl_route_inc_as route_inc_as Odl_To_Play_route_inc_lacp - [Template] Odl_To_Play_Template route_inc_lacp Play_To_Odl_route_inc_lacp @@ -226,7 +205,6 @@ Play_To_Odl_route_inc_lacp route_inc_lacp Odl_To_Play_route_inc_lan - [Template] Odl_To_Play_Template route_inc_lan Play_To_Odl_route_inc_lan @@ -234,7 +212,6 @@ Play_To_Odl_route_inc_lan route_inc_lan Odl_To_Play_route_inc_mac - [Template] Odl_To_Play_Template route_inc_mac Play_To_Odl_route_inc_mac @@ -242,7 +219,6 @@ Play_To_Odl_route_inc_mac route_inc_mac Odl_To_Play_route_inc_rou - [Template] Odl_To_Play_Template route_inc_rou Play_To_Odl_route_inc_rou @@ -250,7 +226,6 @@ Play_To_Odl_route_inc_rou route_inc_rou Odl_To_Play_route_mac_arb - [Template] Odl_To_Play_Template route_mac_arb Play_To_Odl_route_mac_arb @@ -258,7 +233,6 @@ Play_To_Odl_route_mac_arb route_mac_arb Odl_To_Play_route_mac_as - [Template] Odl_To_Play_Template route_mac_as Play_To_Odl_route_mac_as @@ -266,7 +240,6 @@ Play_To_Odl_route_mac_as route_mac_as Odl_To_Play_route_mac_lacp - [Template] Odl_To_Play_Template route_mac_lacp Play_To_Odl_route_mac_lacp @@ -274,7 +247,6 @@ Play_To_Odl_route_mac_lacp route_mac_lacp Odl_To_Play_route_mac_lan - [Template] Odl_To_Play_Template route_mac_lan Play_To_Odl_route_mac_lan @@ -282,7 +254,6 @@ Play_To_Odl_route_mac_lan route_mac_lan Odl_To_Play_route_mac_mac - [Template] Odl_To_Play_Template route_mac_mac Play_To_Odl_route_mac_mac @@ -290,29 +261,82 @@ Play_To_Odl_route_mac_mac route_mac_mac Odl_To_Play_route_mac_rou - [Template] Odl_To_Play_Template route_mac_rou Play_To_Odl_route_mac_rou [Template] Play_To_Odl_Template route_mac_rou +Odl_To_Play_pmsi_rsvp_te_p2mp_lsp + [Template] None + CompareStream.Run_Keyword_If_At_Least_Fluorine Odl_To_Play_Template pmsi_rsvp_te_p2mp_lsp + +Play_To_Odl_pmsi_rsvp_te_p2mp_lsp + [Template] None + CompareStream.Run_Keyword_If_At_Least_Fluorine Play_To_Odl_Template pmsi_rsvp_te_p2mp_lsp + +Odl_To_Play_pmsi_mldp_p2mp_lsp + pmsi_mldp_p2mp_lsp + +Play_To_Odl_pmsi_mldp_p2mp_lsp + [Template] Play_To_Odl_Template + pmsi_mldp_p2mp_lsp + +Odl_To_Play_pmsi_pim_ssm_tree + pmsi_pim_ssm_tree + +Play_To_Odl_pmsi_pim_ssm_tree + [Template] Play_To_Odl_Template + pmsi_pim_ssm_tree + +Odl_To_Play_pmsi_pim_sm_tree + pmsi_pim_sm_tree + +Play_To_Odl_pmsi_pim_sm_tree + [Template] Play_To_Odl_Template + pmsi_pim_sm_tree + +Odl_To_Play_pmsi_bidir_pim_tree + pmsi_bidir_pim_tree + +Play_To_Odl_pmsi_bidir_pim_tree + [Template] Play_To_Odl_Template + pmsi_bidir_pim_tree + +Odl_To_Play_pmsi_ingress_replication + pmsi_ingress_replication + +Play_To_Odl_pmsi_ingress_replication + [Template] Play_To_Odl_Template + pmsi_ingress_replication + +Odl_To_Play_pmsi_mldp_mp2mp_lsp + pmsi_mldp_mp2mp_lsp + +Play_To_Odl_pmsi_mldp_mp2mp_lsp + [Template] Play_To_Odl_Template + pmsi_mldp_mp2mp_lsp + Kill_Talking_BGP_Speaker [Documentation] Abort the Python speaker [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + [Template] NONE BGPSpeaker.Kill_BGP_Speaker + BGPcliKeywords.Store_File_To_Workspace play.py.out evpn_play.log Delete_Bgp_Peer_Configuration [Documentation] Revert the BGP configuration to the original state: without any configured peers. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing - &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} BGP_NAME=${BGP_PEER_NAME} IP=${TOOLS_SYSTEM_IP} BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} - TemplatedRequests.Delete_Templated ${BGP_VARIABLES_FOLDER}/bgp_peer mapping=${mapping} session=${CONFIG_SESSION} + [Template] NONE + &{mapping} BuiltIn.Create_Dictionary IP=${TOOLS_SYSTEM_IP} BGP_RIB_OPENCONFIG=${RIB_NAME} + TemplatedRequests.Delete_Templated ${BGP_DIR}/bgp_peer mapping=${mapping} session=${CONFIG_SESSION} Deconfigure_App_Peer [Documentation] Revert the BGP configuration to the original state: without application peer [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing - &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} APP_PEER_NAME=${APP_PEER_NAME} IP=${ODL_SYSTEM_IP} BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} - TemplatedRequests.Delete_Templated ${BGP_VARIABLES_FOLDER}/app_peer mapping=${mapping} session=${CONFIG_SESSION} + [Template] NONE + &{mapping} BuiltIn.Create_Dictionary IP=${ODL_SYSTEM_IP} BGP_RIB_OPENCONFIG=${RIB_NAME} + TemplatedRequests.Delete_Templated ${BGP_DIR}/app_peer mapping=${mapping} session=${CONFIG_SESSION} *** Keywords *** Start_Suite @@ -324,10 +348,10 @@ Start_Suite RequestsLibrary.Create Session ${CONFIG_SESSION} http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} SSHLibrary.Put File ${PLAY_SCRIPT} . SSHKeywords.Assure_Library_Ipaddr target_dir=. - ${app_rib}= Set Variable ${ODL_SYSTEM_IP} - ${bgp_rib}= Set Variable example-bgp-rib - BuiltIn.Set_Suite_Variable ${EVPN_CONF_URL} /restconf/config/bgp-rib:application-rib/${app_rib}/tables/odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/odl-bgp-evpn:evpn-routes/ - BuiltIn.Set_Suite_Variable ${EVPN_LOC_RIB_OPER_URL} /restconf/operational/bgp-rib:bgp-rib/rib/${bgp_rib}/loc-rib/tables/odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/odl-bgp-evpn:evpn-routes + BuiltIn.Set_Suite_Variable ${EVPN_CONF_URL} /restconf/config/bgp-rib:application-rib/${ODL_SYSTEM_IP}/tables/odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/odl-bgp-evpn:evpn-routes/ + BuiltIn.Set_Suite_Variable ${EVPN_LOC_RIB} /restconf/operational/bgp-rib:bgp-rib/rib/${RIB_NAME}/loc-rib/tables/odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/odl-bgp-evpn:evpn-routes + ${EMPTY_ROUTES} = OperatingSystem.Get_File ${EVPN_DIR}/empty_routes/empty_routes.json + BuiltIn.Set_Suite_Variable ${EMPTY_ROUTES} Stop_Suite [Documentation] Suite teardown keyword @@ -341,10 +365,12 @@ Start_Bgp_Peer Odl_To_Play_Template [Arguments] ${totest} - ${data_xml}= OperatingSystem.Get_File ${EVPN_VARIABLES_DIR}/${totest}.xml - ${data_json}= OperatingSystem.Get_File ${EVPN_VARIABLES_DIR}/${totest}.json - ${announce_hex}= OperatingSystem.Get_File ${EVPN_VARIABLES_DIR}/announce_${totest}.hex - ${withdraw_hex}= OperatingSystem.Get_File ${EVPN_VARIABLES_DIR}/withdraw_${totest}.hex + ${data_xml} = OperatingSystem.Get_File ${EVPN_DIR}/${totest}/${totest}.xml + ${data_json} = OperatingSystem.Get_File ${EVPN_DIR}/${totest}/${totest}.json + ${announce_hex} = OperatingSystem.Get_File ${EVPN_DIR}/${totest}/announce_${totest}.hex + ${announce_hex} = String.Remove_String ${announce_hex} \n + ${withdraw_hex} = OperatingSystem.Get_File ${EVPN_DIR}/${totest}/withdraw_${totest}.hex + ${withdraw_hex} = String.Remove_String ${withdraw_hex} \n ${data_path_xml} CompareStream.Run_Keyword_If_Less_Than_Fluorine String.Replace_String ${data_xml} ${PATH_ID_XML} ${EMPTY} ${post_data_xml} CompareStream.Set_Variable_If_At_Least_Fluorine ${data_xml} ${data_path_xml} BuiltIn.Log ${post_data_xml} @@ -352,75 +378,71 @@ Odl_To_Play_Template BuiltIn.Log ${announce_hex} BuiltIn.Log ${withdraw_hex} BgpRpcClient.play_clean - ${resp}= RequestsLibrary.Post_Request ${CONFIG_SESSION} ${EVPN_CONF_URL} data=${post_data_xml} headers=${HEADERS_XML} + ${resp} = RequestsLibrary.Post_Request ${CONFIG_SESSION} ${EVPN_CONF_URL} data=${post_data_xml} headers=${HEADERS_XML} + BuiltIn.Log ${resp.content} BuiltIn.Should_Be_Equal_As_Numbers ${resp.status_code} 204 - ${resp}= RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_CONF_URL} headers=${HEADERS_XML} + ${resp} = RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_CONF_URL} headers=${HEADERS_XML} BuiltIn.Log ${resp.content} - ${aupdate}= BuiltIn.Wait_Until_Keyword_Succeeds 4x 2s Get_Update_Content + ${aupdate} = BuiltIn.Wait_Until_Keyword_Succeeds 4x 2s Get_Update_Content BuiltIn.Log ${aupdate} BuiltIn.Should_Be_Equal_As_Strings ${aupdate} ${announce_hex} BgpRpcClient.play_clean Remove_Configured_Routes - ${wupdate}= BuiltIn.Wait_Until_Keyword_Succeeds 4x 2s Get_Update_Content + ${wupdate} = BuiltIn.Wait_Until_Keyword_Succeeds 4x 2s Get_Update_Content BuiltIn.Log ${wupdate} BuiltIn.Should Be Equal As Strings ${wupdate} ${withdraw_hex} [Teardown] Remove_Configured_Routes Play_To_Odl_Template [Arguments] ${totest} - ${data_xml}= OperatingSystem.Get_File ${EVPN_VARIABLES_DIR}/${totest}.xml - ${data_json}= OperatingSystem.Get_File ${EVPN_VARIABLES_DIR}/${totest}.json - ${announce_hex}= OperatingSystem.Get_File ${EVPN_VARIABLES_DIR}/announce_${totest}.hex - ${withdraw_hex}= OperatingSystem.Get_File ${EVPN_VARIABLES_DIR}/withdraw_${totest}.hex - ${empty_routes}= OperatingSystem.Get_File ${EVPN_VARIABLES_DIR}/empty_routes.json + ${data_xml} = OperatingSystem.Get_File ${EVPN_DIR}/${totest}/${totest}.xml + ${data_json} = OperatingSystem.Get_File ${EVPN_DIR}/${totest}/${totest}.json + ${announce_hex} = OperatingSystem.Get_File ${EVPN_DIR}/${totest}/announce_${totest}.hex + ${withdraw_hex} = OperatingSystem.Get_File ${EVPN_DIR}/${totest}/withdraw_${totest}.hex ${data_path_json} CompareStream.Run_Keyword_If_Less_Than_Fluorine String.Replace_String ${data_json} ${PATH_ID_JSON} ${EMPTY} ${data_json_exp} CompareStream.Set_Variable_If_At_Least_Fluorine ${data_json} ${data_path_json} - BuiltIn.Set_Suite_Variable ${withdraw_hex} - BuiltIn.Set_Suite_Variable ${empty_routes} BuiltIn.Log ${data_xml} BuiltIn.Log ${data_json_exp} BuiltIn.Log ${announce_hex} BuiltIn.Log ${withdraw_hex} - BuiltIn.Log ${empty_routes} BgpRpcClient.play_clean BgpRpcClient.play_send ${announce_hex} - BuiltIn.Wait_Until_Keyword_Succeeds 4x 2s Loc_Rib_Presnece ${data_json_exp} + BuiltIn.Wait_Until_Keyword_Succeeds 4x 2s Loc_Rib_Presence ${data_json_exp} BgpRpcClient.play_send ${withdraw_hex} - BuiltIn.Wait_Until_Keyword_Succeeds 4x 2s Loc_Rib_Presnece ${empty_routes} + BuiltIn.Wait_Until_Keyword_Succeeds 4x 2s Loc_Rib_Presence ${EMPTY_ROUTES} [Teardown] Withdraw_Route_And_Verify ${withdraw_hex} Verify_Test_Preconditions - ${resp}= RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_CONF_URL} + ${resp} = RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_CONF_URL} BuiltIn.Should_Be_Equal_As_Numbers ${resp.status_code} 404 - ${empty_routes}= OperatingSystem.Get_File ${EVPN_VARIABLES_DIR}/empty_routes.json - Loc_Rib_Presnece ${empty_routes} + Loc_Rib_Presence ${EMPTY_ROUTES} Remove_Configured_Routes [Documentation] Removes the route if present. First GET is for debug purposes. - ${rsp}= RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_LOC_RIB_OPER_URL} headers=${HEADERS} + ${rsp} = RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_LOC_RIB} headers=${HEADERS} Log ${rsp.content} - ${rsp}= RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_CONF_URL} headers=${HEADERS} + ${rsp} = RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_CONF_URL} headers=${HEADERS} Log ${rsp.content} - BuiltIn.Return_From_Keyword_If "${rsp.status_code}"=="404" - ${resp}= RequestsLibrary.Delete_Request ${CONFIG_SESSION} ${EVPN_CONF_URL} + BuiltIn.Return_From_Keyword_If "${rsp.status_code}" == "404" + ${resp} = RequestsLibrary.Delete_Request ${CONFIG_SESSION} ${EVPN_CONF_URL} BuiltIn.Should_Be_Equal_As_Numbers ${resp.status_code} 200 Withdraw_Route_And_Verify [Arguments] ${withdraw_hex} [Documentation] Sends withdraw update message from exabgp and verifies route removal from odl's rib BgpRpcClient.play_send ${withdraw_hex} - BuiltIn.Wait_Until_Keyword_Succeeds 3x 2s Loc Rib Presnece ${empty_routes} + BuiltIn.Wait_Until_Keyword_Succeeds 3x 2s Loc_Rib_Presence ${EMPTY_ROUTES} Get_Update_Content [Documentation] Gets received data from odl's peer - ${resp}= RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_LOC_RIB_OPER_URL} headers=${HEADERS_XML} + ${resp} = RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_LOC_RIB} headers=${HEADERS_XML} BuiltIn.Log ${resp.content} - ${update}= BgpRpcClient.play_get + ${update} = BgpRpcClient.play_get BuiltIn.Should_Not_Be_Equal ${update} ${Empty} [Return] ${update} -Loc_Rib_Presnece +Loc_Rib_Presence [Arguments] ${exp_content} [Documentation] Verifies if loc-rib contains expected data - ${rsp}= RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_LOC_RIB_OPER_URL} headers=${HEADERS} + ${rsp} = RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_LOC_RIB} headers=${HEADERS} TemplatedRequests.Normalize_Jsons_And_Compare ${exp_content} ${rsp.content} diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/empty_routes.json b/csit/variables/bgpfunctional/l2vpn_evpn/empty_routes/empty_routes.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/empty_routes.json rename to csit/variables/bgpfunctional/l2vpn_evpn/empty_routes/empty_routes.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/announce_pmsi_bidir_pim_tree.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/announce_pmsi_bidir_pim_tree.hex new file mode 100644 index 0000000000..c7a8886614 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/announce_pmsi_bidir_pim_tree.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff005a020000004380160d010504e3802b2b2b2b0a0a0a0a4001010040020040050400000064800e2200194604c714a629000417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.json new file mode 100644 index 0000000000..57d0961a49 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.json @@ -0,0 +1,37 @@ +{ + "odl-bgp-evpn:evpn-routes": { + "evpn-route": [ + { + "route-key": "BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==", + "path-id": 0, + "route-distinguisher": "429496729:1", + "es-route": { + "orig-route-ip": "43.43.43.43", + "arbitrary": { + "arbitrary": "AAAAAAAAAAAA" + } + }, + "attributes": { + "origin": { + "value": "igp" + }, + "local-pref": { + "pref": 100 + }, + "as-path": {}, + "pmsi-tunnel": { + "leaf-information-required": true, + "mpls-label": 20024, + "bidir-pim-tree": { + "p-address": "43.43.43.43", + "p-multicast-group": "10.10.10.10" + } + }, + "ipv4-next-hop": { + "global": "199.20.166.41" + } + } + } + ] + } +} diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.xml b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.xml new file mode 100644 index 0000000000..8cd14b1150 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.xml @@ -0,0 +1,31 @@ + + BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw== + 0 + 429496729:1 + + 43.43.43.43 + + AAAAAAAAAAAA + + + + + 199.20.166.41 + + + + igp + + + 100 + + + true + 20024 + + 43.43.43.43 + 10.10.10.10 + + + + diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/withdraw_pmsi_bidir_pim_tree.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/withdraw_pmsi_bidir_pim_tree.hex new file mode 100644 index 0000000000..43aae7b271 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/withdraw_pmsi_bidir_pim_tree.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff0054020000003d80160d010504e3802b2b2b2b0a0a0a0a4001010040020040050400000064800f1c0019460417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/announce_pmsi_ingress_replication.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/announce_pmsi_ingress_replication.hex new file mode 100644 index 0000000000..596afb3ad0 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/announce_pmsi_ingress_replication.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff0056020000003f801609000604e380ac0c7b034001010040020040050400000064800e2200194604c714a629000417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.json new file mode 100644 index 0000000000..f479de594e --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.json @@ -0,0 +1,36 @@ +{ + "odl-bgp-evpn:evpn-routes": { + "evpn-route": [ + { + "route-key": "BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==", + "path-id": 0, + "route-distinguisher": "429496729:1", + "es-route": { + "orig-route-ip": "43.43.43.43", + "arbitrary": { + "arbitrary": "AAAAAAAAAAAA" + } + }, + "attributes": { + "origin": { + "value": "igp" + }, + "local-pref": { + "pref": 100 + }, + "as-path": {}, + "pmsi-tunnel": { + "leaf-information-required": false, + "mpls-label": 20024, + "ingress-replication": { + "receiving-endpoint-address": "172.12.123.3" + } + }, + "ipv4-next-hop": { + "global": "199.20.166.41" + } + } + } + ] + } +} diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.xml b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.xml new file mode 100644 index 0000000000..f4845609d2 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.xml @@ -0,0 +1,31 @@ + + + BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw== + 0 + 429496729:1 + + 43.43.43.43 + + AAAAAAAAAAAA + + + + + 199.20.166.41 + + + + igp + + + 100 + + + false + 20024 + + 172.12.123.3 + + + + diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/withdraw_pmsi_ingress_replication.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/withdraw_pmsi_ingress_replication.hex new file mode 100644 index 0000000000..984ac7302c --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/withdraw_pmsi_ingress_replication.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff00500200000039801609000604e380ac0c7b034001010040020040050400000064800f1c0019460417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/announce_pmsi_mldp_mp2mp_lsp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/announce_pmsi_mldp_mp2mp_lsp.hex new file mode 100644 index 0000000000..3131e7598e --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/announce_pmsi_mldp_mp2mp_lsp.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff005c020000004580160f000704e380010007010101010101014001010040020040050400000064800e2200194604c714a629000417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.json new file mode 100644 index 0000000000..5af9f82651 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.json @@ -0,0 +1,37 @@ +{ + "odl-bgp-evpn:evpn-routes": { + "evpn-route": [ + { + "route-key": "BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==", + "path-id": 0, + "route-distinguisher": "429496729:1", + "es-route": { + "orig-route-ip": "43.43.43.43", + "arbitrary": { + "arbitrary": "AAAAAAAAAAAA" + } + }, + "attributes": { + "origin": { + "value": "igp" + }, + "local-pref": { + "pref": 100 + }, + "as-path": {}, + "pmsi-tunnel": { + "leaf-information-required": false, + "mpls-label": 20024, + "mldp-mp2mp-lsp": { + "opaque-type": 1, + "opaque": "01:01:01:01:01:01:01" + } + }, + "ipv4-next-hop": { + "global": "199.20.166.41" + } + } + } + ] + } +} \ No newline at end of file diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.xml b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.xml new file mode 100644 index 0000000000..a9421e5c59 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.xml @@ -0,0 +1,32 @@ + + + BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw== + 0 + 429496729:1 + + 43.43.43.43 + + AAAAAAAAAAAA + + + + + 199.20.166.41 + + + + igp + + + 100 + + + false + 20024 + + 1 + 01:01:01:01:01:01:01 + + + + diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/withdraw_pmsi_mldp_mp2mp_lsp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/withdraw_pmsi_mldp_mp2mp_lsp.hex new file mode 100644 index 0000000000..3dfd8e56d6 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/withdraw_pmsi_mldp_mp2mp_lsp.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff0056020000003f80160f000704e380010007010101010101014001010040020040050400000064800f1c0019460417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/announce_pmsi_mldp_p2mp_lsp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/announce_pmsi_mldp_p2mp_lsp.hex new file mode 100644 index 0000000000..5898746889 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/announce_pmsi_mldp_p2mp_lsp.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff0066020000004f801619010204e380060001040a0a0a0a000a010007010101010101014001010040020040050400000064800e2200194604c714a629000417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.json new file mode 100644 index 0000000000..f6385150b8 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.json @@ -0,0 +1,43 @@ +{ + "odl-bgp-evpn:evpn-routes": { + "evpn-route": [ + { + "route-key": "BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==", + "path-id": 0, + "route-distinguisher": "429496729:1", + "es-route": { + "orig-route-ip": "43.43.43.43", + "arbitrary": { + "arbitrary": "AAAAAAAAAAAA" + } + }, + "attributes": { + "origin": { + "value": "igp" + }, + "local-pref": { + "pref": 100 + }, + "as-path": {}, + "pmsi-tunnel": { + "leaf-information-required": true, + "mpls-label": 20024, + "mldp-p2mp-lsp": { + "address-family": "bgp-types:ipv4-address-family", + "opaque-value": [ + { + "opaque": "01:01:01:01:01:01:01", + "opaque-type": 1 + } + ], + "root-node-address": "10.10.10.10" + } + }, + "ipv4-next-hop": { + "global": "199.20.166.41" + } + } + } + ] + } +} diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.xml b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.xml new file mode 100644 index 0000000000..fd99eb7c91 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.xml @@ -0,0 +1,36 @@ + + + BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw== + 0 + 429496729:1 + + 43.43.43.43 + + AAAAAAAAAAAA + + + + + 199.20.166.41 + + + + igp + + + 100 + + + true + 20024 + + x:ipv4-address-family + 10.10.10.10 + + 1 + 01:01:01:01:01:01:01 + + + + + diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/withdraw_pmsi_mldp_p2mp_lsp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/withdraw_pmsi_mldp_p2mp_lsp.hex new file mode 100644 index 0000000000..52334c3864 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/withdraw_pmsi_mldp_p2mp_lsp.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff00600200000049801619010204e380060001040a0a0a0a000a010007010101010101014001010040020040050400000064800f1c0019460417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/announce_pmsi_pim_sm_tree.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/announce_pmsi_pim_sm_tree.hex new file mode 100644 index 0000000000..f25b09471f --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/announce_pmsi_pim_sm_tree.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff005a020000004380160d010404e3802b2b2b2b0a0a0a0a4001010040020040050400000064800e2200194604c714a629000417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.json new file mode 100644 index 0000000000..cfb55d239f --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.json @@ -0,0 +1,37 @@ +{ + "odl-bgp-evpn:evpn-routes": { + "evpn-route": [ + { + "route-key": "BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==", + "path-id": 0, + "route-distinguisher": "429496729:1", + "es-route": { + "orig-route-ip": "43.43.43.43", + "arbitrary": { + "arbitrary": "AAAAAAAAAAAA" + } + }, + "attributes": { + "origin": { + "value": "igp" + }, + "local-pref": { + "pref": 100 + }, + "as-path": {}, + "pmsi-tunnel": { + "leaf-information-required": true, + "mpls-label": 20024, + "pim-sm-tree": { + "p-address": "43.43.43.43", + "p-multicast-group": "10.10.10.10" + } + }, + "ipv4-next-hop": { + "global": "199.20.166.41" + } + } + } + ] + } +} diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.xml b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.xml new file mode 100644 index 0000000000..54d6c9c16d --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.xml @@ -0,0 +1,32 @@ + + + BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw== + 0 + 429496729:1 + + 43.43.43.43 + + AAAAAAAAAAAA + + + + + 199.20.166.41 + + + + igp + + + 100 + + + true + 20024 + + 43.43.43.43 + 10.10.10.10 + + + + diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/withdraw_pmsi_pim_sm_tree.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/withdraw_pmsi_pim_sm_tree.hex new file mode 100644 index 0000000000..8a7c2083b4 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/withdraw_pmsi_pim_sm_tree.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff0054020000003d80160d010404e3802b2b2b2b0a0a0a0a4001010040020040050400000064800f1c0019460417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/announce_pmsi_pim_ssm_tree.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/announce_pmsi_pim_ssm_tree.hex new file mode 100644 index 0000000000..7df8120b28 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/announce_pmsi_pim_ssm_tree.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff005a020000004380160d010304e3800b0c0d0e0a0a0a0a4001010040020040050400000064800e2200194604c714a629000417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.json new file mode 100644 index 0000000000..e258b6274c --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.json @@ -0,0 +1,37 @@ +{ + "odl-bgp-evpn:evpn-routes": { + "evpn-route": [ + { + "route-key": "BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==", + "path-id": 0, + "route-distinguisher": "429496729:1", + "es-route": { + "orig-route-ip": "43.43.43.43", + "arbitrary": { + "arbitrary": "AAAAAAAAAAAA" + } + }, + "attributes": { + "origin": { + "value": "igp" + }, + "local-pref": { + "pref": 100 + }, + "as-path": {}, + "pmsi-tunnel": { + "leaf-information-required": true, + "mpls-label": 20024, + "pim-ssm-tree": { + "p-address": "11.12.13.14", + "p-multicast-group": "10.10.10.10" + } + }, + "ipv4-next-hop": { + "global": "199.20.166.41" + } + } + } + ] + } +} diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.xml b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.xml new file mode 100644 index 0000000000..fec115929c --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.xml @@ -0,0 +1,32 @@ + + + BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw== + 0 + 429496729:1 + + 43.43.43.43 + + AAAAAAAAAAAA + + + + + 199.20.166.41 + + + + igp + + + 100 + + + true + 20024 + + 11.12.13.14 + 10.10.10.10 + + + + diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/withdraw_pmsi_pim_ssm_tree.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/withdraw_pmsi_pim_ssm_tree.hex new file mode 100644 index 0000000000..f4782fb27b --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/withdraw_pmsi_pim_ssm_tree.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff0054020000003d80160d010304e3800b0c0d0e0a0a0a0a4001010040020040050400000064800f1c0019460417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/announce_pmsi_rsvp_te_p2mp_lsp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/announce_pmsi_rsvp_te_p2mp_lsp.hex new file mode 100644 index 0000000000..c2838e073e --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/announce_pmsi_rsvp_te_p2mp_lsp.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff005e0200000047801611010104e380423a35c700002b670a0a0a0a4001010040020040050400000064800e2200194604c714a629000417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.json new file mode 100644 index 0000000000..e47526609a --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.json @@ -0,0 +1,38 @@ +{ + "odl-bgp-evpn:evpn-routes": { + "evpn-route": [ + { + "route-key": "BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==", + "path-id": 0, + "route-distinguisher": "429496729:1", + "es-route": { + "orig-route-ip": "43.43.43.43", + "arbitrary": { + "arbitrary": "AAAAAAAAAAAA" + } + }, + "attributes": { + "origin": { + "value": "igp" + }, + "local-pref": { + "pref": 100 + }, + "as-path": {}, + "pmsi-tunnel": { + "leaf-information-required": true, + "mpls-label": 20024, + "rsvp-te-p2mp-lsp": { + "extended-tunnel-id": "10.10.10.10", + "p2mp-id": 1111111111, + "tunnel-id": 11111 + } + }, + "ipv4-next-hop": { + "global": "199.20.166.41" + } + } + } + ] + } +} diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.xml b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.xml new file mode 100644 index 0000000000..ebf7ce3a14 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.xml @@ -0,0 +1,33 @@ + + + BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw== + 0 + 429496729:1 + + 43.43.43.43 + + AAAAAAAAAAAA + + + + + 199.20.166.41 + + + + igp + + + 100 + + + true + 20024 + + 1111111111 + 11111 + 10.10.10.10 + + + + diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/withdraw_pmsi_rsvp_te_p2mp_lsp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/withdraw_pmsi_rsvp_te_p2mp_lsp.hex new file mode 100644 index 0000000000..a8054857f2 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/withdraw_pmsi_rsvp_te_p2mp_lsp.hex @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff00580200000041801611010104e380423a35c700002b670a0a0a0a4001010040020040050400000064800f1c0019460417000219999999000100000000000000000000202b2b2b2b diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_arb.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/announce_route_es_arb.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_arb.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/announce_route_es_arb.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/route_es_arb.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/route_es_arb.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/route_es_arb.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/route_es_arb.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_arb.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/withdraw_route_es_arb.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_arb.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/withdraw_route_es_arb.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_as.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/announce_route_es_as.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_as.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/announce_route_es_as.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/route_es_as.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/route_es_as.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/route_es_as.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/route_es_as.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_as.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/withdraw_route_es_as.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_as.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/withdraw_route_es_as.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_lacp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/announce_route_es_lacp.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_lacp.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/announce_route_es_lacp.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/route_es_lacp.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/route_es_lacp.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/route_es_lacp.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/route_es_lacp.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_lacp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/withdraw_route_es_lacp.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_lacp.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/withdraw_route_es_lacp.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_lan.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/announce_route_es_lan.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_lan.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/announce_route_es_lan.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/route_es_lan.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/route_es_lan.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/route_es_lan.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/route_es_lan.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_lan.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/withdraw_route_es_lan.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_lan.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/withdraw_route_es_lan.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_mac.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/announce_route_es_mac.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_mac.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/announce_route_es_mac.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/route_es_mac.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/route_es_mac.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/route_es_mac.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/route_es_mac.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_mac.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/withdraw_route_es_mac.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_mac.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/withdraw_route_es_mac.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_rou.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/announce_route_es_rou.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_es_rou.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/announce_route_es_rou.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/route_es_rou.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/route_es_rou.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/route_es_rou.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/route_es_rou.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_rou.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/withdraw_route_es_rou.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_es_rou.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/withdraw_route_es_rou.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_arb.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/announce_route_eth_arb.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_arb.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/announce_route_eth_arb.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/route_eth_arb.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/route_eth_arb.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/route_eth_arb.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/route_eth_arb.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_arb.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/withdraw_route_eth_arb.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_arb.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/withdraw_route_eth_arb.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_as.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/announce_route_eth_as.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_as.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/announce_route_eth_as.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/route_eth_as.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/route_eth_as.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/route_eth_as.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/route_eth_as.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_as.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/withdraw_route_eth_as.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_as.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/withdraw_route_eth_as.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/announce_route_eth_lacp.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/announce_route_eth_lacp.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/route_eth_lacp.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/route_eth_lacp.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/route_eth_lacp.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/route_eth_lacp.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/withdraw_route_eth_lacp.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/withdraw_route_eth_lacp.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp_extdef.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/announce_route_eth_lacp_extdef.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp_extdef.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/announce_route_eth_lacp_extdef.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/route_eth_lacp_extdef.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/route_eth_lacp_extdef.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/route_eth_lacp_extdef.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/route_eth_lacp_extdef.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp_extdef.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/withdraw_route_eth_lacp_extdef.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp_extdef.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/withdraw_route_eth_lacp_extdef.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp_extesilab.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/announce_route_eth_lacp_extesilab.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp_extesilab.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/announce_route_eth_lacp_extesilab.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/route_eth_lacp_extesilab.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/route_eth_lacp_extesilab.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/route_eth_lacp_extesilab.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/route_eth_lacp_extesilab.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp_extesilab.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/withdraw_route_eth_lacp_extesilab.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp_extesilab.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/withdraw_route_eth_lacp_extesilab.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp_extesr.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/announce_route_eth_lacp_extesr.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp_extesr.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/announce_route_eth_lacp_extesr.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/route_eth_lacp_extesr.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/route_eth_lacp_extesr.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/route_eth_lacp_extesr.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/route_eth_lacp_extesr.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp_extesr.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/withdraw_route_eth_lacp_extesr.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp_extesr.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/withdraw_route_eth_lacp_extesr.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp_extl2.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/announce_route_eth_lacp_extl2.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp_extl2.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/announce_route_eth_lacp_extl2.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/route_eth_lacp_extl2.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/route_eth_lacp_extl2.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/route_eth_lacp_extl2.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/route_eth_lacp_extl2.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp_extl2.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/withdraw_route_eth_lacp_extl2.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp_extl2.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/withdraw_route_eth_lacp_extl2.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp_extmac.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/announce_route_eth_lacp_extmac.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lacp_extmac.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/announce_route_eth_lacp_extmac.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/route_eth_lacp_extmac.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/route_eth_lacp_extmac.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/route_eth_lacp_extmac.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/route_eth_lacp_extmac.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp_extmac.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/withdraw_route_eth_lacp_extmac.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lacp_extmac.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/withdraw_route_eth_lacp_extmac.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lan.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/announce_route_eth_lan.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_lan.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/announce_route_eth_lan.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/route_eth_lan.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/route_eth_lan.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/route_eth_lan.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/route_eth_lan.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lan.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/withdraw_route_eth_lan.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_lan.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/withdraw_route_eth_lan.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_mac.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/announce_route_eth_mac.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_mac.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/announce_route_eth_mac.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/route_eth_mac.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/route_eth_mac.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/route_eth_mac.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/route_eth_mac.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_mac.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/withdraw_route_eth_mac.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_mac.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/withdraw_route_eth_mac.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_rou.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/announce_route_eth_rou.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_eth_rou.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/announce_route_eth_rou.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/route_eth_rou.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/route_eth_rou.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/route_eth_rou.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/route_eth_rou.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_rou.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/withdraw_route_eth_rou.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_eth_rou.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/withdraw_route_eth_rou.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_arb.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/announce_route_inc_arb.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_arb.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/announce_route_inc_arb.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/route_inc_arb.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/route_inc_arb.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/route_inc_arb.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/route_inc_arb.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_arb.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/withdraw_route_inc_arb.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_arb.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/withdraw_route_inc_arb.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_as.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/announce_route_inc_as.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_as.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/announce_route_inc_as.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/route_inc_as.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/route_inc_as.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/route_inc_as.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/route_inc_as.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_as.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/withdraw_route_inc_as.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_as.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/withdraw_route_inc_as.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_lacp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/announce_route_inc_lacp.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_lacp.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/announce_route_inc_lacp.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/route_inc_lacp.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/route_inc_lacp.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/route_inc_lacp.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/route_inc_lacp.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_lacp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/withdraw_route_inc_lacp.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_lacp.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/withdraw_route_inc_lacp.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_lan.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/announce_route_inc_lan.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_lan.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/announce_route_inc_lan.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/route_inc_lan.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/route_inc_lan.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/route_inc_lan.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/route_inc_lan.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_lan.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/withdraw_route_inc_lan.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_lan.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/withdraw_route_inc_lan.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_mac.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/announce_route_inc_mac.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_mac.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/announce_route_inc_mac.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/route_inc_mac.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/route_inc_mac.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/route_inc_mac.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/route_inc_mac.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_mac.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/withdraw_route_inc_mac.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_mac.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/withdraw_route_inc_mac.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_rou.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/announce_route_inc_rou.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_inc_rou.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/announce_route_inc_rou.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/route_inc_rou.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/route_inc_rou.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/route_inc_rou.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/route_inc_rou.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_rou.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/withdraw_route_inc_rou.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_inc_rou.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/withdraw_route_inc_rou.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_arb.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/announce_route_mac_arb.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_arb.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/announce_route_mac_arb.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/route_mac_arb.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/route_mac_arb.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/route_mac_arb.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/route_mac_arb.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_arb.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/withdraw_route_mac_arb.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_arb.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/withdraw_route_mac_arb.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_as.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/announce_route_mac_as.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_as.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/announce_route_mac_as.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/route_mac_as.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/route_mac_as.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/route_mac_as.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/route_mac_as.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_as.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/withdraw_route_mac_as.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_as.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/withdraw_route_mac_as.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_lacp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/announce_route_mac_lacp.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_lacp.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/announce_route_mac_lacp.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/route_mac_lacp.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/route_mac_lacp.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/route_mac_lacp.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/route_mac_lacp.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_lacp.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/withdraw_route_mac_lacp.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_lacp.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/withdraw_route_mac_lacp.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_lan.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/announce_route_mac_lan.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_lan.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/announce_route_mac_lan.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/route_mac_lan.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/route_mac_lan.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/route_mac_lan.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/route_mac_lan.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_lan.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/withdraw_route_mac_lan.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_lan.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/withdraw_route_mac_lan.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_mac.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/announce_route_mac_mac.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_mac.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/announce_route_mac_mac.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/route_mac_mac.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/route_mac_mac.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/route_mac_mac.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/route_mac_mac.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_mac.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/withdraw_route_mac_mac.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_mac.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/withdraw_route_mac_mac.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_rou.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/announce_route_mac_rou.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/announce_route_mac_rou.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/announce_route_mac_rou.hex diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/route_mac_rou.json similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.json rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/route_mac_rou.json diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/route_mac_rou.xml similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.xml rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/route_mac_rou.xml diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_rou.hex b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/withdraw_route_mac_rou.hex similarity index 100% rename from csit/variables/bgpfunctional/l2vpn_evpn/withdraw_route_mac_rou.hex rename to csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/withdraw_route_mac_rou.hex -- 2.36.6