fix(core): Topology models

Signed-off-by: Peter Mikus <[email protected]>
Change-Id: Ie32c378ac5c2f694d9aa541c5f7c61b4bcbb5453

diff --git a/topologies/available/lf_2n_emr_testbed25.yaml b/topologies/available/lf_2n_emr_testbed25.yaml
index 1c789d3..8f498f7 100644 (file)
--- a/topologies/available/lf_2n_emr_testbed25.yaml
+++ b/topologies/available/lf_2n_emr_testbed25.yaml
@@ -9,7 +9,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    model: Intel-Sapphirerapids
+    model: Intel-Emeraldrapids
     host: 10.30.51.41
     arch: x86_64
     port: 6001

diff --git a/topologies/available/lf_2n_emr_testbed26.yaml b/topologies/available/lf_2n_emr_testbed26.yaml
index 2898bb0..a7855d6 100644 (file)
--- a/topologies/available/lf_2n_emr_testbed26.yaml
+++ b/topologies/available/lf_2n_emr_testbed26.yaml
@@ -9,7 +9,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    model: Intel-Sapphirerapids
+    model: Intel-Emeraldrapids
     host: 10.30.51.43
     arch: x86_64
     port: 6001

diff --git a/topologies/available/lf_2n_zn2_testbed210.yaml b/topologies/available/lf_2n_zn2_testbed210.yaml
index 36296ae..d446205 100644 (file)
--- a/topologies/available/lf_2n_zn2_testbed210.yaml
+++ b/topologies/available/lf_2n_zn2_testbed210.yaml
@@ -9,7 +9,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    model: Amd-Epyc
+    model: Amd-EpycZen2
     host: 10.30.51.61
     arch: x86_64
     port: 6001
@@ -82,7 +82,7 @@ nodes:
         model: Intel-X710
   DUT1:
     type: DUT
-    model: Amd-Epyc
+    model: Amd-EpycZen2
     host: 10.30.51.60
     arch: x86_64
     port: 22

diff --git a/topologies/available/lf_3n_oct_testbed215.yaml b/topologies/available/lf_3n_oct_testbed215.yaml
index cc9445f..41c1164 100644 (file)
--- a/topologies/available/lf_3n_oct_testbed215.yaml
+++ b/topologies/available/lf_3n_oct_testbed215.yaml
@@ -34,7 +34,7 @@ nodes:
         model: Intel-E810CQ
   DUT1:
     type: DUT
-    model: Marvel-Octeon-CN10K
+    model: Marvel-OcteonCN10K
     host: 10.30.51.95
     arch: aarch64
     port: 22
@@ -68,7 +68,7 @@ nodes:
         model: Cavium-A063-100G
   DUT2:
     type: DUT
-    model: Marvel-Octeon-CN10K
+    model: Marvel-OcteonCN10K
     host: 10.30.51.96
     arch: aarch64
     port: 22

diff --git a/topologies/available/vpp_device.template b/topologies/available/vpp_device.template
index f8e2045..6b9fb7d 100644 (file)
--- a/topologies/available/vpp_device.template
+++ b/topologies/available/vpp_device.template
@@ -8,6 +8,7 @@ metadata:
 nodes:
   TG:
     type: TG
+    model: Virtual
     host: ${CSIT_TG_HOST}
     arch: ${CSIT_TG_ARCH}
     port: ${CSIT_TG_PORT}
@@ -17,6 +18,7 @@ nodes:
 ${CSIT_TG_INTERFACES}
   DUT1:
     type: DUT
+    model: Virtual
     host: ${CSIT_DUT1_HOST}
     arch: ${CSIT_DUT1_ARCH}
     port: ${CSIT_DUT1_PORT}