From 3d936ad7ae8a3696905d917f4db6cf6bd187893d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 17:17:15 +0000 Subject: [PATCH 1/7] feat(Dependencies): Update dependency ansible to v9.2.0 | datasource | package | from | to | | ---------- | ------- | ----- | ----- | | pypi | ansible | 9.1.0 | 9.2.0 | --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8f51938..5e2f49d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ python-keystoneclient==5.3.0 openstacksdk==2.1.0 deprecated==1.2.14 Click==8.1.7 -ansible==9.1.0 +ansible==9.2.0 flake8==7.0.0 paramiko==3.4.0 ruamel.yaml==0.18.5 From 1b09c6ee518b2a20a4359f6d30e828b28de2e143 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 13:52:18 +0000 Subject: [PATCH 2/7] feat(Dependencies): Update docker.elastic.co/beats/filebeat Docker tag to v8.12.1 | datasource | package | from | to | | ---------- | -------------------------------- | ------ | ------ | | docker | docker.elastic.co/beats/filebeat | 8.12.0 | 8.12.1 | --- docker-compose.bibigrid.yml | 2 +- docker-compose.host.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.bibigrid.yml b/docker-compose.bibigrid.yml index 8d80d17..5b815bf 100644 --- a/docker-compose.bibigrid.yml +++ b/docker-compose.bibigrid.yml @@ -41,7 +41,7 @@ services: # filebeat simplevm_filebeat: - image: docker.elastic.co/beats/filebeat:8.12.0 + image: docker.elastic.co/beats/filebeat:8.12.1 env_file: - .env volumes: diff --git a/docker-compose.host.yml b/docker-compose.host.yml index 00ab252..f9ccc23 100644 --- a/docker-compose.host.yml +++ b/docker-compose.host.yml @@ -25,7 +25,7 @@ services: simplevm_client_filebeat: container_name: simplevm_client_filebeat - image: docker.elastic.co/beats/filebeat:8.12.0 + image: docker.elastic.co/beats/filebeat:8.12.1 env_file: - .env volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 557cabe..7524328 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: # filebeat simplevm_client_filebeat: container_name: simplevm_client_filebeat - image: docker.elastic.co/beats/filebeat:8.12.0 + image: docker.elastic.co/beats/filebeat:8.12.1 env_file: - .env volumes: From 642c366046d26965a3d65e388cbc8ebab377fa8b Mon Sep 17 00:00:00 2001 From: dweinholz Date: Wed, 7 Feb 2024 12:05:51 +0100 Subject: [PATCH 3/7] fix(Flavor):if flavor not found for existing vm ignore error --- .../openstack_connector.py | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/simple_vm_client/openstack_connector/openstack_connector.py b/simple_vm_client/openstack_connector/openstack_connector.py index 1157ad7..4622069 100644 --- a/simple_vm_client/openstack_connector/openstack_connector.py +++ b/simple_vm_client/openstack_connector/openstack_connector.py @@ -459,17 +459,23 @@ def netcat(self, host: str, port: int) -> bool: logger.info(f"Checking SSH Connection {host}:{port} Result = {r}") return r == 0 - def get_flavor(self, name_or_id: str) -> Flavor: + def get_flavor(self, name_or_id: str, ignore_error: bool = False) -> Flavor: logger.info(f"Get flavor {name_or_id}") flavor: Flavor = self.openstack_connection.get_flavor( name_or_id=name_or_id, get_extra=True ) + if flavor is None: - logger.exception(f"Flavor {name_or_id} not found!") - raise FlavorNotFoundException( - message=f"Flavor {name_or_id} not found!", name_or_id=name_or_id - ) + logger.error(f"Flavor {name_or_id} not found!") + + if not ignore_error: + raise FlavorNotFoundException( + message=f"Flavor {name_or_id} not found!", name_or_id=name_or_id + ) + else: + return Flavor() + return flavor def get_flavors(self) -> list[Flavor]: @@ -1014,7 +1020,9 @@ def get_server(self, openstack_id: str) -> Server: ignore_not_found=True, ) - server.flavor = self.get_flavor(name_or_id=server.flavor["id"]) + server.flavor = self.get_flavor( + name_or_id=server.flavor["id"], ignore_error=True + ) return server except OpenStackCloudException as e: From c12756c0a9e9015f31cc75c445859323381da2e1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 13:44:30 +0000 Subject: [PATCH 4/7] feat(Dependencies): Update dependency ruamel.yaml to v0.18.6 | datasource | package | from | to | | ---------- | ----------- | ------ | ------ | | pypi | ruamel.yaml | 0.18.5 | 0.18.6 | --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5e2f49d..bff188b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ Click==8.1.7 ansible==9.2.0 flake8==7.0.0 paramiko==3.4.0 -ruamel.yaml==0.18.5 +ruamel.yaml==0.18.6 pyvim==3.0.3 redis==5.0.1 requests==2.31.0 From 93d5812db06b5e9664b862caac470f9e294da30f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 10 Feb 2024 22:01:52 +0000 Subject: [PATCH 5/7] feat(Dependencies): Update dependency pre-commit to v3.6.1 | datasource | package | from | to | | ---------- | ---------- | ----- | ----- | | pypi | pre-commit | 3.6.0 | 3.6.1 | --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bff188b..4768b74 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pyvim==3.0.3 redis==5.0.1 requests==2.31.0 pyyaml==6.0.1 -pre-commit==3.6.0 +pre-commit==3.6.1 types-PyYAML==6.0.12.12 sympy==1.12 types-redis==4.6.0.20240106 From 44f313b42370acb59939e7d06c8c82f2a649ff82 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 04:34:12 +0000 Subject: [PATCH 6/7] feat(Dependencies): Update dependency setuptools to v69.1.0 | datasource | package | from | to | | ---------- | ---------- | ------ | ------ | | pypi | setuptools | 69.0.3 | 69.1.0 | --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4768b74..02eb649 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -setuptools==69.0.3 +setuptools==69.1.0 thrift==0.16.0 python-keystoneclient==5.3.0 openstacksdk==2.1.0 From d905c03f9a0e2e88b2b72beeef6328dfd52c7dfd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 06:52:37 +0000 Subject: [PATCH 7/7] feat(Dependencies): Update pre-commit hook psf/black-pre-commit-mirror to v24.2.0 | datasource | package | from | to | | ----------- | --------------------------- | ------ | ------ | | github-tags | psf/black-pre-commit-mirror | 24.1.1 | 24.2.0 | --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 46bb005..0c526fb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.1.1 + rev: 24.2.0 hooks: - id: black language_version: python3.11