linting is good probably

Author: NeilHanlon

kiwi/storage/subformat/vagrant_base.py

@@ -36,6 +36,7 @@
 
 VagrantConfigDict = Dict['str', xml_parse.vagrantconfig]
 
+
 class DiskFormatVagrantBase(DiskFormatBase):
     """
     Base class for creating vagrant boxes.
@@ -102,7 +103,7 @@ def post_init(self, custom_args: VagrantConfigDict):
         self.vagrantconfig = custom_args.pop('vagrantconfig')
         self.vagrant_post_init(custom_args)
 
-    def vagrant_post_init(self, custom_args: Dict['str', xml_parse.vagrantconfig]) -> None:
+    def vagrant_post_init(self, custom_args: VagrantConfigDict = None) -> None:
         """
         Vagrant provider specific post initialization method
 

kiwi/storage/subformat/vagrant_libvirt.py

@@ -22,7 +22,9 @@
 )
 
 # project
-from kiwi.storage.subformat.vagrant_base import DiskFormatVagrantBase
+from kiwi.storage.subformat.vagrant_base import (
+    DiskFormatVagrantBase, VagrantConfigDict
+)
 from kiwi.storage.subformat.qcow2 import DiskFormatQcow2
 from kiwi.command import Command
 
@@ -31,7 +33,7 @@ class DiskFormatVagrantLibVirt(DiskFormatVagrantBase):
     """
     **Create a vagrant box for the libvirt provider**
     """
-    def vagrant_post_init(self) -> None:
+    def vagrant_post_init(self, custom_args: VagrantConfigDict = None) -> None:
         self.image_format = 'vagrant.libvirt.box'
         self.provider = 'libvirt'
 

kiwi/storage/subformat/vagrant_virtualbox.py

@@ -24,7 +24,9 @@
 from kiwi.storage.subformat.template.virtualbox_ovf import (
     VirtualboxOvfTemplate
 )
-from kiwi.storage.subformat.vagrant_base import DiskFormatVagrantBase
+from kiwi.storage.subformat.vagrant_base import (
+    DiskFormatVagrantBase, VagrantConfigDict
+)
 from kiwi.storage.subformat.vmdk import DiskFormatVmdk
 from kiwi.command import Command
 
@@ -34,7 +36,7 @@ class DiskFormatVagrantVirtualBox(DiskFormatVagrantBase):
     **Create a vagrant box for the virtualbox provider**
     """
 
-    def vagrant_post_init(self) -> None:
+    def vagrant_post_init(self, custom_args: VagrantConfigDict = None) -> None:
         self.provider = 'virtualbox'
         self.image_format = 'vagrant.virtualbox.box'
 

kiwi/storage/subformat/vagrant_vmware.py

@@ -16,15 +16,12 @@
 # along with kiwi.  If not, see <http://www.gnu.org/licenses/>
 #
 
-import os
 # from textwrap import dedent
 from typing import (
     List, Dict
 )
-from pathlib import PurePath
 
 # project
-from kiwi.command import Command
 from kiwi.storage.subformat.vagrant_base import (DiskFormatVagrantBase,
                                                  VagrantConfigDict)
 from kiwi.storage.subformat.vmdk import DiskFormatVmdk
@@ -39,10 +36,10 @@ class DiskFormatVagrantVMware(DiskFormatVagrantBase):
     **Create a vagrant box for the vmware provider**
     """
 
-    def vagrant_post_init(self, custom_args: VagrantConfigDict) -> None:
+    def vagrant_post_init(self, custom_args: VagrantConfigDict = None) -> None:
         self.image_format = 'vagrant.vmware_desktop.box'
         self.provider = 'vmware_desktop'
-        self.options = self.get_qemu_option_list(custom_args)
+        self.custom_args = custom_args
 
     def create_box_img(self, temp_image_dir: str) -> List[str]:
         """
@@ -59,7 +56,7 @@ def create_box_img(self, temp_image_dir: str) -> List[str]:
         """
         vmdk = DiskFormatVmdk(
             self.xml_state, self.root_dir, self.target_dir,
-            custom_args=self.options
+            custom_args=self.custom_args
         )
         try:
             vmdk.create_image_format()