qontract-reconcile 0.10.1rc801__py3-none-any.whl → 0.10.1rc803__py3-none-any.whl

tools/qontract_cli.py

@@ -136,7 +136,8 @@ from reconcile.utils.secret_reader import (
 from reconcile.utils.semver_helper import parse_semver
 from reconcile.utils.state import init_state
 from reconcile.utils.terraform_client import TerraformClient as Terraform
-from tools.cli_commands.cost_report.command import CostReportCommand
+from tools.cli_commands.cost_report.aws import AwsCostReportCommand
+from tools.cli_commands.cost_report.openshift import OpenShiftCostReportCommand
 from tools.cli_commands.gpg_encrypt import (
     GPGEncryptCommand,
     GPGEncryptCommandData,
@@ -2538,7 +2539,14 @@ def alerts(ctx, file_path):
 @get.command()
 @click.pass_context
 def aws_cost_report(ctx):
-    command = CostReportCommand.create()
+    command = AwsCostReportCommand.create()
+    print(command.execute())
+
+
+@get.command()
+@click.pass_context
+def openshift_cost_report(ctx):
+    command = OpenShiftCostReportCommand.create()
     print(command.execute())
 
 

tools/test/test_qontract_cli.py

@@ -128,12 +128,14 @@ def test_early_exit_cache_delete(env_vars, mock_queries, mock_early_exit_cache):
 
 
 @pytest.fixture
-def mock_cost_report_command(mocker):
-    return mocker.patch("tools.qontract_cli.CostReportCommand", autospec=True)
+def mock_aws_cost_report_command(mocker):
+    return mocker.patch("tools.qontract_cli.AwsCostReportCommand", autospec=True)
 
 
-def test_get_aws_cost_report(env_vars, mock_queries, mock_cost_report_command):
-    mock_cost_report_command.create.return_value.execute.return_value = "some report"
+def test_get_aws_cost_report(env_vars, mock_queries, mock_aws_cost_report_command):
+    mock_aws_cost_report_command.create.return_value.execute.return_value = (
+        "some report"
+    )
     runner = CliRunner()
     result = runner.invoke(
         qontract_cli.get,
@@ -143,5 +145,29 @@ def test_get_aws_cost_report(env_vars, mock_queries, mock_cost_report_command):
 
     assert result.exit_code == 0
     assert result.output == "some report\n"
-    mock_cost_report_command.create.assert_called_once_with()
-    mock_cost_report_command.create.return_value.execute.assert_called_once_with()
+    mock_aws_cost_report_command.create.assert_called_once_with()
+    mock_aws_cost_report_command.create.return_value.execute.assert_called_once_with()
+
+
+@pytest.fixture
+def mock_openshift_cost_report_command(mocker):
+    return mocker.patch("tools.qontract_cli.OpenShiftCostReportCommand", autospec=True)
+
+
+def test_get_openshift_cost_report(
+    env_vars, mock_queries, mock_openshift_cost_report_command
+):
+    mock_openshift_cost_report_command.create.return_value.execute.return_value = (
+        "some report"
+    )
+    runner = CliRunner()
+    result = runner.invoke(
+        qontract_cli.get,
+        "openshift-cost-report",
+        obj={},
+    )
+
+    assert result.exit_code == 0
+    assert result.output == "some report\n"
+    mock_openshift_cost_report_command.create.assert_called_once_with()
+    mock_openshift_cost_report_command.create.return_value.execute.assert_called_once_with()