diff --git a/mktxp/cli/output/capsman_out.py b/mktxp/cli/output/capsman_out.py index 8f6186f..28fcfd5 100644 --- a/mktxp/cli/output/capsman_out.py +++ b/mktxp/cli/output/capsman_out.py @@ -14,8 +14,8 @@ from tabulate import tabulate from mktxp.cli.output.base_out import BaseOutputProcessor -from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource -from mktxp.datasources.capsman_ds import CapsmanRegistrationsMetricsDataSource +from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource +from mktxp.datasource.capsman_ds import CapsmanRegistrationsMetricsDataSource class CapsmanOutput: diff --git a/mktxp/cli/output/dhcp_out.py b/mktxp/cli/output/dhcp_out.py index 5661010..8fa0b28 100644 --- a/mktxp/cli/output/dhcp_out.py +++ b/mktxp/cli/output/dhcp_out.py @@ -14,7 +14,7 @@ from tabulate import tabulate from mktxp.cli.output.base_out import BaseOutputProcessor -from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource +from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource class DHCPOutput: diff --git a/mktxp/cli/output/wifi_out.py b/mktxp/cli/output/wifi_out.py index 7387a62..cd5d97f 100644 --- a/mktxp/cli/output/wifi_out.py +++ b/mktxp/cli/output/wifi_out.py @@ -14,8 +14,8 @@ from tabulate import tabulate from mktxp.cli.output.base_out import BaseOutputProcessor -from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource -from mktxp.datasources.wireless_ds import WirelessMetricsDataSource +from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource +from mktxp.datasource.wireless_ds import WirelessMetricsDataSource class WirelessOutput: diff --git a/mktxp/collectors/__init__.py b/mktxp/collector/__init__.py similarity index 100% rename from mktxp/collectors/__init__.py rename to mktxp/collector/__init__.py diff --git a/mktxp/collectors/bandwidth_collector.py b/mktxp/collector/bandwidth_collector.py similarity index 98% rename from mktxp/collectors/bandwidth_collector.py rename to mktxp/collector/bandwidth_collector.py index 2cdb7c6..52aa508 100644 --- a/mktxp/collectors/bandwidth_collector.py +++ b/mktxp/collector/bandwidth_collector.py @@ -17,7 +17,7 @@ import speedtest from datetime import datetime from multiprocessing import Pool from mktxp.cli.config.config import config_handler -from mktxp.collectors.base_collector import BaseCollector +from mktxp.collector.base_collector import BaseCollector result_list = [{'download': 0, 'upload': 0, 'ping': 0}] diff --git a/mktxp/collectors/base_collector.py b/mktxp/collector/base_collector.py similarity index 98% rename from mktxp/collectors/base_collector.py rename to mktxp/collector/base_collector.py index 9c01a8a..8f84ea6 100644 --- a/mktxp/collectors/base_collector.py +++ b/mktxp/collector/base_collector.py @@ -18,7 +18,7 @@ from mktxp.cli.config.config import MKTXPConfigKeys class BaseCollector: ''' Base Collector methods - For use by custom collectors + For use by custom collector ''' @staticmethod def info_collector(name, decription, router_records, metric_labels=[]): diff --git a/mktxp/collectors/capsman_collector.py b/mktxp/collector/capsman_collector.py similarity index 94% rename from mktxp/collectors/capsman_collector.py rename to mktxp/collector/capsman_collector.py index 865090b..d6fc1b1 100644 --- a/mktxp/collectors/capsman_collector.py +++ b/mktxp/collector/capsman_collector.py @@ -14,9 +14,9 @@ from mktxp.cli.output.base_out import BaseOutputProcessor from mktxp.cli.config.config import MKTXPConfigKeys -from mktxp.collectors.base_collector import BaseCollector -from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource -from mktxp.datasources.capsman_ds import CapsmanCapsMetricsDataSource, CapsmanRegistrationsMetricsDataSource +from mktxp.collector.base_collector import BaseCollector +from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource +from mktxp.datasource.capsman_ds import CapsmanCapsMetricsDataSource, CapsmanRegistrationsMetricsDataSource class CapsmanCollector(BaseCollector): diff --git a/mktxp/collectors/dhcp_collector.py b/mktxp/collector/dhcp_collector.py similarity index 94% rename from mktxp/collectors/dhcp_collector.py rename to mktxp/collector/dhcp_collector.py index c6685bb..87e934d 100644 --- a/mktxp/collectors/dhcp_collector.py +++ b/mktxp/collector/dhcp_collector.py @@ -13,8 +13,8 @@ from mktxp.cli.config.config import MKTXPConfigKeys -from mktxp.collectors.base_collector import BaseCollector -from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource +from mktxp.collector.base_collector import BaseCollector +from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource class DHCPCollector(BaseCollector): diff --git a/mktxp/collectors/firewall_collector.py b/mktxp/collector/firewall_collector.py similarity index 95% rename from mktxp/collectors/firewall_collector.py rename to mktxp/collector/firewall_collector.py index 8fbecdb..2354ac4 100644 --- a/mktxp/collectors/firewall_collector.py +++ b/mktxp/collector/firewall_collector.py @@ -13,8 +13,8 @@ from mktxp.cli.config.config import MKTXPConfigKeys -from mktxp.collectors.base_collector import BaseCollector -from mktxp.datasources.firewall_ds import FirewallMetricsDataSource +from mktxp.collector.base_collector import BaseCollector +from mktxp.datasource.firewall_ds import FirewallMetricsDataSource class FirewallCollector(BaseCollector): diff --git a/mktxp/collectors/health_collector.py b/mktxp/collector/health_collector.py similarity index 91% rename from mktxp/collectors/health_collector.py rename to mktxp/collector/health_collector.py index 0e6e291..4c77494 100644 --- a/mktxp/collectors/health_collector.py +++ b/mktxp/collector/health_collector.py @@ -12,8 +12,8 @@ ## GNU General Public License for more details. -from mktxp.collectors.base_collector import BaseCollector -from mktxp.datasources.health_ds import HealthMetricsDataSource +from mktxp.collector.base_collector import BaseCollector +from mktxp.datasource.health_ds import HealthMetricsDataSource class HealthCollector(BaseCollector): diff --git a/mktxp/collectors/identity_collector.py b/mktxp/collector/identity_collector.py similarity index 89% rename from mktxp/collectors/identity_collector.py rename to mktxp/collector/identity_collector.py index 80fd623..975f62f 100644 --- a/mktxp/collectors/identity_collector.py +++ b/mktxp/collector/identity_collector.py @@ -12,8 +12,8 @@ ## GNU General Public License for more details. -from mktxp.collectors.base_collector import BaseCollector -from mktxp.datasources.identity_ds import IdentityMetricsDataSource +from mktxp.collector.base_collector import BaseCollector +from mktxp.datasource.identity_ds import IdentityMetricsDataSource class IdentityCollector(BaseCollector): diff --git a/mktxp/collectors/interface_collector.py b/mktxp/collector/interface_collector.py similarity index 95% rename from mktxp/collectors/interface_collector.py rename to mktxp/collector/interface_collector.py index f7e98a6..4cf8f9a 100644 --- a/mktxp/collectors/interface_collector.py +++ b/mktxp/collector/interface_collector.py @@ -12,8 +12,8 @@ ## GNU General Public License for more details. -from mktxp.collectors.base_collector import BaseCollector -from mktxp.datasources.interface_ds import InterfaceTrafficMetricsDataSource +from mktxp.collector.base_collector import BaseCollector +from mktxp.datasource.interface_ds import InterfaceTrafficMetricsDataSource class InterfaceCollector(BaseCollector): diff --git a/mktxp/collectors/mktxp_collector.py b/mktxp/collector/mktxp_collector.py similarity index 89% rename from mktxp/collectors/mktxp_collector.py rename to mktxp/collector/mktxp_collector.py index edce76a..85976c1 100644 --- a/mktxp/collectors/mktxp_collector.py +++ b/mktxp/collector/mktxp_collector.py @@ -12,8 +12,8 @@ ## GNU General Public License for more details. -from mktxp.collectors.base_collector import BaseCollector -from mktxp.datasources.mktxp_ds import MKTXPMetricsDataSource +from mktxp.collector.base_collector import BaseCollector +from mktxp.datasource.mktxp_ds import MKTXPMetricsDataSource class MKTXPCollector(BaseCollector): diff --git a/mktxp/collectors/monitor_collector.py b/mktxp/collector/monitor_collector.py similarity index 96% rename from mktxp/collectors/monitor_collector.py rename to mktxp/collector/monitor_collector.py index 46e42af..76b6edb 100644 --- a/mktxp/collectors/monitor_collector.py +++ b/mktxp/collector/monitor_collector.py @@ -12,9 +12,9 @@ ## GNU General Public License for more details. -from mktxp.collectors.base_collector import BaseCollector +from mktxp.collector.base_collector import BaseCollector from mktxp.cli.output.base_out import BaseOutputProcessor -from mktxp.datasources.interface_ds import InterfaceMonitorMetricsDataSource +from mktxp.datasource.interface_ds import InterfaceMonitorMetricsDataSource class MonitorCollector(BaseCollector): diff --git a/mktxp/collectors/pool_collector.py b/mktxp/collector/pool_collector.py similarity index 93% rename from mktxp/collectors/pool_collector.py rename to mktxp/collector/pool_collector.py index 12085a5..2af111c 100644 --- a/mktxp/collectors/pool_collector.py +++ b/mktxp/collector/pool_collector.py @@ -13,8 +13,8 @@ from mktxp.cli.config.config import MKTXPConfigKeys -from mktxp.collectors.base_collector import BaseCollector -from mktxp.datasources.pool_ds import PoolMetricsDataSource, PoolUsedMetricsDataSource +from mktxp.collector.base_collector import BaseCollector +from mktxp.datasource.pool_ds import PoolMetricsDataSource, PoolUsedMetricsDataSource class PoolCollector(BaseCollector): diff --git a/mktxp/collectors/resource_collector.py b/mktxp/collector/resource_collector.py similarity index 96% rename from mktxp/collectors/resource_collector.py rename to mktxp/collector/resource_collector.py index d815f4c..82be43c 100644 --- a/mktxp/collectors/resource_collector.py +++ b/mktxp/collector/resource_collector.py @@ -12,9 +12,9 @@ ## GNU General Public License for more details. -from mktxp.collectors.base_collector import BaseCollector +from mktxp.collector.base_collector import BaseCollector from mktxp.cli.output.base_out import BaseOutputProcessor -from mktxp.datasources.system_resource_ds import SystemResourceMetricsDataSource +from mktxp.datasource.system_resource_ds import SystemResourceMetricsDataSource class SystemResourceCollector(BaseCollector): diff --git a/mktxp/collectors/route_collector.py b/mktxp/collector/route_collector.py similarity index 95% rename from mktxp/collectors/route_collector.py rename to mktxp/collector/route_collector.py index 37cd4c4..269e816 100644 --- a/mktxp/collectors/route_collector.py +++ b/mktxp/collector/route_collector.py @@ -13,8 +13,8 @@ from mktxp.cli.config.config import MKTXPConfigKeys -from mktxp.collectors.base_collector import BaseCollector -from mktxp.datasources.route_ds import RouteMetricsDataSource +from mktxp.collector.base_collector import BaseCollector +from mktxp.datasource.route_ds import RouteMetricsDataSource class RouteCollector(BaseCollector): diff --git a/mktxp/collectors/wlan_collector.py b/mktxp/collector/wlan_collector.py similarity index 94% rename from mktxp/collectors/wlan_collector.py rename to mktxp/collector/wlan_collector.py index c14e5dc..bdb4b6d 100644 --- a/mktxp/collectors/wlan_collector.py +++ b/mktxp/collector/wlan_collector.py @@ -13,10 +13,10 @@ from mktxp.cli.output.base_out import BaseOutputProcessor -from mktxp.collectors.base_collector import BaseCollector -from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource -from mktxp.datasources.wireless_ds import WirelessMetricsDataSource -from mktxp.datasources.interface_ds import InterfaceMonitorMetricsDataSource +from mktxp.collector.base_collector import BaseCollector +from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource +from mktxp.datasource.wireless_ds import WirelessMetricsDataSource +from mktxp.datasource.interface_ds import InterfaceMonitorMetricsDataSource class WLANCollector(BaseCollector): diff --git a/mktxp/collectors_handler.py b/mktxp/collectors_handler.py index ea48892..bbcb4b7 100644 --- a/mktxp/collectors_handler.py +++ b/mktxp/collectors_handler.py @@ -13,19 +13,19 @@ from timeit import default_timer -from mktxp.collectors.dhcp_collector import DHCPCollector -from mktxp.collectors.interface_collector import InterfaceCollector -from mktxp.collectors.health_collector import HealthCollector -from mktxp.collectors.identity_collector import IdentityCollector -from mktxp.collectors.monitor_collector import MonitorCollector -from mktxp.collectors.pool_collector import PoolCollector -from mktxp.collectors.resource_collector import SystemResourceCollector -from mktxp.collectors.route_collector import RouteCollector -from mktxp.collectors.wlan_collector import WLANCollector -from mktxp.collectors.capsman_collector import CapsmanCollector -from mktxp.collectors.bandwidth_collector import BandwidthCollector -from mktxp.collectors.firewall_collector import FirewallCollector -from mktxp.collectors.mktxp_collector import MKTXPCollector +from mktxp.collector.dhcp_collector import DHCPCollector +from mktxp.collector.interface_collector import InterfaceCollector +from mktxp.collector.health_collector import HealthCollector +from mktxp.collector.identity_collector import IdentityCollector +from mktxp.collector.monitor_collector import MonitorCollector +from mktxp.collector.pool_collector import PoolCollector +from mktxp.collector.resource_collector import SystemResourceCollector +from mktxp.collector.route_collector import RouteCollector +from mktxp.collector.wlan_collector import WLANCollector +from mktxp.collector.capsman_collector import CapsmanCollector +from mktxp.collector.bandwidth_collector import BandwidthCollector +from mktxp.collector.firewall_collector import FirewallCollector +from mktxp.collector.mktxp_collector import MKTXPCollector class CollectorsHandler: diff --git a/mktxp/datasources/__init__.py b/mktxp/datasource/__init__.py similarity index 100% rename from mktxp/datasources/__init__.py rename to mktxp/datasource/__init__.py diff --git a/mktxp/datasources/base_ds.py b/mktxp/datasource/base_ds.py similarity index 100% rename from mktxp/datasources/base_ds.py rename to mktxp/datasource/base_ds.py diff --git a/mktxp/datasources/capsman_ds.py b/mktxp/datasource/capsman_ds.py similarity index 97% rename from mktxp/datasources/capsman_ds.py rename to mktxp/datasource/capsman_ds.py index 522cbfc..0a93a6a 100644 --- a/mktxp/datasources/capsman_ds.py +++ b/mktxp/datasource/capsman_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class CapsmanCapsMetricsDataSource: diff --git a/mktxp/datasources/dhcp_ds.py b/mktxp/datasource/dhcp_ds.py similarity index 97% rename from mktxp/datasources/dhcp_ds.py rename to mktxp/datasource/dhcp_ds.py index c92eb99..d1e4dae 100644 --- a/mktxp/datasources/dhcp_ds.py +++ b/mktxp/datasource/dhcp_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class DHCPMetricsDataSource: diff --git a/mktxp/datasources/firewall_ds.py b/mktxp/datasource/firewall_ds.py similarity index 96% rename from mktxp/datasources/firewall_ds.py rename to mktxp/datasource/firewall_ds.py index 122af44..43ef67a 100644 --- a/mktxp/datasources/firewall_ds.py +++ b/mktxp/datasource/firewall_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class FirewallMetricsDataSource: diff --git a/mktxp/datasources/health_ds.py b/mktxp/datasource/health_ds.py similarity index 95% rename from mktxp/datasources/health_ds.py rename to mktxp/datasource/health_ds.py index a7905f3..c53a4ec 100644 --- a/mktxp/datasources/health_ds.py +++ b/mktxp/datasource/health_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class HealthMetricsDataSource: diff --git a/mktxp/datasources/identity_ds.py b/mktxp/datasource/identity_ds.py similarity index 95% rename from mktxp/datasources/identity_ds.py rename to mktxp/datasource/identity_ds.py index 239b8cc..ae2d73e 100644 --- a/mktxp/datasources/identity_ds.py +++ b/mktxp/datasource/identity_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class IdentityMetricsDataSource: diff --git a/mktxp/datasources/interface_ds.py b/mktxp/datasource/interface_ds.py similarity index 98% rename from mktxp/datasources/interface_ds.py rename to mktxp/datasource/interface_ds.py index 6b2d7e6..dd6b36a 100644 --- a/mktxp/datasources/interface_ds.py +++ b/mktxp/datasource/interface_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class InterfaceTrafficMetricsDataSource: diff --git a/mktxp/datasources/mktxp_ds.py b/mktxp/datasource/mktxp_ds.py similarity index 95% rename from mktxp/datasources/mktxp_ds.py rename to mktxp/datasource/mktxp_ds.py index d7138d4..ce7500f 100644 --- a/mktxp/datasources/mktxp_ds.py +++ b/mktxp/datasource/mktxp_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class MKTXPMetricsDataSource: diff --git a/mktxp/datasources/pool_ds.py b/mktxp/datasource/pool_ds.py similarity index 95% rename from mktxp/datasources/pool_ds.py rename to mktxp/datasource/pool_ds.py index b446651..69f39ef 100644 --- a/mktxp/datasources/pool_ds.py +++ b/mktxp/datasource/pool_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class PoolMetricsDataSource: diff --git a/mktxp/datasources/route_ds.py b/mktxp/datasource/route_ds.py similarity index 95% rename from mktxp/datasources/route_ds.py rename to mktxp/datasource/route_ds.py index e8f3314..90444d2 100644 --- a/mktxp/datasources/route_ds.py +++ b/mktxp/datasource/route_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class RouteMetricsDataSource: diff --git a/mktxp/datasources/routerboard_ds.py b/mktxp/datasource/routerboard_ds.py similarity index 95% rename from mktxp/datasources/routerboard_ds.py rename to mktxp/datasource/routerboard_ds.py index 2944e33..b4ae3f5 100644 --- a/mktxp/datasources/routerboard_ds.py +++ b/mktxp/datasource/routerboard_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class RouterboardMetricsDataSource: diff --git a/mktxp/datasources/system_resource_ds.py b/mktxp/datasource/system_resource_ds.py similarity index 95% rename from mktxp/datasources/system_resource_ds.py rename to mktxp/datasource/system_resource_ds.py index d50fd83..4f462ff 100644 --- a/mktxp/datasources/system_resource_ds.py +++ b/mktxp/datasource/system_resource_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class SystemResourceMetricsDataSource: diff --git a/mktxp/datasources/wireless_ds.py b/mktxp/datasource/wireless_ds.py similarity index 95% rename from mktxp/datasources/wireless_ds.py rename to mktxp/datasource/wireless_ds.py index 4214a1c..faa5a4a 100644 --- a/mktxp/datasources/wireless_ds.py +++ b/mktxp/datasource/wireless_ds.py @@ -12,7 +12,7 @@ ## GNU General Public License for more details. -from mktxp.datasources.base_ds import BaseDSProcessor +from mktxp.datasource.base_ds import BaseDSProcessor class WirelessMetricsDataSource: