Merge pull request #5818 from ashwin9390/private/ashwin/CP-49928

Author: psafont

python3/Makefile

@@ -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)

scripts/static-vdis renamed to python3/bin/static-vdis

@@ -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:

python3/tests/test_static_vdis.py

@@ -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)