From 993f28bd50cc84ece8ab2f55840a350d3cf76332 Mon Sep 17 00:00:00 2001 From: nlitkowski Date: Wed, 5 Jan 2022 14:30:05 +0100 Subject: [PATCH] fix scripts --- .gitignore | 1 + 4-3/constants.py | 3 ++- 4-3/deploy.py | 22 +++++++++++----------- 4-3/remove.py | 11 ++++++----- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index cc92ca8..e5d1eb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ */.ipynb_checkpoints/* +4-3/__pycache__/constants.cpython-38.pyc diff --git a/4-3/constants.py b/4-3/constants.py index 8ef9920..13003c3 100644 --- a/4-3/constants.py +++ b/4-3/constants.py @@ -17,4 +17,5 @@ MACHINE_OS = "ubuntu-20.04" LB_TYPE = "lb11" -MACHINE_COUNT = 2 \ No newline at end of file +MACHINE_COUNT = 2 +NAME_SEP = "-" \ No newline at end of file diff --git a/4-3/deploy.py b/4-3/deploy.py index 7c3dd95..8f89f03 100644 --- a/4-3/deploy.py +++ b/4-3/deploy.py @@ -35,7 +35,7 @@ def get_ssh_key(client: Client) -> BoundSSHKey: ssh_key = client.ssh_keys.create( name=SSH_KEY_NAME, public_key=ssh_key_pub) print( - f"Klucz SSH: {ssh_key.data_model.name}, {ssh_key.data_model.public_key}") + f"Klucz SSH: {ssh_key.data_model.name}, {ssh_key.data_model.public_key}\n") return ssh_key @@ -51,21 +51,21 @@ def get_vnet(client: Client) -> BoundNetwork: ] ) print( - f"Sieć wirtualna: {vnet.data_model.name} ({vnet.data_model.ip_range})") + f"Sieć wirtualna: {vnet.data_model.name} ({vnet.data_model.ip_range})\n") return vnet def create_ws_server(client: Client, vnet: BoundNetwork, ssh_key: BoundSSHKey, i: int) -> BoundServer: - name = f"{WS_SERVER_NAME}_{str(i)}" - ws_server = client.servers.get_by_name(name) + ws_name = f"{WS_SERVER_NAME}{NAME_SEP}{str(i)}" + ws_server = client.servers.get_by_name(ws_name) if ws_server is not None: print( - f"Serwer: {ws_server.data_model.name}\n\tpubliczne IP: {ws_server.data_model.public_net.ipv4.ip}\n\tprywatne IP: {ws_server.data_model.private_net[0].ip}") + f"Serwer: {ws_server.data_model.name}\n\tpubliczne IP: {ws_server.data_model.public_net.ipv4.ip}\n\tprywatne IP: {ws_server.data_model.private_net[0].ip}\n") return ws_server with open(CLOUD_INIT_WS_FNAME) as f: cloud_init_db = f.read() ws_server_resp = client.servers.create( - name=name, + name=ws_name, server_type=ServerType(MACHINE_TYPE), image=Image(name=MACHINE_OS), ssh_keys=[ssh_key], @@ -75,11 +75,11 @@ def create_ws_server(client: Client, vnet: BoundNetwork, ssh_key: BoundSSHKey, i ) ws_server_resp.action.wait_until_finished() - print(f"Tworzenie serwera ws: {ws_server_resp.action.complete}") + print(f"Tworzenie serwera ws: {ws_server_resp.action.complete}\n") - ws_server = client.servers.get_by_name(name) + ws_server = client.servers.get_by_name(ws_name) print( - f"Serwer: {ws_server.data_model.name}\n\tpubliczne IP: {ws_server.data_model.public_net.ipv4.ip}\n\tprywatne IP: {ws_server.data_model.private_net[0].ip}") + f"Serwer: {ws_server.data_model.name}\n\tpubliczne IP: {ws_server.data_model.public_net.ipv4.ip}\n\tprywatne IP: {ws_server.data_model.private_net[0].ip}\n") return ws_server @@ -87,7 +87,7 @@ def create_load_balancer(client: Client, vnet: BoundNetwork, ssh_key: BoundSSHKe if(client.load_balancers.get_by_name(LB_NAME)): load_balancer = client.load_balancers.get_by_name(LB_NAME) print( - f"Load balancer: {load_balancer.data_model.name}\n\tpubliczne IP: {load_balancer.data_model.public_net.ipv4.ip}") + f"Load balancer: {load_balancer.data_model.name}\n\tpubliczne IP: {load_balancer.data_model.public_net.ipv4.ip}\n") return load_balancer else: targets = [] @@ -133,7 +133,7 @@ def create_load_balancer(client: Client, vnet: BoundNetwork, ssh_key: BoundSSHKe print(f"Tworzenie load balancera: {load_balancer.action.complete}") load_balancer = client.load_balancers.get_by_name(LB_NAME) print( - f"Load balancer: {load_balancer.data_model.name}\n\tpubliczne IP: {load_balancer.data_model.public_net.ipv4.ip}\n\tprywatne IP: {load_balancer.data_model.private_net[0].ip}") + f"Load balancer: {load_balancer.data_model.name}\n\tpubliczne IP: {load_balancer.data_model.public_net.ipv4.ip}\n\tprywatne IP: {load_balancer.data_model.private_net[0].ip}\n") return load_balancer diff --git a/4-3/remove.py b/4-3/remove.py index 9527217..ea712f3 100644 --- a/4-3/remove.py +++ b/4-3/remove.py @@ -10,14 +10,15 @@ def main(): ssh_key = client.ssh_keys.get_by_name(SSH_KEY_NAME) vnet = client.networks.get_by_name(VNET_NAME) - db_server = client.servers.get_by_name(DB_SERVER_NAME) - gitea_server = client.servers.get_by_name(GITEA_SERVER_NAME) + load_balancer = client.load_balancers.get_by_name(LB_NAME) + + load_balancer.delete() + + for i in range(1, MACHINE_COUNT + 1): + client.servers.get_by_name(f"{WS_SERVER_NAME}{NAME_SEP}{str(i)}").delete() ssh_key.delete() vnet.delete() - db_server.delete() - gitea_server.delete() - if __name__ == "__main__": main()