From de8952a040065d70d9443ab1b4aceab2e27ec566 Mon Sep 17 00:00:00 2001
From: Ai Hamano <ai.hamano@ntt-at.co.jp>
Date: Tue, 20 Feb 2024 11:43:53 +0900
Subject: [PATCH] Change path to test sample

The patch below moved test samples from under {tacker_root}/tacker/
to under {tacker_root}/samples/.
* https://review.opendev.org/c/openstack/tacker/+/907170

In accordance with this, this patch corrects the old paths left
in comments etc. with new paths.

Change-Id: Ib7b3f141a28c5339e1df4bbe89a4168fde81d786
---
 devstack/lib/tacker                                             | 2 +-
 doc/source/user/mgmt_driver_for_ansible_driver_usage_guide.rst  | 2 +-
 tacker/tests/functional/tools/test-setup-k8s-vim.sh             | 2 +-
 .../tests/unit/extensions/test_extension_extended_attribute.py  | 2 +-
 tacker/tests/utils.py                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/devstack/lib/tacker b/devstack/lib/tacker
index 25ecccc71..358806613 100644
--- a/devstack/lib/tacker
+++ b/devstack/lib/tacker
@@ -448,7 +448,7 @@ function tacker_create_initial_network {
 }
 
 function tacker_setup_default_vim_resources {
-    # Note: These must be the same as in tacker/tests/etc/samples/local-vim.yaml
+    # Note: These must be the same as in samples/tests/etc/samples/local-vim.yaml
     # and devstack/vim_config.yaml
     DEFAULT_VIM_PROJECT_NAME="nfv"
     DEFAULT_VIM_USER="nfv_user"
diff --git a/doc/source/user/mgmt_driver_for_ansible_driver_usage_guide.rst b/doc/source/user/mgmt_driver_for_ansible_driver_usage_guide.rst
index f936089e1..286d7bd32 100644
--- a/doc/source/user/mgmt_driver_for_ansible_driver_usage_guide.rst
+++ b/doc/source/user/mgmt_driver_for_ansible_driver_usage_guide.rst
@@ -583,7 +583,7 @@ Please refer to the procedure in Section `Create and Upload VNF Package`_.
     * Scripts/
 
     Please get the contents of the ``Files`` folder from the
-    ``tacker/tests/etc/samples/etsi/nfv/common/Files/``.
+    ``samples/tests/etc/samples/etsi/nfv/common/Files/``.
 
 
 2. VNF Create/Instantiate
diff --git a/tacker/tests/functional/tools/test-setup-k8s-vim.sh b/tacker/tests/functional/tools/test-setup-k8s-vim.sh
index 2a9a16f04..b2100d980 100755
--- a/tacker/tests/functional/tools/test-setup-k8s-vim.sh
+++ b/tacker/tests/functional/tools/test-setup-k8s-vim.sh
@@ -15,7 +15,7 @@
 #  --os-auth-url
 #  --config-file
 
-conf_dir=/opt/stack/tacker/tacker/tests/etc/samples
+conf_dir=/opt/stack/tacker/samples/tests/etc/samples
 
 register_vim() {
     openstack vim register \
diff --git a/tacker/tests/unit/extensions/test_extension_extended_attribute.py b/tacker/tests/unit/extensions/test_extension_extended_attribute.py
index de776411f..d805e4842 100644
--- a/tacker/tests/unit/extensions/test_extension_extended_attribute.py
+++ b/tacker/tests/unit/extensions/test_extension_extended_attribute.py
@@ -44,7 +44,7 @@ class ExtensionExtendedAttributeTestCase(base.BaseTestCase):
             "ExtensionExtendedAttributeTestPlugin"
         )
 
-        # point config file to: tacker/tests/etc/tacker.conf.test
+        # point config file to: samples/tests/etc/tacker.conf.test
         self.config_parse()
 
         self.setup_coreplugin(plugin)
diff --git a/tacker/tests/utils.py b/tacker/tests/utils.py
index c8ec2742e..ed7bb8bcc 100644
--- a/tacker/tests/utils.py
+++ b/tacker/tests/utils.py
@@ -233,7 +233,7 @@ def copy_csar_files(fake_csar_path, csar_dir_name,
     :param fake_csar_path: a temporary directory in which csar data will be
                            copied.
     :param csar_dir_name: the relative path of csar directory with respect to
-                          './tacker/tests/etc/samples/etsi/nfv' directory.
+                          './samples/tests/etc/samples/etsi/nfv' directory.
                           for ex. 'vnfpkgm1'.
     :param csar_without_tosca_meta: when set to 'True', it will only copy root
                                     level yaml file and image file.