Skip to content

Commit

Permalink
feat(servers): Support simple backups and fix #124
Browse files Browse the repository at this point in the history
  • Loading branch information
Antti Myyrä committed Aug 7, 2023
1 parent f291d80 commit 0404dcc
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"license" : 0,
"memory_amount" : "1024",
"nic_model" : "e1000",
"simple_backup": "0430,monthlies",
"state" : "started",
"storage_devices" : {
"storage_device" : [
Expand Down
1 change: 1 addition & 0 deletions test/json_data/server_create.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"memory_amount" : "1024",
"nic_model" : "virtio",
"state" : "started",
"simple_backup": "0430,monthlies",
"storage_devices" : {
"storage_device" : [
{
Expand Down
5 changes: 5 additions & 0 deletions test/test_server_creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ def test_server_init(self, manager):
Storage(os='01000000-0000-4000-8000-000030200200', size=10),
Storage(size=100, title='storage disk 1'),
],
simple_backup='0430,monthlies',
)

assert server1.title == 'my.example.com'
assert server1.core_number == 2
assert server1.memory_amount == 1024
assert server1.hostname == server1.title
assert server1.zone == 'us-chi1'
assert server1.simple_backup == '0430,monthlies'

def test_server_prepare_post_body(self):
server = Server(
Expand Down Expand Up @@ -188,6 +190,7 @@ def test_create_server_with_dict(self, manager):
'memory_amount': 1024,
'hostname': 'my.example.com',
'zone': 'us-chi1',
'simple_backup': '0430,monthlies',
'storage_devices': [
{'os': '01000000-0000-4000-8000-000030200200', 'size': 10},
{'size': 100, 'title': 'storage disk 1'},
Expand All @@ -210,6 +213,8 @@ def test_create_server_with_dict(self, manager):
assert server1.vnc == 'off'
assert server1.vnc_password == 'aabbccdd'

assert server1.simple_backup == '0430,monthlies'

@responses.activate
def test_create_server_from_template(self, manager):
UUID = '01215a5a-c330-4565-81ca-0e0e22eac672'
Expand Down
2 changes: 2 additions & 0 deletions upcloud_api/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class Server:
'memory_amount',
'nic_model',
'plan',
'simple_backup',
'title',
'timezone',
'video_model',
Expand All @@ -71,6 +72,7 @@ class Server:
'password_delivery',
'plan',
'server_group',
'simple_backup',
'timezone',
'metadata',
'user_data',
Expand Down

0 comments on commit 0404dcc

Please sign in to comment.