From d4464a39149e2d71e625e46dee70678980ad164a Mon Sep 17 00:00:00 2001
From: pmikus <peter.mikus@protonmail.ch>
Date: Thu, 15 Dec 2022 10:20:29 +0000
Subject: feat(core): DNV decommission

- Static content will be removed separately

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I0992e941e1c24552837eaf7e8d3f6564b3cb21c8
---
 resources/libraries/bash/function/common.sh | 34 -----------------------------
 resources/libraries/python/Constants.py     |  7 ------
 2 files changed, 41 deletions(-)

(limited to 'resources')

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index b1677c39ae..a383063c82 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -471,14 +471,6 @@ function get_test_code () {
             NODENESS="3n"
             FLAVOR="icx"
             ;;
-        *"2n-dnv"*)
-            NODENESS="2n"
-            FLAVOR="dnv"
-            ;;
-        *"3n-dnv"*)
-            NODENESS="3n"
-            FLAVOR="dnv"
-            ;;
         *"3n-snr"*)
             NODENESS="3n"
             FLAVOR="snr"
@@ -858,9 +850,6 @@ function select_tags () {
 
     # Select default NIC tag.
     case "${TEST_CODE}" in
-        *"3n-dnv"* | *"2n-dnv"*)
-            default_nic="nic_intel-x553"
-            ;;
         *"3n-snr"*)
             default_nic="nic_intel-e822cq"
             ;;
@@ -890,7 +879,6 @@ function select_tags () {
     awk_nics_sub_cmd+='gsub("x710","10ge2p1x710");'
     awk_nics_sub_cmd+='gsub("xl710","40ge2p1xl710");'
     awk_nics_sub_cmd+='gsub("x520-da2","10ge2p1x520");'
-    awk_nics_sub_cmd+='gsub("x553","10ge2p1x553");'
     awk_nics_sub_cmd+='gsub("cx556a","100ge2p1cx556a");'
     awk_nics_sub_cmd+='gsub("e810cq","100ge2p1e810cq");'
     awk_nics_sub_cmd+='gsub("vic1227","10ge2p1vic1227");'
@@ -994,23 +982,9 @@ function select_tags () {
         *"2n-zn2"*)
             test_tag_array+=("!ipsechw")
             ;;
-        *"2n-dnv"*)
-            test_tag_array+=("!memif")
-            test_tag_array+=("!srv6_proxy")
-            test_tag_array+=("!vhost")
-            test_tag_array+=("!vts")
-            test_tag_array+=("!drv_avf")
-            ;;
         *"2n-tx2"* | *"3n-alt"*)
             test_tag_array+=("!ipsechw")
             ;;
-        *"3n-dnv"*)
-            test_tag_array+=("!memif")
-            test_tag_array+=("!srv6_proxy")
-            test_tag_array+=("!vhost")
-            test_tag_array+=("!vts")
-            test_tag_array+=("!drv_avf")
-            ;;
         *"3n-snr"*)
             ;;
         *"3n-tsh"*)
@@ -1117,14 +1091,6 @@ function select_topology () {
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_icx*.yaml )
             TOPOLOGIES_TAGS="2_node_*_link_topo"
             ;;
-        "2n_dnv")
-            TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_dnv*.yaml )
-            TOPOLOGIES_TAGS="2_node_single_link_topo"
-            ;;
-        "3n_dnv")
-            TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_dnv*.yaml )
-            TOPOLOGIES_TAGS="3_node_single_link_topo"
-            ;;
         "3n_snr")
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_snr*.yaml )
             TOPOLOGIES_TAGS="3_node_single_link_topo"
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index fa18a5b4a2..0ae92f68ac 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -307,7 +307,6 @@ class Constants:
     # Mapping from NIC name to its bps limit.
     NIC_NAME_TO_BPS_LIMIT = {
         u"Intel-X520-DA2": 10000000000,
-        u"Intel-X553": 10000000000,
         u"Intel-X710": 10000000000,
         u"Intel-XL710": 24500000000,
         u"Intel-XXV710": 24500000000,
@@ -322,7 +321,6 @@ class Constants:
     # Mapping from NIC name to its pps limit.
     NIC_NAME_TO_PPS_LIMIT = {
         u"Intel-X520-DA2": 14880952,
-        u"Intel-X553": 14880952,
         u"Intel-X710": 14880952,
         u"Intel-XL710": 18750000,
         u"Intel-XXV710": 18750000,
@@ -337,7 +335,6 @@ class Constants:
     # Suite file names use codes for NICs.
     NIC_NAME_TO_CODE = {
         u"Intel-X520-DA2": u"10ge2p1x520",
-        u"Intel-X553": u"10ge2p1x553",
         u"Intel-X710": u"10ge2p1x710",
         u"Intel-XL710": u"40ge2p1xl710",
         u"Intel-XXV710": u"25ge2p1xxv710",
@@ -351,7 +348,6 @@ class Constants:
     # Shortened lowercase NIC model name, useful for presentation.
     NIC_CODE_TO_SHORT_NAME = {
         u"10ge2p1x520": u"x520",
-        u"10ge2p1x553": u"x553",
         u"10ge2p1x710": u"x710",
         u"40ge2p1xl710": u"xl710",
         u"25ge2p1xxv710": u"xxv710",
@@ -365,7 +361,6 @@ class Constants:
     # Not each driver is supported by each NIC.
     NIC_NAME_TO_DRIVER = {
         u"Intel-X520-DA2": [u"vfio-pci", u"af_xdp"],
-        u"Intel-X553": [u"vfio-pci", u"af_xdp"],
         u"Intel-X710": [u"vfio-pci", u"avf", u"af_xdp"],
         u"Intel-XL710": [u"vfio-pci", u"avf", u"af_xdp"],
         u"Intel-XXV710": [u"vfio-pci", u"avf", u"af_xdp"],
@@ -411,7 +406,6 @@ class Constants:
     # Not each driver is supported by each NIC.
     DPDK_NIC_NAME_TO_DRIVER = {
         u"Intel-X520-DA2": [u"vfio-pci"],
-        u"Intel-X553": [u"vfio-pci"],
         u"Intel-X710": [u"vfio-pci"],
         u"Intel-XL710": [u"vfio-pci"],
         u"Intel-XXV710": [u"vfio-pci"],
@@ -447,7 +441,6 @@ class Constants:
 
     # TODO CSIT-1481: Crypto HW should be read from topology file instead.
     NIC_NAME_TO_CRYPTO_HW = {
-        u"Intel-X553": u"HW_C3xxx",
         u"Intel-E822CQ": u"HW_C4xxx",
         u"Intel-X710": u"HW_DH895xcc",
         u"Intel-XL710": u"HW_DH895xcc",
-- 
cgit 1.2.3-korg