Merge pull request #606 from powerapi-ng/refactor/remove-file-db

refactor(database): Remove unused `file` database

Author: gfieni

src/powerapi/cli/common_cli_parsing_manager.py

@@ -159,38 +159,6 @@ def __init__(self):
             subgroup_parser=subparser_csv_input
         )
 
-        subparser_file_input = SubgroupConfigParsingManager("filedb")
-        subparser_file_input.add_argument(
-            "m",
-            "model",
-            help_text="specify data type that will be stored in the database",
-            default_value="HWPCReport",
-        )
-        subparser_file_input.add_argument("f", "filename", help_text="specify file name")
-        subparser_file_input.add_argument(
-            "n", "name", help_text="specify pusher name", default_value="pusher_filedb"
-        )
-        self.add_subgroup_parser(
-            subgroup_name="input",
-            subgroup_parser=subparser_file_input
-        )
-
-        subparser_file_output = SubgroupConfigParsingManager("filedb")
-        subparser_file_output.add_argument(
-            "m",
-            "model",
-            help_text="specify data type that will be stored in the database",
-            default_value="PowerReport",
-        )
-        subparser_file_output.add_argument("f", "filename", help_text="specify file name")
-        subparser_file_output.add_argument(
-            "n", "name", help_text="specify pusher name", default_value="pusher_filedb"
-        )
-        self.add_subgroup_parser(
-            subgroup_name="output",
-            subgroup_parser=subparser_file_output
-        )
-
         subparser_virtiofs_output = SubgroupConfigParsingManager("virtiofs")
         help_text = "regexp used to extract vm name from report."
         help_text += "The regexp must match the name of the target in the HWPC-report and a group must"

src/powerapi/cli/generator.py

@@ -33,7 +33,7 @@
 from collections.abc import Callable
 
 from powerapi.actor import Actor
-from powerapi.database import MongoDB, CsvDB, OpenTSDB, SocketDB, PrometheusDB, VirtioFSDB, FileDB
+from powerapi.database import MongoDB, CsvDB, OpenTSDB, SocketDB, PrometheusDB, VirtioFSDB
 from powerapi.database.influxdb2 import InfluxDB2
 from powerapi.exception import PowerAPIException, ModelNameAlreadyUsed, DatabaseNameDoesNotExist, ModelNameDoesNotExist, \
     DatabaseNameAlreadyUsed, ProcessorTypeDoesNotExist, ProcessorTypeAlreadyUsed
@@ -194,7 +194,6 @@ def __init__(self, component_group_name: str):
                                                      root_directory_name=db_config['root-directory-name'],
                                                      vm_directory_name_prefix=db_config['vm-directory-name-prefix'],
                                                      vm_directory_name_suffix=db_config['vm-directory-name-suffix']),
-            'filedb': lambda db_config: FileDB(report_type=db_config['model'], filename=db_config['filename'])
         }
 
     def remove_report_class(self, model_name: str):

src/powerapi/database/__init__.py

@@ -34,4 +34,3 @@
 from powerapi.database.prometheus import PrometheusDB
 from powerapi.database.virtiofs import VirtioFSDB
 from powerapi.database.socket import SocketDB
-from powerapi.database.file import FileDB

src/powerapi/database/file/__init__.py

@@ -175,19 +175,6 @@ def several_inputs_outputs_stream_virtiofs_without_some_arguments_config(several
     return several_inputs_outputs_stream_config
 
 
-@pytest.fixture
-def several_inputs_outputs_stream_filedb_without_some_arguments_config(several_inputs_outputs_stream_config):
-    """
-    Configuration with several inputs and outputs and stream mode enabled. Some arguments
-    of filedb output are removed
-    """
-    for _, current_output in several_inputs_outputs_stream_config["output"].items():
-        if current_output['type'] == 'filedb':
-            current_output.pop('filename')
-
-    return several_inputs_outputs_stream_config
-
-
 @pytest.fixture
 def several_k8s_pre_processors_config():
     """

src/powerapi/database/file/file_db.py

@@ -286,9 +286,6 @@ def test_generate_several_pushers_from_config(several_inputs_outputs_stream_conf
             assert db.vm_directory_name_prefix == current_pusher_infos['vm-directory-name-prefix']
             assert db.vm_directory_name_suffix == current_pusher_infos['vm-directory-name-suffix']
 
-        elif pusher_type == 'filedb':
-            assert db.filename == current_pusher_infos['filename']
-
         else:
             pytest.fail(f'Unsupported pusher type: {pusher_type}')
 
@@ -337,17 +334,6 @@ def test_generate_pusher_raise_exception_when_missing_arguments_in_virtiofs_outp
         generator.generate(several_inputs_outputs_stream_virtiofs_without_some_arguments_config)
 
 
-def test_generate_pusher_raise_exception_when_missing_arguments_in_filedb_output(
-        several_inputs_outputs_stream_filedb_without_some_arguments_config):
-    """
-    Test that PusherGenerator raises a PowerAPIException when some arguments are missing for filedb output
-    """
-    generator = PusherGenerator()
-
-    with pytest.raises(PowerAPIException):
-        generator.generate(several_inputs_outputs_stream_filedb_without_some_arguments_config)
-
-
 def test_generate_pusher_when_missing_arguments_in_csv_output_generate_related_actors(
         several_inputs_outputs_stream_csv_without_some_arguments_config):
     """

tests/unit/cli/conftest.py

@@ -70,13 +70,6 @@
           "root-directory-name": "my_dir",
           "vm-directory-name-prefix": "prefix_1",
           "vm-directory-name-suffix": "suffix_1"
-      },
-      "eighth": {
-          "type": "filedb",
-          "model": "PowerReport",
-          "filename": "myname.txt"
       }
   }
 }
-
-