Conforming naming scheme in a few plugins

Went through a few plugins to make sure inherit distro plugins were keeping
same naming scheme as the rest.

Signed-off-by: Adam Stokes <hackr@cypherbook.com>

6 files changed, 13 insertions, 11 deletions

diff --git a/sos/plugins/acpid.py b/sos/plugins/acpid.py
index 42840e7d..1c092e42 100644
--- a/sos/plugins/acpid.py
+++ b/sos/plugins/acpid.py
@@ -17,7 +17,7 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class acpid(Plugin):
     plugin_name = "acpid"
 
-class AcpidRedHat(acpid, RedHatPlugin):
+class RedHatAcpid(acpid, RedHatPlugin):
     """acpid related information
     """
     def setup(self):
@@ -25,7 +25,7 @@ class AcpidRedHat(acpid, RedHatPlugin):
             "/var/log/acpid*",
             "/etc/acpi/events/power.conf"])
 
-class AcpidDebian(acpid, DebianPlugin, UbuntuPlugin):
+class DebianAcpid(acpid, DebianPlugin, UbuntuPlugin):
     """acpid related information for Debian and Ubuntu
     """
     def setup(self):
diff --git a/sos/plugins/cgroups.py b/sos/plugins/cgroups.py
index 73e6ac93..5b217760 100644
--- a/sos/plugins/cgroups.py
+++ b/sos/plugins/cgroups.py
@@ -14,12 +14,14 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class cgroups(Plugin, DebianPlugin, UbuntuPlugin):
+class cgroups(Plugin):
     """cgroup subsystem information
     """
 
     plugin_name = "cgroups"
 
+class DebianCgroups(cgroups, DebianPlugin, UbuntuPlugin):
+
     files = ('/proc/cgroups',)
 
     def setup(self):
diff --git a/sos/plugins/cobbler.py b/sos/plugins/cobbler.py
index 08847309..5ad1d062 100644
--- a/sos/plugins/cobbler.py
+++ b/sos/plugins/cobbler.py
@@ -17,7 +17,7 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class cobbler(Plugin):
     plugin_name = "cobbler"
     
-class CobblerRedHat(cobbler, RedHatPlugin):
+class RedHatCobbler(cobbler, RedHatPlugin):
     """cobbler related information
     """
 
@@ -29,7 +29,7 @@ class CobblerRedHat(cobbler, RedHatPlugin):
         self.addCopySpec("/var/lib/rhn/kickstarts")
         self.addCopySpec("/var/lib/cobbler")
 
-class CobblerDebianPlugin(cobbler, DebianPlugin, UbuntuPlugin):
+class DebianCobbler(cobbler, DebianPlugin, UbuntuPlugin):
     """cobbler related information for Debian and Ubuntu
     """
 
diff --git a/sos/plugins/dhcp.py b/sos/plugins/dhcp.py
index 7ed2e7e1..772ea35b 100644
--- a/sos/plugins/dhcp.py
+++ b/sos/plugins/dhcp.py
@@ -20,7 +20,7 @@ class dhcp(Plugin):
 
     plugin_name = "dhcp"
 
-class DhcpRedHat(dhcp, RedHatPlugin):
+class RedHatDhcp(dhcp, RedHatPlugin):
     """DHCP related information for Red Hat based distributions"""
 
     files = ('/etc/rc.d/init.d/dhcpd',)
@@ -32,7 +32,7 @@ class DhcpRedHat(dhcp, RedHatPlugin):
             "/etc/dhcpd.conf",
             "/etc/dhcp"])
 
-class DhcpDebian(dhcp, UbuntuPlugin):
+class UbuntuDhcp(dhcp, UbuntuPlugin):
     """DHCP related information for Debian based distributions"""
 
     files = ('/etc/init.d/udhcpd',)
diff --git a/sos/plugins/general.py b/sos/plugins/general.py
index 1ad03055..62c7e441 100644
--- a/sos/plugins/general.py
+++ b/sos/plugins/general.py
@@ -90,7 +90,7 @@ class RedHatGeneral(general, RedHatPlugin):
                 r"(\s*proxyPassword\s*=\s*)\S+", r"\1***")
 
 
-class GeneralDebian(general, DebianPlugin, UbuntuPlugin):
+class DebianGeneral(general, DebianPlugin, UbuntuPlugin):
     """Basic system information for Debian based distributions"""
 
     def setup(self):
@@ -101,7 +101,7 @@ class GeneralDebian(general, DebianPlugin, UbuntuPlugin):
             "/var/log/up2date",
             "/etc/lsb-release"
         ])
-class GeneralUbuntu(general, UbuntuPlugin):
+class UbuntuGeneral(general, UbuntuPlugin):
     """Basic system information for Ubuntu based distributions"""
 
     def setup(self):
diff --git a/sos/plugins/system.py b/sos/plugins/system.py
index 7aade419..3033bd22 100644
--- a/sos/plugins/system.py
+++ b/sos/plugins/system.py
@@ -17,7 +17,7 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class system(Plugin):
     plugin_name = "system"
 
-class SystemRedHat(system, RedHatPlugin):
+class RedHatSystem(system, RedHatPlugin):
     """core system related information
     """
     def setup(self):
@@ -39,7 +39,7 @@ class SystemRedHat(system, RedHatPlugin):
 
         self.addCmdOutput("/usr/bin/crontab -l")
 
-class SystemDebian(system, DebianPlugin, UbuntuPlugin):
+class DebianSystem(system, DebianPlugin, UbuntuPlugin):
     """core system related information for Debian and Ubuntu
     """
     def setup(self):