Skip to content

Commit

Permalink
Merge pull request #449 from deNBI/fix/security
Browse files Browse the repository at this point in the history
Fix/security
  • Loading branch information
vktrrdk authored Jan 9, 2024
2 parents aac4e30 + 1d7fb8c commit c6f21c3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# This workflow will install dependencies, create coverage tests and run Pytest Coverage Comment
# For more information see: https://github.com/MishaKav/pytest-coverage-comment/
name: pytest-coverage-comment
Expand Down Expand Up @@ -31,3 +32,4 @@ jobs:
with:
pytest-coverage-path: ./pytest-coverage.txt
junitxml-path: ./pytest.xml

4 changes: 2 additions & 2 deletions simple_vm_client/VirtualMachineHandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,13 @@ def get_server(self, openstack_id: str) -> VM:
return server

def get_servers(self) -> list[VM]:
servers = openstack_servers = self.openstack_connector.get_servers()
servers = self.openstack_connector.get_servers()
servers_full = []

for server in servers:
servers_full.append(self.forc_connector.get_playbook_status(server=server))
serv = thrift_converter.os_to_thrift_servers(openstack_servers=servers)
return servers_full
return serv

def get_servers_by_ids(self, server_ids: list[str]) -> list[VM]:
return thrift_converter.os_to_thrift_servers(
Expand Down
4 changes: 2 additions & 2 deletions simple_vm_client/util/thrift_converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ def os_to_thrift_volume(openstack_volume: OpenStack_Volume) -> Volume:
try:
device = openstack_volume.attachments[0]["device"]
server_id = openstack_volume.attachments[0]["server_id"]
except Exception:
pass
except Exception as e:
logger.log(f"Exception on os_to_thrift_volume:\n{e}")
volume = Volume(
status=openstack_volume.status,
id=openstack_volume.id,
Expand Down

0 comments on commit c6f21c3

Please sign in to comment.