Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package virt-scenario for openSUSE:Factory checked in at 2023-03-15 18:56:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-scenario (Old) and /work/SRC/openSUSE:Factory/.virt-scenario.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-scenario" Wed Mar 15 18:56:09 2023 rev:3 rq:1072047 version:0.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-scenario/virt-scenario.changes 2023-03-14 18:17:31.832015911 +0100 +++ /work/SRC/openSUSE:Factory/.virt-scenario.new.31432/virt-scenario.changes 2023-03-15 18:56:15.232940703 +0100 @@ -1,0 +2,11 @@ +Wed Mar 15 08:43:08 UTC 2023 - Antoine Ginies <agin...@suse.com> + +- version 0.7.3: + * cleanup some code + * fix wrong info in data encryption + * fix cluster size error + * fix default path to image + * fix missing custom loader + * fix some wrong output order + +------------------------------------------------------------------- Old: ---- virt-scenario-0.7.2.tar.gz New: ---- virt-scenario-0.7.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-scenario.spec ++++++ --- /var/tmp/diff_new_pack.cSArjy/_old 2023-03-15 18:56:15.672943044 +0100 +++ /var/tmp/diff_new_pack.cSArjy/_new 2023-03-15 18:56:15.676943065 +0100 @@ -19,7 +19,7 @@ %define pythons python3 Name: virt-scenario -Version: 0.7.2 +Version: 0.7.3 Release: 0 Summary: Create XML guest configuration and prepare the host for a scenario License: GPL-3.0-or-later ++++++ virt-scenario-0.7.2.tar.gz -> virt-scenario-0.7.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-0.7.2/ChangeLog new/virt-scenario-0.7.3/ChangeLog --- old/virt-scenario-0.7.2/ChangeLog 2023-03-14 12:06:47.000000000 +0100 +++ new/virt-scenario-0.7.3/ChangeLog 2023-03-15 09:42:14.000000000 +0100 @@ -1,3 +1,53 @@ +2023-03-15 aginies <agin...@suse.com> + + remove unwanted help (already provided by default) + + +2023-03-15 aginies <agin...@suse.com> + + fix wrong info in man page + + +2023-03-15 aginies <agin...@suse.com> + + prepapre 0.7.3 + + +2023-03-15 aginies <agin...@suse.com> + + fix wrong info in data encryption + + +2023-03-14 aginies <agin...@suse.com> + + fix custom loader for securevm + + +2023-03-14 aginies <agin...@suse.com> + + restore custom support for secure_vm; Show virsh define at the end of the config (guest and host) + + +2023-03-14 aginies <agin...@suse.com> + + fix cluster_size + + +2023-03-14 aginies <agin...@suse.com> + + fix default path recommendation for VM image + + +2023-03-14 aginies <agin...@suse.com> + + fix cluster size parameter + + +2023-03-14 aginies <agin...@suse.com> + + fix default path to VM image + + 2023-03-14 aginies <agin...@suse.com> version 0.7.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-0.7.2/PKG-INFO new/virt-scenario-0.7.3/PKG-INFO --- old/virt-scenario-0.7.2/PKG-INFO 2023-03-14 12:06:47.000000000 +0100 +++ new/virt-scenario-0.7.3/PKG-INFO 2023-03-15 09:42:14.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: virt-scenario -Version: 0.7.2 +Version: 0.7.3 Summary: Virt-scenario Home-page: https://github.com/aginies/virt-scenario Author: Antoine Ginies @@ -57,7 +57,7 @@ # host side: qemu-img creation options (-o), qemu-img --help - unit: G - capacity: 20 - - cluster_size: 2M + - cluster_size: 1024k - lazy_refcounts: on # preallocation: off, metadata (qcow2), falloc, full - preallocation: off @@ -149,7 +149,7 @@ | format | qcow2 | raw | qcow2 | | disk bus | virtio | virtio | virtio | | capacity | 20G | 20G | 20G | - | cluster_size | 8M | NA | 8M + | cluster_size | 1024k | NA | 1024k | Host Settings | Secure VM | Computation | Desktop | | :------------ | :---: | :---: | :---: | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-0.7.2/README.md new/virt-scenario-0.7.3/README.md --- old/virt-scenario-0.7.2/README.md 2023-03-11 05:13:25.000000000 +0100 +++ new/virt-scenario-0.7.3/README.md 2023-03-14 17:49:50.000000000 +0100 @@ -49,7 +49,7 @@ # host side: qemu-img creation options (-o), qemu-img --help - unit: G - capacity: 20 - - cluster_size: 2M + - cluster_size: 1024k - lazy_refcounts: on # preallocation: off, metadata (qcow2), falloc, full - preallocation: off @@ -141,7 +141,7 @@ | format | qcow2 | raw | qcow2 | | disk bus | virtio | virtio | virtio | | capacity | 20G | 20G | 20G | -| cluster_size | 8M | NA | 8M +| cluster_size | 1024k | NA | 1024k | Host Settings | Secure VM | Computation | Desktop | | :------------ | :---: | :---: | :---: | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-0.7.2/man/virt-scenario.1 new/virt-scenario-0.7.3/man/virt-scenario.1 --- old/virt-scenario-0.7.2/man/virt-scenario.1 2023-03-14 10:07:47.000000000 +0100 +++ new/virt-scenario-0.7.3/man/virt-scenario.1 2023-03-15 09:01:56.000000000 +0100 @@ -72,7 +72,7 @@ # host side: qemu-img creation options (-o), qemu-img --help - unit: G - capacity: 20 - - cluster_size: 2M + - cluster_size: 1024k - lazy_refcounts: on # preallocation: off, metadata (qcow2), falloc, full - preallocation: off @@ -246,11 +246,11 @@ T{ cluster_size T}@T{ -8M +1024k T}@T{ NA T}@T{ -8M +1024k T} .TE .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-0.7.2/setup.py new/virt-scenario-0.7.3/setup.py --- old/virt-scenario-0.7.2/setup.py 2023-03-14 12:05:59.000000000 +0100 +++ new/virt-scenario-0.7.3/setup.py 2023-03-15 08:53:42.000000000 +0100 @@ -188,7 +188,7 @@ setuptools.setup( name="virt-scenario", - version="0.7.2", + version="0.7.3", author="Antoine Ginies", author_email="agin...@suse.com", description="Virt-scenario", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-0.7.2/src/virt_scenario.egg-info/PKG-INFO new/virt-scenario-0.7.3/src/virt_scenario.egg-info/PKG-INFO --- old/virt-scenario-0.7.2/src/virt_scenario.egg-info/PKG-INFO 2023-03-14 12:06:47.000000000 +0100 +++ new/virt-scenario-0.7.3/src/virt_scenario.egg-info/PKG-INFO 2023-03-15 09:42:14.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: virt-scenario -Version: 0.7.2 +Version: 0.7.3 Summary: Virt-scenario Home-page: https://github.com/aginies/virt-scenario Author: Antoine Ginies @@ -57,7 +57,7 @@ # host side: qemu-img creation options (-o), qemu-img --help - unit: G - capacity: 20 - - cluster_size: 2M + - cluster_size: 1024k - lazy_refcounts: on # preallocation: off, metadata (qcow2), falloc, full - preallocation: off @@ -149,7 +149,7 @@ | format | qcow2 | raw | qcow2 | | disk bus | virtio | virtio | virtio | | capacity | 20G | 20G | 20G | - | cluster_size | 8M | NA | 8M + | cluster_size | 1024k | NA | 1024k | Host Settings | Secure VM | Computation | Desktop | | :------------ | :---: | :---: | :---: | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-0.7.2/src/virtscenario/__init__.py new/virt-scenario-0.7.3/src/virtscenario/__init__.py --- old/virt-scenario-0.7.2/src/virtscenario/__init__.py 2023-03-14 12:05:37.000000000 +0100 +++ new/virt-scenario-0.7.3/src/virtscenario/__init__.py 2023-03-15 08:53:31.000000000 +0100 @@ -30,4 +30,4 @@ builtins.__dict__["_"] = str -__version__ = "0.7.2" +__version__ = "0.7.3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-0.7.2/src/virtscenario/host.py new/virt-scenario-0.7.3/src/virtscenario/host.py --- old/virt-scenario-0.7.2/src/virtscenario/host.py 2023-03-07 11:56:56.000000000 +0100 +++ new/virt-scenario-0.7.3/src/virtscenario/host.py 2023-03-14 18:02:13.000000000 +0100 @@ -384,7 +384,7 @@ else: util.print_error("There is no hugepages support on this system") -def host_end(filename, toreport, conffile): +def host_end(toreport, conffile): """ end of host configuration """ @@ -394,8 +394,6 @@ util.print_warning("You are over writing scenario setting!") print(" Overwrite are from "+conffile+"\n") util.print_recommended(toreport) - util.print_summary_ok("\nHow to use this on your system") - util.print_ok("\nvirsh define "+filename+"\n") # Net data NET_DATA = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-0.7.2/src/virtscenario/main.py new/virt-scenario-0.7.3/src/virtscenario/main.py --- old/virt-scenario-0.7.2/src/virtscenario/main.py 2023-03-14 12:04:35.000000000 +0100 +++ new/virt-scenario-0.7.3/src/virtscenario/main.py 2023-03-15 09:16:30.000000000 +0100 @@ -113,6 +113,13 @@ cfg_store.store_config() util.print_summary_ok("Guest XML Configuration is done") +def show_how_to_use(filename): + """ + show the virsh define command + """ + util.print_summary_ok("\nHow to use this on your system") + util.print_ok("\nvirsh define "+filename+"\n") + def find_ext_file(ext): """ Show all extension files in current path @@ -240,7 +247,7 @@ 'mainconf': conffile, 'hvconf': hvfile, 'hvselected': None, - 'path': '/var/libvirt/images', + 'path': '/var/lib/libvirt/images', 'orverwrite': 'off', } @@ -443,7 +450,7 @@ 'format': '', 'unit': 'G', 'capacity': '20', - 'cluster_size': '2M', + 'cluster_size': '1024k', 'lazy_refcounts': '', 'preallocation': '', 'compression_type': 'zlib', @@ -600,12 +607,12 @@ self.STORAGE_DATA_REC['encryption'] == "off" # if they differ grab data to report if self.STORAGE_DATA['encryption'] != self.STORAGE_DATA_REC['encryption']: - # there is no diff is no user setting + # there is no diff if no user setting if self.STORAGE_DATA['encryption'] != "": nestedindex += 1 self.toreport[nestedindex]['title'] = "Disk Encryption" self.toreport[nestedindex]['rec'] = self.STORAGE_DATA_REC['encryption'] - self.toreport[nestedindex]['set'] = "off" + self.toreport[nestedindex]['set'] = self.STORAGE_DATA['encryption'] # if no encryption set and recommended is on if self.STORAGE_DATA['encryption'] == "" and self.STORAGE_DATA_REC['encryption'] == "on": self.STORAGE_DATA['encryption'] = "on" @@ -743,7 +750,7 @@ self.iothreads = guest.create_iothreads(computation.iothreads) self.controller = guest.create_controller(self.listosdef) - #self.custom = ["loader",] + self.custom = ["loader",] fw_features = ['secure-boot'] firmware = fw.find_firmware(self.fw_info, arch=self.listosdef['arch'], features=fw_features, interface='uefi') if firmware: @@ -774,11 +781,13 @@ host.swappiness("0") # mq-deadline / kyber / bfq / none host.manage_ioscheduler("mq-deadline") - host.host_end(cfg_store.get_path()+"domain.xml", self.toreport, self.conffile) + host.host_end(self.toreport, self.conffile) if self.mode != "host" or self.mode == "both": final_step_guest(cfg_store, self) + show_how_to_use(cfg_store.get_path()+"domain.xml") + def help_desktop(self): """ show some help on desktop scenario @@ -856,11 +865,13 @@ host.swappiness("35") # mq-deadline / kyber / bfq / none host.manage_ioscheduler("mq-deadline") - host.host_end(cfg_store.get_path()+"domain.xml", self.toreport, self.conffile) + host.host_end(self.toreport, self.conffile) if self.mode != "host" or self.mode == "both": final_step_guest(cfg_store, self) + show_how_to_use(cfg_store.get_path()+"domain.xml") + def help_securevm(self): """ show some help on secure VM scenario @@ -935,6 +946,7 @@ # transparent hugepages doesnt need any XML config self.hugepages = "" + self.custom = ["loader",] # Find matching firmware if sev_info.es_supported(): fw_features = ['amd-sev-es'] @@ -982,14 +994,16 @@ # mq-deadline / kyber / bfq / none host.manage_ioscheduler("bfq") # END of the config - host.host_end(cfg_store.get_path()+"domain.xml", self.toreport, self.conffile) + host.host_end(self.toreport, self.conffile) if self.mode != "host" or self.mode == "both": final_step_guest(cfg_store, self) + show_how_to_use(cfg_store.get_path()+"domain.xml") + def do_name(self, args): """ - define the machine name + Define the Virtual Machine name """ if args == "": print("Please select a correct Virtual Machine name") @@ -1000,15 +1014,9 @@ self.dataprompt.update({'name': name['name']}) self.update_prompt(name['name']) - def help_name(self): - """ - help about the machine name - """ - print("Define the Virtual Machine name") - def do_machine(self, args): """ - select machine + Define the machine type """ if args not in qemulist.LIST_MACHINETYPE: print("Please select a correct machine Type") @@ -1029,15 +1037,9 @@ completions = [f for f in qemulist.LIST_MACHINETYPE if f.startswith(text)] return completions - def help_machine(self): - """ - help machine - """ - print("Define the machine type") - def do_vcpu(self, args): """ - vcpu number + Set the VCPU for the VM definition """ if args.isdigit() is False: print("Please select a correct vcpu number") @@ -1050,15 +1052,9 @@ self.dataprompt.update({'vcpu': vcpu['vcpu']}) self.update_prompt(vcpu['vcpu']) - def help_vcpu(self): - """ - help vcpu - """ - print("Set the VCPU for the VM definition") - def do_diskpath(self, args): """ - define the disk path of the virtual image + Define the path directory to store the Virtual Machine image """ if os.path.isdir(args): path = args @@ -1070,15 +1066,9 @@ else: util.print_error('Please select a corrent path dir') - def help_diskpath(self): - """ - help about disk path - """ - print("Define the path directory to store the Virtual Machine image") - def do_bootdev(self, args): """ - boot device + Select the boot device """ if args not in qemulist.LIST_BOOTDEV: print("Please select a correct boot devices") @@ -1099,15 +1089,9 @@ completions = [f for f in qemulist.LIST_BOOTDEV if f.startswith(text)] return completions - def help_bootdev(self): - """ - help bootdev - """ - print("Select the boot device") - def do_cdrom(self, args): """ - select source file to ISO cdrom + Select the Source file to the CDROM/DVD ISO file """ file = args if os.path.isfile(file): @@ -1119,15 +1103,9 @@ else: util.print_error("CDROM/DVD ISO source file " +file +" Doesnt exist!") - def help_cdrom(self): - """ - cdrom help - """ - print("Select the Source file to the CDROM/DVD ISO file") - def do_memory(self, args): """ - memory + Set Memory size, should be in Gib """ if args.isdigit() is False: print("Please select a correct memory value (GiB)") @@ -1138,12 +1116,6 @@ self.dataprompt.update({'memory': memory['memory']}) self.update_prompt(memory['memory']) - def help_memory(self): - """ - help memory - """ - print("Memory should be in Gib") - def file_complete(self, text, line, begidx, endidx, ext): """ auto completion to find ext files in current path @@ -1166,8 +1138,10 @@ def do_mode(self, args): """ - select if guest only should be done, or host - default host and guest are done + Select if: + - XML guest configuration should be done + - host configuration + - both should be done (default) """ mode = args if mode not in self.all_modes: @@ -1187,7 +1161,7 @@ def do_overwrite(self, args): """ - mode to overwrite previous config + Overwrite mode allow you to overwrite previous config (XML and config store) """ overwrite = args if overwrite not in self.overwrite_options: @@ -1198,15 +1172,9 @@ self.dataprompt.update({'overwrite': config['overwrite']}) self.update_prompt(config['overwrite']) - def help_overwrite(self): - """ - help overwrite - """ - print("Overwrite mode allow you to overwrite previous config (XML and config store)") - def do_conf(self, args): """ - select the conf yaml file + Select the yaml configuration file """ file = args if os.path.isfile(file): @@ -1221,12 +1189,6 @@ else: util.print_error("File " +file +" Doesnt exist!") - def help_conf(self): - """ - help about conf file selection - """ - print("Select the yaml configuration file") - def do_hvconf(self, args): """ Load Hypervisor configuration @@ -1244,12 +1206,6 @@ else: util.print_error("File " +file +" Doesnt exist!") - def help_hvlist(self): - """ - help about listing available hypervisors - """ - print("List available hypervisors") - def do_hvlist(self, args): """ List available hypervisor configurations @@ -1258,12 +1214,6 @@ self.basic_config() hv.list_hypervisors() - def help_hvselect(self): - """ - help about setting new default hypervisor - """ - print("List available hypervisors") - def do_hvselect(self, args): """ Set hypervisor for which VMs are configured @@ -1283,16 +1233,10 @@ def do_quit(self, args): """ Exit the application + Shorthand: Ctrl-D """ # French Flag :) print(util.esc('44')+'Bye'+util.esc('107')+'Bye'+util.esc('41')+'Bye'+util.esc(0)) return True - def help_quit(self): - """ - Quit virt-scenario - """ - print('Exit the application. Shorthand: Ctrl-D.') - do_EOF = do_quit - help_EOF = help_quit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-0.7.2/src/virtscenario.yaml new/virt-scenario-0.7.3/src/virtscenario.yaml --- old/virt-scenario-0.7.2/src/virtscenario.yaml 2023-03-07 15:58:38.000000000 +0100 +++ new/virt-scenario-0.7.3/src/virtscenario.yaml 2023-03-14 17:49:10.000000000 +0100 @@ -28,13 +28,13 @@ # - disk_cache: none - disk_target: vda - disk_bus: virtio - - path: /var/libvirt/images + - path: /var/lib/libvirt/images # format: qcow2, raw # - format: qcow2 # host side: qemu-img creation options (-o), qemu-img --help - unit: G - capacity: 20 - - cluster_size: 8M + - cluster_size: 1024k # - lazy_refcounts: on # preallocation: off, metadata (qcow2), falloc, full # - preallocation: metadata