Skip to content

Commit dc6abfc

Browse files
allmightyspiffallmightyspiff
committed
tox and style fixes
1 parent 41d4ef5 commit dc6abfc

File tree

5 files changed

+47
-53
lines changed

5 files changed

+47
-53
lines changed

‎SoftLayer/CLI/dns/zone_list.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ def cli(env):
1515
"""List all zones."""
1616

1717
manager = SoftLayer.DNSManager(env.client)
18-
objectMask = "mask[id,name,serial,updateDate,resourceRecordCount]"
19-
zones = manager.list_zones(mask=objectMask)
18+
object_mask = "mask[id,name,serial,updateDate,resourceRecordCount]"
19+
zones = manager.list_zones(mask=object_mask)
2020
table = formatting.Table(['id', 'zone', 'serial', 'updated', 'records'])
2121
table.align = 'l'
2222
for zone in zones:

‎SoftLayer/fixtures/SoftLayer_Dns_Domain_ResourceRecord.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
createObject = {'name': 'example.com'}
22
deleteObject = True
33
editObject = True
4+
getObject = {'id': 12345, 'ttl': 7200, 'data': 'd', 'host': 'a', 'type': 'cname'}

‎SoftLayer/managers/dns.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ def get_records(self, zone_id, ttl=None, data=None, host=None, record_type=None)
209209
if record_type:
210210
_filter['resourceRecords']['type'] = utils.query_filter(record_type.lower())
211211

212-
objectMask = 'id,expire,domainId,host,minimum,refresh,retry,mxPriority,ttl,type,data,responsiblePerson'
212+
object_mask = 'id,expire,domainId,host,minimum,refresh,retry,mxPriority,ttl,type,data,responsiblePerson'
213213
results = self.client.call('SoftLayer_Dns_Domain', 'getResourceRecords', id=zone_id,
214-
mask=objectMask, filter=_filter.to_dict(), iter=True)
214+
mask=object_mask, filter=_filter.to_dict(), iter=True)
215215
return results
216216

217217
def edit_record(self, record):

‎tests/CLI/modules/dns_tests.py‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,4 +278,20 @@ def test_issues_999(self):
278278
self.assert_no_fail(result)
279279
actual_output = json.loads(result.output)[0]
280280
self.assertEqual(actual_output['id'], 137416416)
281-
self.assertEqual(actual_output['record'], '')
281+
self.assertEqual(actual_output['record'], '')
282+
283+
def test_list_zones_no_update(self):
284+
fake_zones = [
285+
{
286+
'name': 'example.com',
287+
'id': 12345,
288+
'serial': 2014030728,
289+
'updateDate': None}
290+
]
291+
domains_mock = self.set_mock('SoftLayer_Account', 'getDomains')
292+
domains_mock.return_value = fake_zones
293+
result = self.run_command(['dns', 'zone-list'])
294+
295+
self.assert_no_fail(result)
296+
actual_output = json.loads(result.output)
297+
self.assertEqual(actual_output[0]['updated'], '2014-03-07 00:00')

‎tests/managers/dns_tests.py‎

Lines changed: 25 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,19 @@ def test_get_zone(self):
2525
res = self.dns_client.get_zone(12345)
2626

2727
self.assertEqual(res, fixtures.SoftLayer_Dns_Domain.getObject)
28-
self.assert_called_with('SoftLayer_Dns_Domain', 'getObject',
29-
identifier=12345,
30-
mask='mask[resourceRecords]')
28+
self.assert_called_with('SoftLayer_Dns_Domain', 'getObject', identifier=12345, mask='mask[resourceRecords]')
3129

3230
def test_get_zone_without_records(self):
3331
self.dns_client.get_zone(12345, records=False)
3432

35-
self.assert_called_with('SoftLayer_Dns_Domain', 'getObject',
36-
identifier=12345,
37-
mask=None)
33+
self.assert_called_with('SoftLayer_Dns_Domain', 'getObject', identifier=12345, mask=None)
3834

3935
def test_resolve_zone_name(self):
4036
res = self.dns_client._get_zone_id_from_name('example.com')
4137

4238
self.assertEqual([12345], res)
4339
_filter = {"domains": {"name": {"operation": "_= example.com"}}}
44-
self.assert_called_with('SoftLayer_Account', 'getDomains',
45-
filter=_filter)
40+
self.assert_called_with('SoftLayer_Account', 'getDomains', filter=_filter)
4641

4742
def test_resolve_zone_name_no_matches(self):
4843
mock = self.set_mock('SoftLayer_Account', 'getDomains')
@@ -52,36 +47,30 @@ def test_resolve_zone_name_no_matches(self):
5247

5348
self.assertEqual([], res)
5449
_filter = {"domains": {"name": {"operation": "_= example.com"}}}
55-
self.assert_called_with('SoftLayer_Account', 'getDomains',
56-
filter=_filter)
50+
self.assert_called_with('SoftLayer_Account', 'getDomains', filter=_filter)
5751

5852
def test_create_zone(self):
5953
res = self.dns_client.create_zone('example.com', serial='2014110201')
6054

6155
args = ({'serial': '2014110201',
6256
'name': 'example.com',
6357
'resourceRecords': {}},)
64-
self.assert_called_with('SoftLayer_Dns_Domain', 'createObject',
65-
args=args)
58+
self.assert_called_with('SoftLayer_Dns_Domain', 'createObject', args=args)
6659
self.assertEqual(res, {'name': 'example.com'})
6760

6861
def test_delete_zone(self):
6962
self.dns_client.delete_zone(1)
70-
self.assert_called_with('SoftLayer_Dns_Domain', 'deleteObject',
71-
identifier=1)
63+
self.assert_called_with('SoftLayer_Dns_Domain', 'deleteObject', identifier=1)
7264

7365
def test_edit_zone(self):
7466
self.dns_client.edit_zone('example.com')
7567

76-
self.assert_called_with('SoftLayer_Dns_Domain', 'editObject',
77-
args=('example.com',))
68+
self.assert_called_with('SoftLayer_Dns_Domain', 'editObject', args=('example.com',))
7869

7970
def test_create_record(self):
80-
res = self.dns_client.create_record(1, 'test', 'TXT', 'testing',
81-
ttl=1200)
71+
res = self.dns_client.create_record(1, 'test', 'TXT', 'testing', ttl=1200)
8272

83-
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord',
84-
'createObject',
73+
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord', 'createObject',
8574
args=({
8675
'domainId': 1,
8776
'ttl': 1200,
@@ -94,8 +83,7 @@ def test_create_record(self):
9483
def test_create_record_mx(self):
9584
res = self.dns_client.create_record_mx(1, 'test', 'testing', ttl=1200, priority=21)
9685

97-
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord',
98-
'createObject',
86+
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord', 'createObject',
9987
args=({
10088
'domainId': 1,
10189
'ttl': 1200,
@@ -110,8 +98,7 @@ def test_create_record_srv(self):
11098
res = self.dns_client.create_record_srv(1, 'record', 'test_data', 'SLS', 8080, 'foobar',
11199
ttl=1200, priority=21, weight=15)
112100

113-
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord',
114-
'createObject',
101+
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord', 'createObject',
115102
args=({
116103
'complexType': 'SoftLayer_Dns_Domain_ResourceRecord_SrvType',
117104
'domainId': 1,
@@ -130,14 +117,8 @@ def test_create_record_srv(self):
130117
def test_create_record_ptr(self):
131118
res = self.dns_client.create_record_ptr('test', 'testing', ttl=1200)
132119

133-
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord',
134-
'createObject',
135-
args=({
136-
'ttl': 1200,
137-
'host': 'test',
138-
'type': 'PTR',
139-
'data': 'testing'
140-
},))
120+
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord', 'createObject',
121+
args=({'ttl': 1200, 'host': 'test', 'type': 'PTR', 'data': 'testing'},))
141122
self.assertEqual(res, {'name': 'example.com'})
142123

143124
def test_generate_create_dict(self):
@@ -161,27 +142,21 @@ def test_generate_create_dict(self):
161142
def test_delete_record(self):
162143
self.dns_client.delete_record(1)
163144

164-
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord',
165-
'deleteObject',
166-
identifier=1)
145+
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord', 'deleteObject', identifier=1)
167146

168147
def test_edit_record(self):
169148
self.dns_client.edit_record({'id': 1, 'name': 'test', 'ttl': '1800'})
170149

171-
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord',
172-
'editObject',
173-
args=({'id': 1,
174-
'name': 'test',
175-
'ttl': '1800'},),
150+
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord', 'editObject',
151+
args=({'id': 1, 'name': 'test', 'ttl': '1800'},),
176152
identifier=1)
177153

178154
def test_dump_zone(self):
179155
self.dns_client.dump_zone(1)
180156

181-
self.assert_called_with('SoftLayer_Dns_Domain', 'getZoneFileContents',
182-
identifier=1)
157+
self.assert_called_with('SoftLayer_Dns_Domain', 'getZoneFileContents', identifier=1)
183158

184-
def test_get_record(self):
159+
def test_get_records(self):
185160
# maybe valid domain, but no records matching
186161
mock = self.set_mock('SoftLayer_Dns_Domain', 'getResourceRecords')
187162
mock.return_value = []
@@ -190,11 +165,7 @@ def test_get_record(self):
190165
mock.reset_mock()
191166
records = fixtures.SoftLayer_Dns_Domain.getResourceRecords
192167
mock.return_value = [records[0]]
193-
self.dns_client.get_records(12345,
194-
record_type='a',
195-
host='hostname',
196-
data='a',
197-
ttl='86400')
168+
self.dns_client.get_records(12345, record_type='a', host='hostname', data='a', ttl='86400')
198169

199170
_filter = {'resourceRecords': {'type': {'operation': '_= a'},
200171
'host': {'operation': '_= hostname'},
@@ -203,3 +174,9 @@ def test_get_record(self):
203174
self.assert_called_with('SoftLayer_Dns_Domain', 'getResourceRecords',
204175
identifier=12345,
205176
filter=_filter)
177+
178+
def test_get_record(self):
179+
record_id = 1234
180+
record = self.dns_client.get_record(record_id)
181+
self.assertEqual(record['id'], 12345)
182+
self.assert_called_with('SoftLayer_Dns_Domain_ResourceRecord', 'getObject', identifier=record_id)

0 commit comments

Comments
 (0)