More adjustments/cleanups for the system configuration

helper objects.

1. Add in a parser for the /etc/hostname file that can be shared
2. Adjust the sysconfig configobj parser to not always quote
   fields that it does not need to quote + add in tests around
   this to ensure that we don't go nuts with quoting again.

3 files changed, 101 insertions, 3 deletions

diff --git a/tests/unittests/test_distros/test_hostname.py b/tests/unittests/test_distros/test_hostname.py
new file mode 100644
index 00000000..8e644f4d
--- /dev/null
+++ b/tests/unittests/test_distros/test_hostname.py
@@ -0,0 +1,38 @@
+from mocker import MockerTestCase
+
+from cloudinit.distros.parsers import hostname
+
+
+BASE_HOSTNAME = '''
+# My super-duper-hostname
+
+blahblah
+
+'''
+BASE_HOSTNAME = BASE_HOSTNAME.strip()
+
+
+class TestHostnameHelper(MockerTestCase):
+    def test_parse_same(self):
+        hn = hostname.HostnameConf(BASE_HOSTNAME)
+        self.assertEquals(str(hn).strip(), BASE_HOSTNAME)
+        self.assertEquals(hn.hostname, 'blahblah')
+
+    def test_no_adjust_hostname(self):
+        hn = hostname.HostnameConf(BASE_HOSTNAME)
+        prev_name = hn.hostname
+        hn.set_hostname("")
+        self.assertEquals(hn.hostname, prev_name)
+
+    def test_adjust_hostname(self):
+        hn = hostname.HostnameConf(BASE_HOSTNAME)
+        prev_name = hn.hostname
+        self.assertEquals(prev_name, 'blahblah')
+        hn.set_hostname("bbbbd")
+        self.assertEquals(hn.hostname, 'bbbbd')
+        expected_out = '''
+# My super-duper-hostname
+
+bbbbd
+'''
+        self.assertEquals(str(hn).strip(), expected_out.strip())
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
index b7ce6fea..9763b14b 100644
--- a/tests/unittests/test_distros/test_netconfig.py
+++ b/tests/unittests/test_distros/test_netconfig.py
@@ -9,6 +9,8 @@ from cloudinit import helpers
 from cloudinit import settings
 from cloudinit import util
 
+from cloudinit.distros.parsers.sys_conf import SysConf
+
 from StringIO import StringIO
 
 
@@ -83,9 +85,8 @@ class TestNetCfgDistro(MockerTestCase):
         self.assertEquals(write_buf.mode, 0644)
 
     def assertCfgEquals(self, blob1, blob2):
-        cfg_tester = distros.parsers.quoting_conf.QuotingConfigObj
-        b1 = dict(cfg_tester(blob1.strip().splitlines()))
-        b2 = dict(cfg_tester(blob2.strip().splitlines()))
+        b1 = dict(SysConf(blob1.strip().splitlines()))
+        b2 = dict(SysConf(blob2.strip().splitlines()))
         self.assertEquals(b1, b2)
         for (k, v) in b1.items():
             self.assertIn(k, b2)
diff --git a/tests/unittests/test_distros/test_sysconfig.py b/tests/unittests/test_distros/test_sysconfig.py
new file mode 100644
index 00000000..196d090d
--- /dev/null
+++ b/tests/unittests/test_distros/test_sysconfig.py
@@ -0,0 +1,59 @@
+from mocker import MockerTestCase
+
+from cloudinit.distros.parsers.sys_conf import SysConf
+
+
+# Lots of good examples @
+# http://content.hccfl.edu/pollock/AUnix1/SysconfigFilesDesc.txt
+
+class TestSysConfHelper(MockerTestCase):
+    def test_parse_no_change(self):
+        contents = '''# A comment
+USESMBAUTH=no
+KEYTABLE=/usr/lib/kbd/keytables/us.map
+SHORTDATE=$(date +%y:%m:%d:%H:%M)
+HOSTNAME=blahblah
+NETMASK0=255.255.255.0
+# Inline comment
+LIST=$LOGROOT/incremental-list
+IPV6TO4_ROUTING="eth0-:0004::1/64 eth1-:0005::1/64"
+ETHTOOL_OPTS="-K ${DEVICE} tso on; -G ${DEVICE} rx 256 tx 256"
+USEMD5=no'''
+        conf = SysConf(contents.splitlines())
+        self.assertEquals(conf['HOSTNAME'], 'blahblah')
+        self.assertEquals(conf['SHORTDATE'], '$(date +%y:%m:%d:%H:%M)')
+        # Should be unquoted
+        self.assertEquals(conf['ETHTOOL_OPTS'], ('-K ${DEVICE} tso on; '
+                                                 '-G ${DEVICE} rx 256 tx 256'))
+        self.assertEquals(contents, str(conf))
+
+    def test_parse_adjust(self):
+        contents = 'IPV6TO4_ROUTING="eth0-:0004::1/64 eth1-:0005::1/64"'
+        conf = SysConf(contents.splitlines())
+        # Should be unquoted
+        self.assertEquals('eth0-:0004::1/64 eth1-:0005::1/64',
+                          conf['IPV6TO4_ROUTING'])
+        conf['IPV6TO4_ROUTING'] = "blah \tblah"
+        contents2 = str(conf).strip()
+        # Should be requoted due to whitespace
+        self.assertEquals('IPV6TO4_ROUTING="blah \tblah"', contents2)
+
+    def test_parse_no_adjust_shell(self):
+        conf = SysConf(''.splitlines())
+        conf['B'] = ' $(time)'
+        contents = str(conf)
+        self.assertEquals('B= $(time)', contents)
+
+    def test_parse_empty(self):
+        contents = ''
+        conf = SysConf(contents.splitlines())
+        self.assertEquals('', str(conf).strip())
+
+    def test_parse_add_new(self):
+        contents = 'BLAH=b'
+        conf = SysConf(contents.splitlines())
+        conf['Z'] = 'd'
+        contents = str(conf)
+        self.assertIn("Z=d", contents)
+        self.assertIn("BLAH=b", contents)
+