Merge branch 'staging'

.github/workflows/blacked.yml

@@ -4,7 +4,7 @@ jobs:
     format:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2.3.5
+            - uses: actions/checkout@v2.4.0
             - name: Checking out Branch
               run: git checkout "${GITHUB_REF:11}"
             - name: black
@@ -17,7 +17,7 @@ jobs:
             - name: Create Pull Request
               if: steps.git-check.outputs.modified == 'true'
               id: cpr
-              uses: peter-evans/create-pull-request@v3.10.1
+              uses: peter-evans/create-pull-request@v3.11.0
               with:
                token: ${{ secrets.GITHUB_TOKEN }}
                commit-message: fix(Linting):blacked code

.github/workflows/build_image.yml

@@ -8,5 +8,5 @@ jobs:
               uses: rokroskar/[email protected]
               env:
                 GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-            - uses: actions/checkout@v2.3.5
+            - uses: actions/checkout@v2.4.0
             - run: docker build --no-cache .

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2.3.5
+      uses: actions/checkout@v2.4.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/master-protection.yml

@@ -14,7 +14,7 @@ jobs:
         uses: rokroskar/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
 
       - name: Check Tag
         run: |

.github/workflows/publish_docker.yml

@@ -15,7 +15,7 @@ jobs:
         uses: rokroskar/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
       - name: Extract branch name
         shell: bash
         run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"

.github/workflows/release_image.yml

@@ -11,7 +11,7 @@ jobs:
      - name: Get the version
        id: get_version
        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-     - uses: actions/checkout@v2.3.5
+     - uses: actions/checkout@v2.4.0
      - name: Publish to Registry
        uses: elgohr/Publish-Docker-Github-Action@master
        with:

.github/workflows/update_docker_tags.yml

@@ -14,7 +14,7 @@ jobs:
         uses: rokroskar/[email protected]
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
       - run: |
           python3 update_env_by_dockerfile.py Dockerfile.update .env.in
           echo $?
@@ -24,7 +24,7 @@ jobs:
       - name: Create Pull Request
         if: steps.git-check.outputs.modified == 'true'
         id: cpr
-        uses: peter-evans/create-pull-request@v3.10.1
+        uses: peter-evans/create-pull-request@v3.11.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: feat(Dockerfile):updated dependencies

VirtualMachineService/VirtualMachineHandler.py

@@ -2204,13 +2204,13 @@ def create_snapshot(self, openstack_id, name, elixir_id, base_tags, description)
             LOG.exception("Create snapshot {0} error: {1}".format(openstack_id, e))
 
             raise conflictException(Reason="409")
+            return None
         except Exception:
             LOG.exception("Instance {0} not found".format(openstack_id))
-            return
+            return None
         try:
             snapshot = self.conn.get_image_by_id(snapshot_munch["id"])
             snapshot_id = snapshot["id"]
-            # todo check again
             try:
                 image = self.conn.get_image(name_or_id=snapshot_id)
                 if description:
@@ -2222,12 +2222,14 @@ def create_snapshot(self, openstack_id, name, elixir_id, base_tags, description)
                     self.conn.image.add_tag(image=snapshot_id, tag=tag)
             except Exception:
                 LOG.exception("Tag error catched")
+                return None
             try:
                 self.conn.image.add_tag(image=snapshot_id, tag=elixir_id)
             except Exception:
                 LOG.exception(
                     f"Could not add Tag {elixir_id} to Snapshot: {snapshot_id}"
                 )
+                return None
 
             return snapshot_id
         except Exception as e:

requirements.txt

@@ -1,10 +1,10 @@
-setuptools==58.4.0
+setuptools==58.5.3
 thrift==0.15.0
 python-keystoneclient
 openstacksdk ==0.59.0
 deprecated == 1.2.13
 Click==8.0.3
-ansible==4.7.0
+ansible==4.8.0
 flake8==4.0.1
 ruamel.yaml<0.18.0
 paramiko==2.8.0