openstack/tacker
Code Issues Proposed changes

Fix incorrect file path in pkggen.py

Browse Source 
This patch fixes the path to userdata_standard.py and
container_update_mgmt_v2.py specified in pkggen.py
to the correct one below.

* userdata_standard.py
```
# samples/tests/functional/sol_v2_common/sampleX
userdata_dir =
"../../../../../tacker/sol_refactored/infra_drivers/openstack/"
```

* container_update_mgmt_v2.py
```
mgmt_driver_path = os.path.join(
    cur_dir, '../../../../../tacker/sol_refactored',
    'mgmt_drivers/container_update_mgmt_v2.py')
```

Closes-Bug: #2074332
Change-Id: Iea5d417bba0e1f9a6518df59ced77d6e50ba34de
This commit is contained in:
Ai Hamano 2024-07-29 14:35:57 +09:00
parent 3aaa63e0c7
commit 6e9bfa93c7
13 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/mgmt_driver/kubernetes/sol_v2_kubernetes_vnf_package/pkggen.py
View File

@ -41,8 +41,8 @@ tmp_contents = os.path.join(tmp_dir, "contents")
shutil.copytree(os.path.join(".", "contents"), tmp_contents)
# add userdata script
# tacker/sol_refactored/infra_drivers/openstack/userdata_standard.py
userdata_dir = "../../../../tacker/sol_refactored/infra_drivers/openstack/"
# tacker/tests/sol_refactored/infra_drivers/openstack/userdata_standard.py
userdata_dir = "../../../../../tacker/sol_refactored/infra_drivers/openstack/"
userdata_file = "userdata_standard.py"
userdata_path = os.path.abspath(userdata_dir + userdata_file)
# mkdir UserData/ and copy userdata_path into it

2
samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/pkggen.py
View File

@ -31,7 +31,7 @@ vnfd_id = uuidutils.generate_uuid()
# samples/tests/functional/sol_kubernetes_v2/{package_name}
cur_dir = os.path.dirname(__file__)
mgmt_driver_path = os.path.join(
cur_dir, '../../../../tacker/sol_refactored',
cur_dir, '../../../../../tacker/sol_refactored',
'mgmt_drivers/container_update_mgmt_v2.py')
utils.make_zip(".", tmp_dir, vnfd_id, mgmt_driver=mgmt_driver_path)

2
samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_before/pkggen.py
View File

@ -31,7 +31,7 @@ vnfd_id = uuidutils.generate_uuid()
# samples/tests/functional/sol_kubernetes_v2/{package_name}
cur_dir = os.path.dirname(__file__)
mgmt_driver_path = os.path.join(
cur_dir, '../../../../tacker/sol_refactored',
cur_dir, '../../../../../tacker/sol_refactored',
'mgmt_drivers/container_update_mgmt_v2.py')
utils.make_zip(".", tmp_dir, vnfd_id, mgmt_driver=mgmt_driver_path)

4
samples/tests/functional/sol_v2_common/basic_lcms_max_individual_vnfc/pkggen.py
View File

@ -33,8 +33,8 @@ image_path = test_utils.test_etc_sample("etsi/nfv/common/Files/images",
"cirros-0.5.2-x86_64-disk.img")
# tacker/sol_refactored/infra_drivers/openstack/userdata_standard.py
# samples/functional/sol_v2_common/sampleX
userdata_dir = "../../../../tacker/sol_refactored/infra_drivers/openstack/"
# samples/tests/functional/sol_v2_common/sampleX
userdata_dir = "../../../../../tacker/sol_refactored/infra_drivers/openstack/"
userdata_file = "userdata_standard.py"
userdata_path = os.path.abspath(userdata_dir + userdata_file)

4
samples/tests/functional/sol_v2_common/basic_lcms_min_individual_vnfc/pkggen.py
View File

@ -29,8 +29,8 @@ zip_file_name = os.path.basename(os.path.abspath(".")) + '.zip'
tmp_dir = tempfile.mkdtemp()
# tacker/sol_refactored/infra_drivers/openstack/userdata_standard.py
# samples/functional/sol_v2_common/sampleX
userdata_dir = "../../../../tacker/sol_refactored/infra_drivers/openstack/"
# samples/tests/functional/sol_v2_common/sampleX
userdata_dir = "../../../../../tacker/sol_refactored/infra_drivers/openstack/"
userdata_file = "userdata_standard.py"
userdata_path = os.path.abspath(userdata_dir + userdata_file)

4
samples/tests/functional/sol_v2_common/change_vnfpkg_max_individual_vnfc/pkggen.py
View File

@ -29,8 +29,8 @@ zip_file_name = os.path.basename(os.path.abspath(".")) + '.zip'
tmp_dir = tempfile.mkdtemp()
# tacker/sol_refactored/infra_drivers/openstack/userdata_standard.py
# samples/functional/sol_v2_common/sampleX
userdata_dir = "../../../../tacker/sol_refactored/infra_drivers/openstack/"
# samples/tests/functional/sol_v2_common/sampleX
userdata_dir = "../../../../../tacker/sol_refactored/infra_drivers/openstack/"
userdata_file = "userdata_standard.py"
userdata_path = os.path.abspath(userdata_dir + userdata_file)

4
samples/tests/functional/sol_v2_common/change_vnfpkg_or_update_min_individual_vnfc/pkggen.py
View File

@ -33,8 +33,8 @@ image_path = test_utils.test_etc_sample("etsi/nfv/common/Files/images",
"cirros-0.5.2-x86_64-disk.img")
# tacker/sol_refactored/infra_drivers/openstack/userdata_standard.py
# samples/functional/sol_v2_common/sampleX
userdata_dir = "../../../../tacker/sol_refactored/infra_drivers/openstack/"
# samples/tests/functional/sol_v2_common/sampleX
userdata_dir = "../../../../../tacker/sol_refactored/infra_drivers/openstack/"
userdata_file = "userdata_standard.py"
userdata_path = os.path.abspath(userdata_dir + userdata_file)

4
samples/tests/functional/sol_v2_common/update_vnf_max_individual_vnfc/pkggen.py
View File

@ -33,8 +33,8 @@ image_path = test_utils.test_etc_sample("etsi/nfv/common/Files/images",
"cirros-0.5.2-x86_64-disk.img")
# tacker/sol_refactored/infra_drivers/openstack/userdata_standard.py
# samples/functional/sol_v2_common/sampleX
userdata_dir = "../../../../tacker/sol_refactored/infra_drivers/openstack/"
# samples/tests/functional/sol_v2_common/sampleX
userdata_dir = "../../../../../tacker/sol_refactored/infra_drivers/openstack/"
userdata_file = "userdata_standard.py"
userdata_path = os.path.abspath(userdata_dir + userdata_file)

4
samples/tests/functional/sol_v2_common/userdata_standard/pkggen.py
View File

@ -33,8 +33,8 @@ image_path = test_utils.test_etc_sample("etsi/nfv/common/Files/images",
"cirros-0.5.2-x86_64-disk.img")
# tacker/sol_refactored/infra_drivers/openstack/userdata_standard.py
# samples/functional/sol_v2_common/sampleX
userdata_dir = "../../../../tacker/sol_refactored/infra_drivers/openstack/"
# samples/tests/functional/sol_v2_common/sampleX
userdata_dir = "../../../../../tacker/sol_refactored/infra_drivers/openstack/"
userdata_file = "userdata_standard.py"
userdata_path = os.path.abspath(userdata_dir + userdata_file)

4
samples/tests/functional/sol_v2_common/userdata_standard_az_retry/pkggen.py
View File

@ -33,8 +33,8 @@ image_path = test_utils.test_etc_sample("etsi/nfv/common/Files/images",
"cirros-0.5.2-x86_64-disk.img")
# tacker/sol_refactored/infra_drivers/openstack/userdata_standard.py
# samples/functional/sol_v2_common/sampleX
userdata_dir = "../../../../tacker/sol_refactored/infra_drivers/openstack/"
# samples/tests/functional/sol_v2_common/sampleX
userdata_dir = "../../../../../tacker/sol_refactored/infra_drivers/openstack/"
userdata_file = "userdata_standard.py"
userdata_path = os.path.abspath(userdata_dir + userdata_file)

4
samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg/pkggen.py
View File

@ -33,8 +33,8 @@ image_path = test_utils.test_etc_sample("etsi/nfv/common/Files/images",
"cirros-0.5.2-x86_64-disk.img")
# tacker/sol_refactored/infra_drivers/openstack/userdata_standard.py
# samples/functional/sol_v2_common/sampleX
userdata_dir = "../../../../tacker/sol_refactored/infra_drivers/openstack/"
# samples/tests/functional/sol_v2_common/sampleX
userdata_dir = "../../../../../tacker/sol_refactored/infra_drivers/openstack/"
userdata_file = "userdata_standard.py"
userdata_path = os.path.abspath(userdata_dir + userdata_file)

4
samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg_nw/pkggen.py
View File

@ -33,8 +33,8 @@ image_path = test_utils.test_etc_sample("etsi/nfv/common/Files/images",
"cirros-0.5.2-x86_64-disk.img")
# tacker/sol_refactored/infra_drivers/openstack/userdata_standard.py
# samples/functional/sol_v2_common/sampleX
userdata_dir = "../../../../tacker/sol_refactored/infra_drivers/openstack/"
# samples/tests/functional/sol_v2_common/sampleX
userdata_dir = "../../../../../tacker/sol_refactored/infra_drivers/openstack/"
userdata_file = "userdata_standard.py"
userdata_path = os.path.abspath(userdata_dir + userdata_file)

4
samples/tests/functional/sol_v2_common/userdata_standard_with_non_boot_volume/pkggen.py
View File

@ -33,8 +33,8 @@ image_path = test_utils.test_etc_sample("etsi/nfv/common/Files/images",
"cirros-0.5.2-x86_64-disk.img")
# tacker/sol_refactored/infra_drivers/openstack/userdata_standard.py
# samples/functional/sol_v2_common/sampleX
userdata_dir = "../../../../tacker/sol_refactored/infra_drivers/openstack/"
# samples/tests/functional/sol_v2_common/sampleX
userdata_dir = "../../../../../tacker/sol_refactored/infra_drivers/openstack/"
userdata_file = "userdata_standard.py"
userdata_path = os.path.abspath(userdata_dir + userdata_file)