ci: use veth instead of dummy to fix vrrp

Author: msherman64

testing/configs/base.yml

@@ -1,8 +1,7 @@
 # config for CI
 
-ci_bridge_name: "fake_br"
-ci_api_name: "dummy1"
-ci_neutron_name: "dummy2"
+ci_api_name: "fake_br"
+ci_neutron_name: "dummy1"
 
 ci_api_ip: "172.18.200.10/24"
 ci_api_vip: "172.18.200.254"

testing/setup_ciab.sh

@@ -18,7 +18,6 @@ test_config="${1}"
 
 # set ip addresses and ifaces
 ./testing/setup_ifaces.sh \
-    $(yq '.ci_bridge_name' $test_config) \
     $(yq '.ci_api_name' $test_config) \
     $(yq '.ci_neutron_name' $test_config) \
     $(yq '.ci_api_ip' $test_config)

testing/setup_ifaces.sh

@@ -6,22 +6,19 @@
 set -x
 
 function setup_ifaces {
-    local bridge_name=$1
-    local api_name=$2
-    local neutron_name=$3
-    local api_ip=$4
+    local api_name=$1
+    local neutron_name=$2
+    local api_ip=$3
 
-    sudo ip link add $bridge_name type bridge
-    sudo ip link set $bridge_name up
-
-    sudo ip link add $api_name type dummy
-    sudo ip link set $api_name master $bridge_name
+    sudo ip link add $api_name type bridge
     sudo ip link set $api_name up
     sudo ip addr add $api_ip dev $api_name
 
-    sudo ip link add $neutron_name type dummy
-    sudo ip link set $neutron_name master $bridge_name
-    sudo ip link set $neutron_name up
+    sudo ip link add kolla_veth type veth peer name $neutron_name
+    sudo ip link set kolla_veth up
+    sudo ip link set kolla_veth master $api_name
+
+    sudo ip link set $neutron_name up   
 }
 
-setup_ifaces $1 $2 $3 $4
+setup_ifaces $1 $2 $3