diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 66940280..5cc29085 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,7 +39,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} queries: +security-extended, security-and-quality @@ -51,7 +51,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -65,4 +65,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 17990918..9fb0f407 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: - --remove-all-unused-imports - repo: https://github.com/PyCQA/flake8 - rev: 6.1.0 + rev: 7.0.0 hooks: - id: flake8 args: [ "--config=setup.cfg" ] diff --git a/Dockerfile b/Dockerfile index bfd3a55e..d7b78f01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12.0-bookworm +FROM python:3.11.4-buster RUN apt-get update -y RUN apt-get install -y build-essential WORKDIR /code diff --git a/VirtualMachineService/VirtualMachineHandler.py b/VirtualMachineService/VirtualMachineHandler.py index 5ec70ea2..67cbfd62 100644 --- a/VirtualMachineService/VirtualMachineHandler.py +++ b/VirtualMachineService/VirtualMachineHandler.py @@ -2933,11 +2933,11 @@ def get_limits(self): maxTotalInstances,totalRamUsed,totalInstancesUsed) of the OpenStack Project from the Client. - :return: {'maxTotalVolumes': maxTotalVolumes, ' - maxTotalVolumeGigabytes': maxTotalVolumeGigabytes, - 'maxTotalInstances': maxTotalInstances, - 'totalRamUsed': totalRamUsed, - 'totalInstancesUsed': totalFlInstancesUsed} + :return: {'max_total_volumes': max_total_volumes, ' + max_total_volume_gigabytes': max_total_volume_gigabytes, + 'max_total_istances': max_total_instances, + 'total_ram_used': total_ram_used, + 'total_instances_used': total_instances_used} """ self.LOG.info("Get Limits") limits = {} @@ -2951,10 +2951,10 @@ def get_limits(self): "total_cores_used": str(limits["total_cores_used"]), "total_instances_used": str(limits["total_instances_used"]), "total_ram_used": str(math.ceil(limits["total_ram_used"] / 1024)), - "maxTotalVolumes": str(limits["maxTotalVolumes"]), - "maxTotalVolumeGigabytes": str(limits["maxTotalVolumeGigabytes"]), - "totalVolumesUsed": str(limits["totalVolumesUsed"]), - "totalGigabytesUsed": str(limits["totalGigabytesUsed"]), + "max_total_volumes": str(limits["max_total_volumes"]), + "max_total_volume_gigabytes": str(limits["max_total_volume_gigabytes"]), + "total_volumes_used": str(limits["total_volumes_used"]), + "total_gigabytes_used": str(limits["total_gigabytes_used"]), } def install_ansible_galaxy_requirements(self): diff --git a/VirtualMachineService/VirtualMachineService-remote b/VirtualMachineService/VirtualMachineService-remote index 95c0b8c2..6eec5357 100755 --- a/VirtualMachineService/VirtualMachineService-remote +++ b/VirtualMachineService/VirtualMachineService-remote @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Autogenerated by Thrift Compiler (0.17.0) +# Autogenerated by Thrift Compiler (0.19.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # diff --git a/VirtualMachineService/VirtualMachineService.py b/VirtualMachineService/VirtualMachineService.py index 420e0bb7..07f41b9f 100644 --- a/VirtualMachineService/VirtualMachineService.py +++ b/VirtualMachineService/VirtualMachineService.py @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.16.0) +# Autogenerated by Thrift Compiler (0.19.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # diff --git a/VirtualMachineService/constants.py b/VirtualMachineService/constants.py index 8f9c3f5d..f6b4bb68 100644 --- a/VirtualMachineService/constants.py +++ b/VirtualMachineService/constants.py @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.17.0) +# Autogenerated by Thrift Compiler (0.19.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # diff --git a/VirtualMachineService/ttypes.py b/VirtualMachineService/ttypes.py index a6b1b9c0..09ce74c6 100644 --- a/VirtualMachineService/ttypes.py +++ b/VirtualMachineService/ttypes.py @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.17.0) +# Autogenerated by Thrift Compiler (0.19.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # diff --git a/docker-compose.bibigrid.yml b/docker-compose.bibigrid.yml index c3e75a0d..5241f00a 100644 --- a/docker-compose.bibigrid.yml +++ b/docker-compose.bibigrid.yml @@ -45,7 +45,7 @@ services: # filebeat filebeat: - image: docker.elastic.co/beats/filebeat:8.11.1 + image: docker.elastic.co/beats/filebeat:8.11.3 env_file: - .env volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 236d2d28..0a9cf159 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: # filebeat filebeat: container_name: client_filebeat - image: docker.elastic.co/beats/filebeat:8.11.1 + image: docker.elastic.co/beats/filebeat:8.11.3 env_file: - .env volumes: diff --git a/requirements.txt b/requirements.txt index ce0e4546..7fbdb4bf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ setuptools==68.2.2 thrift==0.16.0 python-keystoneclient==5.2.0 -openstacksdk ==1.5.0 +openstacksdk ==2.0.0 deprecated ==1.2.14 Click==8.1.7 -ansible==5.1.0 -flake8==6.1.0 -paramiko==3.3.1 +ansible==5.0.1 +flake8==7.0.0 +paramiko==3.4.0 ruamel.yaml==0.18.5 pyvim==3.0.3 redis==5.0.1 diff --git a/requirements.yml b/requirements.yml index b1ef433d..5067720e 100644 --- a/requirements.yml +++ b/requirements.yml @@ -3,7 +3,7 @@ roles: version: v4.1.0 - name: oefenweb.latest_r - version: v3.1.5 + version: v3.1.7 - name: andrewrothstein.miniconda