-${BGP_BMP_DIR} ${CURDIR}/../variables/bgpfunctional/bmp_basic/filled_structure
-${BGP_BMP_FEAT_DIR} ${CURDIR}/../variables/bgpfunctional/bmp_basic/empty_structure
-${BGP_RIB_URI} ${OPERATIONAL_API}/bgp-rib:bgp-rib/rib/example-bgp-rib
-${BGP_TOPOLOGY_URI} ${OPERATIONAL_TOPO_API}/topology/example-ipv4-topology
-${VAR_BASE_BGP} ${CURDIR}/../variables/bgpfunctional
-${RIB_NAME} example-bgp-rib
-${OLD_AS_PATH} \n"as-path": {},
-${NEW_AS_PATH} ${EMPTY}
-&{APP_PEER} IP=${ODL_SYSTEM_IP} BGP_RIB=${RIB_NAME}
-${NEW_IPV4_ROUTES_LINE} ${EMPTY}
-${OLD_IPV4_ROUTES_LINE} \n"bgp-inet:ipv4-routes": {},
+${BGP_BMP_DIR} ${CURDIR}/../variables/bgpfunctional/bmp_basic/filled_structure
+${BGP_BMP_FEAT_DIR} ${CURDIR}/../variables/bgpfunctional/bmp_basic/empty_structure
+${BGP_RIB_URI} bgp-rib:bgp-rib/rib=example-bgp-rib
+${BGP_TOPOLOGY_URI} ${TOPOLOGY_URL}=example-ipv4-topology
+${VAR_BASE_BGP} ${CURDIR}/../variables/bgpfunctional
+${RIB_NAME} example-bgp-rib
+&{APP_PEER} IP=${ODL_SYSTEM_IP} BGP_RIB=${RIB_NAME}