Remove hardcoded default route in cfg01-day01 image
To get actual default route, need to remove the hardcoded one
Change-Id: Iccd87d90712059724af59ecd928cb949681b991e
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data-cfg01.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data-cfg01.yaml
index 8a53b87..b375527 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data-cfg01.yaml
@@ -36,6 +36,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/underlay--user-data-cfg01.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/underlay--user-data-cfg01.yaml
index 8bf0c77..50a253b 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/underlay--user-data-cfg01.yaml
@@ -36,6 +36,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay--user-data-cfg01.yaml b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay--user-data-cfg01.yaml
index 2fcf441..c2b42d3 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay--user-data-cfg01.yaml
@@ -36,6 +36,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml
index e4d144b..9934e7a 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml
@@ -36,6 +36,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/k8s-ha-calico/underlay--user-data-cfg01.yaml b/tcp_tests/templates/k8s-ha-calico/underlay--user-data-cfg01.yaml
index e0bdeda..1a6d136 100644
--- a/tcp_tests/templates/k8s-ha-calico/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/k8s-ha-calico/underlay--user-data-cfg01.yaml
@@ -33,8 +33,10 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
+ - sudo ifdown ens4
- sudo ifup ens4
# Create swap
diff --git a/tcp_tests/templates/k8s-ha-contrail/underlay--user-data-cfg01.yaml b/tcp_tests/templates/k8s-ha-contrail/underlay--user-data-cfg01.yaml
index 95c970d..af0bf27 100644
--- a/tcp_tests/templates/k8s-ha-contrail/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/k8s-ha-contrail/underlay--user-data-cfg01.yaml
@@ -33,8 +33,11 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
+ - sudo ifdown ens4
+ - sudo ifdown ens5
- sudo ifup ens4
- sudo ifup ens5
diff --git a/tcp_tests/templates/mcp-ocata-local-repo-dvr/underlay--user-data-cfg01.yaml b/tcp_tests/templates/mcp-ocata-local-repo-dvr/underlay--user-data-cfg01.yaml
index 9fb7110..6f03dca 100644
--- a/tcp_tests/templates/mcp-ocata-local-repo-dvr/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/mcp-ocata-local-repo-dvr/underlay--user-data-cfg01.yaml
@@ -36,6 +36,7 @@
- echo "supersede domain-name-servers $DNS_IP" >> /etc/dhcp/dhclient.conf
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay--user-data-cfg01.yaml b/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay--user-data-cfg01.yaml
index 96d9128..fb1e5f6 100644
--- a/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown eth0
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup eth0
# Create swap
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ceph-offline/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp-ocata-ceph-offline/underlay--user-data-cfg01.yaml
index 9fb7110..6f03dca 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ceph-offline/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ceph-offline/underlay--user-data-cfg01.yaml
@@ -36,6 +36,7 @@
- echo "supersede domain-name-servers $DNS_IP" >> /etc/dhcp/dhclient.conf
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay--user-data-cfg01.yaml
index 268db92..0507edf 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/underlay--user-data-cfg01.yaml
index 268db92..0507edf 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay--user-data-cfg01.yaml
index 268db92..0507edf 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/underlay--user-data-cfg01.yaml
index 268db92..0507edf 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr/underlay--user-data-cfg01.yaml
index 268db92..0507edf 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/virtual-mcp-pike-ovs-ceph/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp-pike-ovs-ceph/underlay--user-data-cfg01.yaml
index 268db92..0507edf 100644
--- a/tcp_tests/templates/virtual-mcp-pike-ovs-ceph/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-ovs-ceph/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/virtual-mcp-pike-ovs/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp-pike-ovs/underlay--user-data-cfg01.yaml
index 268db92..0507edf 100644
--- a/tcp_tests/templates/virtual-mcp-pike-ovs/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-ovs/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/virtual-mcp11-dvr/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp11-dvr/underlay--user-data-cfg01.yaml
index 268db92..0507edf 100644
--- a/tcp_tests/templates/virtual-mcp11-dvr/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp11-dvr/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/virtual-mcp11-k8s-calico-minimal/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp11-k8s-calico-minimal/underlay--user-data-cfg01.yaml
index e0bdeda..1a6d136 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-calico-minimal/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-calico-minimal/underlay--user-data-cfg01.yaml
@@ -33,8 +33,10 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
+ - sudo ifdown ens4
- sudo ifup ens4
# Create swap
diff --git a/tcp_tests/templates/virtual-mcp11-k8s-calico/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp11-k8s-calico/underlay--user-data-cfg01.yaml
index e0bdeda..1a6d136 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-calico/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-calico/underlay--user-data-cfg01.yaml
@@ -33,8 +33,10 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
+ - sudo ifdown ens4
- sudo ifup ens4
# Create swap
diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data-cfg01.yaml
index 95c970d..af0bf27 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data-cfg01.yaml
@@ -33,8 +33,11 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
+ - sudo ifdown ens4
+ - sudo ifdown ens5
- sudo ifup ens4
- sudo ifup ens5
diff --git a/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay--user-data-cfg01.yaml
index 268db92..0507edf 100644
--- a/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/virtual-mcp11-ovs/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp11-ovs/underlay--user-data-cfg01.yaml
index 268db92..0507edf 100644
--- a/tcp_tests/templates/virtual-mcp11-ovs/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp11-ovs/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
diff --git a/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay--user-data-cfg01.yaml
index 268db92..0507edf 100644
--- a/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay--user-data-cfg01.yaml
@@ -33,6 +33,7 @@
# Prepare network connection
- sudo ifdown ens3
+ - sudo ip r d default || true # remove existing default route to get it from dhcp
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}