merge from trunk

2 files changed, 120 insertions, 0 deletions

diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
index 9172e3aa..36eae2dc 100644
--- a/tests/unittests/test_distros/test_netconfig.py
+++ b/tests/unittests/test_distros/test_netconfig.py
@@ -319,3 +319,63 @@ defaultrouter="192.168.1.254"
 '''
             self.assertCfgEquals(expected_buf, str(write_buf))
             self.assertEqual(write_buf.mode, 0o644)
+
+    def test_apply_network_config_fallback(self):
+        fbsd_distro = self._get_distro('freebsd')
+
+        # a weak attempt to verify that we don't have an implementation
+        # of _write_network_config or apply_network_config in fbsd now,
+        # which would make this test not actually test the fallback.
+        self.assertRaises(
+            NotImplementedError, fbsd_distro._write_network_config,
+            BASE_NET_CFG)
+
+        # now run
+        mynetcfg = {
+            'config': [{"type": "physical", "name": "eth0",
+                        "mac_address": "c0:d6:9f:2c:e8:80",
+                        "subnets": [{"type": "dhcp"}]}],
+            'version': 1}
+
+        write_bufs = {}
+        read_bufs = {
+            '/etc/rc.conf': '',
+            '/etc/resolv.conf': '',
+        }
+
+        def replace_write(filename, content, mode=0o644, omode="wb"):
+            buf = WriteBuffer()
+            buf.mode = mode
+            buf.omode = omode
+            buf.write(content)
+            write_bufs[filename] = buf
+
+        def replace_read(fname, read_cb=None, quiet=False):
+            if fname not in read_bufs:
+                if fname in write_bufs:
+                    return str(write_bufs[fname])
+                raise IOError("%s not found" % fname)
+            else:
+                if fname in write_bufs:
+                    return str(write_bufs[fname])
+                return read_bufs[fname]
+
+        with ExitStack() as mocks:
+            mocks.enter_context(
+                mock.patch.object(util, 'subp', return_value=('vtnet0', '')))
+            mocks.enter_context(
+                mock.patch.object(os.path, 'exists', return_value=False))
+            mocks.enter_context(
+                mock.patch.object(util, 'write_file', replace_write))
+            mocks.enter_context(
+                mock.patch.object(util, 'load_file', replace_read))
+
+            fbsd_distro.apply_network_config(mynetcfg, bring_up=False)
+
+            self.assertIn('/etc/rc.conf', write_bufs)
+            write_buf = write_bufs['/etc/rc.conf']
+            expected_buf = '''
+ifconfig_vtnet0="DHCP"
+'''
+            self.assertCfgEquals(expected_buf, str(write_buf))
+            self.assertEqual(write_buf.mode, 0o644)
diff --git a/tests/unittests/test_handler/test_handler_mcollective.py b/tests/unittests/test_handler/test_handler_mcollective.py
new file mode 100644
index 00000000..f9448d80
--- /dev/null
+++ b/tests/unittests/test_handler/test_handler_mcollective.py
@@ -0,0 +1,60 @@
+from cloudinit.config import cc_mcollective
+from cloudinit import util
+
+from .. import helpers
+
+import configobj
+import logging
+import shutil
+from six import BytesIO
+import tempfile
+
+LOG = logging.getLogger(__name__)
+
+
+class TestConfig(helpers.FilesystemMockingTestCase):
+    def setUp(self):
+        super(TestConfig, self).setUp()
+        self.tmp = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.tmp)
+
+    def test_basic_config(self):
+        cfg = {
+            'mcollective': {
+                'conf': {
+                    'loglevel': 'debug',
+                    'connector': 'rabbitmq',
+                    'logfile': '/var/log/mcollective.log',
+                    'ttl': '4294957',
+                    'collectives': 'mcollective',
+                    'main_collective': 'mcollective',
+                    'securityprovider': 'psk',
+                    'daemonize': '1',
+                    'factsource': 'yaml',
+                    'direct_addressing': '1',
+                    'plugin.psk': 'unset',
+                    'libdir': '/usr/share/mcollective/plugins',
+                    'identity': '1',
+                },
+            },
+        }
+        self.patchUtils(self.tmp)
+        cc_mcollective.configure(cfg['mcollective']['conf'])
+        contents = util.load_file("/etc/mcollective/server.cfg", decode=False)
+        contents = configobj.ConfigObj(BytesIO(contents))
+        expected = {
+            'loglevel': 'debug',
+            'connector': 'rabbitmq',
+            'logfile': '/var/log/mcollective.log',
+            'ttl': '4294957',
+            'collectives': 'mcollective',
+            'main_collective': 'mcollective',
+            'securityprovider': 'psk',
+            'daemonize': '1',
+            'factsource': 'yaml',
+            'direct_addressing': '1',
+            'plugin.psk': 'unset',
+            'libdir': '/usr/share/mcollective/plugins',
+            'identity': '1',
+        }
+        self.assertEqual(expected, dict(contents))