[sonic_sku_create] Move tests from sonic-utilities-tests/ folder to t…

…ests/ folder (sonic-net#1222) Move all files currently in sonic-utilities-tests folder to tests folder of sonic-utilities repository Co-authored-by: Madhan Babu <[email protected]>
stepanblyschak · Nov 7, 2020 · 673f98d · 673f98d
1 parent 0d49a85
commit 673f98d
Show file tree

Hide file tree

Showing 22 changed files with 4 additions and 4 deletions.
diff --git a/scripts/sonic_sku_create.py b/scripts/sonic_sku_create.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#!/usr/bin/python
 """
 usage: sonic_sku_create.py [-h] [-v] [-f FILE] [-m [MINIGRAPH_FILE]] [-b BASE]
                            [-r] [-k HWSKU]

diff --git a/..._create_input/ACS-MSN2700/buffers.json.j2 → ..._create_input/ACS-MSN2700/buffers.json.j2 b/..._create_input/ACS-MSN2700/buffers.json.j2 → ..._create_input/ACS-MSN2700/buffers.json.j2
diff --git a/..._input/ACS-MSN2700/buffers_defaults_t0.j2 → ..._input/ACS-MSN2700/buffers_defaults_t0.j2 b/..._input/ACS-MSN2700/buffers_defaults_t0.j2 → ..._input/ACS-MSN2700/buffers_defaults_t0.j2
diff --git a/..._input/ACS-MSN2700/buffers_defaults_t1.j2 → ..._input/ACS-MSN2700/buffers_defaults_t1.j2 b/..._input/ACS-MSN2700/buffers_defaults_t1.j2 → ..._input/ACS-MSN2700/buffers_defaults_t1.j2
diff --git a/...e_input/ACS-MSN2700/pg_profile_lookup.ini → ...e_input/ACS-MSN2700/pg_profile_lookup.ini b/...e_input/ACS-MSN2700/pg_profile_lookup.ini → ...e_input/ACS-MSN2700/pg_profile_lookup.ini
diff --git a/..._create_input/ACS-MSN2700/port_config.ini → ..._create_input/ACS-MSN2700/port_config.ini b/..._create_input/ACS-MSN2700/port_config.ini → ..._create_input/ACS-MSN2700/port_config.ini
diff --git a/...sts/sku_create_input/ACS-MSN2700/qos.json → tests/sku_create_input/ACS-MSN2700/qos.json b/...sts/sku_create_input/ACS-MSN2700/qos.json → tests/sku_create_input/ACS-MSN2700/qos.json
diff --git a/.../sku_create_input/ACS-MSN2700/sai.profile → .../sku_create_input/ACS-MSN2700/sai.profile b/.../sku_create_input/ACS-MSN2700/sai.profile → .../sku_create_input/ACS-MSN2700/sai.profile
diff --git a/...ku_create_input/Mellanox-SN2700-D48C8.xml → ...ku_create_input/Mellanox-SN2700-D48C8.xml b/...ku_create_input/Mellanox-SN2700-D48C8.xml → ...ku_create_input/Mellanox-SN2700-D48C8.xml
diff --git a/...put/Mellanox-SN2700-D48C8/buffers.json.j2 → ...put/Mellanox-SN2700-D48C8/buffers.json.j2 b/...put/Mellanox-SN2700-D48C8/buffers.json.j2 → ...put/Mellanox-SN2700-D48C8/buffers.json.j2
diff --git a/...lanox-SN2700-D48C8/buffers_defaults_t0.j2 → ...lanox-SN2700-D48C8/buffers_defaults_t0.j2 b/...lanox-SN2700-D48C8/buffers_defaults_t0.j2 → ...lanox-SN2700-D48C8/buffers_defaults_t0.j2
diff --git a/...lanox-SN2700-D48C8/buffers_defaults_t1.j2 → ...lanox-SN2700-D48C8/buffers_defaults_t1.j2 b/...lanox-SN2700-D48C8/buffers_defaults_t1.j2 → ...lanox-SN2700-D48C8/buffers_defaults_t1.j2
diff --git a/...llanox-SN2700-D48C8/pg_profile_lookup.ini → ...llanox-SN2700-D48C8/pg_profile_lookup.ini b/...llanox-SN2700-D48C8/pg_profile_lookup.ini → ...llanox-SN2700-D48C8/pg_profile_lookup.ini
diff --git a/...put/Mellanox-SN2700-D48C8/port_config.ini → ...put/Mellanox-SN2700-D48C8/port_config.ini b/...put/Mellanox-SN2700-D48C8/port_config.ini → ...put/Mellanox-SN2700-D48C8/port_config.ini
diff --git a/...Mellanox-SN2700-D48C8/port_config.ini.bak → ...Mellanox-SN2700-D48C8/port_config.ini.bak b/...Mellanox-SN2700-D48C8/port_config.ini.bak → ...Mellanox-SN2700-D48C8/port_config.ini.bak
diff --git a/...Mellanox-SN2700-D48C8/port_config.ini.new → ...Mellanox-SN2700-D48C8/port_config.ini.new b/...Mellanox-SN2700-D48C8/port_config.ini.new → ...Mellanox-SN2700-D48C8/port_config.ini.new
diff --git a/...ellanox-SN2700-D48C8/port_config.ini.orig → ...ellanox-SN2700-D48C8/port_config.ini.orig b/...ellanox-SN2700-D48C8/port_config.ini.orig → ...ellanox-SN2700-D48C8/port_config.ini.orig
diff --git a/...eate_input/Mellanox-SN2700-D48C8/qos.json → ...eate_input/Mellanox-SN2700-D48C8/qos.json b/...eate_input/Mellanox-SN2700-D48C8/qos.json → ...eate_input/Mellanox-SN2700-D48C8/qos.json
diff --git a/...e_input/Mellanox-SN2700-D48C8/sai.profile → ...e_input/Mellanox-SN2700-D48C8/sai.profile b/...e_input/Mellanox-SN2700-D48C8/sai.profile → ...e_input/Mellanox-SN2700-D48C8/sai.profile
diff --git a/...x-SN2700-D48C8/sai_2700_48x50g_8x100g.xml → ...x-SN2700-D48C8/sai_2700_48x50g_8x100g.xml b/...x-SN2700-D48C8/sai_2700_48x50g_8x100g.xml → ...x-SN2700-D48C8/sai_2700_48x50g_8x100g.xml
diff --git a/...lities-tests/sku_create_input/default_sku → tests/sku_create_input/default_sku b/...lities-tests/sku_create_input/default_sku → tests/sku_create_input/default_sku
diff --git a/sonic-utilities-tests/sku_create_test.py → tests/sku_create_test.py b/sonic-utilities-tests/sku_create_test.py → tests/sku_create_test.py
@@ -7,11 +7,11 @@
 test_path = os.path.dirname(os.path.abspath(__file__))
 modules_path = os.path.dirname(test_path)
 scripts_path = os.path.join(modules_path, "scripts")
-input_path = os.path.join(modules_path, "sonic-utilities-tests/sku_create_input")
+input_path = os.path.join(modules_path, "tests/sku_create_input")
 sku_def_file = os.path.join(input_path, "Mellanox-SN2700-D48C8.xml")
 sku_create_script = os.path.join(scripts_path, "sonic_sku_create.py")
-output_file_path = os.path.join(modules_path, "sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8_NEW/port_config.ini")
-model_file_path = os.path.join(modules_path, "sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini")
+output_file_path = os.path.join(modules_path, "tests/sku_create_input/Mellanox-SN2700-D48C8_NEW/port_config.ini")
+model_file_path = os.path.join(modules_path, "tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini")
 
 sys.path.insert(0, test_path)
 sys.path.insert(0, modules_path)