IPv6: add regexp for IP addresses and URL schemas 75/56975/3
authorValentina Krasnobaeva <valentina.krasnobaeva@6wind.com>
Fri, 12 May 2017 12:33:41 +0000 (14:33 +0200)
committerJamo Luhrsen <jluhrsen@redhat.com>
Fri, 12 May 2017 22:08:35 +0000 (22:08 +0000)
Add ${IP_REGEX}, ${IP6_REGEX} and also regexp to describe url schemas
for routers, fibEntries, vpn-interfaces, neutron-vpn-portip-port-data
object configs.

Change-Id: If80ebcaf0dc018de493aea0b9c81ecb461e188aa
Signed-off-by: Valentina Krasnobaeva <valentina.krasnobaeva@6wind.com>
csit/variables/netvirt/Variables.robot

index b977af2b787592dc61d81475208ccf173d3a4d88..96419122a84ddc9c5a74e0b443a0f30b5af42cfc 100644 (file)
@@ -14,6 +14,8 @@ ${ROUTERS}        ROUTER_1
 ${RESP_CODE}      200
 ${RESP_ERROR_CODE}    400
 ${MAC_REGEX}      ([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})
+${IP_REGEX}       (([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])
+${IP6_REGEX}      (2001:([0-9A-Fa-f]{0,4}:){1,6}([0-9A-Fa-f]{1,4}))
 ${PING_REGEXP}    , 0% packet loss
 ${NO_PING_REGEXP}    , 100% packet loss
 # Values passed for ARP_Learning
@@ -50,6 +52,10 @@ ${INTERVAL_31000}    {"tunnel-monitor-interval":{"interval":31000}}
 ${NETWORK_URL}    ${CONFIG_API}/neutron:neutron/networks/
 ${SUBNETWORK_URL}    ${CONFIG_API}/neutron:neutron/subnets/
 ${PORT_URL}       ${CONFIG_API}/neutron:neutron/ports/
+${ROUTER_URL}     ${CONFIG_API}/neutron:neutron/routers/
+${FIB_ENTRY_URL}    ${CONFIG_API}/odl-fib:fibEntries/
+${VPN_IFACES_URL}    ${CONFIG_API}/l3vpn:vpn-interfaces/
+${VPN_PORT_DATA_URL}    ${CONFIG_API}/neutronvpn:neutron-vpn-portip-port-data/
 ${TUNNEL_MONITOR_URL}    ${OPERATIONAL_API}/itm-config:tunnel-monitor-params/
 ${MONITOR_INTERVAL_URL}    ${OPERATIONAL_API}/itm-config:tunnel-monitor-interval/
 ${TUNNEL_TRANSPORTZONE}    ${CONFIG_API}/itm:transport-zones