diff --git a/dp3_server/config/processing_core.yml b/dp3_server/config/processing_core.yml index 0fc5363..55d07fa 100644 --- a/dp3_server/config/processing_core.yml +++ b/dp3_server/config/processing_core.yml @@ -30,6 +30,6 @@ modules_dir: "../modules" # extension must be used! enabled_modules: - "dns_open_resolver" - - "ip_activity" + - "ip_activity_classifier" - "ip_filter" - "ip_to_dns_hostname" diff --git a/dp3_server/modules/ip_activity.py b/dp3_server/modules/ip_activity_classifier.py similarity index 77% rename from dp3_server/modules/ip_activity.py rename to dp3_server/modules/ip_activity_classifier.py index 4f3f11b..6f0bb55 100644 --- a/dp3_server/modules/ip_activity.py +++ b/dp3_server/modules/ip_activity_classifier.py @@ -7,13 +7,17 @@ from dp3.common.task import DataPointTask -class IPactivity(BaseModule): - def __init__(self, platform_config: PlatformConfig, _, registrar: CallbackRegistrar): +class IPActivityClassifier(BaseModule): + def __init__( + self, platform_config: PlatformConfig, _, registrar: CallbackRegistrar + ): super().__init__(platform_config, {}, registrar) registrar.register_on_new_attr_hook(self.processing_function, "ip", "activity") - def processing_function(self, eid: str, dp: DataPointTimeseriesBase) -> List[DataPointTask]: - avg_bytes_per_time_step = sum(dp.v.bytes) / len(dp.v.bytes) + def processing_function( + self, eid: str, dp: DataPointTimeseriesBase + ) -> List[DataPointTask]: + avg_bytes_per_time_step = sum(dp.v.out_bytes) / len(dp.v.out_bytes) act_class = self.ip_act(avg_bytes_per_time_step) @@ -27,7 +31,7 @@ def processing_function(self, eid: str, dp: DataPointTimeseriesBase) -> List[Dat "etype": "ip", "eid": eid, "attr": "activity_class", - "src": "secondary/ip_activity", + "src": "secondary/ip_activity_classifier", "v": act_class, } ],