Skip to content

CP-49928: Moved static-vdis from scripts/ to python3/bin directory #5818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2024
Merged

CP-49928: Moved static-vdis from scripts/ to python3/bin directory #5818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions python3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ install:
$(IPROG) bin/hfx_filename $(DESTDIR)$(OPTDIR)/bin
$(IPROG) bin/perfmon $(DESTDIR)$(OPTDIR)/bin
$(IPROG) bin/xe-scsi-dev-map $(DESTDIR)$(OPTDIR)/bin
$(IPROG) bin/static-vdis $(DESTDIR)$(OPTDIR)/bin
$(IPROG) extensions/pool_update.apply $(DESTDIR)$(EXTENSIONDIR)
$(IPROG) extensions/pool_update.precheck $(DESTDIR)$(EXTENSIONDIR)
$(IPROG) extensions/Test.test $(DESTDIR)$(EXTENSIONDIR)
Expand Down
0 scripts/static-vdis → python3/bin/static-vdis
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion python3/tests/test_static_vdis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
def static_vdis() -> ModuleType:
"""Test fixture to return the static-vdis module, mocked to avoid dependencies."""
with mocked_modules("XenAPI", "inventory"):
return import_file_as_module("scripts/static-vdis")
return import_file_as_module("python3/bin/static-vdis")


# Hide pylint warnings for redefined-outer-name from using the static_vdis fixture:
Expand Down
1 change: 0 additions & 1 deletion scripts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ install:
$(IPROG) xe-edit-bootloader $(DESTDIR)$(OPTDIR)/bin
$(IPROG) xe-get-network-backend $(DESTDIR)$(OPTDIR)/bin
$(IPROG) xe-enable-all-plugin-metrics $(DESTDIR)$(OPTDIR)/bin
$(IPROG) static-vdis $(DESTDIR)$(OPTDIR)/bin
$(IPROG) with-vdi $(DESTDIR)$(OPTDIR)/debug
$(IPROG) import-update-key $(DESTDIR)$(OPTDIR)/debug
$(IPROG) pool.conf $(DESTDIR)$(ETCXENDIR)
Expand Down