maqet 0.0.1.3__py3-none-any.whl → 0.0.1.4__py3-none-any.whl

maqet/core.py

@@ -260,6 +260,8 @@ class Maqet:
         self.Machine = Machine  # For comfortable stage building
         self._config = benedict(kwargs)
 
+        self._validate_config()
+
         self._stages = dict()
         self.storage: dict[str, Drive] = dict()
 
@@ -276,6 +278,18 @@ class Maqet:
             else:
                 LOG.warning(f"Stage {stage} not found. Skipping")
 
+    def _validate_config(self):
+        default_config_fields = {
+            'binary': 'qemu-system-x86_64',
+            'arguments': [],
+            'user_arguments': [],
+            'storage': {}
+        }
+
+        for k, v in default_config_fields.items():
+            if k not in self._config:
+                self._config[k] = v
+
     @property
     def command(self) -> str:
         """
@@ -298,9 +312,11 @@ class Maqet:
     @config.setter
     def set_config(self, new_config: dict):
         self._config = benedict(new_config)
+        self._validate_config()
 
     def merge_config(self, new_config: dict):
         self._config.merge(new_config)
+        self._validate_config()
 
     def add_argument(self, argument: str) -> None:
         """

maqet-0.0.1.4.dist-info/METADATA

@@ -0,0 +1,6 @@
+Metadata-Version: 2.1
+Name: maqet
+Version: 0.0.1.4
+Requires-Python: >=3.12
+Requires-Dist: python-benedict >=0.33.2
+

{maqet-0.0.1.3.dist-info → maqet-0.0.1.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 maqet/__init__.py,sha256=hH-7x9aitvZKK46YFjdGLvHRSGMl67QLWwYlzikeoRw,96
-maqet/core.py,sha256=7SjZaVNWsZG7Sp2lw_UcrMKInWHMsprpq9nnnyiEi8s,11841
+maqet/core.py,sha256=lq1sQU3lGSiADiD_nYMKXv4zYvhSrJaVPfSDzv03wiw,12274
 maqet/functions.py,sha256=gZRIeCZpalnK6T9ktDzGHIT8LzniXaEMdzFNVTccXOo,2856
 maqet/logger.py,sha256=3N9TnInogdYVZ7DrT6Cg6lL8Q-c6AufBDspy9RmLWhk,1821
 maqet/storage.py,sha256=09atk3-eMf2xH-CGdwrr9D-zHMPXkaLXT1AIjZ6WMxI,6273
@@ -27,7 +27,7 @@ qemu/utils/qemu_ga_client.py,sha256=ycQ6lOh7Q0DEwvNq_LyE0Y4DRZfimq8kjhNlyn3K0Zk,
 qemu/utils/qom.py,sha256=sC2wXMZ_dH4E5HnYinjCMpagx_I-9NJ5oJi0rEiqqQQ,7564
 qemu/utils/qom_common.py,sha256=UQitmqLNGYfd3DoMaLNxRprgJeaEs6hX-8mrhGQ2mkc,4991
 qemu/utils/qom_fuse.py,sha256=uDbTKVWWej1Ey1Jsnw2p9sjmuLC_2vBBtBZpPG40I-k,5966
-maqet-0.0.1.3.dist-info/METADATA,sha256=lkT0rMHt-c6_DXT-HjQPZFULSEHIzceQqsBMSw24Oo4,3154
-maqet-0.0.1.3.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-maqet-0.0.1.3.dist-info/top_level.txt,sha256=9J0eHJ7TIdifxVkOxhgWVSyxkKRQhuFcbqUzIjhmgWg,11
-maqet-0.0.1.3.dist-info/RECORD,,
+maqet-0.0.1.4.dist-info/METADATA,sha256=sltSMjplayRAPOPAf5RV8rJ8s_xXdZufdEVPWp5OXGs,116
+maqet-0.0.1.4.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+maqet-0.0.1.4.dist-info/top_level.txt,sha256=9J0eHJ7TIdifxVkOxhgWVSyxkKRQhuFcbqUzIjhmgWg,11
+maqet-0.0.1.4.dist-info/RECORD,,

maqet-0.0.1.3.dist-info/METADATA

@@ -1,104 +0,0 @@
-Metadata-Version: 2.1
-Name: maqet
-Version: 0.0.1.3
-Project-URL: Repository, https://gitlab.com/m4x0n_24/maqet/-/tree/main
-Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.12
-Description-Content-Type: text/markdown
-Requires-Dist: python-benedict >=0.33.2
-
-# MAQET
-
-**Work in progress.** Documentation and code can be absolute mess.
-
-If you are willing to help - open issue, MR or do something else
-to attract maintainer's attention
-
-## Description
-
-MAQET stands for M4x0n QEmu Tool.
-It's based on [QEMU](https://gitlab.com/qemu-project/qemu) python [tooling](https://gitlab.com/qemu-project/qemu/-/tree/master/python?ref_type=heads).
-
-Main goal of this project is to provide good way to run qemu virtual machine.
-Author (m4x0n) wants to create virtual environment for repeatable testing
-of Linux installation and configuration before messing around with real computer,
-so all features implemented are primarily pursuing this goal.
-
-### Roadmap
-
-First usable version:
-
-- [x] YAML manifest for VM settings
-- [x] Storage (-drive) management:
-  - [x] RAW and QCOW2 files
-  - [x] Using backing images for QCOW2
-  - [x] Internal snapshots for QCOW2
-- [x] Stages defined as python functions with decorator (Flask style)
-- [x] CLI to specify stage, additional arguments and options
-- [x] QMP commands
-
-Goals for near future (sorted by priority):
-
-- [ ] Unified naming of variables (what is config? What is manifest?)
-- [ ] Code cleanup, adding typing hints, docstrings etc.
-- [ ] Extensible system of kwargs handling in every class (see in dev notes)
-- [ ] Unit tests
-- [ ] Full translation of strings into QMP key inputs
-
-Advanced goals
-
-- [ ] Custom QMP command presets
-- [ ] Advanced storage management
-- [ ] Runtime snapshots via qmp
-- [ ] Remote storage types (iscsi)
-
-## Usage guide
-
-See [example](https://gitlab.com/m4x0n_24/maqet/-/tree/main/example)
-Full documentation will be later
-
-## Development notes
-
-### Unification of **kwargs handling in extensible way
-
-Problem: classes have *args and **kwargs arguments. It gives flexibility,
-but also makes argument handling cumbersome (Ladder of if statements).
-
-Main class - Maqet, get it's kwargs and uses them as a config,
-parses and creates Machine class object
-with relevant arguments, also in form of kwargs.
-
-Idea is to make it extensible and unified. Like this:
-
-```yaml
-binary: qemu-system-x86_64
-arguments:
-  - foo
-  - bar
-  - baz
-storage:
-  - hda:
-      size: 5G
-      type: qcow2
-      options:
-        id: sda
-      ...
-some_custom_field:
-  - memory: 8G
-  - cpu: 4
-  - print: I_LIKE_PONIES
-```
-
-Binary is easy, just pass it into Machine
-What about arguments? Also pass into Machie, I made parser that turn them
-into cli arguments for qemu binary
-Storage? Call object Storage for every object in the list and pass contents inside
-Custom field? It will be ignored. If we want to use it?
-For example:
-We want to turn `memory: 8G, cpu: 4` into `-m 8G -smp 4`
-and run `print("I_LIKE_PONIES")` before VM starts.
-So we need somehow to extend Maqet class. How to do it? Still not sure.
-
-### QEMU not in PyPI
-
-Now QEMU tooling for python is used as sparse-checkouted git submodule.