Fix setting of virtualbox defaults, so they can be properly overwritten.

Author: fschulze

CHANGES.rst

@@ -2,6 +2,7 @@
 ==================
 
 - [feature] files copied during bootstrap can be encrypted using the ``ploy vault`` commands. This is useful for the private ssh host keys in ``bootstrap-files``.
+- [fix] fixed setting of virtualbox defaults, so they can be properly overwritten
 
 
 2.0.0 - 2015-03-05

bsdploy/__init__.py

@@ -90,6 +90,9 @@ def augment_instance(instance):
     if get_ansible_version() < (1, 5):
         log.error("You have an Ansible version below 1.5.0, which isn't supported anymore.")
         sys.exit(1)
+
+    main_config = instance.master.main_config
+
     # provide virtualbox specific convenience defaults:
     if instance.master.sectiongroupname == ('vb-instance'):
 
@@ -98,22 +101,23 @@ def augment_instance(instance):
             instance.config.setdefault(key, value)
 
         # default hostonly interface
-        if 'vb-hostonlyif' not in instance.master.main_config:
-            instance.master.main_config['vb-hostonlyif'] = ConfigSection(
-                vboxnet0=ConfigSection(virtualbox_hostonlyif_defaults))
+        hostonlyif = main_config.setdefault('vb-hostonlyif', ConfigSection())
+        vboxnet0 = hostonlyif.setdefault('vboxnet0', ConfigSection())
+        for key, value in virtualbox_hostonlyif_defaults.items():
+            vboxnet0.setdefault(key, value)
 
         # default dhcp server
-        if 'vb-dhcpserver' not in instance.master.main_config:
-            instance.master.main_config['vb-dhcpserver'] = ConfigSection(
-                vboxnet0=ConfigSection(virtualbox_dhcpserver_defaults))
+        dhcpserver = main_config.setdefault('vb-dhcpserver', ConfigSection())
+        vboxnet0 = dhcpserver.setdefault('vboxnet0', ConfigSection())
+        for key, value in virtualbox_dhcpserver_defaults.items():
+            vboxnet0.setdefault(key, value)
 
         # default virtual disk
         if 'vb-disk:defaultdisk' in instance.config.get('storage', {}):
-            try:
-                instance.master.main_config['vb-disk']['defaultdisk']
-            except KeyError:
-                instance.master.main_config['vb-disk'] = ConfigSection(
-                    defaultdisk=ConfigSection(virtualbox_bootdisk_defaults))
+            disks = main_config.setdefault('vb-disk', ConfigSection())
+            defaultdisk = disks.setdefault('defaultdisk', ConfigSection())
+            for key, value in virtualbox_bootdisk_defaults.items():
+                defaultdisk.setdefault(key, value)
 
     if not instance.master.sectiongroupname.startswith('ez-'):
         return
@@ -122,7 +126,7 @@ def augment_instance(instance):
         instance.config.setdefault(key, value)
 
     if 'fabfile' not in instance.config:
-        playbooks_directory = get_playbooks_directory(instance.master.main_config)
+        playbooks_directory = get_playbooks_directory(main_config)
         fabfile = path.join(playbooks_directory, instance.uid, 'fabfile.py')
         if path.exists(fabfile):
             instance.config['fabfile'] = fabfile
@@ -141,7 +145,7 @@ def augment_instance(instance):
             instance.config['roles'] = 'jails_host'
         if 'fingerprint' not in instance.config:
             host_defined_path = instance.config.get('bootstrap-files')
-            ploy_conf_path = instance.master.main_config.path
+            ploy_conf_path = main_config.path
             if host_defined_path is None:
                 bootstrap_path = path.join(ploy_conf_path, '..', 'bootstrap-files')
             else:

bsdploy/tests/test_bsdploy.py

@@ -129,6 +129,89 @@ def test_augment_non_ezjail_instance(ctrl, ployconf):
     assert dict(ctrl.instances['foo'].config) == {}
 
 
+@pytest.mark.parametrize("config, expected", [
+    ([], {'vboxnet0': {'ip': '192.168.56.1'}}),
+    (['[vb-hostonlyif:vboxnet0]'], {'vboxnet0': {'ip': '192.168.56.1'}}),
+    (['[vb-hostonlyif:vboxnet0]', 'ip = 192.168.57.1'],
+     {'vboxnet0': {'ip': '192.168.57.1'}}),
+    (['[vb-hostonlyif:vboxnet1]', 'ip = 192.168.57.1'],
+     {'vboxnet0': {'ip': '192.168.56.1'}, 'vboxnet1': {'ip': '192.168.57.1'}})])
+def test_virtualbox_hostonlyif(ctrl, config, expected, ployconf):
+    import ploy_virtualbox
+    ctrl.plugins['virtualbox'] = ploy_virtualbox.plugin
+    ployconf.fill([
+        '[vb-instance:vb]'] + config)
+    # trigger augmentation
+    ctrl.instances['vb']
+    assert ctrl.config['vb-hostonlyif'] == expected
+
+
+@pytest.mark.parametrize("config, expected", [
+    ([],
+     {'vboxnet0': {
+         'ip': '192.168.56.2', 'netmask': '255.255.255.0',
+         'lowerip': '192.168.56.100', 'upperip': '192.168.56.254'}}),
+    (['[vb-dhcpserver:vboxnet0]'],
+     {'vboxnet0': {
+         'ip': '192.168.56.2', 'netmask': '255.255.255.0',
+         'lowerip': '192.168.56.100', 'upperip': '192.168.56.254'}}),
+    (['[vb-dhcpserver:vboxnet0]', 'ip = 192.168.57.2'],
+     {'vboxnet0': {
+         'ip': '192.168.57.2', 'netmask': '255.255.255.0',
+         'lowerip': '192.168.56.100', 'upperip': '192.168.56.254'}}),
+    (['[vb-dhcpserver:vboxnet0]', 'netmask = 255.255.0.0'],
+     {'vboxnet0': {
+         'ip': '192.168.56.2', 'netmask': '255.255.0.0',
+         'lowerip': '192.168.56.100', 'upperip': '192.168.56.254'}}),
+    (['[vb-dhcpserver:vboxnet0]', 'lowerip = 192.168.56.50'],
+     {'vboxnet0': {
+         'ip': '192.168.56.2', 'netmask': '255.255.255.0',
+         'lowerip': '192.168.56.50', 'upperip': '192.168.56.254'}}),
+    (['[vb-dhcpserver:vboxnet0]', 'upperip = 192.168.56.200'],
+     {'vboxnet0': {
+         'ip': '192.168.56.2', 'netmask': '255.255.255.0',
+         'lowerip': '192.168.56.100', 'upperip': '192.168.56.200'}}),
+    (['[vb-dhcpserver:vboxnet0]', 'ip = 192.168.57.2', 'netmask = 255.255.0.0', 'lowerip = 192.168.56.50', 'upperip = 192.168.56.200'],
+     {'vboxnet0': {
+         'ip': '192.168.57.2', 'netmask': '255.255.0.0',
+         'lowerip': '192.168.56.50', 'upperip': '192.168.56.200'}}),
+    (['[vb-dhcpserver:vboxnet1]', 'ip = 192.168.57.2'],
+     {'vboxnet0': {
+         'ip': '192.168.56.2', 'netmask': '255.255.255.0',
+         'lowerip': '192.168.56.100', 'upperip': '192.168.56.254'},
+      'vboxnet1': {
+         'ip': '192.168.57.2'}})])
+def test_virtualbox_dhcpserver(ctrl, config, expected, ployconf):
+    import ploy_virtualbox
+    ctrl.plugins['virtualbox'] = ploy_virtualbox.plugin
+    ployconf.fill([
+        '[vb-instance:vb]'] + config)
+    # trigger augmentation
+    ctrl.instances['vb']
+    assert ctrl.config['vb-dhcpserver'] == expected
+
+
+@pytest.mark.parametrize("config, expected", [
+    ([], {}),
+    (['storage = --medium vb-disk:defaultdisk'],
+     {'defaultdisk': {'size': '102400'}}),
+    (['storage = --medium vb-disk:defaultdisk', '[vb-disk:defaultdisk]'],
+     {'defaultdisk': {'size': '102400'}}),
+    (['storage = --medium vb-disk:defaultdisk', '[vb-disk:defaultdisk]', 'size = 1024000'],
+     {'defaultdisk': {'size': '1024000'}}),
+    (['storage = --medium vb-disk:defaultdisk', '[vb-disk:otherdisk]'],
+     {'defaultdisk': {'size': '102400'},
+      'otherdisk': {}})])
+def test_virtualbox_defaultdisk(ctrl, config, expected, ployconf):
+    import ploy_virtualbox
+    ctrl.plugins['virtualbox'] = ploy_virtualbox.plugin
+    ployconf.fill([
+        '[vb-instance:vb]'] + config)
+    # trigger augmentation
+    ctrl.instances['vb']
+    assert ctrl.config.get('vb-disk', {}) == expected
+
+
 @pytest.mark.parametrize("instance, key, value, expected", [
     ('foo', 'ansible_python_interpreter', 'python2.7', 'python2.7'),
     ('foo', 'startup_script', 'foo', {'path': '{tempdir}/etc/foo'}),

setup.py

@@ -46,6 +46,7 @@
             'repoze.sphinx.autointerface',
             'coverage',
             'jarn.mkrelease',
+            'ploy_virtualbox>=1.1.0',
             'pytest >= 2.4.2',
             'pytest-flakes',
             'pytest-pep8',