Skip to content

Commit 84afd4c

Browse files
committed
Merge pull request #123 from andrewsomething/droplet_features
Set the bool values for Droplet features on load.
2 parents fa526e5 + b1a82a3 commit 84afd4c

4 files changed

Lines changed: 35 additions & 0 deletions

File tree

digitalocean/Droplet.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,20 @@ def load(self):
138138
self.ip_address = net['ip_address']
139139
if self.networks['v6']:
140140
self.ip_v6_address = self.networks['v6'][0]['ip_address']
141+
142+
if "backups" in self.features:
143+
self.backups = True
144+
else:
145+
self.backups = False
146+
if "ipv6" in self.features:
147+
self.ipv6 = True
148+
else:
149+
self.ipv6 = False
150+
if "private_networking" in self.features:
151+
self.private_networking = True
152+
else:
153+
self.private_networking = False
154+
141155
return self
142156

143157
def _perform_action(self, params, return_dict=True):

digitalocean/Manager.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,22 @@ def get_all_droplets(self):
9999
droplet.ip_address = net['ip_address']
100100
if droplet.networks['v6']:
101101
droplet.ip_v6_address = droplet.networks['v6'][0]['ip_address']
102+
103+
if "backups" in droplet.features:
104+
droplet.backups = True
105+
else:
106+
droplet.backups = False
107+
if "ipv6" in droplet.features:
108+
droplet.ipv6 = True
109+
else:
110+
droplet.ipv6 = False
111+
if "private_networking" in droplet.features:
112+
droplet.private_networking = True
113+
else:
114+
droplet.private_networking = False
115+
102116
droplets.append(droplet)
117+
103118
return droplets
104119

105120
def get_droplet(self, droplet_id):

digitalocean/tests/test_droplet.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ def test_load(self):
4040
self.assertEqual(d.memory, 512)
4141
self.assertEqual(d.vcpus, 1)
4242
self.assertEqual(d.disk, 20)
43+
self.assertEqual(d.backups, False)
44+
self.assertEqual(d.ipv6, True)
45+
self.assertEqual(d.private_networking, False)
4346
self.assertEqual(d.region['slug'], "nyc3")
4447
self.assertEqual(d.status, "active")
4548
self.assertEqual(d.image['slug'], "ubuntu-14-04-x64")

digitalocean/tests/test_manager.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ def test_droplets(self):
6868
self.assertEqual(droplet.memory, 512)
6969
self.assertEqual(droplet.vcpus, 1)
7070
self.assertEqual(droplet.disk, 20)
71+
self.assertEqual(droplet.backups, True)
72+
self.assertEqual(droplet.ipv6, True)
73+
self.assertEqual(droplet.private_networking, False)
7174
self.assertEqual(droplet.region['slug'], "nyc3")
7275
self.assertEqual(droplet.status, "active")
7376
self.assertEqual(droplet.image['slug'], "ubuntu-14-04-x64")

0 commit comments

Comments
 (0)