From 4fba7bc51ee2b69a3f20c7efecb88304dd08bbb7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 15:35:17 +0000 Subject: [PATCH 1/3] feat(Dependencies): Update dependency redis to v5.2.0 | datasource | package | from | to | | ---------- | ------- | ----- | ----- | | pypi | redis | 5.1.1 | 5.2.0 | --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 461c79d..1520a51 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ flake8==7.1.1 paramiko==3.5.0 ruamel.yaml==0.18.6 pyvim==3.0.3 -redis==5.1.1 +redis==5.2.0 requests==2.32.3 pyyaml==6.0.2 pre-commit==4.0.1 From 07bc73a0f90d1f6321b269c8f2b56831e6e4e51c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 11:50:31 +0000 Subject: [PATCH 2/3] feat(Dependencies): Update dependency setuptools to v75.3.0 | datasource | package | from | to | | ---------- | ---------- | ------ | ------ | | pypi | setuptools | 75.2.0 | 75.3.0 | --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 461c79d..0d8fbe9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -setuptools==75.2.0 +setuptools==75.3.0 thrift==0.21.0 openstacksdk==4.0.1 deprecated==1.2.14 From f66a51719797b6f52072bcabce55677ac2a4f91c Mon Sep 17 00:00:00 2001 From: dweinholz Date: Mon, 4 Nov 2024 13:33:02 +0100 Subject: [PATCH 3/3] fix(Playbook):if resenv provided but create only backend, resenv playbook can be skipped - also fixed none for flavor --- simple_vm_client/forc_connector/playbook/playbook.py | 2 +- simple_vm_client/openstack_connector/openstack_connector.py | 3 +-- simple_vm_client/util/thrift_converter.py | 6 +++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/simple_vm_client/forc_connector/playbook/playbook.py b/simple_vm_client/forc_connector/playbook/playbook.py index cf7b4d6..d8ad862 100644 --- a/simple_vm_client/forc_connector/playbook/playbook.py +++ b/simple_vm_client/forc_connector/playbook/playbook.py @@ -129,7 +129,7 @@ def copy_playbooks_and_init(self, public_key: str) -> None: self.yaml_exec.dump(data_gp, generic_playbook) def copy_and_init_research_environment(self) -> None: - if not self.research_environment_template: + if not self.research_environment_template or self.create_only_backend: return shutil.copytree( diff --git a/simple_vm_client/openstack_connector/openstack_connector.py b/simple_vm_client/openstack_connector/openstack_connector.py index c7ca70b..3a51875 100644 --- a/simple_vm_client/openstack_connector/openstack_connector.py +++ b/simple_vm_client/openstack_connector/openstack_connector.py @@ -572,7 +572,7 @@ def get_flavor(self, name_or_id: str, ignore_error: bool = False) -> Flavor: message=f"Flavor {name_or_id} not found!", name_or_id=name_or_id ) else: - return Flavor() + return None return flavor @@ -1263,7 +1263,6 @@ def get_server(self, openstack_id: str) -> Server: ignore_not_active=True, ignore_not_found=True, ) - server.flavor = self.get_flavor( name_or_id=server.flavor["id"], ignore_error=True ) diff --git a/simple_vm_client/util/thrift_converter.py b/simple_vm_client/util/thrift_converter.py index c25891a..e129d82 100644 --- a/simple_vm_client/util/thrift_converter.py +++ b/simple_vm_client/util/thrift_converter.py @@ -107,7 +107,11 @@ def os_to_thrift_server(openstack_server: OpenStack_Server) -> VM: return VM(vm_state=VmStates.NOT_FOUND) fixed_ip = "" floating_ip = "" - flavor = os_to_thrift_flavor(openstack_flavor=openstack_server.flavor) + if openstack_server.flavor: + + flavor = os_to_thrift_flavor(openstack_flavor=openstack_server.flavor) + else: + flavor = None if openstack_server.image: image = os_to_thrift_image(openstack_image=openstack_server.image) else: