fix: notify_failure triggered before foreman_heal runs

* Added foreman_heal run at the end of M&R
* Better handling of boolean values on notifications blueprint

fixes: #550
Change-Id: I281d54ac575cdc12529a05a819333745eeb0f7cc

Author: grafuls

src/quads/cli/cli.py

@@ -21,7 +21,7 @@
 from quads.server.models import Assignment
 from quads.tools import reports
 from quads.tools.external.jira import Jira, JiraException
-from quads.tools.foreman_heal import main as foreman_heal
+from quads.tools.foreman_heal import rbac as foreman_heal
 from quads.tools.make_instackenv_json import main as regen_instack
 from quads.tools.move_and_rebuild import move_and_rebuild, switch_config
 from quads.tools.notify import main as notify
@@ -656,10 +656,10 @@ def action_extend(self):
 
         if not check:
             data = {
-                "one_day": "False",
-                "three_days": "False",
-                "five_days": "False",
-                "seven_days": "False",
+                "one_day": False,
+                "three_days": False,
+                "five_days": False,
+                "seven_days": False,
             }
             try:
                 self.quads.update_notification(schedules[0].assignment.notification.id, data)
@@ -1698,6 +1698,7 @@ def action_movehosts(self):  # pragma: no cover
                                     assignment.id,
                                     {"provisioned": True, "validated": validate},
                                 )
+                                foreman_heal(self.logger)
                         except (
                             APIServerException,
                             APIBadRequest,
@@ -1818,7 +1819,6 @@ def action_cloudonly(self):
             _hosts = self.quads.filter_hosts(host_kwargs)
             if _hosts:
                 for schedule in sorted(schedules, key=lambda k: k.host.name):
-                    # TODO: check data properties
                     if schedule.host.name in [host.name for host in _hosts]:
                         self.logger.info(schedule.host.name)
         else:
@@ -1838,7 +1838,7 @@ def action_cloudonly(self):
                 if self.cli_args.get("filter"):
                     filter_args = self._filter_kwargs(self.cli_args.get("filter"))
                     host_kwargs.update(filter_args)
-                    _host = self.quads.filter_hosts(host_kwargs)
+                    _hosts = self.quads.filter_hosts(host_kwargs)
                 else:
                     _hosts = self.quads.get_hosts()
                 for host in sorted(_hosts, key=lambda k: k.name):

src/quads/server/blueprints/notifications.py

@@ -46,8 +46,8 @@ def update_notification(notification_id: int) -> Response:
     update_fields = {}
     for attr in obj_attrs:
         value = data.get(attr.key)
-        if value:
-            if type(value) == str:
+        if attr.key in data:
+            if isinstance(value, str):
                 if value.lower() in ["true", "false"]:
                     value = eval(value.lower().capitalize())
             update_fields[attr.key] = value

src/quads/tools/foreman_heal.py

@@ -16,7 +16,7 @@
 quads = QuadsApi(Config)
 
 
-def main(_logger=None):
+def rbac(_logger=None):
     global logger
     if _logger:  # pragma: no cover
         logger = _logger
@@ -59,7 +59,7 @@ def main(_logger=None):
                 if current_schedule:
 
                     logger.info("  Current Host Permissions:")
-                    for host, properties in cloud_hosts.items():  # pragma: no cover
+                    for host, _ in cloud_hosts.items():  # pragma: no cover
                         logger.info(f"    {host}")
 
                         match = [schedule.host.name for schedule in current_schedule if schedule.host.name == host]
@@ -78,7 +78,7 @@ def main(_logger=None):
                 else:
                     if cloud_hosts:  # pragma: no cover
                         logger.info("  No active schedule, removing pre-existing roles.")
-                        for host, properties in cloud_hosts.items():
+                        for host, _ in cloud_hosts.items():
                             _host_id = loop.run_until_complete(foreman_admin.get_host_id(host))
                             loop.run_until_complete(foreman_admin.put_element("hosts", _host_id, "owner_id", admin_id))
                             logger.info(f"* Removed permission {host}")
@@ -87,4 +87,4 @@ def main(_logger=None):
 
 
 if __name__ == "__main__":  # pragma: no cover
-    main()
+    rbac()

src/quads/tools/move_and_rebuild.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 import asyncio
 import logging
-import os
 from datetime import datetime
 from time import sleep
 

src/quads/tools/validate_env.py

@@ -196,7 +196,7 @@ async def post_network_test(self):
                 }
                 previous_schedule = quads.get_schedules(data=data)
                 if previous_schedule:
-                    previous_cloud = previous_schedule[0].cloud.name
+                    previous_cloud = previous_schedule[0].assignment.cloud.name
                 result = switch_config(host.name, previous_cloud, host.cloud.name)
                 if result:
                     try:

tests/tools/test_foreman_heal.py

@@ -1,7 +1,7 @@
 import logging
 
 from quads.config import Config
-from quads.tools.foreman_heal import main as foreman_heal_main
+from quads.tools.foreman_heal import rbac as foreman_heal_main
 from tests.tools.test_base import TestBase