fix terminate for REST

REST's terminate did not pass the floating ip list. Now it is passed as well.

#709

Author: XaverStiensmeier

bibigrid/core/actions/terminate.py

@@ -29,7 +29,7 @@ def write_cluster_state(state):
         yaml.safe_dump(data=state, stream=cluster_info_file)
 
 
-def terminate(cluster_id, providers, log, floating_ip_ids, debug=False, assume_yes=False):
+def terminate(cluster_id, providers, floating_ip_ids, log, debug=False, assume_yes=False):
     """
     Goes through all providers and gets info of all servers which name contains cluster ID.
     It then checks if any resources are reserved, but not used and frees them that were hold by the cluster.

bibigrid/core/startup.py

@@ -144,9 +144,8 @@ def run_action(action, configurations, config_input, cluster_id, debug):
                         LOG.info("Action terminate selected")
                         exit_state = terminate.terminate(cluster_id=cluster_id, providers=providers,
                                                          floating_ip_ids=configuration_handler.get_list_by_key(
-                                                             configurations=configurations,key="floatingIpId"),
-                                                         log=LOG,
-                                                         debug=debug)
+                                                             configurations=configurations, key="floatingIpId"),
+                                                         log=LOG, debug=debug)
                     case 'ide':
                         LOG.info("Action ide selected")
                         exit_state = ide.ide(cluster_id, providers[0], configurations[0], LOG)

bibigrid/core/startup_rest.py

@@ -193,7 +193,9 @@ async def terminate_cluster(cluster_id: str,
 
     try:
         providers = provider_handler.get_providers(configurations, log)
-        thread = threading.Thread(target=terminate.terminate, args=(cluster_id, providers, log))
+        thread = threading.Thread(target=terminate.terminate,
+                                  args=(cluster_id, providers, configuration_handler.get_list_by_key(
+                                      configurations=configurations, key="floatingIpId"), log))
         thread.start()
         return JSONResponse(content={"message": "Termination successfully requested."}, status_code=202)
     except Exception as exc:  # pylint: disable=broad-except

tests/unit_tests/test_terminate_cluster.py

@@ -30,7 +30,7 @@ def test_terminate(self, mock_output, mock_local):
         provider.list_volumes([{"name": "bibigrid-master-i950vaoqzfbwpnq-tmp-0"}])
         provider.delete_security_group.return_value = True
         provider.delete_application_credentials.return_value = True
-        terminate.terminate(str(cluster_id), [provider], startup.LOG, [None], False, True)
+        terminate.terminate(str(cluster_id), [provider], [None], startup.LOG, False, True)
         provider.delete_server.assert_called_with(21, delete_ips=True)
         provider.delete_keypair.assert_called_with(KEY_NAME.format(cluster_id=cluster_id))
         mock_output.assert_called_with(cluster_server_state=[provider.delete_server.return_value],
@@ -57,7 +57,7 @@ def test_terminate_delete_ip_false(self, mock_output, mock_local):
         provider.list_volumes([{"name": "bibigrid-master-i950vaoqzfbwpnq-tmp-0"}])
         provider.delete_security_group.return_value = True
         provider.delete_application_credentials.return_value = True
-        terminate.terminate(str(cluster_id), [provider], startup.LOG, ["123"], False, True)
+        terminate.terminate(str(cluster_id), [provider], ["123"], startup.LOG, False, True)
         provider.delete_server.assert_called_with(21, delete_ips=False)
 
     @patch("bibigrid.core.actions.terminate.delete_local_keypairs")
@@ -70,7 +70,7 @@ def test_terminate_none(self, _, mock_local):
         provider.list_servers.return_value = [
             {"name": master_identifier(cluster_id=str(cluster_id + 1)), "id": 21}]
         provider.delete_keypair.return_value = False
-        terminate.terminate(str(cluster_id), [provider], startup.LOG, [None], False, True)
+        terminate.terminate(str(cluster_id), [provider], [None], startup.LOG, False, True)
         provider.delete_server.assert_not_called()
         provider.delete_keypair.assert_called_with(
             KEY_NAME.format(cluster_id=str(cluster_id)))  # since keypair is not called