Merge branch 'staging'

VirtualMachineService/VirtualMachineHandler.py

@@ -736,7 +736,9 @@ def get_server(self, openstack_id: str) -> VM:
                 return VM(status=self.NOT_FOUND)
             return self.openstack_server_to_thrift_server(server=server)
 
-
+        except ResourceNotFound:
+            self.LOG.exception(f"Could not find server {id}")
+            return VM(status=self.NOT_FOUND)
         except Exception:
             self.LOG.exception(f"Could get server {openstack_id}")
             return VM(status=self.CHECKING_STATUS)
@@ -1810,6 +1812,9 @@ def get_volume(self, volume_id):
                 self.LOG.exception(f"Could not find volume {id}")
                 return Volume(status=self.NOT_FOUND)
 
+        except ResourceNotFound:
+            self.LOG.exception(f"Could not find volume {id}")
+            return Volume(status=self.NOT_FOUND)
         except Exception:
             self.LOG.exception(f"Could not find volume {id}")
             return Volume(status=self.CHECKING_STATUS)
@@ -1865,11 +1870,13 @@ def check_server_status(self, openstack_id: str) -> VM:
             if not server:
                 self.LOG.exception(f"No Server with id  {openstack_id} ")
                 return VM(status=self.NOT_FOUND)
+        except ResourceNotFound:
+            self.LOG.exception(f"Could not find server {id}")
+            return VM(status=self.NOT_FOUND)
         except Exception:
             self.LOG.exception(f"Could not get server {openstack_id} ")
             return VM(status=self.CHECKING_STATUS)
 
-
         serv = server.to_dict()
 
         try:

requirements.txt

@@ -5,8 +5,8 @@ openstacksdk ==1.3.1
 deprecated ==1.2.14
 Click==8.1.6
 ansible==8.2.0
-flake8==6.0.0
-paramiko==3.2.0
+flake8==6.1.0
+paramiko==3.3.1
 ruamel.yaml==0.17.32
 pyvim==3.0.3
 redis==4.6.0