System config niceness!

1. Move out the old helpers that provided oop access/reading/writing
   to various standard conf files and place those in parsers instead.
2. Unify the 'update_hostname' which varied very little	between	distros
   and make it generic so that subclasses can only provide a couple of 
   functions to	obtain the hostname updating functionality
3. Implement that new set of functions in rhel/debian    
4. Use the new parsers chop_comment function for similar use 
   cases as well as add a new utils make header	function that
   can be used for configuration files that are	newly generated
   to use (less	duplication here of this same thing being done
   in multiple places.
5. Add in a distro '_apply_hostname' which calls out to	the 'hostname'
   program to set the system hostname (more duplication	elimination).
6. Make the 'constant' filenames being written to for configuration
   by the various distros be instance members instead of string
   constants 'sprinkled' throughout the code

3 files changed, 13 insertions, 11 deletions

diff --git a/tests/unittests/test_distros/test_hosts.py b/tests/unittests/test_distros/test_hosts.py
index 621837ab..687a0dab 100644
--- a/tests/unittests/test_distros/test_hosts.py
+++ b/tests/unittests/test_distros/test_hosts.py
@@ -1,6 +1,6 @@
 from mocker import MockerTestCase
 
-from cloudinit.distros import helpers
+from cloudinit.distros.parsers import hosts
 
 
 BASE_ETC = '''
@@ -16,7 +16,7 @@ BASE_ETC = BASE_ETC.strip()
 
 class TestHostsHelper(MockerTestCase):
     def test_parse(self):
-        eh = helpers.HostsConf(BASE_ETC)
+        eh = hosts.HostsConf(BASE_ETC)
         self.assertEquals(eh.get_entry('127.0.0.1'), [['localhost']])
         self.assertEquals(eh.get_entry('192.168.1.10'),
                           [['foo.mydomain.org', 'foo'],
@@ -25,7 +25,7 @@ class TestHostsHelper(MockerTestCase):
         self.assertTrue(eh.startswith('# Example'))
 
     def test_add(self):
-        eh = helpers.HostsConf(BASE_ETC)
+        eh = hosts.HostsConf(BASE_ETC)
         eh.add_entry('127.0.0.0', 'blah')
         self.assertEquals(eh.get_entry('127.0.0.0'), [['blah']])
         eh.add_entry('127.0.0.3', 'blah', 'blah2', 'blah3')
@@ -33,7 +33,7 @@ class TestHostsHelper(MockerTestCase):
                           [['blah', 'blah2', 'blah3']])
 
     def test_del(self):
-        eh = helpers.HostsConf(BASE_ETC)
+        eh = hosts.HostsConf(BASE_ETC)
         eh.add_entry('127.0.0.0', 'blah')
         self.assertEquals(eh.get_entry('127.0.0.0'), [['blah']])
 
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
index 55765f0c..b7ce6fea 100644
--- a/tests/unittests/test_distros/test_netconfig.py
+++ b/tests/unittests/test_distros/test_netconfig.py
@@ -83,7 +83,7 @@ class TestNetCfgDistro(MockerTestCase):
         self.assertEquals(write_buf.mode, 0644)
 
     def assertCfgEquals(self, blob1, blob2):
-        cfg_tester = distros.rhel.QuotingConfigObj
+        cfg_tester = distros.parsers.quoting_conf.QuotingConfigObj
         b1 = dict(cfg_tester(blob1.strip().splitlines()))
         b2 = dict(cfg_tester(blob2.strip().splitlines()))
         self.assertEquals(b1, b2)
diff --git a/tests/unittests/test_distros/test_resolv.py b/tests/unittests/test_distros/test_resolv.py
index 5f122833..d947dda0 100644
--- a/tests/unittests/test_distros/test_resolv.py
+++ b/tests/unittests/test_distros/test_resolv.py
@@ -1,6 +1,8 @@
 from mocker import MockerTestCase
 
-from cloudinit.distros import helpers
+from cloudinit.distros.parsers import resolv_conf
+
+import re
 
 
 BASE_RESOLVE = '''
@@ -14,12 +16,12 @@ BASE_RESOLVE = BASE_RESOLVE.strip()
 
 class TestResolvHelper(MockerTestCase):
     def test_parse_same(self):
-        rp = helpers.ResolvConf(BASE_RESOLVE)
+        rp = resolv_conf.ResolvConf(BASE_RESOLVE)
         rp_r = str(rp).strip()
         self.assertEquals(BASE_RESOLVE, rp_r)
 
     def test_local_domain(self):
-        rp = helpers.ResolvConf(BASE_RESOLVE)
+        rp = resolv_conf.ResolvConf(BASE_RESOLVE)
         self.assertEquals(None, rp.local_domain)
 
         rp.local_domain = "bob"
@@ -27,7 +29,7 @@ class TestResolvHelper(MockerTestCase):
         self.assertIn('domain bob', str(rp))
 
     def test_nameservers(self):
-        rp = helpers.ResolvConf(BASE_RESOLVE)
+        rp = resolv_conf.ResolvConf(BASE_RESOLVE)
         self.assertIn('10.15.44.14', rp.nameservers)
         self.assertIn('10.15.30.92', rp.nameservers)
         rp.add_nameserver('10.2')
@@ -41,12 +43,12 @@ class TestResolvHelper(MockerTestCase):
         self.assertNotIn('10.3', rp.nameservers)
 
     def test_search_domains(self):
-        rp = helpers.ResolvConf(BASE_RESOLVE)
+        rp = resolv_conf.ResolvConf(BASE_RESOLVE)
         self.assertIn('yahoo.com', rp.search_domains)
         self.assertIn('blah.yahoo.com', rp.search_domains)
         rp.add_search_domain('bbb.y.com')
         self.assertIn('bbb.y.com', rp.search_domains)
-        self.assertRegexpMatches(str(rp), r'search(.*)bbb.y.com(.*)')
+        self.assertTrue(re.search(r'search(.*)bbb.y.com(.*)', str(rp)))
         self.assertIn('bbb.y.com', rp.search_domains)
         rp.add_search_domain('bbb.y.com')
         self.assertEquals(len(rp.search_domains), 3)