Merge branch 'staging'

.pre-commit-config.yaml

@@ -2,23 +2,23 @@ default_stages: [ commit ]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
 
   - repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 23.7.0
     hooks:
       - id: black
   - repo: https://github.com/sondrelg/pep585-upgrade
-    rev: 'v1'  # Use the sha / tag you want to point at
+    rev: 'v1.0.1'  # Use the sha / tag you want to point at
     hooks:
       - id: upgrade-type-hints
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
   -   repo: https://github.com/neutrinoceros/flynt/
@@ -27,15 +27,15 @@ repos:
       -   id: flynt
 
   - repo: https://github.com/myint/autoflake
-    rev: v1.4
+    rev: v2.2.0
     hooks:
       - id: autoflake
         args:
           - --in-place
           - --remove-all-unused-imports
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 6.1.0
     hooks:
       - id: flake8
         args: [ "--config=setup.cfg" ]

VirtualMachineService/VirtualMachineHandler.py

@@ -2666,7 +2666,7 @@ def delete_volume(self, volume_id):
 
         try:
             self.LOG.info(f"Delete Volume  {volume_id}")
-            self.conn.block_storage.delete_volume(volume=volume_id, force=True)
+            self.conn.block_storage.delete_volume(volume=volume_id)
             return True
         except ConflictException:
             self.LOG.exception(f"Delete volume {volume_id} error")

requirements.txt

@@ -1,7 +1,7 @@
 setuptools==68.0.0
 thrift==0.16.0
 python-keystoneclient==5.1.0
-openstacksdk ==1.3.1
+openstacksdk ==1.4.0
 deprecated ==1.2.14
 Click==8.1.6
 ansible==8.2.0