DS refactor, fixes/optimizations

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.datasource.dhcp_ds import DHCPMetricsDataSource
-from mktxp.datasources.capsman_ds import CapsmanRegistrationsMetricsDataSource
+from mktxp.datasource.capsman_ds import CapsmanRegistrationsMetricsDataSource
 
 
 class CapsmanOutput:

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:

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.datasource.dhcp_ds import DHCPMetricsDataSource
-from mktxp.datasources.wireless_ds import WirelessMetricsDataSource
+from mktxp.datasource.wireless_ds import WirelessMetricsDataSource
 
 
 class WirelessOutput:

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}]

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=[]):

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.collector.base_collector import BaseCollector
-from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource
+from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource
-from mktxp.datasources.capsman_ds import CapsmanCapsMetricsDataSource, CapsmanRegistrationsMetricsDataSource
+from mktxp.datasource.capsman_ds import CapsmanCapsMetricsDataSource, CapsmanRegistrationsMetricsDataSource
 
 
 class CapsmanCollector(BaseCollector):

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.collector.base_collector import BaseCollector
-from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource
+from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource
 
 
 class DHCPCollector(BaseCollector):

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.collector.base_collector import BaseCollector
-from mktxp.datasources.firewall_ds import FirewallMetricsDataSource
+from mktxp.datasource.firewall_ds import FirewallMetricsDataSource
 
 
 class FirewallCollector(BaseCollector):

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.collector.base_collector import BaseCollector
-from mktxp.datasources.health_ds import HealthMetricsDataSource
+from mktxp.datasource.health_ds import HealthMetricsDataSource
 
 
 class HealthCollector(BaseCollector):

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.collector.base_collector import BaseCollector
-from mktxp.datasources.identity_ds import IdentityMetricsDataSource
+from mktxp.datasource.identity_ds import IdentityMetricsDataSource
 
 
 class IdentityCollector(BaseCollector):

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.collector.base_collector import BaseCollector
-from mktxp.datasources.interface_ds import InterfaceTrafficMetricsDataSource
+from mktxp.datasource.interface_ds import InterfaceTrafficMetricsDataSource
 
 
 class InterfaceCollector(BaseCollector):

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.collector.base_collector import BaseCollector
-from mktxp.datasources.mktxp_ds import MKTXPMetricsDataSource
+from mktxp.datasource.mktxp_ds import MKTXPMetricsDataSource
 
 
 class MKTXPCollector(BaseCollector):

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):

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.collector.base_collector import BaseCollector
-from mktxp.datasources.pool_ds import PoolMetricsDataSource, PoolUsedMetricsDataSource
+from mktxp.datasource.pool_ds import PoolMetricsDataSource, PoolUsedMetricsDataSource
 
 
 class PoolCollector(BaseCollector):

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):

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.collector.base_collector import BaseCollector
-from mktxp.datasources.route_ds import RouteMetricsDataSource
+from mktxp.datasource.route_ds import RouteMetricsDataSource
 
 
 class RouteCollector(BaseCollector):

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.collector.base_collector import BaseCollector
-from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource
+from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource
-from mktxp.datasources.wireless_ds import WirelessMetricsDataSource
+from mktxp.datasource.wireless_ds import WirelessMetricsDataSource
-from mktxp.datasources.interface_ds import InterfaceMonitorMetricsDataSource
+from mktxp.datasource.interface_ds import InterfaceMonitorMetricsDataSource
 
 
 class WLANCollector(BaseCollector):

mktxp/collectors_handler.py

@@ -13,19 +13,19 @@
 
 
 from timeit import default_timer
-from mktxp.collectors.dhcp_collector import DHCPCollector
+from mktxp.collector.dhcp_collector import DHCPCollector
-from mktxp.collectors.interface_collector import InterfaceCollector
+from mktxp.collector.interface_collector import InterfaceCollector
-from mktxp.collectors.health_collector import HealthCollector
+from mktxp.collector.health_collector import HealthCollector
-from mktxp.collectors.identity_collector import IdentityCollector
+from mktxp.collector.identity_collector import IdentityCollector
-from mktxp.collectors.monitor_collector import MonitorCollector
+from mktxp.collector.monitor_collector import MonitorCollector
-from mktxp.collectors.pool_collector import PoolCollector
+from mktxp.collector.pool_collector import PoolCollector
-from mktxp.collectors.resource_collector import SystemResourceCollector
+from mktxp.collector.resource_collector import SystemResourceCollector
-from mktxp.collectors.route_collector import RouteCollector
+from mktxp.collector.route_collector import RouteCollector
-from mktxp.collectors.wlan_collector import WLANCollector
+from mktxp.collector.wlan_collector import WLANCollector
-from mktxp.collectors.capsman_collector import CapsmanCollector
+from mktxp.collector.capsman_collector import CapsmanCollector
-from mktxp.collectors.bandwidth_collector import BandwidthCollector
+from mktxp.collector.bandwidth_collector import BandwidthCollector
-from mktxp.collectors.firewall_collector import FirewallCollector
+from mktxp.collector.firewall_collector import FirewallCollector
-from mktxp.collectors.mktxp_collector import MKTXPCollector
+from mktxp.collector.mktxp_collector import MKTXPCollector
 
 
 class CollectorsHandler:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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: