From 71428ba1bc664feedbb41ea3d4a5b44a5a096dac Mon Sep 17 00:00:00 2001 From: Jake Hunsaker Date: Tue, 24 Mar 2020 16:18:39 -0400 Subject: [global] Fix report import paths Updates the uses of 'from sos.plugins' to 'from sos.report.plugins' in order to fix imports across the project with the new tree organization. Additionally, the legacy `sosreport` binary now injects the user's current working directory into the path the python interpreter uses in order to allow local execution from a git checkout. Signed-off-by: Jake Hunsaker --- bin/sosreport | 6 +++++- example_plugins/example.py | 2 +- sos/policies/__init__.py | 2 +- sos/policies/debian.py | 2 +- sos/policies/ibmkvm.py | 2 +- sos/policies/redhat.py | 2 +- sos/policies/suse.py | 2 +- sos/policies/ubuntu.py | 2 +- sos/report/__init__.py | 0 sos/report/plugins/__init__.py | 2 +- sos/report/plugins/abrt.py | 2 +- sos/report/plugins/acpid.py | 2 +- sos/report/plugins/activemq.py | 2 +- sos/report/plugins/alternatives.py | 2 +- sos/report/plugins/anaconda.py | 2 +- sos/report/plugins/anacron.py | 2 +- sos/report/plugins/ansible.py | 2 +- sos/report/plugins/apache.py | 2 +- sos/report/plugins/apparmor.py | 2 +- sos/report/plugins/apport.py | 2 +- sos/report/plugins/apt.py | 2 +- sos/report/plugins/ata.py | 2 +- sos/report/plugins/atomichost.py | 2 +- sos/report/plugins/auditd.py | 2 +- sos/report/plugins/autofs.py | 2 +- sos/report/plugins/azure.py | 2 +- sos/report/plugins/block.py | 2 +- sos/report/plugins/boom.py | 2 +- sos/report/plugins/boot.py | 2 +- sos/report/plugins/btrfs.py | 2 +- sos/report/plugins/buildah.py | 2 +- sos/report/plugins/candlepin.py | 2 +- sos/report/plugins/canonical_livepatch.py | 2 +- sos/report/plugins/ceph.py | 2 +- sos/report/plugins/ceph_ansible.py | 2 +- sos/report/plugins/cgroups.py | 2 +- sos/report/plugins/chrony.py | 2 +- sos/report/plugins/cifs.py | 2 +- sos/report/plugins/clear_containers.py | 4 ++-- sos/report/plugins/cloud_init.py | 2 +- sos/report/plugins/cman.py | 2 +- sos/report/plugins/cobbler.py | 2 +- sos/report/plugins/cockpit.py | 2 +- sos/report/plugins/collectd.py | 2 +- sos/report/plugins/composer.py | 2 +- sos/report/plugins/conntrackd.py | 4 ++-- sos/report/plugins/console.py | 2 +- sos/report/plugins/container_log.py | 2 +- sos/report/plugins/convert2rhel.py | 2 +- sos/report/plugins/corosync.py | 2 +- sos/report/plugins/crio.py | 2 +- sos/report/plugins/cron.py | 2 +- sos/report/plugins/crypto.py | 2 +- sos/report/plugins/cs.py | 2 +- sos/report/plugins/ctdb.py | 2 +- sos/report/plugins/cups.py | 2 +- sos/report/plugins/date.py | 2 +- sos/report/plugins/dbus.py | 2 +- sos/report/plugins/devicemapper.py | 2 +- sos/report/plugins/devices.py | 2 +- sos/report/plugins/dhcp.py | 2 +- sos/report/plugins/distupgrade.py | 2 +- sos/report/plugins/dlm.py | 2 +- sos/report/plugins/dmraid.py | 2 +- sos/report/plugins/dnf.py | 2 +- sos/report/plugins/docker.py | 2 +- sos/report/plugins/docker_distribution.py | 2 +- sos/report/plugins/dovecot.py | 2 +- sos/report/plugins/dpkg.py | 2 +- sos/report/plugins/dracut.py | 2 +- sos/report/plugins/ds.py | 2 +- sos/report/plugins/ebpf.py | 2 +- sos/report/plugins/elastic.py | 2 +- sos/report/plugins/etcd.py | 2 +- sos/report/plugins/fcoe.py | 2 +- sos/report/plugins/fibrechannel.py | 2 +- sos/report/plugins/filesys.py | 2 +- sos/report/plugins/firewalld.py | 2 +- sos/report/plugins/foreman.py | 4 ++-- sos/report/plugins/frr.py | 2 +- sos/report/plugins/fwupd.py | 2 +- sos/report/plugins/gdm.py | 2 +- sos/report/plugins/gfs2.py | 2 +- sos/report/plugins/gluster.py | 2 +- sos/report/plugins/gluster_block.py | 2 +- sos/report/plugins/gnocchi.py | 2 +- sos/report/plugins/grafana.py | 2 +- sos/report/plugins/grub.py | 2 +- sos/report/plugins/grub2.py | 4 ++-- sos/report/plugins/gssproxy.py | 2 +- sos/report/plugins/haproxy.py | 2 +- sos/report/plugins/hardware.py | 2 +- sos/report/plugins/host.py | 2 +- sos/report/plugins/hpasm.py | 2 +- sos/report/plugins/hts.py | 2 +- sos/report/plugins/i18n.py | 2 +- sos/report/plugins/infiniband.py | 2 +- sos/report/plugins/insights.py | 2 +- sos/report/plugins/ipa.py | 2 +- sos/report/plugins/ipmitool.py | 2 +- sos/report/plugins/iprconfig.py | 2 +- sos/report/plugins/ipvs.py | 2 +- sos/report/plugins/iscsi.py | 2 +- sos/report/plugins/iscsitarget.py | 2 +- sos/report/plugins/jars.py | 2 +- sos/report/plugins/java.py | 2 +- sos/report/plugins/juju.py | 2 +- sos/report/plugins/kata_containers.py | 4 ++-- sos/report/plugins/kdump.py | 2 +- sos/report/plugins/keepalived.py | 2 +- sos/report/plugins/kernel.py | 2 +- sos/report/plugins/kernelrt.py | 2 +- sos/report/plugins/keyutils.py | 2 +- sos/report/plugins/kimchi.py | 2 +- sos/report/plugins/kpatch.py | 2 +- sos/report/plugins/krb5.py | 2 +- sos/report/plugins/kubernetes.py | 2 +- sos/report/plugins/kvm.py | 2 +- sos/report/plugins/landscape.py | 2 +- sos/report/plugins/ldap.py | 2 +- sos/report/plugins/leapp.py | 2 +- sos/report/plugins/libraries.py | 2 +- sos/report/plugins/libreswan.py | 2 +- sos/report/plugins/libvirt.py | 2 +- sos/report/plugins/lightdm.py | 2 +- sos/report/plugins/lilo.py | 2 +- sos/report/plugins/login.py | 2 +- sos/report/plugins/logrotate.py | 2 +- sos/report/plugins/logs.py | 2 +- sos/report/plugins/lstopo.py | 2 +- sos/report/plugins/lustre.py | 2 +- sos/report/plugins/lvm2.py | 2 +- sos/report/plugins/lxd.py | 2 +- sos/report/plugins/maas.py | 2 +- sos/report/plugins/manageiq.py | 2 +- sos/report/plugins/md.py | 2 +- sos/report/plugins/megacli.py | 2 +- sos/report/plugins/memcached.py | 2 +- sos/report/plugins/memory.py | 2 +- sos/report/plugins/mongodb.py | 2 +- sos/report/plugins/monit.py | 2 +- sos/report/plugins/mpt.py | 2 +- sos/report/plugins/mssql.py | 2 +- sos/report/plugins/multipath.py | 2 +- sos/report/plugins/mysql.py | 2 +- sos/report/plugins/named.py | 2 +- sos/report/plugins/navicli.py | 2 +- sos/report/plugins/networking.py | 4 ++-- sos/report/plugins/networkmanager.py | 2 +- sos/report/plugins/nfs.py | 2 +- sos/report/plugins/nfsganesha.py | 2 +- sos/report/plugins/nfsserver.py | 2 +- sos/report/plugins/nginx.py | 2 +- sos/report/plugins/nis.py | 2 +- sos/report/plugins/nodejs.py | 4 ++-- sos/report/plugins/npm.py | 4 ++-- sos/report/plugins/nscd.py | 2 +- sos/report/plugins/nss.py | 2 +- sos/report/plugins/ntb.py | 2 +- sos/report/plugins/ntp.py | 2 +- sos/report/plugins/numa.py | 2 +- sos/report/plugins/nvidia.py | 2 +- sos/report/plugins/nvme.py | 2 +- sos/report/plugins/oddjob.py | 2 +- sos/report/plugins/omnipath_client.py | 2 +- sos/report/plugins/omnipath_manager.py | 2 +- sos/report/plugins/omsa.py | 2 +- sos/report/plugins/opencl.py | 2 +- sos/report/plugins/opendaylight.py | 2 +- sos/report/plugins/opengl.py | 2 +- sos/report/plugins/openhpi.py | 2 +- sos/report/plugins/openshift.py | 2 +- sos/report/plugins/openssl.py | 2 +- sos/report/plugins/openstack_ansible.py | 2 +- sos/report/plugins/openstack_aodh.py | 2 +- sos/report/plugins/openstack_ceilometer.py | 2 +- sos/report/plugins/openstack_cinder.py | 2 +- sos/report/plugins/openstack_glance.py | 2 +- sos/report/plugins/openstack_heat.py | 2 +- sos/report/plugins/openstack_horizon.py | 2 +- sos/report/plugins/openstack_instack.py | 2 +- sos/report/plugins/openstack_ironic.py | 2 +- sos/report/plugins/openstack_keystone.py | 2 +- sos/report/plugins/openstack_manila.py | 2 +- sos/report/plugins/openstack_neutron.py | 2 +- sos/report/plugins/openstack_nova.py | 2 +- sos/report/plugins/openstack_novajoin.py | 2 +- sos/report/plugins/openstack_octavia.py | 2 +- sos/report/plugins/openstack_placement.py | 2 +- sos/report/plugins/openstack_sahara.py | 2 +- sos/report/plugins/openstack_swift.py | 2 +- sos/report/plugins/openstack_tripleo.py | 2 +- sos/report/plugins/openstack_trove.py | 2 +- sos/report/plugins/openvswitch.py | 2 +- sos/report/plugins/origin.py | 2 +- sos/report/plugins/os_net_config.py | 2 +- sos/report/plugins/ovirt.py | 2 +- sos/report/plugins/ovirt_engine_backup.py | 2 +- sos/report/plugins/ovirt_hosted_engine.py | 2 +- sos/report/plugins/ovirt_imageio.py | 2 +- sos/report/plugins/ovirt_node.py | 2 +- sos/report/plugins/ovirt_provider_ovn.py | 2 +- sos/report/plugins/ovn_central.py | 2 +- sos/report/plugins/ovn_host.py | 2 +- sos/report/plugins/pacemaker.py | 2 +- sos/report/plugins/pam.py | 2 +- sos/report/plugins/pci.py | 2 +- sos/report/plugins/pcp.py | 2 +- sos/report/plugins/peripety.py | 2 +- sos/report/plugins/perl.py | 2 +- sos/report/plugins/podman.py | 2 +- sos/report/plugins/postfix.py | 2 +- sos/report/plugins/postgresql.py | 2 +- sos/report/plugins/powerpath.py | 2 +- sos/report/plugins/powerpc.py | 2 +- sos/report/plugins/ppp.py | 2 +- sos/report/plugins/procenv.py | 2 +- sos/report/plugins/process.py | 2 +- sos/report/plugins/processor.py | 2 +- sos/report/plugins/psacct.py | 2 +- sos/report/plugins/ptp.py | 2 +- sos/report/plugins/pulp.py | 2 +- sos/report/plugins/puppet.py | 2 +- sos/report/plugins/pxe.py | 2 +- sos/report/plugins/python.py | 2 +- sos/report/plugins/qpid.py | 2 +- sos/report/plugins/qpid_dispatch.py | 2 +- sos/report/plugins/qt.py | 2 +- sos/report/plugins/quagga.py | 2 +- sos/report/plugins/rabbitmq.py | 2 +- sos/report/plugins/radius.py | 2 +- sos/report/plugins/rasdaemon.py | 2 +- sos/report/plugins/rear.py | 2 +- sos/report/plugins/redis.py | 2 +- sos/report/plugins/release.py | 2 +- sos/report/plugins/rhcos.py | 2 +- sos/report/plugins/rhui.py | 2 +- sos/report/plugins/rhv_analyzer.py | 2 +- sos/report/plugins/rpm.py | 2 +- sos/report/plugins/rpmostree.py | 2 +- sos/report/plugins/ruby.py | 2 +- sos/report/plugins/runc.py | 2 +- sos/report/plugins/s390.py | 2 +- sos/report/plugins/salt.py | 2 +- sos/report/plugins/saltmaster.py | 2 +- sos/report/plugins/samba.py | 2 +- sos/report/plugins/sanlock.py | 2 +- sos/report/plugins/saphana.py | 2 +- sos/report/plugins/sapnw.py | 2 +- sos/report/plugins/sar.py | 2 +- sos/report/plugins/sas3ircu.py | 2 +- sos/report/plugins/scsi.py | 2 +- sos/report/plugins/selinux.py | 2 +- sos/report/plugins/sendmail.py | 2 +- sos/report/plugins/services.py | 2 +- sos/report/plugins/skydive.py | 2 +- sos/report/plugins/smartcard.py | 2 +- sos/report/plugins/snappy.py | 2 +- sos/report/plugins/snmp.py | 2 +- sos/report/plugins/sos_extras.py | 2 +- sos/report/plugins/soundcard.py | 2 +- sos/report/plugins/squid.py | 2 +- sos/report/plugins/ssh.py | 2 +- sos/report/plugins/ssmtp.py | 2 +- sos/report/plugins/sssd.py | 4 ++-- sos/report/plugins/storageconsole.py | 2 +- sos/report/plugins/stratis.py | 2 +- sos/report/plugins/subscription_manager.py | 2 +- sos/report/plugins/sudo.py | 2 +- sos/report/plugins/sunrpc.py | 2 +- sos/report/plugins/symcli.py | 2 +- sos/report/plugins/system.py | 2 +- sos/report/plugins/systemd.py | 2 +- sos/report/plugins/systemtap.py | 2 +- sos/report/plugins/sysvipc.py | 2 +- sos/report/plugins/targetcli.py | 2 +- sos/report/plugins/teamd.py | 2 +- sos/report/plugins/tftpserver.py | 2 +- sos/report/plugins/tomcat.py | 2 +- sos/report/plugins/tuned.py | 2 +- sos/report/plugins/ubuntu.py | 2 +- sos/report/plugins/udev.py | 2 +- sos/report/plugins/unity.py | 2 +- sos/report/plugins/unpackaged.py | 2 +- sos/report/plugins/upstart.py | 2 +- sos/report/plugins/usb.py | 2 +- sos/report/plugins/validation_framework.py | 2 +- sos/report/plugins/vdo.py | 2 +- sos/report/plugins/vdsm.py | 2 +- sos/report/plugins/veritas.py | 2 +- sos/report/plugins/vhostmd.py | 2 +- sos/report/plugins/virsh.py | 2 +- sos/report/plugins/virtwho.py | 2 +- sos/report/plugins/vmware.py | 2 +- sos/report/plugins/vsftpd.py | 2 +- sos/report/plugins/vulkan.py | 2 +- sos/report/plugins/watchdog.py | 2 +- sos/report/plugins/wireless.py | 2 +- sos/report/plugins/x11.py | 2 +- sos/report/plugins/xen.py | 2 +- sos/report/plugins/xfs.py | 2 +- sos/report/plugins/xinetd.py | 2 +- sos/report/plugins/yum.py | 2 +- sos/report/plugins/zfs.py | 2 +- sos/report/sosreport.py | 8 ++++---- tests/option_tests.py | 2 +- tests/plugin_tests.py | 2 +- tests/policy_tests.py | 2 +- 308 files changed, 323 insertions(+), 319 deletions(-) create mode 100644 sos/report/__init__.py diff --git a/bin/sosreport b/bin/sosreport index af6fab68..43d58acb 100755 --- a/bin/sosreport +++ b/bin/sosreport @@ -10,8 +10,12 @@ """ sos entry point. """ import sys +import os try: - from sos.sosreport import main + # allow running from the git checkout, even though as of 4.0 we are moving + # binaries into a bin/ top-level directory. + sys.path.append(os.getcwd()) + from sos.report.sosreport import main except KeyboardInterrupt: raise SystemExit() diff --git a/example_plugins/example.py b/example_plugins/example.py index ac4bc790..0f6ece47 100755 --- a/example_plugins/example.py +++ b/example_plugins/example.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin # the class name determines the plugin name # if you want to override it simply provide a @classmethod name() diff --git a/sos/policies/__init__.py b/sos/policies/__init__.py index 13211bfa..fb93f492 100644 --- a/sos/policies/__init__.py +++ b/sos/policies/__init__.py @@ -17,7 +17,7 @@ from sos.utilities import (ImporterHelper, is_executable, shell_out, sos_get_command_output) -from sos.plugins import IndependentPlugin, ExperimentalPlugin +from sos.report.plugins import IndependentPlugin, ExperimentalPlugin from sos import _sos as _ from sos import SoSOptions, _arg_names from textwrap import fill diff --git a/sos/policies/debian.py b/sos/policies/debian.py index 1a99f4c2..1d7bc57f 100644 --- a/sos/policies/debian.py +++ b/sos/policies/debian.py @@ -1,4 +1,4 @@ -from sos.plugins import DebianPlugin +from sos.report.plugins import DebianPlugin from sos.policies import PackageManager, LinuxPolicy import os diff --git a/sos/policies/ibmkvm.py b/sos/policies/ibmkvm.py index b9f0498a..bc9f1b36 100644 --- a/sos/policies/ibmkvm.py +++ b/sos/policies/ibmkvm.py @@ -12,7 +12,7 @@ from __future__ import print_function -from sos.plugins import PowerKVMPlugin, ZKVMPlugin, RedHatPlugin +from sos.report.plugins import PowerKVMPlugin, ZKVMPlugin, RedHatPlugin from sos.policies.redhat import RedHatPolicy import os diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py index eb5b09d8..9aa594c8 100644 --- a/sos/policies/redhat.py +++ b/sos/policies/redhat.py @@ -14,7 +14,7 @@ import os import sys import re -from sos.plugins import RedHatPlugin +from sos.report.plugins import RedHatPlugin from sos.policies import LinuxPolicy, PackageManager, PresetDefaults from sos import _sos as _ from sos import SoSOptions diff --git a/sos/policies/suse.py b/sos/policies/suse.py index 2cd1def8..fcb56aa0 100644 --- a/sos/policies/suse.py +++ b/sos/policies/suse.py @@ -12,7 +12,7 @@ from __future__ import print_function import os import sys -from sos.plugins import RedHatPlugin, SuSEPlugin +from sos.report.plugins import RedHatPlugin, SuSEPlugin from sos.policies import LinuxPolicy, PackageManager from sos import _sos as _ diff --git a/sos/policies/ubuntu.py b/sos/policies/ubuntu.py index e14d76ca..169602a4 100644 --- a/sos/policies/ubuntu.py +++ b/sos/policies/ubuntu.py @@ -1,6 +1,6 @@ from __future__ import with_statement -from sos.plugins import UbuntuPlugin, DebianPlugin +from sos.report.plugins import UbuntuPlugin, DebianPlugin from sos.policies.debian import DebianPolicy import os diff --git a/sos/report/__init__.py b/sos/report/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/sos/report/plugins/__init__.py b/sos/report/plugins/__init__.py index 103ffc72..9e33296d 100644 --- a/sos/report/plugins/__init__.py +++ b/sos/report/plugins/__init__.py @@ -2034,7 +2034,7 @@ def import_plugin(name, superclasses=None): module. superclasses should be a tuple of valid superclasses to import, this defaults to (Plugin,). """ - plugin_fqname = "sos.plugins.%s" % name + plugin_fqname = "sos.report.plugins.%s" % name if not superclasses: superclasses = (Plugin,) return import_module(plugin_fqname, superclasses) diff --git a/sos/report/plugins/abrt.py b/sos/report/plugins/abrt.py index 83aa0431..97b63618 100644 --- a/sos/report/plugins/abrt.py +++ b/sos/report/plugins/abrt.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Abrt(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/acpid.py b/sos/report/plugins/acpid.py index c4990df7..6cea883c 100644 --- a/sos/report/plugins/acpid.py +++ b/sos/report/plugins/acpid.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Acpid(Plugin): diff --git a/sos/report/plugins/activemq.py b/sos/report/plugins/activemq.py index f8b3c827..c9b364b1 100644 --- a/sos/report/plugins/activemq.py +++ b/sos/report/plugins/activemq.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class ActiveMq(Plugin, DebianPlugin): diff --git a/sos/report/plugins/alternatives.py b/sos/report/plugins/alternatives.py index 2cdf1c5b..0d8b9a16 100644 --- a/sos/report/plugins/alternatives.py +++ b/sos/report/plugins/alternatives.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Alternatives(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/anaconda.py b/sos/report/plugins/anaconda.py index 4e73b8aa..8a5f78b4 100644 --- a/sos/report/plugins/anaconda.py +++ b/sos/report/plugins/anaconda.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os diff --git a/sos/report/plugins/anacron.py b/sos/report/plugins/anacron.py index f2c69624..69ceec4a 100644 --- a/sos/report/plugins/anacron.py +++ b/sos/report/plugins/anacron.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Anacron(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/ansible.py b/sos/report/plugins/ansible.py index 02cb8eba..f0d1b114 100644 --- a/sos/report/plugins/ansible.py +++ b/sos/report/plugins/ansible.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin class Ansible(Plugin, RedHatPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/apache.py b/sos/report/plugins/apache.py index f3ee68d5..528f1152 100644 --- a/sos/report/plugins/apache.py +++ b/sos/report/plugins/apache.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Apache(Plugin): diff --git a/sos/report/plugins/apparmor.py b/sos/report/plugins/apparmor.py index e239c0b5..b3e08f60 100644 --- a/sos/report/plugins/apparmor.py +++ b/sos/report/plugins/apparmor.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, UbuntuPlugin +from sos.report.plugins import Plugin, UbuntuPlugin class Apparmor(Plugin, UbuntuPlugin): diff --git a/sos/report/plugins/apport.py b/sos/report/plugins/apport.py index d64fa3df..1c8a6676 100644 --- a/sos/report/plugins/apport.py +++ b/sos/report/plugins/apport.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, DebianPlugin, UbuntuPlugin class Apport(Plugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/apt.py b/sos/report/plugins/apt.py index ff14c1c5..c94740b3 100644 --- a/sos/report/plugins/apt.py +++ b/sos/report/plugins/apt.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, UbuntuPlugin, DebianPlugin class Apt(Plugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/ata.py b/sos/report/plugins/ata.py index b0c60358..e8ee226f 100644 --- a/sos/report/plugins/ata.py +++ b/sos/report/plugins/ata.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin import os diff --git a/sos/report/plugins/atomichost.py b/sos/report/plugins/atomichost.py index 5a911133..90db7ad8 100644 --- a/sos/report/plugins/atomichost.py +++ b/sos/report/plugins/atomichost.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class AtomicHost(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/auditd.py b/sos/report/plugins/auditd.py index 8380a6d1..fd587e24 100644 --- a/sos/report/plugins/auditd.py +++ b/sos/report/plugins/auditd.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Auditd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/autofs.py b/sos/report/plugins/autofs.py index 5f404074..15835fc1 100644 --- a/sos/report/plugins/autofs.py +++ b/sos/report/plugins/autofs.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class Autofs(Plugin): diff --git a/sos/report/plugins/azure.py b/sos/report/plugins/azure.py index e134457e..abdea2fa 100644 --- a/sos/report/plugins/azure.py +++ b/sos/report/plugins/azure.py @@ -9,7 +9,7 @@ # See the LICENSE file in the source distribution for further information. import os -from sos.plugins import Plugin, UbuntuPlugin, RedHatPlugin +from sos.report.plugins import Plugin, UbuntuPlugin, RedHatPlugin class Azure(Plugin, UbuntuPlugin): diff --git a/sos/report/plugins/block.py b/sos/report/plugins/block.py index 334af024..6d4bde38 100644 --- a/sos/report/plugins/block.py +++ b/sos/report/plugins/block.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Block(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/boom.py b/sos/report/plugins/boom.py index 5a089912..83d30621 100644 --- a/sos/report/plugins/boom.py +++ b/sos/report/plugins/boom.py @@ -7,7 +7,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Boom(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/boot.py b/sos/report/plugins/boot.py index 0d8861f6..78e1eabf 100644 --- a/sos/report/plugins/boot.py +++ b/sos/report/plugins/boot.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin from glob import glob diff --git a/sos/report/plugins/btrfs.py b/sos/report/plugins/btrfs.py index db402fed..e09b22eb 100644 --- a/sos/report/plugins/btrfs.py +++ b/sos/report/plugins/btrfs.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class Btrfs(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/plugins/buildah.py b/sos/report/plugins/buildah.py index 7c154e25..5307f181 100644 --- a/sos/report/plugins/buildah.py +++ b/sos/report/plugins/buildah.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Buildah(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/candlepin.py b/sos/report/plugins/candlepin.py index 243b5f5b..e0f06eca 100644 --- a/sos/report/plugins/candlepin.py +++ b/sos/report/plugins/candlepin.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from pipes import quote from re import match diff --git a/sos/report/plugins/canonical_livepatch.py b/sos/report/plugins/canonical_livepatch.py index 563c99bd..92d34ea1 100644 --- a/sos/report/plugins/canonical_livepatch.py +++ b/sos/report/plugins/canonical_livepatch.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, UbuntuPlugin +from sos.report.plugins import Plugin, UbuntuPlugin class CanonicaLivepatch(Plugin, UbuntuPlugin): diff --git a/sos/report/plugins/ceph.py b/sos/report/plugins/ceph.py index 259b80c5..783722ec 100644 --- a/sos/report/plugins/ceph.py +++ b/sos/report/plugins/ceph.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin from socket import gethostname diff --git a/sos/report/plugins/ceph_ansible.py b/sos/report/plugins/ceph_ansible.py index ebf18696..357b954b 100644 --- a/sos/report/plugins/ceph_ansible.py +++ b/sos/report/plugins/ceph_ansible.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin class CephAnsible(Plugin, RedHatPlugin, DebianPlugin): diff --git a/sos/report/plugins/cgroups.py b/sos/report/plugins/cgroups.py index f8d76a2d..a8710ee8 100644 --- a/sos/report/plugins/cgroups.py +++ b/sos/report/plugins/cgroups.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Cgroups(Plugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/chrony.py b/sos/report/plugins/chrony.py index 8eafcfd9..1921ec20 100644 --- a/sos/report/plugins/chrony.py +++ b/sos/report/plugins/chrony.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Chrony(Plugin): diff --git a/sos/report/plugins/cifs.py b/sos/report/plugins/cifs.py index 3c02fcca..667b0764 100644 --- a/sos/report/plugins/cifs.py +++ b/sos/report/plugins/cifs.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Cifs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/clear_containers.py b/sos/report/plugins/clear_containers.py index fadf0a09..b3e9fb20 100644 --- a/sos/report/plugins/clear_containers.py +++ b/sos/report/plugins/clear_containers.py @@ -8,8 +8,8 @@ import re -from sos.plugins import (Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, - SuSEPlugin) +from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, + UbuntuPlugin, SuSEPlugin) class ClearContainers(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, diff --git a/sos/report/plugins/cloud_init.py b/sos/report/plugins/cloud_init.py index b92104e3..96a1e6aa 100644 --- a/sos/report/plugins/cloud_init.py +++ b/sos/report/plugins/cloud_init.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class CloudInit(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/plugins/cman.py b/sos/report/plugins/cman.py index 7cf3a067..a2eae720 100644 --- a/sos/report/plugins/cman.py +++ b/sos/report/plugins/cman.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from glob import glob diff --git a/sos/report/plugins/cobbler.py b/sos/report/plugins/cobbler.py index 6b809ee2..52e514af 100644 --- a/sos/report/plugins/cobbler.py +++ b/sos/report/plugins/cobbler.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Cobbler(Plugin): diff --git a/sos/report/plugins/cockpit.py b/sos/report/plugins/cockpit.py index 8917f190..067bb4b9 100644 --- a/sos/report/plugins/cockpit.py +++ b/sos/report/plugins/cockpit.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Cockpit(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/collectd.py b/sos/report/plugins/collectd.py index d1f49bc3..48083512 100644 --- a/sos/report/plugins/collectd.py +++ b/sos/report/plugins/collectd.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. import re -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Collectd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/composer.py b/sos/report/plugins/composer.py index ab7ac195..36af13c3 100644 --- a/sos/report/plugins/composer.py +++ b/sos/report/plugins/composer.py @@ -1,4 +1,4 @@ -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Composer(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/conntrackd.py b/sos/report/plugins/conntrackd.py index c0f496c9..d373c4ac 100644 --- a/sos/report/plugins/conntrackd.py +++ b/sos/report/plugins/conntrackd.py @@ -7,8 +7,8 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, \ - SuSEPlugin +from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, + UbuntuPlugin, SuSEPlugin) class Conntrackd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, SuSEPlugin): diff --git a/sos/report/plugins/console.py b/sos/report/plugins/console.py index 6549df54..596bddce 100644 --- a/sos/report/plugins/console.py +++ b/sos/report/plugins/console.py @@ -7,7 +7,7 @@ # See the LICENSE file in the source distribution for further information. from glob import glob -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin class Console(Plugin, RedHatPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/container_log.py b/sos/report/plugins/container_log.py index 392cb1e5..0d939f69 100644 --- a/sos/report/plugins/container_log.py +++ b/sos/report/plugins/container_log.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os diff --git a/sos/report/plugins/convert2rhel.py b/sos/report/plugins/convert2rhel.py index 2b5e8ae8..9c796a83 100644 --- a/sos/report/plugins/convert2rhel.py +++ b/sos/report/plugins/convert2rhel.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class convert2rhel(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/corosync.py b/sos/report/plugins/corosync.py index efecd5d9..665999c9 100644 --- a/sos/report/plugins/corosync.py +++ b/sos/report/plugins/corosync.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os.path import re diff --git a/sos/report/plugins/crio.py b/sos/report/plugins/crio.py index a68b87cf..e2d064e5 100644 --- a/sos/report/plugins/crio.py +++ b/sos/report/plugins/crio.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, SoSPredicate +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, SoSPredicate class CRIO(Plugin, RedHatPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/cron.py b/sos/report/plugins/cron.py index 356eaa79..09076911 100644 --- a/sos/report/plugins/cron.py +++ b/sos/report/plugins/cron.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Cron(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/crypto.py b/sos/report/plugins/crypto.py index a9c51bb1..06294b45 100644 --- a/sos/report/plugins/crypto.py +++ b/sos/report/plugins/crypto.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Crypto(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/cs.py b/sos/report/plugins/cs.py index 9343470e..2c9ff751 100644 --- a/sos/report/plugins/cs.py +++ b/sos/report/plugins/cs.py @@ -10,7 +10,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from os.path import exists from glob import glob diff --git a/sos/report/plugins/ctdb.py b/sos/report/plugins/ctdb.py index e4e1e9d6..5c4173fe 100644 --- a/sos/report/plugins/ctdb.py +++ b/sos/report/plugins/ctdb.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Ctdb(Plugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/cups.py b/sos/report/plugins/cups.py index 6c159e95..39459e3b 100644 --- a/sos/report/plugins/cups.py +++ b/sos/report/plugins/cups.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Cups(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/date.py b/sos/report/plugins/date.py index fec3d664..4bb89d72 100644 --- a/sos/report/plugins/date.py +++ b/sos/report/plugins/date.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin class Date(Plugin, RedHatPlugin, DebianPlugin): diff --git a/sos/report/plugins/dbus.py b/sos/report/plugins/dbus.py index 606b6e94..ff0dd4a3 100644 --- a/sos/report/plugins/dbus.py +++ b/sos/report/plugins/dbus.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Dbus(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/devicemapper.py b/sos/report/plugins/devicemapper.py index a97b7336..d54e969a 100644 --- a/sos/report/plugins/devicemapper.py +++ b/sos/report/plugins/devicemapper.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class DeviceMapper(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/devices.py b/sos/report/plugins/devices.py index ad33d91e..2a4cf7c7 100644 --- a/sos/report/plugins/devices.py +++ b/sos/report/plugins/devices.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Devices(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/dhcp.py b/sos/report/plugins/dhcp.py index fc48e5d9..69992892 100644 --- a/sos/report/plugins/dhcp.py +++ b/sos/report/plugins/dhcp.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin class Dhcp(Plugin): diff --git a/sos/report/plugins/distupgrade.py b/sos/report/plugins/distupgrade.py index 50dac150..1ea7bd76 100644 --- a/sos/report/plugins/distupgrade.py +++ b/sos/report/plugins/distupgrade.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class DistUpgrade(Plugin): diff --git a/sos/report/plugins/dlm.py b/sos/report/plugins/dlm.py index 93820ce3..6cc53a61 100644 --- a/sos/report/plugins/dlm.py +++ b/sos/report/plugins/dlm.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import re diff --git a/sos/report/plugins/dmraid.py b/sos/report/plugins/dmraid.py index c647fe12..20c647b7 100644 --- a/sos/report/plugins/dmraid.py +++ b/sos/report/plugins/dmraid.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Dmraid(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/dnf.py b/sos/report/plugins/dnf.py index 1bc01a98..b980e792 100644 --- a/sos/report/plugins/dnf.py +++ b/sos/report/plugins/dnf.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class DNFPlugin(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/docker.py b/sos/report/plugins/docker.py index 74843ab2..ac56322b 100644 --- a/sos/report/plugins/docker.py +++ b/sos/report/plugins/docker.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, SoSPredicate +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, SoSPredicate class Docker(Plugin): diff --git a/sos/report/plugins/docker_distribution.py b/sos/report/plugins/docker_distribution.py index 0e2cec36..17b6baa0 100644 --- a/sos/report/plugins/docker_distribution.py +++ b/sos/report/plugins/docker_distribution.py @@ -7,7 +7,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os diff --git a/sos/report/plugins/dovecot.py b/sos/report/plugins/dovecot.py index f59dce35..feb2d6cb 100644 --- a/sos/report/plugins/dovecot.py +++ b/sos/report/plugins/dovecot.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Dovecot(Plugin): diff --git a/sos/report/plugins/dpkg.py b/sos/report/plugins/dpkg.py index fc432c7a..473b2d12 100644 --- a/sos/report/plugins/dpkg.py +++ b/sos/report/plugins/dpkg.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, DebianPlugin, UbuntuPlugin class Dpkg(Plugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/dracut.py b/sos/report/plugins/dracut.py index 06d22c2b..7bf9d7fa 100644 --- a/sos/report/plugins/dracut.py +++ b/sos/report/plugins/dracut.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Dracut(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/ds.py b/sos/report/plugins/ds.py index 70507c4f..61e123b3 100644 --- a/sos/report/plugins/ds.py +++ b/sos/report/plugins/ds.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os diff --git a/sos/report/plugins/ebpf.py b/sos/report/plugins/ebpf.py index 36ac608b..003bc745 100644 --- a/sos/report/plugins/ebpf.py +++ b/sos/report/plugins/ebpf.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import json diff --git a/sos/report/plugins/elastic.py b/sos/report/plugins/elastic.py index c91843ab..aecf37cf 100644 --- a/sos/report/plugins/elastic.py +++ b/sos/report/plugins/elastic.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import re diff --git a/sos/report/plugins/etcd.py b/sos/report/plugins/etcd.py index f1365571..986cd291 100644 --- a/sos/report/plugins/etcd.py +++ b/sos/report/plugins/etcd.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from os import path diff --git a/sos/report/plugins/fcoe.py b/sos/report/plugins/fcoe.py index 11289256..4803d48a 100644 --- a/sos/report/plugins/fcoe.py +++ b/sos/report/plugins/fcoe.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class fcoe(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/fibrechannel.py b/sos/report/plugins/fibrechannel.py index 89e61f6a..a8f318a3 100644 --- a/sos/report/plugins/fibrechannel.py +++ b/sos/report/plugins/fibrechannel.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Fibrechannel(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/filesys.py b/sos/report/plugins/filesys.py index cba662a9..87f3f26b 100644 --- a/sos/report/plugins/filesys.py +++ b/sos/report/plugins/filesys.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Filesys(Plugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/firewalld.py b/sos/report/plugins/firewalld.py index f7b41c4a..60b4fb86 100644 --- a/sos/report/plugins/firewalld.py +++ b/sos/report/plugins/firewalld.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, SoSPredicate +from sos.report.plugins import Plugin, RedHatPlugin, SoSPredicate class FirewallD(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/foreman.py b/sos/report/plugins/foreman.py index a533251a..a1a20b96 100644 --- a/sos/report/plugins/foreman.py +++ b/sos/report/plugins/foreman.py @@ -9,8 +9,8 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin,\ - SCLPlugin +from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, + UbuntuPlugin, SCLPlugin) from pipes import quote from re import match diff --git a/sos/report/plugins/frr.py b/sos/report/plugins/frr.py index 031b2d93..6da2cdfb 100644 --- a/sos/report/plugins/frr.py +++ b/sos/report/plugins/frr.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Frr(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/fwupd.py b/sos/report/plugins/fwupd.py index c2fd2781..28a0c1f8 100644 --- a/sos/report/plugins/fwupd.py +++ b/sos/report/plugins/fwupd.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Fwupd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/gdm.py b/sos/report/plugins/gdm.py index 9420492f..ca882f88 100644 --- a/sos/report/plugins/gdm.py +++ b/sos/report/plugins/gdm.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Gdm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/gfs2.py b/sos/report/plugins/gfs2.py index fa7fb300..cf5c219b 100644 --- a/sos/report/plugins/gfs2.py +++ b/sos/report/plugins/gfs2.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Gfs2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/gluster.py b/sos/report/plugins/gluster.py index 1a349d9e..a1d8f977 100644 --- a/sos/report/plugins/gluster.py +++ b/sos/report/plugins/gluster.py @@ -11,7 +11,7 @@ import os.path import os import glob import string -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Gluster(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/gluster_block.py b/sos/report/plugins/gluster_block.py index 3a0d278a..5159c31c 100644 --- a/sos/report/plugins/gluster_block.py +++ b/sos/report/plugins/gluster_block.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. import glob -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class GlusterBlock(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/gnocchi.py b/sos/report/plugins/gnocchi.py index 2c24534e..d2e867c6 100644 --- a/sos/report/plugins/gnocchi.py +++ b/sos/report/plugins/gnocchi.py @@ -10,7 +10,7 @@ # See the LICENSE file in the source distribution for further information. import os -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Gnocchi(Plugin): diff --git a/sos/report/plugins/grafana.py b/sos/report/plugins/grafana.py index 0ce98345..81599062 100644 --- a/sos/report/plugins/grafana.py +++ b/sos/report/plugins/grafana.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Grafana(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/grub.py b/sos/report/plugins/grub.py index 0c885c3e..f3ff6156 100644 --- a/sos/report/plugins/grub.py +++ b/sos/report/plugins/grub.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Grub(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/grub2.py b/sos/report/plugins/grub2.py index 0ca6fe09..5d085db3 100644 --- a/sos/report/plugins/grub2.py +++ b/sos/report/plugins/grub2.py @@ -6,8 +6,8 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import (Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, - SoSPredicate) +from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, + UbuntuPlugin, SoSPredicate) class Grub2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/gssproxy.py b/sos/report/plugins/gssproxy.py index 7fdde14d..13765ce7 100644 --- a/sos/report/plugins/gssproxy.py +++ b/sos/report/plugins/gssproxy.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class GSSProxy(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/haproxy.py b/sos/report/plugins/haproxy.py index 4e0c40b5..6f01a173 100644 --- a/sos/report/plugins/haproxy.py +++ b/sos/report/plugins/haproxy.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin from re import match try: diff --git a/sos/report/plugins/hardware.py b/sos/report/plugins/hardware.py index d5542fb1..ecb23f88 100644 --- a/sos/report/plugins/hardware.py +++ b/sos/report/plugins/hardware.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class Hardware(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/host.py b/sos/report/plugins/host.py index 0073d7cb..30d64c68 100644 --- a/sos/report/plugins/host.py +++ b/sos/report/plugins/host.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin class Host(Plugin, RedHatPlugin, DebianPlugin): diff --git a/sos/report/plugins/hpasm.py b/sos/report/plugins/hpasm.py index 0a1ef243..b159137e 100644 --- a/sos/report/plugins/hpasm.py +++ b/sos/report/plugins/hpasm.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Hpasm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/hts.py b/sos/report/plugins/hts.py index 4e0296d7..54a1ff95 100644 --- a/sos/report/plugins/hts.py +++ b/sos/report/plugins/hts.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class HardwareTestSuite(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/i18n.py b/sos/report/plugins/i18n.py index 0b35d11e..e730ae71 100644 --- a/sos/report/plugins/i18n.py +++ b/sos/report/plugins/i18n.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class I18n(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/infiniband.py b/sos/report/plugins/infiniband.py index 8e81ceed..f18f64eb 100644 --- a/sos/report/plugins/infiniband.py +++ b/sos/report/plugins/infiniband.py @@ -9,7 +9,7 @@ # See the LICENSE file in the source distribution for further information. import os -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Infiniband(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/insights.py b/sos/report/plugins/insights.py index a944e494..a8fa4e5f 100644 --- a/sos/report/plugins/insights.py +++ b/sos/report/plugins/insights.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class RedHatInsights(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/ipa.py b/sos/report/plugins/ipa.py index 273d8509..64f8572c 100644 --- a/sos/report/plugins/ipa.py +++ b/sos/report/plugins/ipa.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, SoSPredicate +from sos.report.plugins import Plugin, RedHatPlugin, SoSPredicate from glob import glob from os.path import exists diff --git a/sos/report/plugins/ipmitool.py b/sos/report/plugins/ipmitool.py index e3a2920f..4b68c47d 100644 --- a/sos/report/plugins/ipmitool.py +++ b/sos/report/plugins/ipmitool.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin class IpmiTool(Plugin, RedHatPlugin, DebianPlugin): diff --git a/sos/report/plugins/iprconfig.py b/sos/report/plugins/iprconfig.py index 6bc10485..55cd6992 100644 --- a/sos/report/plugins/iprconfig.py +++ b/sos/report/plugins/iprconfig.py @@ -9,7 +9,7 @@ # This plugin enables collection of logs for Power systems import re -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class IprConfig(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/plugins/ipvs.py b/sos/report/plugins/ipvs.py index a2669588..5c0f1c4a 100644 --- a/sos/report/plugins/ipvs.py +++ b/sos/report/plugins/ipvs.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, SoSPredicate +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, SoSPredicate class Ipvs(Plugin, RedHatPlugin, DebianPlugin): diff --git a/sos/report/plugins/iscsi.py b/sos/report/plugins/iscsi.py index 8c6deae1..1c2a5c8e 100644 --- a/sos/report/plugins/iscsi.py +++ b/sos/report/plugins/iscsi.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Iscsi(Plugin): diff --git a/sos/report/plugins/iscsitarget.py b/sos/report/plugins/iscsitarget.py index 396cf183..cbe0ed6b 100644 --- a/sos/report/plugins/iscsitarget.py +++ b/sos/report/plugins/iscsitarget.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class IscsiTarget(Plugin): diff --git a/sos/report/plugins/jars.py b/sos/report/plugins/jars.py index 85525dfe..b463870e 100644 --- a/sos/report/plugins/jars.py +++ b/sos/report/plugins/jars.py @@ -14,7 +14,7 @@ import os import re import zipfile from functools import partial -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Jars(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/java.py b/sos/report/plugins/java.py index e1630fe2..d2191274 100644 --- a/sos/report/plugins/java.py +++ b/sos/report/plugins/java.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class Java(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/plugins/juju.py b/sos/report/plugins/juju.py index 65f19474..feb0aecc 100644 --- a/sos/report/plugins/juju.py +++ b/sos/report/plugins/juju.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, UbuntuPlugin +from sos.report.plugins import Plugin, UbuntuPlugin class Juju(Plugin, UbuntuPlugin): diff --git a/sos/report/plugins/kata_containers.py b/sos/report/plugins/kata_containers.py index ea59b7a2..31d2bd61 100644 --- a/sos/report/plugins/kata_containers.py +++ b/sos/report/plugins/kata_containers.py @@ -6,8 +6,8 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import (Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, - SuSEPlugin) +from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, + UbuntuPlugin, SuSEPlugin) class KataContainers(Plugin, RedHatPlugin, DebianPlugin, diff --git a/sos/report/plugins/kdump.py b/sos/report/plugins/kdump.py index 73eb493c..c5040da5 100644 --- a/sos/report/plugins/kdump.py +++ b/sos/report/plugins/kdump.py @@ -8,7 +8,7 @@ import os import platform -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class KDump(Plugin): diff --git a/sos/report/plugins/keepalived.py b/sos/report/plugins/keepalived.py index 31bdc1f9..589633f7 100644 --- a/sos/report/plugins/keepalived.py +++ b/sos/report/plugins/keepalived.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Keepalived(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/kernel.py b/sos/report/plugins/kernel.py index 98f905ed..20317e0e 100644 --- a/sos/report/plugins/kernel.py +++ b/sos/report/plugins/kernel.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os import glob diff --git a/sos/report/plugins/kernelrt.py b/sos/report/plugins/kernelrt.py index ae57f03a..f006d2a7 100644 --- a/sos/report/plugins/kernelrt.py +++ b/sos/report/plugins/kernelrt.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class KernelRT(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/keyutils.py b/sos/report/plugins/keyutils.py index 200c2cd2..53657fdb 100644 --- a/sos/report/plugins/keyutils.py +++ b/sos/report/plugins/keyutils.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Keyutils(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/kimchi.py b/sos/report/plugins/kimchi.py index af9efb03..7a63b047 100644 --- a/sos/report/plugins/kimchi.py +++ b/sos/report/plugins/kimchi.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class Kimchi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/plugins/kpatch.py b/sos/report/plugins/kpatch.py index 3a531772..04d8521d 100644 --- a/sos/report/plugins/kpatch.py +++ b/sos/report/plugins/kpatch.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import re diff --git a/sos/report/plugins/krb5.py b/sos/report/plugins/krb5.py index 04d8018c..140eb3e0 100644 --- a/sos/report/plugins/krb5.py +++ b/sos/report/plugins/krb5.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Krb5(Plugin): diff --git a/sos/report/plugins/kubernetes.py b/sos/report/plugins/kubernetes.py index 8fc0eba4..61bce333 100644 --- a/sos/report/plugins/kubernetes.py +++ b/sos/report/plugins/kubernetes.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin from fnmatch import translate from os import path import re diff --git a/sos/report/plugins/kvm.py b/sos/report/plugins/kvm.py index f8014a0d..e5b9ff4f 100644 --- a/sos/report/plugins/kvm.py +++ b/sos/report/plugins/kvm.py @@ -9,7 +9,7 @@ # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os diff --git a/sos/report/plugins/landscape.py b/sos/report/plugins/landscape.py index 1a160d38..36755282 100644 --- a/sos/report/plugins/landscape.py +++ b/sos/report/plugins/landscape.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, UbuntuPlugin +from sos.report.plugins import Plugin, UbuntuPlugin class Landscape(Plugin, UbuntuPlugin): diff --git a/sos/report/plugins/ldap.py b/sos/report/plugins/ldap.py index 6c9e418c..2ec0240f 100644 --- a/sos/report/plugins/ldap.py +++ b/sos/report/plugins/ldap.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Ldap(Plugin): diff --git a/sos/report/plugins/leapp.py b/sos/report/plugins/leapp.py index 8a7c762e..e27aa4c5 100644 --- a/sos/report/plugins/leapp.py +++ b/sos/report/plugins/leapp.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Leapp(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/libraries.py b/sos/report/plugins/libraries.py index 581c2ffe..61c78668 100644 --- a/sos/report/plugins/libraries.py +++ b/sos/report/plugins/libraries.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin class Libraries(Plugin, RedHatPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/libreswan.py b/sos/report/plugins/libreswan.py index 22e11ba8..0cc9542c 100644 --- a/sos/report/plugins/libreswan.py +++ b/sos/report/plugins/libreswan.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Libreswan(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/libvirt.py b/sos/report/plugins/libvirt.py index 883c0ddd..be0c3094 100644 --- a/sos/report/plugins/libvirt.py +++ b/sos/report/plugins/libvirt.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin import glob import os diff --git a/sos/report/plugins/lightdm.py b/sos/report/plugins/lightdm.py index 2135b8f7..43818c0c 100644 --- a/sos/report/plugins/lightdm.py +++ b/sos/report/plugins/lightdm.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class LightDm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/lilo.py b/sos/report/plugins/lilo.py index d8c8fa7a..4b8da846 100644 --- a/sos/report/plugins/lilo.py +++ b/sos/report/plugins/lilo.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin class Lilo(Plugin, RedHatPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/login.py b/sos/report/plugins/login.py index 86f8bdc4..3299976a 100644 --- a/sos/report/plugins/login.py +++ b/sos/report/plugins/login.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Login(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/logrotate.py b/sos/report/plugins/logrotate.py index f2b9faf6..e8286b0c 100644 --- a/sos/report/plugins/logrotate.py +++ b/sos/report/plugins/logrotate.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class LogRotate(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/logs.py b/sos/report/plugins/logs.py index 1f0f163b..d6ec0e6b 100644 --- a/sos/report/plugins/logs.py +++ b/sos/report/plugins/logs.py @@ -8,7 +8,7 @@ import os import glob -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Logs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/lstopo.py b/sos/report/plugins/lstopo.py index 7f0fc2f8..4f6b6a11 100644 --- a/sos/report/plugins/lstopo.py +++ b/sos/report/plugins/lstopo.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin from sos.utilities import is_executable diff --git a/sos/report/plugins/lustre.py b/sos/report/plugins/lustre.py index 25c9333f..0bb58709 100644 --- a/sos/report/plugins/lustre.py +++ b/sos/report/plugins/lustre.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Lustre(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/lvm2.py b/sos/report/plugins/lvm2.py index 24bf685f..e331e55b 100644 --- a/sos/report/plugins/lvm2.py +++ b/sos/report/plugins/lvm2.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Lvm2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/lxd.py b/sos/report/plugins/lxd.py index e76e9427..637fc166 100644 --- a/sos/report/plugins/lxd.py +++ b/sos/report/plugins/lxd.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, UbuntuPlugin +from sos.report.plugins import Plugin, UbuntuPlugin class LXD(Plugin, UbuntuPlugin): diff --git a/sos/report/plugins/maas.py b/sos/report/plugins/maas.py index 0b70cee7..448206b4 100644 --- a/sos/report/plugins/maas.py +++ b/sos/report/plugins/maas.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, UbuntuPlugin +from sos.report.plugins import Plugin, UbuntuPlugin class Maas(Plugin, UbuntuPlugin): diff --git a/sos/report/plugins/manageiq.py b/sos/report/plugins/manageiq.py index 90f69824..7e877161 100644 --- a/sos/report/plugins/manageiq.py +++ b/sos/report/plugins/manageiq.py @@ -11,7 +11,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from os import environ import os.path diff --git a/sos/report/plugins/md.py b/sos/report/plugins/md.py index 5850637b..e79e5ca1 100644 --- a/sos/report/plugins/md.py +++ b/sos/report/plugins/md.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Md(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/megacli.py b/sos/report/plugins/megacli.py index f29aa830..f807f1c4 100644 --- a/sos/report/plugins/megacli.py +++ b/sos/report/plugins/megacli.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class MegaCLI(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/memcached.py b/sos/report/plugins/memcached.py index f70c75cb..364ce20c 100644 --- a/sos/report/plugins/memcached.py +++ b/sos/report/plugins/memcached.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Memcached(Plugin): diff --git a/sos/report/plugins/memory.py b/sos/report/plugins/memory.py index 370b7589..f32e8351 100644 --- a/sos/report/plugins/memory.py +++ b/sos/report/plugins/memory.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/mongodb.py b/sos/report/plugins/mongodb.py index 8cb77d7d..de5aa88d 100644 --- a/sos/report/plugins/mongodb.py +++ b/sos/report/plugins/mongodb.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class MongoDb(Plugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/monit.py b/sos/report/plugins/monit.py index e3eecec5..69262975 100644 --- a/sos/report/plugins/monit.py +++ b/sos/report/plugins/monit.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from glob import glob diff --git a/sos/report/plugins/mpt.py b/sos/report/plugins/mpt.py index 19d0e6e3..4687556a 100644 --- a/sos/report/plugins/mpt.py +++ b/sos/report/plugins/mpt.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Mpt(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/mssql.py b/sos/report/plugins/mssql.py index 24547ac8..865a9a94 100644 --- a/sos/report/plugins/mssql.py +++ b/sos/report/plugins/mssql.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os diff --git a/sos/report/plugins/multipath.py b/sos/report/plugins/multipath.py index a3a67e35..fcaf337a 100644 --- a/sos/report/plugins/multipath.py +++ b/sos/report/plugins/multipath.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Multipath(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/mysql.py b/sos/report/plugins/mysql.py index 9d2cf0c8..7a481dbe 100644 --- a/sos/report/plugins/mysql.py +++ b/sos/report/plugins/mysql.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os diff --git a/sos/report/plugins/named.py b/sos/report/plugins/named.py index 6df04f35..ae0e5e9a 100644 --- a/sos/report/plugins/named.py +++ b/sos/report/plugins/named.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin from os.path import exists, join, normpath diff --git a/sos/report/plugins/navicli.py b/sos/report/plugins/navicli.py index da9ad26b..4e46c23b 100644 --- a/sos/report/plugins/navicli.py +++ b/sos/report/plugins/navicli.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from sos.utilities import is_executable diff --git a/sos/report/plugins/networking.py b/sos/report/plugins/networking.py index 56d5b440..9681ba59 100644 --- a/sos/report/plugins/networking.py +++ b/sos/report/plugins/networking.py @@ -6,8 +6,8 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import (Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin, - SoSPredicate) +from sos.report.plugins import (Plugin, RedHatPlugin, UbuntuPlugin, + DebianPlugin, SoSPredicate) from os import listdir from re import match diff --git a/sos/report/plugins/networkmanager.py b/sos/report/plugins/networkmanager.py index 02767de5..972fe85b 100644 --- a/sos/report/plugins/networkmanager.py +++ b/sos/report/plugins/networkmanager.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin import os diff --git a/sos/report/plugins/nfs.py b/sos/report/plugins/nfs.py index 833d79a2..9d4dd72f 100644 --- a/sos/report/plugins/nfs.py +++ b/sos/report/plugins/nfs.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Nfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/nfsganesha.py b/sos/report/plugins/nfsganesha.py index daab081d..ea0f84dd 100644 --- a/sos/report/plugins/nfsganesha.py +++ b/sos/report/plugins/nfsganesha.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class NfsGanesha(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/nfsserver.py b/sos/report/plugins/nfsserver.py index 3ee08cd4..a0effae9 100644 --- a/sos/report/plugins/nfsserver.py +++ b/sos/report/plugins/nfsserver.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os from stat import ST_SIZE diff --git a/sos/report/plugins/nginx.py b/sos/report/plugins/nginx.py index d32958ba..44078e94 100644 --- a/sos/report/plugins/nginx.py +++ b/sos/report/plugins/nginx.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Nginx(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/nis.py b/sos/report/plugins/nis.py index bf755223..14e73f5f 100644 --- a/sos/report/plugins/nis.py +++ b/sos/report/plugins/nis.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Nis(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/nodejs.py b/sos/report/plugins/nodejs.py index 68fcf8a5..7f3b2f83 100644 --- a/sos/report/plugins/nodejs.py +++ b/sos/report/plugins/nodejs.py @@ -8,8 +8,8 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, \ - SuSEPlugin +from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, + UbuntuPlugin, SuSEPlugin) class NodeJS(Plugin, RedHatPlugin, SuSEPlugin): diff --git a/sos/report/plugins/npm.py b/sos/report/plugins/npm.py index 0d4f2d24..97bd61e8 100644 --- a/sos/report/plugins/npm.py +++ b/sos/report/plugins/npm.py @@ -10,8 +10,8 @@ import os import json -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, \ - SuSEPlugin +from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, + UbuntuPlugin, SuSEPlugin) class Npm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, SuSEPlugin): diff --git a/sos/report/plugins/nscd.py b/sos/report/plugins/nscd.py index 882f0f97..95a75a89 100644 --- a/sos/report/plugins/nscd.py +++ b/sos/report/plugins/nscd.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Nscd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/nss.py b/sos/report/plugins/nss.py index 50ca7012..1a621072 100644 --- a/sos/report/plugins/nss.py +++ b/sos/report/plugins/nss.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class NSS(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/ntb.py b/sos/report/plugins/ntb.py index 9308e0ab..b405a430 100644 --- a/sos/report/plugins/ntb.py +++ b/sos/report/plugins/ntb.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Ntb(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/ntp.py b/sos/report/plugins/ntp.py index 0ffe092e..540d6b68 100644 --- a/sos/report/plugins/ntp.py +++ b/sos/report/plugins/ntp.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Ntp(Plugin): diff --git a/sos/report/plugins/numa.py b/sos/report/plugins/numa.py index bdef65dd..a32426f3 100644 --- a/sos/report/plugins/numa.py +++ b/sos/report/plugins/numa.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os.path diff --git a/sos/report/plugins/nvidia.py b/sos/report/plugins/nvidia.py index ecf3daeb..b455c0f4 100644 --- a/sos/report/plugins/nvidia.py +++ b/sos/report/plugins/nvidia.py @@ -9,7 +9,7 @@ # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Nvidia(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/nvme.py b/sos/report/plugins/nvme.py index 6127e739..86ef778d 100644 --- a/sos/report/plugins/nvme.py +++ b/sos/report/plugins/nvme.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Nvme(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/oddjob.py b/sos/report/plugins/oddjob.py index 52ca8d6e..4525df4a 100644 --- a/sos/report/plugins/oddjob.py +++ b/sos/report/plugins/oddjob.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Oddjob(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/omnipath_client.py b/sos/report/plugins/omnipath_client.py index 9f8be55f..699cf878 100644 --- a/sos/report/plugins/omnipath_client.py +++ b/sos/report/plugins/omnipath_client.py @@ -14,7 +14,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from os.path import join diff --git a/sos/report/plugins/omnipath_manager.py b/sos/report/plugins/omnipath_manager.py index 95989bf8..4e9e7683 100644 --- a/sos/report/plugins/omnipath_manager.py +++ b/sos/report/plugins/omnipath_manager.py @@ -14,7 +14,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class OmnipathManager(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/omsa.py b/sos/report/plugins/omsa.py index d78d583d..f6e74f80 100644 --- a/sos/report/plugins/omsa.py +++ b/sos/report/plugins/omsa.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class omsa(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/opencl.py b/sos/report/plugins/opencl.py index 7495fb43..ce66f017 100644 --- a/sos/report/plugins/opencl.py +++ b/sos/report/plugins/opencl.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenCL(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/opendaylight.py b/sos/report/plugins/opendaylight.py index 47a6624a..8cde7980 100644 --- a/sos/report/plugins/opendaylight.py +++ b/sos/report/plugins/opendaylight.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class OpenDaylight(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/opengl.py b/sos/report/plugins/opengl.py index f4215464..030369b8 100644 --- a/sos/report/plugins/opengl.py +++ b/sos/report/plugins/opengl.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenGL(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/openhpi.py b/sos/report/plugins/openhpi.py index a3453619..9766ed9d 100644 --- a/sos/report/plugins/openhpi.py +++ b/sos/report/plugins/openhpi.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class OpenHPI(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/openshift.py b/sos/report/plugins/openshift.py index e31040c3..85c2e26a 100644 --- a/sos/report/plugins/openshift.py +++ b/sos/report/plugins/openshift.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os.path diff --git a/sos/report/plugins/openssl.py b/sos/report/plugins/openssl.py index 75b9d8c7..a008067f 100644 --- a/sos/report/plugins/openssl.py +++ b/sos/report/plugins/openssl.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenSSL(Plugin): diff --git a/sos/report/plugins/openstack_ansible.py b/sos/report/plugins/openstack_ansible.py index 31cc566e..62661f93 100644 --- a/sos/report/plugins/openstack_ansible.py +++ b/sos/report/plugins/openstack_ansible.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenStackAnsible(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/openstack_aodh.py b/sos/report/plugins/openstack_aodh.py index 0f432ae1..bb996716 100644 --- a/sos/report/plugins/openstack_aodh.py +++ b/sos/report/plugins/openstack_aodh.py @@ -10,7 +10,7 @@ # See the LICENSE file in the source distribution for further information. import os -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class OpenStackAodh(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/openstack_ceilometer.py b/sos/report/plugins/openstack_ceilometer.py index c2f14502..9ed3e814 100644 --- a/sos/report/plugins/openstack_ceilometer.py +++ b/sos/report/plugins/openstack_ceilometer.py @@ -12,7 +12,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenStackCeilometer(Plugin): diff --git a/sos/report/plugins/openstack_cinder.py b/sos/report/plugins/openstack_cinder.py index ebb4eb8f..ed6e6fa2 100644 --- a/sos/report/plugins/openstack_cinder.py +++ b/sos/report/plugins/openstack_cinder.py @@ -12,7 +12,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenStackCinder(Plugin): diff --git a/sos/report/plugins/openstack_glance.py b/sos/report/plugins/openstack_glance.py index 30c2cfdc..61681d06 100644 --- a/sos/report/plugins/openstack_glance.py +++ b/sos/report/plugins/openstack_glance.py @@ -12,7 +12,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os diff --git a/sos/report/plugins/openstack_heat.py b/sos/report/plugins/openstack_heat.py index a00ebebc..1dd151c1 100644 --- a/sos/report/plugins/openstack_heat.py +++ b/sos/report/plugins/openstack_heat.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os diff --git a/sos/report/plugins/openstack_horizon.py b/sos/report/plugins/openstack_horizon.py index 5acf1102..16c8e1d3 100644 --- a/sos/report/plugins/openstack_horizon.py +++ b/sos/report/plugins/openstack_horizon.py @@ -11,7 +11,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenStackHorizon(Plugin): diff --git a/sos/report/plugins/openstack_instack.py b/sos/report/plugins/openstack_instack.py index c073097c..81ecdb39 100644 --- a/sos/report/plugins/openstack_instack.py +++ b/sos/report/plugins/openstack_instack.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os import re diff --git a/sos/report/plugins/openstack_ironic.py b/sos/report/plugins/openstack_ironic.py index bd3d3671..b27df5d1 100644 --- a/sos/report/plugins/openstack_ironic.py +++ b/sos/report/plugins/openstack_ironic.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os diff --git a/sos/report/plugins/openstack_keystone.py b/sos/report/plugins/openstack_keystone.py index 6052926f..f4cd3299 100644 --- a/sos/report/plugins/openstack_keystone.py +++ b/sos/report/plugins/openstack_keystone.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os diff --git a/sos/report/plugins/openstack_manila.py b/sos/report/plugins/openstack_manila.py index dcd49d2f..1d8429cb 100644 --- a/sos/report/plugins/openstack_manila.py +++ b/sos/report/plugins/openstack_manila.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenStackManila(Plugin): diff --git a/sos/report/plugins/openstack_neutron.py b/sos/report/plugins/openstack_neutron.py index 3719770c..285efeae 100644 --- a/sos/report/plugins/openstack_neutron.py +++ b/sos/report/plugins/openstack_neutron.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os diff --git a/sos/report/plugins/openstack_nova.py b/sos/report/plugins/openstack_nova.py index b1ea8b5d..3db9f99f 100644 --- a/sos/report/plugins/openstack_nova.py +++ b/sos/report/plugins/openstack_nova.py @@ -13,7 +13,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os diff --git a/sos/report/plugins/openstack_novajoin.py b/sos/report/plugins/openstack_novajoin.py index 679d5ac7..1f966f96 100644 --- a/sos/report/plugins/openstack_novajoin.py +++ b/sos/report/plugins/openstack_novajoin.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class OpenStackNovajoin(Plugin): diff --git a/sos/report/plugins/openstack_octavia.py b/sos/report/plugins/openstack_octavia.py index ccdcd4c9..576c632b 100644 --- a/sos/report/plugins/openstack_octavia.py +++ b/sos/report/plugins/openstack_octavia.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenStackOctavia(Plugin): diff --git a/sos/report/plugins/openstack_placement.py b/sos/report/plugins/openstack_placement.py index a0293a7d..7cd9b0b8 100644 --- a/sos/report/plugins/openstack_placement.py +++ b/sos/report/plugins/openstack_placement.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenStackPlacement(Plugin): diff --git a/sos/report/plugins/openstack_sahara.py b/sos/report/plugins/openstack_sahara.py index 1993b58c..91489852 100644 --- a/sos/report/plugins/openstack_sahara.py +++ b/sos/report/plugins/openstack_sahara.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenStackSahara(Plugin): diff --git a/sos/report/plugins/openstack_swift.py b/sos/report/plugins/openstack_swift.py index 22329681..61ee82e3 100644 --- a/sos/report/plugins/openstack_swift.py +++ b/sos/report/plugins/openstack_swift.py @@ -11,7 +11,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenStackSwift(Plugin): diff --git a/sos/report/plugins/openstack_tripleo.py b/sos/report/plugins/openstack_tripleo.py index 652d132f..47cd3e39 100644 --- a/sos/report/plugins/openstack_tripleo.py +++ b/sos/report/plugins/openstack_tripleo.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import re diff --git a/sos/report/plugins/openstack_trove.py b/sos/report/plugins/openstack_trove.py index 09bb1144..f3c39acf 100644 --- a/sos/report/plugins/openstack_trove.py +++ b/sos/report/plugins/openstack_trove.py @@ -9,7 +9,7 @@ # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class OpenStackTrove(Plugin): diff --git a/sos/report/plugins/openvswitch.py b/sos/report/plugins/openvswitch.py index 2ae8a04d..58d176e4 100644 --- a/sos/report/plugins/openvswitch.py +++ b/sos/report/plugins/openvswitch.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin from os.path import join as path_join from os import environ diff --git a/sos/report/plugins/origin.py b/sos/report/plugins/origin.py index aecd698a..0f475da4 100644 --- a/sos/report/plugins/origin.py +++ b/sos/report/plugins/origin.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os.path # This plugin collects static configuration and runtime information diff --git a/sos/report/plugins/os_net_config.py b/sos/report/plugins/os_net_config.py index f244ff93..43d13102 100644 --- a/sos/report/plugins/os_net_config.py +++ b/sos/report/plugins/os_net_config.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class OsNetConfig(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/plugins/ovirt.py b/sos/report/plugins/ovirt.py index ca1dd27e..d9a97f68 100644 --- a/sos/report/plugins/ovirt.py +++ b/sos/report/plugins/ovirt.py @@ -15,7 +15,7 @@ import re import signal -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from sos.utilities import is_executable diff --git a/sos/report/plugins/ovirt_engine_backup.py b/sos/report/plugins/ovirt_engine_backup.py index 76b35799..263b76be 100644 --- a/sos/report/plugins/ovirt_engine_backup.py +++ b/sos/report/plugins/ovirt_engine_backup.py @@ -9,7 +9,7 @@ # See the LICENSE file in the source distribution for further information. import os -from sos.plugins import (Plugin, RedHatPlugin) +from sos.report.plugins import (Plugin, RedHatPlugin) from datetime import datetime diff --git a/sos/report/plugins/ovirt_hosted_engine.py b/sos/report/plugins/ovirt_hosted_engine.py index 7af4e765..450cd698 100644 --- a/sos/report/plugins/ovirt_hosted_engine.py +++ b/sos/report/plugins/ovirt_hosted_engine.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class OvirtHostedEngine(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/ovirt_imageio.py b/sos/report/plugins/ovirt_imageio.py index e9a2d8bf..58b2c6ab 100644 --- a/sos/report/plugins/ovirt_imageio.py +++ b/sos/report/plugins/ovirt_imageio.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class OvirtImageIO(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/ovirt_node.py b/sos/report/plugins/ovirt_node.py index ccb5d3c6..9da20077 100644 --- a/sos/report/plugins/ovirt_node.py +++ b/sos/report/plugins/ovirt_node.py @@ -7,7 +7,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class OvirtNode(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/ovirt_provider_ovn.py b/sos/report/plugins/ovirt_provider_ovn.py index 2f6ab7a5..401495b9 100644 --- a/sos/report/plugins/ovirt_provider_ovn.py +++ b/sos/report/plugins/ovirt_provider_ovn.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class OvirtProviderOvn(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/ovn_central.py b/sos/report/plugins/ovn_central.py index 3c564788..7639bad8 100644 --- a/sos/report/plugins/ovn_central.py +++ b/sos/report/plugins/ovn_central.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import json import os import six diff --git a/sos/report/plugins/ovn_host.py b/sos/report/plugins/ovn_host.py index 005e45ab..e187a2aa 100644 --- a/sos/report/plugins/ovn_host.py +++ b/sos/report/plugins/ovn_host.py @@ -9,7 +9,7 @@ # See the LICENSE file in the source distribution for further information. import os -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin pidfile = 'ovn-controller.pid' diff --git a/sos/report/plugins/pacemaker.py b/sos/report/plugins/pacemaker.py index 940389ee..17e0a5f8 100644 --- a/sos/report/plugins/pacemaker.py +++ b/sos/report/plugins/pacemaker.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin from datetime import datetime, timedelta import re import os.path diff --git a/sos/report/plugins/pam.py b/sos/report/plugins/pam.py index e6cc7a92..30f20484 100644 --- a/sos/report/plugins/pam.py +++ b/sos/report/plugins/pam.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Pam(Plugin): diff --git a/sos/report/plugins/pci.py b/sos/report/plugins/pci.py index ac90f09d..7b3c8cda 100644 --- a/sos/report/plugins/pci.py +++ b/sos/report/plugins/pci.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin import os diff --git a/sos/report/plugins/pcp.py b/sos/report/plugins/pcp.py index 7869208b..3e4f082d 100644 --- a/sos/report/plugins/pcp.py +++ b/sos/report/plugins/pcp.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin import os import os.path from socket import gethostname diff --git a/sos/report/plugins/peripety.py b/sos/report/plugins/peripety.py index d5f11d57..74a88c67 100644 --- a/sos/report/plugins/peripety.py +++ b/sos/report/plugins/peripety.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from re import match import glob diff --git a/sos/report/plugins/perl.py b/sos/report/plugins/perl.py index 8ae7e57b..52bfc29c 100644 --- a/sos/report/plugins/perl.py +++ b/sos/report/plugins/perl.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class Perl(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/plugins/podman.py b/sos/report/plugins/podman.py index 10e39b0c..5441ae3c 100644 --- a/sos/report/plugins/podman.py +++ b/sos/report/plugins/podman.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin class Podman(Plugin, RedHatPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/postfix.py b/sos/report/plugins/postfix.py index 6aed34f8..c0ecb013 100644 --- a/sos/report/plugins/postfix.py +++ b/sos/report/plugins/postfix.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Postfix(Plugin): diff --git a/sos/report/plugins/postgresql.py b/sos/report/plugins/postgresql.py index 26579927..b7b4adbc 100644 --- a/sos/report/plugins/postgresql.py +++ b/sos/report/plugins/postgresql.py @@ -14,7 +14,7 @@ import os -from sos.plugins import (Plugin, UbuntuPlugin, DebianPlugin, SCLPlugin) +from sos.report.plugins import (Plugin, UbuntuPlugin, DebianPlugin, SCLPlugin) from sos.utilities import find diff --git a/sos/report/plugins/powerpath.py b/sos/report/plugins/powerpath.py index 2af35d21..1565e079 100644 --- a/sos/report/plugins/powerpath.py +++ b/sos/report/plugins/powerpath.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, os +from sos.report.plugins import Plugin, RedHatPlugin, os class PowerPath(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/powerpc.py b/sos/report/plugins/powerpc.py index 68d95c6f..e5e4564b 100644 --- a/sos/report/plugins/powerpc.py +++ b/sos/report/plugins/powerpc.py @@ -10,7 +10,7 @@ # specific logs for Pseries, PowerNV platforms. import os -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class PowerPC(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/plugins/ppp.py b/sos/report/plugins/ppp.py index cd2798a6..dcf72e87 100644 --- a/sos/report/plugins/ppp.py +++ b/sos/report/plugins/ppp.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Ppp(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/procenv.py b/sos/report/plugins/procenv.py index 5cd1707b..502f1506 100644 --- a/sos/report/plugins/procenv.py +++ b/sos/report/plugins/procenv.py @@ -7,7 +7,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, DebianPlugin, UbuntuPlugin class Procenv(Plugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/process.py b/sos/report/plugins/process.py index e1c2567a..7a697830 100644 --- a/sos/report/plugins/process.py +++ b/sos/report/plugins/process.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Process(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/processor.py b/sos/report/plugins/processor.py index e1783dcf..dc1d538f 100644 --- a/sos/report/plugins/processor.py +++ b/sos/report/plugins/processor.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class Processor(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/plugins/psacct.py b/sos/report/plugins/psacct.py index a405a06d..314a28d4 100644 --- a/sos/report/plugins/psacct.py +++ b/sos/report/plugins/psacct.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Psacct(Plugin): diff --git a/sos/report/plugins/ptp.py b/sos/report/plugins/ptp.py index c39f8ba0..1f2e0990 100644 --- a/sos/report/plugins/ptp.py +++ b/sos/report/plugins/ptp.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Ptp(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/pulp.py b/sos/report/plugins/pulp.py index bd087a0f..521ed0dd 100644 --- a/sos/report/plugins/pulp.py +++ b/sos/report/plugins/pulp.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from pipes import quote from re import match diff --git a/sos/report/plugins/puppet.py b/sos/report/plugins/puppet.py index cdf37f2c..ee435f03 100644 --- a/sos/report/plugins/puppet.py +++ b/sos/report/plugins/puppet.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin from glob import glob diff --git a/sos/report/plugins/pxe.py b/sos/report/plugins/pxe.py index b8d27958..3b27c1a1 100644 --- a/sos/report/plugins/pxe.py +++ b/sos/report/plugins/pxe.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Pxe(Plugin): diff --git a/sos/report/plugins/python.py b/sos/report/plugins/python.py index f2d16c1e..fae3429e 100644 --- a/sos/report/plugins/python.py +++ b/sos/report/plugins/python.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import sos.policies import os import json diff --git a/sos/report/plugins/qpid.py b/sos/report/plugins/qpid.py index 008aa057..5a80b7e1 100644 --- a/sos/report/plugins/qpid.py +++ b/sos/report/plugins/qpid.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Qpid(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/qpid_dispatch.py b/sos/report/plugins/qpid_dispatch.py index b5da3138..de9535ec 100644 --- a/sos/report/plugins/qpid_dispatch.py +++ b/sos/report/plugins/qpid_dispatch.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from socket import gethostname diff --git a/sos/report/plugins/qt.py b/sos/report/plugins/qt.py index 9690775c..742bf44d 100644 --- a/sos/report/plugins/qt.py +++ b/sos/report/plugins/qt.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Qt(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/quagga.py b/sos/report/plugins/quagga.py index b91ee210..528b1a1c 100644 --- a/sos/report/plugins/quagga.py +++ b/sos/report/plugins/quagga.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Quagga(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/rabbitmq.py b/sos/report/plugins/rabbitmq.py index 42e60e7d..fb7af373 100644 --- a/sos/report/plugins/rabbitmq.py +++ b/sos/report/plugins/rabbitmq.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class RabbitMQ(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/radius.py b/sos/report/plugins/radius.py index b08f92ae..12dc242e 100644 --- a/sos/report/plugins/radius.py +++ b/sos/report/plugins/radius.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Radius(Plugin): diff --git a/sos/report/plugins/rasdaemon.py b/sos/report/plugins/rasdaemon.py index a33e6305..b4edb65f 100644 --- a/sos/report/plugins/rasdaemon.py +++ b/sos/report/plugins/rasdaemon.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Rasdaemon(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/rear.py b/sos/report/plugins/rear.py index 5cec99a7..11798a0a 100644 --- a/sos/report/plugins/rear.py +++ b/sos/report/plugins/rear.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Rear(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/redis.py b/sos/report/plugins/redis.py index 36d90521..3771281a 100644 --- a/sos/report/plugins/redis.py +++ b/sos/report/plugins/redis.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Redis(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/release.py b/sos/report/plugins/release.py index 62b59255..96014210 100644 --- a/sos/report/plugins/release.py +++ b/sos/report/plugins/release.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Release(Plugin, RedHatPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/rhcos.py b/sos/report/plugins/rhcos.py index de9af9df..4c6c596b 100644 --- a/sos/report/plugins/rhcos.py +++ b/sos/report/plugins/rhcos.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class RHCoreOS(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/rhui.py b/sos/report/plugins/rhui.py index 459a8983..a27b230f 100644 --- a/sos/report/plugins/rhui.py +++ b/sos/report/plugins/rhui.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Rhui(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/rhv_analyzer.py b/sos/report/plugins/rhv_analyzer.py index 65ea0e46..5d749c92 100644 --- a/sos/report/plugins/rhv_analyzer.py +++ b/sos/report/plugins/rhv_analyzer.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Rhv_Analyzer(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/rpm.py b/sos/report/plugins/rpm.py index c53b7e40..edfe1349 100644 --- a/sos/report/plugins/rpm.py +++ b/sos/report/plugins/rpm.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Rpm(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/rpmostree.py b/sos/report/plugins/rpmostree.py index 3c6872c2..111f765d 100644 --- a/sos/report/plugins/rpmostree.py +++ b/sos/report/plugins/rpmostree.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Rpmostree(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/ruby.py b/sos/report/plugins/ruby.py index 265386f4..a643a90d 100644 --- a/sos/report/plugins/ruby.py +++ b/sos/report/plugins/ruby.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Ruby(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/runc.py b/sos/report/plugins/runc.py index 39dd7efb..c731f0d6 100644 --- a/sos/report/plugins/runc.py +++ b/sos/report/plugins/runc.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Runc(Plugin): diff --git a/sos/report/plugins/s390.py b/sos/report/plugins/s390.py index 8cb98f81..a1179518 100644 --- a/sos/report/plugins/s390.py +++ b/sos/report/plugins/s390.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class S390(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/salt.py b/sos/report/plugins/salt.py index 595443ba..9b565929 100644 --- a/sos/report/plugins/salt.py +++ b/sos/report/plugins/salt.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin class Salt(Plugin, RedHatPlugin, DebianPlugin): diff --git a/sos/report/plugins/saltmaster.py b/sos/report/plugins/saltmaster.py index 3ac9d8e7..dcad255a 100644 --- a/sos/report/plugins/saltmaster.py +++ b/sos/report/plugins/saltmaster.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin class SaltMaster(Plugin, RedHatPlugin, DebianPlugin): diff --git a/sos/report/plugins/samba.py b/sos/report/plugins/samba.py index 4ac911d3..529403f3 100644 --- a/sos/report/plugins/samba.py +++ b/sos/report/plugins/samba.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Samba(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/sanlock.py b/sos/report/plugins/sanlock.py index 4c677320..2d3d5ea0 100644 --- a/sos/report/plugins/sanlock.py +++ b/sos/report/plugins/sanlock.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class SANLock(Plugin): diff --git a/sos/report/plugins/saphana.py b/sos/report/plugins/saphana.py index 869ed40e..f5ba7dc6 100644 --- a/sos/report/plugins/saphana.py +++ b/sos/report/plugins/saphana.py @@ -7,7 +7,7 @@ # See the LICENSE file in the source distribution for further information. import os -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class saphana(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/sapnw.py b/sos/report/plugins/sapnw.py index 8e2b262a..e301cac3 100644 --- a/sos/report/plugins/sapnw.py +++ b/sos/report/plugins/sapnw.py @@ -7,7 +7,7 @@ # See the LICENSE file in the source distribution for further information. import os -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin def get_directory_listing(path): diff --git a/sos/report/plugins/sar.py b/sos/report/plugins/sar.py index fd871351..44d068b3 100644 --- a/sos/report/plugins/sar.py +++ b/sos/report/plugins/sar.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin import os diff --git a/sos/report/plugins/sas3ircu.py b/sos/report/plugins/sas3ircu.py index b97edda7..583da0a9 100644 --- a/sos/report/plugins/sas3ircu.py +++ b/sos/report/plugins/sas3ircu.py @@ -10,7 +10,7 @@ # This sosreport plugin is meant for sas adapters. # This plugin logs inforamtion on each adapter it finds. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class SAS3ircu(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/scsi.py b/sos/report/plugins/scsi.py index 7b34b6a0..804e9a0b 100644 --- a/sos/report/plugins/scsi.py +++ b/sos/report/plugins/scsi.py @@ -7,7 +7,7 @@ # See the LICENSE file in the source distribution for further information. from glob import glob -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class Scsi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/plugins/selinux.py b/sos/report/plugins/selinux.py index d98b6745..f805642e 100644 --- a/sos/report/plugins/selinux.py +++ b/sos/report/plugins/selinux.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class SELinux(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/sendmail.py b/sos/report/plugins/sendmail.py index f08ec0eb..4bafe937 100644 --- a/sos/report/plugins/sendmail.py +++ b/sos/report/plugins/sendmail.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Sendmail(Plugin): diff --git a/sos/report/plugins/services.py b/sos/report/plugins/services.py index 56e0fce0..2a07fcfa 100644 --- a/sos/report/plugins/services.py +++ b/sos/report/plugins/services.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Services(Plugin): diff --git a/sos/report/plugins/skydive.py b/sos/report/plugins/skydive.py index ee8f53b4..fb1e0cd3 100644 --- a/sos/report/plugins/skydive.py +++ b/sos/report/plugins/skydive.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os diff --git a/sos/report/plugins/smartcard.py b/sos/report/plugins/smartcard.py index cbdd749c..93cb7c05 100644 --- a/sos/report/plugins/smartcard.py +++ b/sos/report/plugins/smartcard.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Smartcard(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/snappy.py b/sos/report/plugins/snappy.py index 06d72654..638d1d4b 100644 --- a/sos/report/plugins/snappy.py +++ b/sos/report/plugins/snappy.py @@ -7,7 +7,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, UbuntuPlugin, DebianPlugin, RedHatPlugin +from sos.report.plugins import Plugin, UbuntuPlugin, DebianPlugin, RedHatPlugin class Snappy(Plugin, UbuntuPlugin, DebianPlugin, RedHatPlugin): diff --git a/sos/report/plugins/snmp.py b/sos/report/plugins/snmp.py index b0e06428..aec29d6c 100644 --- a/sos/report/plugins/snmp.py +++ b/sos/report/plugins/snmp.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Snmp(Plugin): diff --git a/sos/report/plugins/sos_extras.py b/sos/report/plugins/sos_extras.py index 79eddcf2..15392608 100644 --- a/sos/report/plugins/sos_extras.py +++ b/sos/report/plugins/sos_extras.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin import os import stat diff --git a/sos/report/plugins/soundcard.py b/sos/report/plugins/soundcard.py index db4c84bb..030d8511 100644 --- a/sos/report/plugins/soundcard.py +++ b/sos/report/plugins/soundcard.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Soundcard(Plugin): diff --git a/sos/report/plugins/squid.py b/sos/report/plugins/squid.py index 3373e643..c8b5a4db 100644 --- a/sos/report/plugins/squid.py +++ b/sos/report/plugins/squid.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Squid(Plugin): diff --git a/sos/report/plugins/ssh.py b/sos/report/plugins/ssh.py index 3b6485fa..0bc8d90c 100644 --- a/sos/report/plugins/ssh.py +++ b/sos/report/plugins/ssh.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Ssh(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/ssmtp.py b/sos/report/plugins/ssmtp.py index 0b714261..b97c15aa 100644 --- a/sos/report/plugins/ssmtp.py +++ b/sos/report/plugins/ssmtp.py @@ -7,7 +7,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Ssmtp(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/sssd.py b/sos/report/plugins/sssd.py index ea9fdeea..a1fb63e3 100644 --- a/sos/report/plugins/sssd.py +++ b/sos/report/plugins/sssd.py @@ -8,8 +8,8 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import (Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, - SoSPredicate) +from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, + UbuntuPlugin, SoSPredicate) class Sssd(Plugin): diff --git a/sos/report/plugins/storageconsole.py b/sos/report/plugins/storageconsole.py index b70631ba..a7457a17 100644 --- a/sos/report/plugins/storageconsole.py +++ b/sos/report/plugins/storageconsole.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin class StorageConsole(Plugin, RedHatPlugin, DebianPlugin): diff --git a/sos/report/plugins/stratis.py b/sos/report/plugins/stratis.py index 994b5175..154f57ee 100644 --- a/sos/report/plugins/stratis.py +++ b/sos/report/plugins/stratis.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Stratis(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/subscription_manager.py b/sos/report/plugins/subscription_manager.py index b4aa29ea..093b7aaa 100644 --- a/sos/report/plugins/subscription_manager.py +++ b/sos/report/plugins/subscription_manager.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import glob diff --git a/sos/report/plugins/sudo.py b/sos/report/plugins/sudo.py index 14c17472..31749541 100644 --- a/sos/report/plugins/sudo.py +++ b/sos/report/plugins/sudo.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Sudo(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/sunrpc.py b/sos/report/plugins/sunrpc.py index fca8669e..df2c3e3f 100644 --- a/sos/report/plugins/sunrpc.py +++ b/sos/report/plugins/sunrpc.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class SunRPC(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/symcli.py b/sos/report/plugins/symcli.py index fda58197..e3741fe3 100644 --- a/sos/report/plugins/symcli.py +++ b/sos/report/plugins/symcli.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from sos.utilities import is_executable diff --git a/sos/report/plugins/system.py b/sos/report/plugins/system.py index 971c89da..c48c099a 100644 --- a/sos/report/plugins/system.py +++ b/sos/report/plugins/system.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class System(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/systemd.py b/sos/report/plugins/systemd.py index cd21d517..dc274ec0 100644 --- a/sos/report/plugins/systemd.py +++ b/sos/report/plugins/systemd.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Systemd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/systemtap.py b/sos/report/plugins/systemtap.py index 9b9bf7c7..7cd1c238 100644 --- a/sos/report/plugins/systemtap.py +++ b/sos/report/plugins/systemtap.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class SystemTap(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/sysvipc.py b/sos/report/plugins/sysvipc.py index 889f7687..1e271293 100644 --- a/sos/report/plugins/sysvipc.py +++ b/sos/report/plugins/sysvipc.py @@ -7,7 +7,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class SysVIPC(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/targetcli.py b/sos/report/plugins/targetcli.py index 778030f9..7b8a7a6d 100644 --- a/sos/report/plugins/targetcli.py +++ b/sos/report/plugins/targetcli.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class TargetCli(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/teamd.py b/sos/report/plugins/teamd.py index 7eb87c57..88602c6e 100644 --- a/sos/report/plugins/teamd.py +++ b/sos/report/plugins/teamd.py @@ -7,7 +7,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Teamd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/tftpserver.py b/sos/report/plugins/tftpserver.py index 04287612..7439ae47 100644 --- a/sos/report/plugins/tftpserver.py +++ b/sos/report/plugins/tftpserver.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class TftpServer(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/tomcat.py b/sos/report/plugins/tomcat.py index adacde08..46d50571 100644 --- a/sos/report/plugins/tomcat.py +++ b/sos/report/plugins/tomcat.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from datetime import datetime diff --git a/sos/report/plugins/tuned.py b/sos/report/plugins/tuned.py index d15794f5..21770cb1 100644 --- a/sos/report/plugins/tuned.py +++ b/sos/report/plugins/tuned.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Tuned(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/ubuntu.py b/sos/report/plugins/ubuntu.py index e8ef5e61..6eeef2e2 100644 --- a/sos/report/plugins/ubuntu.py +++ b/sos/report/plugins/ubuntu.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, UbuntuPlugin +from sos.report.plugins import Plugin, UbuntuPlugin class Ubuntu(Plugin, UbuntuPlugin): diff --git a/sos/report/plugins/udev.py b/sos/report/plugins/udev.py index a044ab4a..5bc7d055 100644 --- a/sos/report/plugins/udev.py +++ b/sos/report/plugins/udev.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Udev(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/unity.py b/sos/report/plugins/unity.py index 467b7a4c..d00acc3a 100644 --- a/sos/report/plugins/unity.py +++ b/sos/report/plugins/unity.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, UbuntuPlugin +from sos.report.plugins import Plugin, UbuntuPlugin class unity(Plugin, UbuntuPlugin): diff --git a/sos/report/plugins/unpackaged.py b/sos/report/plugins/unpackaged.py index ec7efd99..9ada49ab 100644 --- a/sos/report/plugins/unpackaged.py +++ b/sos/report/plugins/unpackaged.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os import stat diff --git a/sos/report/plugins/upstart.py b/sos/report/plugins/upstart.py index ff81d49d..fdcb89a6 100644 --- a/sos/report/plugins/upstart.py +++ b/sos/report/plugins/upstart.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Upstart(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/usb.py b/sos/report/plugins/usb.py index 11091676..56b35c57 100644 --- a/sos/report/plugins/usb.py +++ b/sos/report/plugins/usb.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class Usb(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/validation_framework.py b/sos/report/plugins/validation_framework.py index 6332bbb5..22c54346 100644 --- a/sos/report/plugins/validation_framework.py +++ b/sos/report/plugins/validation_framework.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin # Notes: diff --git a/sos/report/plugins/vdo.py b/sos/report/plugins/vdo.py index 05934ba1..61f30632 100644 --- a/sos/report/plugins/vdo.py +++ b/sos/report/plugins/vdo.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Vdo(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/vdsm.py b/sos/report/plugins/vdsm.py index 69672643..10854faa 100644 --- a/sos/report/plugins/vdsm.py +++ b/sos/report/plugins/vdsm.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import glob import json diff --git a/sos/report/plugins/veritas.py b/sos/report/plugins/veritas.py index cf506993..a9271907 100644 --- a/sos/report/plugins/veritas.py +++ b/sos/report/plugins/veritas.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os diff --git a/sos/report/plugins/vhostmd.py b/sos/report/plugins/vhostmd.py index 8182c7a9..e4223fbd 100644 --- a/sos/report/plugins/vhostmd.py +++ b/sos/report/plugins/vhostmd.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os diff --git a/sos/report/plugins/virsh.py b/sos/report/plugins/virsh.py index e8073adb..5b32e8d6 100644 --- a/sos/report/plugins/virsh.py +++ b/sos/report/plugins/virsh.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class LibvirtClient(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/plugins/virtwho.py b/sos/report/plugins/virtwho.py index dec889e4..0be53ec2 100644 --- a/sos/report/plugins/virtwho.py +++ b/sos/report/plugins/virtwho.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class VirtWho(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/vmware.py b/sos/report/plugins/vmware.py index 397c4f53..3fe277bd 100644 --- a/sos/report/plugins/vmware.py +++ b/sos/report/plugins/vmware.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class VMWare(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/vsftpd.py b/sos/report/plugins/vsftpd.py index 510e2be7..dc5bb70f 100644 --- a/sos/report/plugins/vsftpd.py +++ b/sos/report/plugins/vsftpd.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin class Vsftpd(Plugin, RedHatPlugin): diff --git a/sos/report/plugins/vulkan.py b/sos/report/plugins/vulkan.py index 7ae16dcd..d76f0138 100644 --- a/sos/report/plugins/vulkan.py +++ b/sos/report/plugins/vulkan.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Vulkan(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/watchdog.py b/sos/report/plugins/watchdog.py index 43d457b2..92bfc9ac 100644 --- a/sos/report/plugins/watchdog.py +++ b/sos/report/plugins/watchdog.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin from glob import glob import os diff --git a/sos/report/plugins/wireless.py b/sos/report/plugins/wireless.py index 395208c6..70c09eab 100644 --- a/sos/report/plugins/wireless.py +++ b/sos/report/plugins/wireless.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Wireless(Plugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/x11.py b/sos/report/plugins/x11.py index 8322d877..f0549df7 100644 --- a/sos/report/plugins/x11.py +++ b/sos/report/plugins/x11.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class X11(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/xen.py b/sos/report/plugins/xen.py index 2e573eb7..2035f202 100644 --- a/sos/report/plugins/xen.py +++ b/sos/report/plugins/xen.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os import re diff --git a/sos/report/plugins/xfs.py b/sos/report/plugins/xfs.py index c04ef0af..454817aa 100644 --- a/sos/report/plugins/xfs.py +++ b/sos/report/plugins/xfs.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin from six.moves import zip diff --git a/sos/report/plugins/xinetd.py b/sos/report/plugins/xinetd.py index 76f15caa..8940cc1d 100644 --- a/sos/report/plugins/xinetd.py +++ b/sos/report/plugins/xinetd.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin class Xinetd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): diff --git a/sos/report/plugins/yum.py b/sos/report/plugins/yum.py index f0d7c60c..1ec7f70a 100644 --- a/sos/report/plugins/yum.py +++ b/sos/report/plugins/yum.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin import os YUM_PLUGIN_PATH = "/usr/lib/yum-plugins/" diff --git a/sos/report/plugins/zfs.py b/sos/report/plugins/zfs.py index 6211d151..b262bd62 100644 --- a/sos/report/plugins/zfs.py +++ b/sos/report/plugins/zfs.py @@ -7,7 +7,7 @@ # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin class Zfs(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/report/sosreport.py b/sos/report/sosreport.py index 1f64a148..723e2874 100644 --- a/sos/report/sosreport.py +++ b/sos/report/sosreport.py @@ -23,7 +23,7 @@ import logging from datetime import datetime from argparse import ArgumentParser, Action -import sos.plugins +import sos.report.plugins from sos.utilities import ImporterHelper, SoSTimeoutError from shutil import rmtree import tempfile @@ -617,8 +617,8 @@ class SoSReport(object): )) def load_plugins(self): - import_plugin = sos.plugins.import_plugin - helper = ImporterHelper(sos.plugins) + import_plugin = sos.report.plugins.import_plugin + helper = ImporterHelper(sos.report.plugins) plugins = helper.get_modules() self.plugin_names = [] self.profiles = set() @@ -627,7 +627,7 @@ class SoSReport(object): extra_classes = [] if self.opts.experimental: - extra_classes.append(sos.plugins.ExperimentalPlugin) + extra_classes.append(sos.report.plugins.ExperimentalPlugin) valid_plugin_classes = tuple(policy_classes + extra_classes) validate_plugin = self.policy.validate_plugin remaining_profiles = list(self.opts.profiles) diff --git a/tests/option_tests.py b/tests/option_tests.py index 133570f0..56480a58 100644 --- a/tests/option_tests.py +++ b/tests/option_tests.py @@ -7,7 +7,7 @@ # See the LICENSE file in the source distribution for further information. import unittest -from sos.plugins import Plugin +from sos.report.plugins import Plugin from sos.policies import LinuxPolicy, InitSystem diff --git a/tests/plugin_tests.py b/tests/plugin_tests.py index 2b6cdb21..207cb724 100644 --- a/tests/plugin_tests.py +++ b/tests/plugin_tests.py @@ -17,7 +17,7 @@ try: except: from io import StringIO -from sos.plugins import Plugin, regex_findall, _mangle_command +from sos.report.plugins import Plugin, regex_findall, _mangle_command from sos.archive import TarFileArchive from sos.policies import LinuxPolicy, InitSystem import sos.policies diff --git a/tests/policy_tests.py b/tests/policy_tests.py index 71ef5c4a..69cc0529 100644 --- a/tests/policy_tests.py +++ b/tests/policy_tests.py @@ -8,7 +8,7 @@ import unittest from sos.policies import Policy, PackageManager, import_policy -from sos.plugins import Plugin, IndependentPlugin, RedHatPlugin, DebianPlugin +from sos.report.plugins import Plugin, IndependentPlugin, RedHatPlugin, DebianPlugin class FauxPolicy(Policy): distro = "Faux" -- cgit