From a333f4e9a63e0350ea14da9fae7d19065bf73e0b Mon Sep 17 00:00:00 2001 From: Navid Zarepak Date: Fri, 11 Dec 2020 19:31:46 +0330 Subject: [PATCH 1/6] Add primary_disk_size to Server domain --- hcloud/servers/domain.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hcloud/servers/domain.py b/hcloud/servers/domain.py index 93392b39..36348ee2 100644 --- a/hcloud/servers/domain.py +++ b/hcloud/servers/domain.py @@ -33,6 +33,8 @@ class Server(BaseDomain): Inbound Traffic for the current billing period in bytes :param included_traffic: int Free Traffic for the current billing period in bytes + :param primary_disk_size: int + Size of the primary Disk :param protection: dict Protection configuration for the server :param labels: dict @@ -79,7 +81,8 @@ class Server(BaseDomain): "labels", "volumes", "private_net", - "created" + "created", + "primary_disk_size" ) def __init__( @@ -103,6 +106,7 @@ def __init__( labels=None, volumes=None, private_net=None, + primary_disk_size=None ): self.id = id self.name = name @@ -123,6 +127,7 @@ def __init__( self.labels = labels self.volumes = volumes self.private_net = private_net + self.primary_disk_size = primary_disk_size class CreateServerResponse(BaseDomain): From d361c8cd33b07789c6c12293b5e8fc55fafbef56 Mon Sep 17 00:00:00 2001 From: Navid Zarepak Date: Fri, 11 Dec 2020 19:33:49 +0330 Subject: [PATCH 2/6] Add primary_disk_size to Server domain --- hcloud/servers/domain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hcloud/servers/domain.py b/hcloud/servers/domain.py index 36348ee2..80d845df 100644 --- a/hcloud/servers/domain.py +++ b/hcloud/servers/domain.py @@ -106,7 +106,7 @@ def __init__( labels=None, volumes=None, private_net=None, - primary_disk_size=None + primary_disk_size=None, ): self.id = id self.name = name From 209ad890b3353fea1cf7a53de3fd52cb3444f056 Mon Sep 17 00:00:00 2001 From: Navid Zarepak Date: Tue, 15 Dec 2020 13:58:48 +0330 Subject: [PATCH 3/6] added primary_disk_size --- tests/unit/servers/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/servers/conftest.py b/tests/unit/servers/conftest.py index c967c979..2d53eaae 100644 --- a/tests/unit/servers/conftest.py +++ b/tests/unit/servers/conftest.py @@ -122,6 +122,7 @@ def response_simple_server(): "outgoing_traffic": 123456, "ingoing_traffic": 123456, "included_traffic": 654321, + "primary_disk_size" 20, "protection": {}, "labels": {}, "volumes": [] From 91e80912099c32a793545995a2e9af89e7e7b007 Mon Sep 17 00:00:00 2001 From: Navid Zarepak Date: Tue, 15 Dec 2020 14:00:50 +0330 Subject: [PATCH 4/6] added primary_disk_size --- tests/unit/servers/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/servers/conftest.py b/tests/unit/servers/conftest.py index 2d53eaae..120ac6f1 100644 --- a/tests/unit/servers/conftest.py +++ b/tests/unit/servers/conftest.py @@ -122,7 +122,7 @@ def response_simple_server(): "outgoing_traffic": 123456, "ingoing_traffic": 123456, "included_traffic": 654321, - "primary_disk_size" 20, + "primary_disk_size": 20, "protection": {}, "labels": {}, "volumes": [] From 0d060df69d9db21bcc9472e5fde78b3167be813f Mon Sep 17 00:00:00 2001 From: Navid Zarepak Date: Tue, 15 Dec 2020 14:01:56 +0330 Subject: [PATCH 5/6] added primary_disk_size --- tests/unit/servers/test_client.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/servers/test_client.py b/tests/unit/servers/test_client.py index 52a7b2b7..d605d188 100644 --- a/tests/unit/servers/test_client.py +++ b/tests/unit/servers/test_client.py @@ -35,6 +35,7 @@ def test_bound_server_init(self, response_full_server): assert bound_server.id == 42 assert bound_server.name == "my-server" + assert bound_server.primary_disk_size == 20 assert isinstance(bound_server.public_net, PublicNetwork) assert isinstance(bound_server.public_net.ipv4, IPv4Address) assert bound_server.public_net.ipv4.ip == "1.2.3.4" From 8e91175f4dfba55a451fc207ff06ad94b114ff9c Mon Sep 17 00:00:00 2001 From: Navid Zarepak Date: Tue, 15 Dec 2020 14:16:29 +0330 Subject: [PATCH 6/6] added primary_disk_size to all server fixtures --- tests/unit/servers/conftest.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/unit/servers/conftest.py b/tests/unit/servers/conftest.py index 120ac6f1..cb526421 100644 --- a/tests/unit/servers/conftest.py +++ b/tests/unit/servers/conftest.py @@ -138,6 +138,7 @@ def response_create_simple_server(): "name": "my-server", "status": "running", "created": "2016-01-30T23:50+00:00", + "primary_disk_size": 20, "public_net": { "ipv4": { "ip": "1.2.3.4", @@ -662,6 +663,7 @@ def response_simple_servers(): "outgoing_traffic": 123456, "ingoing_traffic": 123456, "included_traffic": 654321, + "primary_disk_size": 20, "protection": {}, "labels": {}, "volumes": [] @@ -677,6 +679,7 @@ def response_full_server(): "name": "my-server", "status": "running", "created": "2016-01-30T23:50+00:00", + "primary_disk_size": 20, "public_net": { "ipv4": { "ip": "1.2.3.4",