openstack
/
tacker
Code Issues Proposed changes

Merge "Change path to test sample"

This commit is contained in:
Zuul 2024-03-12 08:08:33 +00:00 committed by Gerrit Code Review
parent 0aa4c760f2 de8952a040
commit b21072efc7
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/tacker
View File

@ -443,7 +443,7 @@ function tacker_create_initial_network {
} }
function tacker_setup_default_vim_resources { 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 # and devstack/vim_config.yaml
DEFAULT_VIM_PROJECT_NAME="nfv" DEFAULT_VIM_PROJECT_NAME="nfv"
DEFAULT_VIM_USER="nfv_user" DEFAULT_VIM_USER="nfv_user"

2
doc/source/user/mgmt_driver_for_ansible_driver_usage_guide.rst
View File

@ -583,7 +583,7 @@ Please refer to the procedure in Section `Create and Upload VNF Package`_.
* Scripts/ * Scripts/
Please get the contents of the ``Files`` folder from the 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 2. VNF Create/Instantiate

2
tacker/tests/functional/tools/test-setup-k8s-vim.sh
View File

@ -15,7 +15,7 @@
# --os-auth-url # --os-auth-url
# --config-file # --config-file
conf_dir=/opt/stack/tacker/tacker/tests/etc/samples conf_dir=/opt/stack/tacker/samples/tests/etc/samples
register_vim() { register_vim() {
openstack vim register \ openstack vim register \

2
tacker/tests/unit/extensions/test_extension_extended_attribute.py
View File

@ -44,7 +44,7 @@ class ExtensionExtendedAttributeTestCase(base.BaseTestCase):
"ExtensionExtendedAttributeTestPlugin" "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.config_parse()
self.setup_coreplugin(plugin) self.setup_coreplugin(plugin)

2
tacker/tests/utils.py
View File

@ -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 :param fake_csar_path: a temporary directory in which csar data will be
copied. copied.
:param csar_dir_name: the relative path of csar directory with respect to :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'. for ex. 'vnfpkgm1'.
:param csar_without_tosca_meta: when set to 'True', it will only copy root :param csar_without_tosca_meta: when set to 'True', it will only copy root
level yaml file and image file. level yaml file and image file.