Merge pull request #475 from deNBI/deps/openstacksdk-3.x

feat(Dependencies): Update dependency openstacksdk to v3

Dockerfile

@@ -1,5 +1,5 @@
-FROM python:3.11.4-buster
-
+FROM python:3.12.0
+RUN echo "deb https://deb.debian.org/debian/ stable main" > /etc/apt/sources.list
 RUN apt-get update -y \
     && apt-get install -y build-essential \
     && apt-get clean \

requirements.txt

@@ -1,7 +1,7 @@
 setuptools==69.2.0
-thrift==0.16.0
+thrift==0.20.0
 python-keystoneclient==5.4.0
-openstacksdk==2.1.0
+openstacksdk==3.0.0
 deprecated==1.2.14
 Click==8.1.7
 ansible==9.3.0

simple_vm_client/forc_connector/playbook/playbook.py

@@ -299,7 +299,6 @@ def add_always_tasks_only(self, playbook_name: str) -> None:
         )
 
     def run_it(self) -> None:
-        logger.info("RUN ITTT")
         command_string = f"/usr/local/bin/ansible-playbook -v -i {self.inventory.name} {self.directory.name}/{self.playbook_exec_name}"
         command_string = shlex.split(command_string)  # type: ignore
         logger.info(f"Run Playbook for {self.playbook_exec_name} - [{command_string}]")

simple_vm_client/openstack_connector/openstack_connector.py

@@ -1426,6 +1426,10 @@ def add_udp_security_group(self, server_id):
             if self._is_security_group_already_added_to_server(
                 server=server, security_group_name=sec_name
             ):
+                logger.info(
+                    f"UDP Security group with name {sec_name} already added to server."
+                )
+
                 return
 
             self.openstack_connection.compute.add_security_group_to_server(

simple_vm_client/test_openstack_connector.py

@@ -1098,7 +1098,12 @@ def test_create_add_keys_script(self, mock_logger_info):
         result_script = self.openstack_connector.create_add_keys_script(keys)
 
         # Assertions
-        expected_script_content = '#!/bin/bash\ndeclare -a keys_to_add=("key1" "key2" "key3" )\necho "Found keys: ${#keys_to_add[*]}"\nfor ix in ${!keys_to_add[*]}\ndo\n    printf "\\n%s" "${keys_to_add[$ix]}" >> /home/ubuntu/.ssh/authorized_keys\n\ndone\n'
+        expected_script_content = (
+            '#!/bin/bash\ndeclare -a keys_to_add=("key1" "key2" "key3" )'
+            '\necho "Found keys: ${#keys_to_add[*]}"\nfor ix in ${!keys_to_add[*]}'
+            '\ndo\n    printf "\\n%s" "${keys_to_add[$ix]}" >> /home/ubuntu/.ssh/authorized_keys'
+            "\n\ndone\n"
+        )
         expected_script_content = encodeutils.safe_encode(
             expected_script_content.encode("utf-8")
         )
@@ -2166,21 +2171,6 @@ def test_reboot_server_success(self, mock_get_server):
             server_mock, "SOFT"
         )
 
-    @patch.object(OpenStackConnector, "get_server")
-    @patch("simple_vm_client.openstack_connector.openstack_connector.logger.exception")
-    def test_reboot_server_conflict_exception(
-        self, mock_logger_exception, mock_get_server
-    ):
-        self.openstack_connector.openstack_connection.compute.reboot_server.side_effect = ConflictException(
-            "Unit Test"
-        )
-        # Act
-        with self.assertRaises(OpenStackConflictException):
-            self.openstack_connector.reboot_server("some_openstack_id", "SOFT")
-        mock_logger_exception.assert_called_once_with(
-            "Reboot Server some_openstack_id failed!"
-        )
-
     @patch.object(OpenStackConnector, "get_server")
     def test_reboot_soft_server(self, mock_get_server):
         # Arrange
@@ -2271,7 +2261,9 @@ def test_get_server(
             ignore_not_active=True,
             ignore_not_found=True,
         )
-        mock_get_flavor.assert_called_once_with(name_or_id=flavor_mock.id)
+        mock_get_flavor.assert_called_once_with(
+            name_or_id=flavor_mock.id, ignore_error=True
+        )
         mock_netcat.return_value = False  # Assuming SSH connection is successful
         # Act
         result_server = self.openstack_connector.get_server(openstack_id)
@@ -2335,7 +2327,7 @@ def test_reboot_server_conflict_exception(
         with self.assertRaises(OpenStackConflictException):
             self.openstack_connector.reboot_server("some_openstack_id", "SOFT")
         mock_logger_exception.assert_called_once_with(
-            f"Reboot Server some_openstack_id failed!"
+            "Reboot Server some_openstack_id failed!"
         )
 
     def test_exist_server_true(self):
@@ -2514,7 +2506,6 @@ def test_is_security_group_in_use_ports(self):
 
     def test_is_security_group_in_use_load_balancers(self):
         # Mock the network.load_balancers method to simulate load balancers associated with the security group
-        load_balancers = [{"id": "lb_id", "name": "lb_name"}]
         self.openstack_connector.openstack_connection.compute.servers.return_value = []
         self.openstack_connector.openstack_connection.network.ports.return_value = []
 
@@ -2668,7 +2659,7 @@ def test_open_port_range_for_vm_in_project_conflict_exception(
                 range_start=1000, range_stop=1000, openstack_id="test"
             )
         mock_logger_exception.assert_called_once_with(
-            f"Could not create security group rule for instance test"
+            "Could not create security group rule for instance test"
         )
 
     @patch.object(OpenStackConnector, "get_or_create_project_security_group")
@@ -2707,7 +2698,7 @@ def test_open_port_range_for_vm_in_project(
         )
 
         # Call the method
-        result = self.openstack_connector.open_port_range_for_vm_in_project(
+        self.openstack_connector.open_port_range_for_vm_in_project(
             range_start=1000,
             range_stop=2000,
             openstack_id=fake_server.id,