Merge branch 'dev' into staging

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
 
   - repo: https://github.com/psf/black-pre-commit-mirror
 
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
       - id: black
         language_version: python3.11
@@ -21,7 +21,7 @@ repos:
       - id: upgrade-type-hints
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
+    rev: 6.0.0
     hooks:
       - id: isort
 

portal_client.thrift

@@ -675,6 +675,7 @@ service VirtualMachineService {
 	void delete_keypair(1:string key_name)
     void add_default_security_groups_to_server(1:string openstack_id) throws  (1:ServerNotFoundException e)
 
+    string get_server_console(1:string openstack_id)  throws  (1:ServerNotFoundException e)
 	/**
 	 * Get a Server.
 	 * Returns: A server instance.

requirements.txt

@@ -1,7 +1,7 @@
 setuptools==75.8.0
 thrift==0.21.0
 openstacksdk==4.0.1
-deprecated==1.2.15
+deprecated==1.2.18
 Click==8.1.8
 ansible==10.5.0
 flake8==7.1.1

simple_vm_client/VirtualMachineHandler.py

@@ -42,7 +42,7 @@ def __init__(self, config_file: str):
         self.metadata_connetor = MetadataConnector(config_file=config_file)
 
     def keyboard_interrupt_handler_playbooks(self) -> None:
-        for k, v in self.forc_connector._active_playbooks.items():
+        for k, v in self.forc_connector.active_playbooks.items():
             logger.info(f"Clearing traces of Playbook-VM for (openstack_id): {k}")
             self.openstack_connector.delete_keypair(
                 key_name=self.forc_connector.redis_connection.hget(k, "name").decode(
@@ -182,6 +182,10 @@ def get_server(self, openstack_id: str, no_connection: bool = False) -> VM:
         server = thrift_converter.os_to_thrift_server(openstack_server=server)
         return server
 
+    def get_server_console(self, openstack_id: str) -> str:
+        logs = self.openstack_connector.get_server_console(openstack_id=openstack_id)
+        return logs
+
     def get_servers(self) -> list[VM]:
         servers = self.openstack_connector.get_servers()
         servers_full = []

simple_vm_client/VirtualMachineService-remote

@@ -107,6 +107,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == "--help":
     print("  string get_keypair_public_key_by_name(string key_name)")
     print("  void delete_keypair(string key_name)")
     print("  void add_default_security_groups_to_server(string openstack_id)")
+    print("  string get_server_console(string openstack_id)")
     print("  VM get_server(string openstack_id, bool no_connection)")
     print("  VM get_server_by_unique_name(string unique_name, bool no_connection)")
     print("  void stop_server(string openstack_id)")
@@ -801,6 +802,16 @@ elif cmd == "add_default_security_groups_to_server":
         )
     )
 
+elif cmd == "get_server_console":
+    if len(args) != 1:
+        print("get_server_console requires 1 args")
+        sys.exit(1)
+    pp.pprint(
+        client.get_server_console(
+            args[0],
+        )
+    )
+
 elif cmd == "get_server":
     if len(args) != 2:
         print("get_server requires 2 args")

simple_vm_client/config/config_local.yml

@@ -82,10 +82,10 @@ forc:
   # Access URL for FORC - optional - default is forc_url without port.
   github_playbooks_repo: https://github.com/deNBI/resenvs/archive/refs/heads/staging.zip
   # GitHub repository URL for FORC playbooks.
-  update_templates_schedule: 0.01
+  update_templates_schedule: 1.01
 
 metadata_server:
-  activated: True
+  activated: False
   use_https: False
   host: simplevm_metadata_server
   port: 8000