Skip to content

Commit be4462a

Browse files
committed
fix(Vm):if creation fails check if vm with id exists
1 parent dfe7c2b commit be4462a

14 files changed

+366
-3
lines changed

docker-compose.bibigrid.host.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ services:
77
- "9090" # Expose the service port
88
env_file:
99
- .env
10+
environment:
11+
- TERM=xterm-256color
12+
tty: true
1013
volumes:
1114
- ${client_PERSISTENT_PATH}/config.yml:/code/simple_vm_client/config.yml
1215
- ${client_PERSISTENT_PATH}/server.pem:/code/simple_vm_client/keys/server.pem

docker-compose.bibigrid.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ services:
77
- ${CLIENT_PORT}:9090
88
env_file:
99
- .env
10+
environment:
11+
- TERM=xterm-256color
12+
tty: true
1013
volumes:
1114
- ${client_PERSISTENT_PATH}/config.yml:/code/simple_vm_client/config.yml
1215
- ${client_PERSISTENT_PATH}/server.pem:/code/simple_vm_client/keys/server.pem

docker-compose.dev.bibigrid.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ services:
99
- ${CLIENT_PORT}:9090
1010
env_file:
1111
- .env
12+
environment:
13+
- TERM=xterm-256color
14+
tty: true
1215
volumes:
1316
- ./simple_vm_client/config/config_local.yml:/code/simple_vm_client/config.yml
1417
- ./simple_vm_client/keys/localhost/server.pem:/code/simple_vm_client/keys/server.pem

docker-compose.dev.giessen.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ services:
99
- ${CLIENT_PORT}:9090
1010
env_file:
1111
- .env.dev.giessen
12+
environment:
13+
- TERM=xterm-256color
14+
tty: true
1215
volumes:
1316
- ./simple_vm_client/config/config_giessen.yml:/code/simple_vm_client/config.yml
1417
- ./simple_vm_client/keys/localhost/server.pem:/code/simple_vm_client/keys/server.pem

docker-compose.dev.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ services:
99
- ${CLIENT_PORT}:9090
1010
env_file:
1111
- .env
12+
environment:
13+
- TERM=xterm-256color
14+
tty: true
1215
volumes:
1316
- ./simple_vm_client/config/config_local.yml:/code/simple_vm_client/config.yml
1417
- ./simple_vm_client/keys/localhost/server.pem:/code/simple_vm_client/keys/server.pem

docker-compose.host.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ services:
77
- "9090" # Expose the service port
88
env_file:
99
- .env
10+
environment:
11+
- TERM=xterm-256color
12+
tty: true
1013
volumes:
1114
- ${client_PERSISTENT_PATH}/config.yml:/code/simple_vm_client/config.yml
1215
- ${client_PERSISTENT_PATH}/server.pem:/code/simple_vm_client/keys/server.pem

docker-compose.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ services:
77
- ${CLIENT_PORT}:9090
88
env_file:
99
- .env
10+
environment:
11+
- TERM=xterm-256color
12+
tty: true
1013
volumes:
1114
- ${client_PERSISTENT_PATH}/config.yml:/code/simple_vm_client/config.yml
1215
- ${client_PERSISTENT_PATH}/server.pem:/code/simple_vm_client/keys/server.pem

portal_client.thrift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,12 @@ service VirtualMachineService {
604604

605605
throws (1:ServerNotFoundException e),
606606

607+
VM get_server_by_unique_name(
608+
609+
/** Id of the server.*/
610+
1:string unique_name)
611+
612+
throws (1:ServerNotFoundException e),
607613

608614
/**
609615
* Stop a Server.

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ pre-commit==3.7.0
1616
types-PyYAML==6.0.12.20240311
1717
sympy==1.12
1818
types-redis==4.6.0.20240311
19+
colorama==0.4.6

simple_vm_client/VirtualMachineHandler.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,14 @@ def set_server_metadata(self, openstack_id: str, metadata: dict[str, str]):
142142
openstack_id=openstack_id, metadata=metadata
143143
)
144144

145+
def get_server_by_unique_name(self, unique_name: str) -> VM:
146+
server = self.openstack_connector.get_server_by_unique_name(
147+
unique_name=unique_name
148+
)
149+
server = self.forc_connector.get_playbook_status(server=server)
150+
server = thrift_converter.os_to_thrift_server(openstack_server=server)
151+
return server
152+
145153
def get_server(self, openstack_id: str) -> VM:
146154
server = self.openstack_connector.get_server(openstack_id=openstack_id)
147155
server = self.forc_connector.get_playbook_status(server=server)

0 commit comments

Comments
 (0)