FIX: Interface up handling

- Increase timeout when trying to check interface (this is useful if
there are multiple interfaces and dump command take more than
TIMEOUT/NR_IF which is happening quite often).
- Reverse the order of applying MTU and interface UP to try to prevent
API overload during interface initialization phase.

Change-Id: I4e8623963d15b3c0d202172b4c58c43a972bb9cb
Signed-off-by: Peter Mikus <pmikus@cisco.com>
(cherry picked from commit 584345da4f7330f7517e5defd894b4995c2b57b0)

6 files changed, 40 insertions, 40 deletions

diff --git a/topologies/available/lf_2n_skx_testbed21.yaml b/topologies/available/lf_2n_skx_testbed21.yaml
index 317938d1e2..5eba0397e7 100644
--- a/topologies/available/lf_2n_skx_testbed21.yaml
+++ b/topologies/available/lf_2n_skx_testbed21.yaml
@@ -23,7 +23,7 @@ nodes:
         ip4_address: "172.16.10.2"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s4-t21-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ab:71"
@@ -31,7 +31,7 @@ nodes:
         ip4_address: "172.16.20.2"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s4-t21-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ab:72"
@@ -71,7 +71,7 @@ nodes:
         ip4_address: "172.16.70.2"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port8:
         # s4-t21-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:b1:99"
@@ -79,7 +79,7 @@ nodes:
         ip4_address: "172.16.70.1"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port9:
         # s4-t21-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:b1:9a"
@@ -117,7 +117,7 @@ nodes:
         ip4_address: "172.16.10.1"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s3-t21-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ad:89"
@@ -125,7 +125,7 @@ nodes:
         ip4_address: "172.16.20.1"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s3-t21-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ad:8a"
diff --git a/topologies/available/lf_2n_skx_testbed22.yaml b/topologies/available/lf_2n_skx_testbed22.yaml
index d2e49a1686..f048e52486 100644
--- a/topologies/available/lf_2n_skx_testbed22.yaml
+++ b/topologies/available/lf_2n_skx_testbed22.yaml
@@ -23,7 +23,7 @@ nodes:
         ip4_address: "172.16.10.2"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s6-t22-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ab:99"
@@ -31,7 +31,7 @@ nodes:
         ip4_address: "172.16.20.2"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s6-t22-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ab:9a"
@@ -71,7 +71,7 @@ nodes:
         ip4_address: "172.16.70.2"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port8:
         # s6-t22-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ab:99"
@@ -79,7 +79,7 @@ nodes:
         ip4_address: "172.16.70.1"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port9:
         # s6-t22-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ab:9a"
@@ -117,7 +117,7 @@ nodes:
         ip4_address: "172.16.10.1"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s5-t22-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:af:a9"
@@ -125,7 +125,7 @@ nodes:
         ip4_address: "172.16.20.1"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s5-t22-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:af:aa"
diff --git a/topologies/available/lf_2n_skx_testbed23.yaml b/topologies/available/lf_2n_skx_testbed23.yaml
index 892e9bf7f0..b62ccc9cf2 100644
--- a/topologies/available/lf_2n_skx_testbed23.yaml
+++ b/topologies/available/lf_2n_skx_testbed23.yaml
@@ -23,7 +23,7 @@ nodes:
         ip4_address: "172.16.10.2"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s8-t23-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:b1:39"
@@ -31,7 +31,7 @@ nodes:
         ip4_address: "172.16.20.2"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s8-t23-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:b1:3a"
@@ -71,7 +71,7 @@ nodes:
         ip4_address: "172.16.70.2"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port8:
         # s8-t23-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ab:21"
@@ -79,7 +79,7 @@ nodes:
         ip4_address: "172.16.70.1"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port9:
         # s8-t23-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ab:22"
@@ -117,7 +117,7 @@ nodes:
         ip4_address: "172.16.10.1"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s7-t23-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ae:31"
@@ -125,7 +125,7 @@ nodes:
         ip4_address: "172.16.20.1"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s7-t23-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ae:32"
diff --git a/topologies/available/lf_2n_skx_testbed24.yaml b/topologies/available/lf_2n_skx_testbed24.yaml
index e73f99db0e..78483c3676 100644
--- a/topologies/available/lf_2n_skx_testbed24.yaml
+++ b/topologies/available/lf_2n_skx_testbed24.yaml
@@ -23,7 +23,7 @@ nodes:
         ip4_address: "172.16.10.2"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s10-t24-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:b1:89"
@@ -31,7 +31,7 @@ nodes:
         ip4_address: "172.16.20.2"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s10-t24-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:b1:8a"
@@ -71,7 +71,7 @@ nodes:
         ip4_address: "172.16.70.2"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port8:
         # s10-t24-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ae:41"
@@ -79,7 +79,7 @@ nodes:
         ip4_address: "172.16.70.1"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port9:
         # s10-t24-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ae:42"
@@ -117,7 +117,7 @@ nodes:
         ip4_address: "172.16.10.1"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s9-t24-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ad:81"
@@ -125,7 +125,7 @@ nodes:
         ip4_address: "172.16.20.1"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s9-t24-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ad:82"
diff --git a/topologies/available/lf_3n_skx_testbed31.yaml b/topologies/available/lf_3n_skx_testbed31.yaml
index c4a8ef1e60..3706a3baeb 100644
--- a/topologies/available/lf_3n_skx_testbed31.yaml
+++ b/topologies/available/lf_3n_skx_testbed31.yaml
@@ -23,7 +23,7 @@ nodes:
         ip4_address: "172.16.10.2"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s13-t31-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:af:59"
@@ -31,7 +31,7 @@ nodes:
         ip4_address: "172.16.20.2"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s13-t31-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:af:5a"
@@ -71,7 +71,7 @@ nodes:
         ip4_address: "172.16.70.2"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port8:
         # s13-t31-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ad:31"
@@ -79,7 +79,7 @@ nodes:
         ip4_address: "172.16.70.1"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port9:
         # s13-t31-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ad:32"
@@ -117,7 +117,7 @@ nodes:
         ip4_address: "172.16.10.1"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s11-t31-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:af:39"
@@ -125,7 +125,7 @@ nodes:
         ip4_address: "172.16.120.1"
         driver: i40e
         link: link21
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s11-t31-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:af:3a"
@@ -179,7 +179,7 @@ nodes:
         ip4_address: "172.16.20.1"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s12-t31-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:aa:a9"
@@ -187,7 +187,7 @@ nodes:
         ip4_address: "172.16.120.2"
         driver: i40e
         link: link21
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s12-t31-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:aa:aa"
diff --git a/topologies/available/lf_3n_skx_testbed32.yaml b/topologies/available/lf_3n_skx_testbed32.yaml
index 807a084a96..bfb38fa4a2 100644
--- a/topologies/available/lf_3n_skx_testbed32.yaml
+++ b/topologies/available/lf_3n_skx_testbed32.yaml
@@ -23,7 +23,7 @@ nodes:
         ip4_address: "172.16.10.2"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s13-t31-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:af:09"
@@ -31,7 +31,7 @@ nodes:
         ip4_address: "172.16.20.2"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s13-t31-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:af:0a"
@@ -71,7 +71,7 @@ nodes:
         ip4_address: "172.16.70.2"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port8:
         # s13-t31-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ab:e1"
@@ -79,7 +79,7 @@ nodes:
         ip4_address: "172.16.70.1"
         driver: i40e
         link: link7
-        model: Intel-XL710
+        model: Intel-X710
       port9:
         # s13-t31-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ab:e2"
@@ -117,7 +117,7 @@ nodes:
         ip4_address: "172.16.10.1"
         driver: i40e
         link: link1
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s14-t32-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ae:61"
@@ -125,7 +125,7 @@ nodes:
         ip4_address: "172.16.120.1"
         driver: i40e
         link: link21
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s14-t32-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ae:62"
@@ -179,7 +179,7 @@ nodes:
         ip4_address: "172.16.20.1"
         driver: i40e
         link: link2
-        model: Intel-XL710
+        model: Intel-X710
       port2:
         # s15-t32-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ae:c1"
@@ -187,7 +187,7 @@ nodes:
         ip4_address: "172.16.120.2"
         driver: i40e
         link: link21
-        model: Intel-XL710
+        model: Intel-X710
       port3:
         # s15-t32-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:a8:ae:c2"