[yum] split out subscription-manager into its own plugin

subscription-manager and rhsm* stuff separated from yum plugin into
a new one (subscription-manager).

Resolves #451

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

2 files changed, 51 insertions, 15 deletions

diff --git a/sos/plugins/subscription_manager.py b/sos/plugins/subscription_manager.py
new file mode 100644
index 00000000..8ba65d83
--- /dev/null
+++ b/sos/plugins/subscription_manager.py
@@ -0,0 +1,43 @@
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+from sos.plugins import Plugin, RedHatPlugin
+
+
+class SubscriptionManager(Plugin, RedHatPlugin):
+    """subscription-manager information
+    """
+
+    plugin_name = 'subscription-manager'
+    profiles = ('system', 'packagemanager', 'sysmgmt')
+
+    files = ('/etc/rhsm/rhsm.conf',)
+    packages = ('subscription-manager',)
+
+    def setup(self):
+        # rhsm config and logs
+        self.add_copy_spec([
+            "/etc/rhsm/",
+            "/var/log/rhsm/rhsm.log",
+            "/var/log/rhsm/rhsmcertd.log"])
+        self.add_cmd_output([
+            "subscription-manager list --installed",
+            "subscription-manager list --consumed",
+            "subscription-manager identity"
+        ])
+        self.add_cmd_output("rhsm-debug system --sos --no-archive "
+                            "--no-subscriptions --destination %s"
+                            % self.get_cmd_output_path())
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py
index 19ed7f2a..71552802 100644
--- a/sos/plugins/yum.py
+++ b/sos/plugins/yum.py
@@ -24,9 +24,11 @@ class Yum(Plugin, RedHatPlugin):
 
     files = ('/etc/yum.conf',)
     packages = ('yum',)
-    option_list = [("yumlist", "list repositories and packages", "slow",
-                    False),
-                   ("yumdebug", "gather yum debugging data", "slow", False)]
+
+    option_list = [
+        ("yumlist", "list repositories and packages", "slow", False),
+        ("yumdebug", "gather yum debugging data", "slow", False)
+    ]
 
     def setup(self):
         # Pull all yum related information
@@ -34,7 +36,8 @@ class Yum(Plugin, RedHatPlugin):
             "/etc/yum",
             "/etc/yum.repos.d",
             "/etc/yum.conf",
-            "/var/log/yum.log"])
+            "/var/log/yum.log"
+        ])
 
         # Get a list of channels the machine is subscribed to.
         self.add_cmd_output("yum -C repolist")
@@ -45,18 +48,8 @@ class Yum(Plugin, RedHatPlugin):
         self.add_copy_spec([
             "/etc/pki/product/*.pem",
             "/etc/pki/consumer/cert.pem",
-            "/etc/pki/entitlement/*.pem",
-            "/etc/rhsm/",
-            "/var/log/rhsm/rhsm.log",
-            "/var/log/rhsm/rhsmcertd.log"])
-        self.add_cmd_output([
-            "subscription-manager list --installed",
-            "subscription-manager list --consumed",
-            "subscription-manager identity"
+            "/etc/pki/entitlement/*.pem"
         ])
-        self.add_cmd_output("rhsm-debug system --sos --no-archive "
-                            "--no-subscriptions --destination %s"
-                            % self.get_cmd_output_path())
         self.add_cmd_output("yum history")
 
         if self.get_option("yumlist"):