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-05-31 21:55:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-scenario (Old) and /work/SRC/openSUSE:Factory/.virt-scenario.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-scenario" Wed May 31 21:55:15 2023 rev:12 rq:1090031 version:2.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-scenario/virt-scenario.changes 2023-05-24 20:23:29.976586370 +0200 +++ /work/SRC/openSUSE:Factory/.virt-scenario.new.1533/virt-scenario.changes 2023-05-31 21:55:16.501281146 +0200 @@ -1,0 +2,15 @@ +Wed May 31 14:48:08 UTC 2023 - Antoine Ginies <aginies@suse.com> + +- version 2.0.4: + * display the force_sev page only in securevm scenario + * typo fixes + * remove pprint debug + * update API demo script + * switch default VM image size to 8GiB instead of 20GiB + +------------------------------------------------------------------- +Wed May 31 14:27:41 UTC 2023 - Antoine Ginies <aginies@suse.com> + +- fix missing directory /etc/virt-scenario/vmconfig + +------------------------------------------------------------------- Old: ---- virt-scenario-2.0.3.tar.gz New: ---- virt-scenario-2.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-scenario.spec ++++++ --- /var/tmp/diff_new_pack.oObZgl/_old 2023-05-31 21:55:16.933283701 +0200 +++ /var/tmp/diff_new_pack.oObZgl/_new 2023-05-31 21:55:16.937283724 +0200 @@ -20,7 +20,7 @@ %define pythons python3 Name: virt-scenario -Version: 2.0.3 +Version: 2.0.4 Release: 0 Summary: Tool to create XML guest configuration and prepare the host for a scenario License: GPL-3.0-or-later @@ -65,7 +65,7 @@ %install %python_install # move yaml file to /etc/virt-scenario -mkdir -p %{buildroot}%{_sysconfdir}/%{name}/ +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/vmconfig mv %{buildroot}%{_datadir}/%{name}/*.yaml %{buildroot}%{_sysconfdir}/%{name}/ mv src/demo_api_usage.py %{buildroot}%{_datadir}/%name/ %python_expand %fdupes %{buildroot}%{$python_sitelib} ++++++ virt-scenario-2.0.3.tar.gz -> virt-scenario-2.0.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-2.0.3/ChangeLog new/virt-scenario-2.0.4/ChangeLog --- old/virt-scenario-2.0.3/ChangeLog 2023-05-24 17:37:34.000000000 +0200 +++ new/virt-scenario-2.0.4/ChangeLog 2023-05-31 16:47:22.000000000 +0200 @@ -1,3 +1,33 @@ +2023-05-31 aginies <aginies@suse.com> + + prepare v2.0.4; typo fixes; Fix force_SEV page display + + +2023-05-30 aginies <aginies@suse.com> + + update internal info + + +2023-05-30 aginies <aginies@suse.com> + + update the doc + + +2023-05-30 aginies <aginies@suse.com> + + update to sync with code + + +2023-05-30 aginies <aginies@suse.com> + + default disk size to 8 + + +2023-05-25 aginies <aginies@suse.com> + + remove pprint + + 2023-05-24 aginies <aginies@suse.com> update doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-2.0.3/PKG-INFO new/virt-scenario-2.0.4/PKG-INFO --- old/virt-scenario-2.0.3/PKG-INFO 2023-05-24 17:37:34.000000000 +0200 +++ new/virt-scenario-2.0.4/PKG-INFO 2023-05-31 16:47:22.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: virt-scenario -Version: 2.0.3 +Version: 2.0.4 Summary: Virt-scenario Home-page: https://github.com/aginies/virt-scenario Author: Antoine Ginies @@ -169,7 +169,6 @@ * **vnet**: Virtual Network for the VM * **machine**: Select the Machine type (from a list) * **bootdev**: Select the boot dev (from a list) - * **diskpath**: Directory where to store disk image * **cdrom**: File Path to CD/DVD installation media * **vmimage**: File path to an already existing VM image @@ -178,6 +177,8 @@ * **capacity**: Disk Size image (GiB) * **format**: Select the Disk Image format (qcow2/raw) * **cache**: Specify the Disk Cache mode + * **encryption**: Encrypt the VM Disk image + * **diskpath**: Directory where to store disk image ### Generate the XML configuration and prepare the host diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-2.0.3/README.md new/virt-scenario-2.0.4/README.md --- old/virt-scenario-2.0.3/README.md 2023-05-24 17:36:39.000000000 +0200 +++ new/virt-scenario-2.0.4/README.md 2023-05-30 12:17:02.000000000 +0200 @@ -161,7 +161,6 @@ * **vnet**: Virtual Network for the VM * **machine**: Select the Machine type (from a list) * **bootdev**: Select the boot dev (from a list) -* **diskpath**: Directory where to store disk image * **cdrom**: File Path to CD/DVD installation media * **vmimage**: File path to an already existing VM image @@ -170,6 +169,8 @@ * **capacity**: Disk Size image (GiB) * **format**: Select the Disk Image format (qcow2/raw) * **cache**: Specify the Disk Cache mode +* **encryption**: Encrypt the VM Disk image +* **diskpath**: Directory where to store disk image ### Generate the XML configuration and prepare the host diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-2.0.3/setup.py new/virt-scenario-2.0.4/setup.py --- old/virt-scenario-2.0.3/setup.py 2023-05-24 17:35:26.000000000 +0200 +++ new/virt-scenario-2.0.4/setup.py 2023-05-31 16:45:58.000000000 +0200 @@ -162,7 +162,7 @@ setuptools.setup( name="virt-scenario", - version="2.0.3", + version="2.0.4", author="Antoine Ginies", author_email="aginies@suse.com", description="Virt-scenario", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-2.0.3/src/demo_api_usage.py new/virt-scenario-2.0.4/src/demo_api_usage.py --- old/virt-scenario-2.0.3/src/demo_api_usage.py 2023-05-22 11:29:15.000000000 +0200 +++ new/virt-scenario-2.0.4/src/demo_api_usage.py 2023-05-30 11:55:40.000000000 +0200 @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. """ -This is a demo how to use the virt-scenario API in your own script +This is a demo how to use the virt-scenario API """ import virtscenario.configuration as configuration @@ -57,6 +57,7 @@ # Memory in GiB self.conf.dataprompt.update({'memory': 4}) ## Storage + self.conf.dataprompt.update({'path': '/var/lib/libvirt/images'}) self.conf.dataprompt.update({'cluster_size': 1024}) self.conf.dataprompt.update({'preallocation': "off"}) self.conf.dataprompt.update({'encryption': "off"}) @@ -64,6 +65,8 @@ self.conf.dataprompt.update({'lazy_refcounts': "off"}) self.conf.dataprompt.update({'disk_target': "vdb"}) self.conf.dataprompt.update({'capacity': 8}) + self.conf.dataprompt.update({'format': 'qcow2'}) + self.conf.dataprompt.update({'cache': 'none'}) # Installation media #self.conf.dataprompt.update({'dvd': "/path/to/dvd"}) # Select an VM image to use diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-2.0.3/src/virt_scenario.egg-info/PKG-INFO new/virt-scenario-2.0.4/src/virt_scenario.egg-info/PKG-INFO --- old/virt-scenario-2.0.3/src/virt_scenario.egg-info/PKG-INFO 2023-05-24 17:37:34.000000000 +0200 +++ new/virt-scenario-2.0.4/src/virt_scenario.egg-info/PKG-INFO 2023-05-31 16:47:22.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: virt-scenario -Version: 2.0.3 +Version: 2.0.4 Summary: Virt-scenario Home-page: https://github.com/aginies/virt-scenario Author: Antoine Ginies @@ -169,7 +169,6 @@ * **vnet**: Virtual Network for the VM * **machine**: Select the Machine type (from a list) * **bootdev**: Select the boot dev (from a list) - * **diskpath**: Directory where to store disk image * **cdrom**: File Path to CD/DVD installation media * **vmimage**: File path to an already existing VM image @@ -178,6 +177,8 @@ * **capacity**: Disk Size image (GiB) * **format**: Select the Disk Image format (qcow2/raw) * **cache**: Specify the Disk Cache mode + * **encryption**: Encrypt the VM Disk image + * **diskpath**: Directory where to store disk image ### Generate the XML configuration and prepare the host diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-2.0.3/src/virtscenario/__init__.py new/virt-scenario-2.0.4/src/virtscenario/__init__.py --- old/virt-scenario-2.0.3/src/virtscenario/__init__.py 2023-05-24 17:20:31.000000000 +0200 +++ new/virt-scenario-2.0.4/src/virtscenario/__init__.py 2023-05-31 16:46:08.000000000 +0200 @@ -29,5 +29,5 @@ import builtins builtins.__dict__["_"] = str -__version__ = "2.0.3" +__version__ = "2.0.4" print(" Version: "+__version__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-2.0.3/src/virtscenario/cmd.py new/virt-scenario-2.0.4/src/virtscenario/cmd.py --- old/virt-scenario-2.0.3/src/virtscenario/cmd.py 2023-05-24 17:34:27.000000000 +0200 +++ new/virt-scenario-2.0.4/src/virtscenario/cmd.py 2023-05-30 11:59:37.000000000 +0200 @@ -54,13 +54,13 @@ lines.append("\n Prepare a Libvirt XML guest config and the host to run a customized guest:\n") lines.append(util.esc('blue')+" computation | desktop | securevm"+util.esc('reset')+"\n") lines.append("\n Possible User Settings For VM are:\n") - lines.append(util.esc('blue')+" name | vcpu | memory | machine | bootdev | vnet | diskpath | cdrom | vmimage"+util.esc('reset')+"\n") + lines.append(util.esc('blue')+" name | vcpu | memory | machine | bootdev | vnet | cdrom | vmimage"+util.esc('reset')+"\n") lines.append("\n Hypervisors parameters:\n") lines.append(util.esc('blue')+" hconf | hvselect | hvlist | force_sev"+util.esc('reset')+"\n") lines.append("\n Storage parameters:\n") - lines.append(util.esc('blue')+" capacity | encryption | format | cache"+util.esc('reset')+"\n") + lines.append(util.esc('blue')+" diskpath| capacity | encryption | format | cache"+util.esc('reset')+"\n") lines.append("\n"+" You can overwrite some recommended VM settings editing: "+config.conffile+"\n") - lines.append("\n Please read the manpage and the README.md file:\n") + lines.append("\n Please read the manpage or the README.md file:\n") lines.append(" https://github.com/aginies/virt-scenario/blob/main/README.md\n") #lines.append(util.esc('red')+"\n WARNING:"+util.esc('reset')+" This is under Devel...\n") lines.append(" Source code: https://github.com/aginies/virt-scenario\n") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-2.0.3/src/virtscenario/configuration.py new/virt-scenario-2.0.4/src/virtscenario/configuration.py --- old/virt-scenario-2.0.3/src/virtscenario/configuration.py 2023-05-24 17:25:51.000000000 +0200 +++ new/virt-scenario-2.0.4/src/virtscenario/configuration.py 2023-05-25 11:29:46.000000000 +0200 @@ -431,9 +431,6 @@ Check if the user as set some stuff, if yes use it only usefull for Guest setting """ - from pprint import pprint - pprint(vars(self)) - #from pprint import pprint; pprint(vars(virtum)) vcpuuser = self.conf.dataprompt.get('vcpu') if vcpuuser != None: self.vcpu = guest.create_cpu({'vcpu': vcpuuser}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-2.0.3/src/virtscenario.yaml new/virt-scenario-2.0.4/src/virtscenario.yaml --- old/virt-scenario-2.0.3/src/virtscenario.yaml 2023-05-23 13:52:08.000000000 +0200 +++ new/virt-scenario-2.0.4/src/virtscenario.yaml 2023-05-30 11:59:49.000000000 +0200 @@ -34,7 +34,7 @@ # - format: qcow2 # host side: qemu-img creation options (-o), qemu-img --help - unit: G - - capacity: 20 + - capacity: 8 - cluster_size: 1024 # - lazy_refcounts: on # preallocation: off, metadata (qcow2), falloc, full diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virt-scenario-2.0.3/src/vsmygtk/main.py new/virt-scenario-2.0.4/src/vsmygtk/main.py --- old/virt-scenario-2.0.3/src/vsmygtk/main.py 2023-05-24 15:00:55.000000000 +0200 +++ new/virt-scenario-2.0.4/src/vsmygtk/main.py 2023-05-31 16:45:37.000000000 +0200 @@ -425,18 +425,10 @@ # force page 3 self.set_current_page(3) - if page > self.get_nth_page(5): - if self.STORAGE_DATA_REC['encryption'] == "on" and self.show_storage_window == "off": - text_mdialog = "In this scenario Virtual Machine Image <b>encryption = on</b>\n" - text_mdialog += "Please set a <b>password</b> or set <b>encryption = off</b>\n" - text_mdialog += "\nClick on the <b>Advanced Storage Configuration</b>\n" - self.dialog_message("Error!", text_mdialog) - self.set_current_page(4) - # after scenario check if secure vm and allow force SEV - if page > self.get_nth_page(3): + if page > self.get_nth_page(2): self.commit() - if self.selected_scenario != "securevm" or self.expert == "off": + if self.selected_scenario != "securevm": # or self.expert == "off": #print("Bypassing force SEV page") if page == self.get_nth_page(4): self.set_page_complete(current_page, True) @@ -455,6 +447,14 @@ self.howto = "virt-scenario-launch --start "+(self.conf.callsign) self.textbuffer_cmd.set_text(self.howto) + if page > self.get_nth_page(5): + if self.STORAGE_DATA_REC['encryption'] == "on" and self.show_storage_window == "off": + text_mdialog = "In this scenario Virtual Machine Image <b>encryption = on</b>\n" + text_mdialog += "Please set a <b>password</b> or set <b>encryption = off</b>\n" + text_mdialog += "\nClick on the <b>Advanced Storage Configuration</b>\n" + self.dialog_message("Error!", text_mdialog) + self.set_current_page(4) + def show_data_from_xml(self): """ show xml data @@ -1053,7 +1053,7 @@ self.append_page(box_forcesev) self.set_page_type(box_forcesev, Gtk.AssistantPageType.CONTENT) - frame_forcesev = gtk.create_frame("Force SEV PDH extraction") + frame_forcesev = gtk.create_frame("Force PDH extraction") grid_forcesev = Gtk.Grid(column_spacing=12, row_spacing=6) grid_forcesev.set_column_homogeneous(True) @@ -1064,7 +1064,7 @@ label_warning.set_line_wrap(True) gtk.margin_top_left_right(label_warning) - label_forcesev = gtk.create_label("Force SEV extraction", Gtk.Align.END) + label_forcesev = gtk.create_label("Force PDH extraction", Gtk.Align.END) gtk.margin_bottom_left(label_forcesev) switch_forcesev = Gtk.Switch() gtk.margin_bottom_right(switch_forcesev)