Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

Commit abdffe6

Browse files
author
Cameron Hall
committed
Overzealous f strings
Signed-off-by: Cameron Hall <cameron.hall@target.com>
1 parent 934f7b8 commit abdffe6

File tree

1 file changed

+84
-59
lines changed

1 file changed

+84
-59
lines changed

tgt_grease/management/Model/bridge.py

Lines changed: 84 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -70,60 +70,85 @@ def action_info(self, node=None, jobs=None, prototypeJobs=None):
7070
server = self.ioc.getCollection('JobServer').find_one({'_id': ObjectId(str(serverId))})
7171
if server:
7272
server = dict(server)
73-
print(f"""
74-
<<<<<<<<<<<<<< SERVER: {server.get('_id')} >>>>>>>>>>>>>>
75-
Activation State: {server.get('active')} Date: {server.get('activationTime')}
76-
Jobs: {server.get('jobs')}
77-
Operating System: {server.get('os')}
78-
Prototypes: {server.get('prototypes')}
79-
Execution Roles: {server.get('roles')}
80-
""")
73+
print("""
74+
<<<<<<<<<<<<<< SERVER: {0} >>>>>>>>>>>>>>
75+
Activation State: {1} Date: {2}
76+
Jobs: {3}
77+
Operating System: {4}
78+
Prototypes: {5}
79+
Execution Roles: {6}
80+
""".format(
81+
server.get('_id'),
82+
server.get('active'),
83+
server.get('activationTime'),
84+
server.get('jobs'),
85+
server.get('os'),
86+
server.get('prototypes'),
87+
server.get('roles'))
88+
)
8189
if jobs and prototypeJobs:
8290
print("======================= SOURCING =======================")
8391
for job in self.ioc.getCollection('SourceData').find({'grease_data.sourcing.server': ObjectId(serverId)}):
84-
print(f"""
92+
print("""
8593
-------------------------------
86-
Job: {job['_id']}
94+
Job: {0}
8795
-------------------------------
88-
""")
96+
""", job['_id'])
8997
if jobs and prototypeJobs:
9098
print("======================= DETECTION =======================")
9199
for job in self.ioc.getCollection('SourceData').find({'grease_data.detection.server': ObjectId(serverId)}):
92-
print(f"""
100+
print("""
93101
-------------------------------
94-
Job: {job['_id']}
95-
Start Time: {job['grease_data']['detection']['start']}
96-
End Time: {job['grease_data']['detection']['end']}
97-
Context: {job['grease_data']['detection']['detection']}
102+
Job: {0}
103+
Start Time: {1}
104+
End Time: {2}
105+
Context: {3}
98106
-------------------------------
99-
""")
107+
""".format(
108+
job['_id'],
109+
job['grease_data']['detection']['start'],
110+
job['grease_data']['detection']['end'],
111+
job['grease_data']['detection']['detection'])
112+
)
100113
if jobs and prototypeJobs:
101114
print("======================= SCHEDULING =======================")
102115
for job in self.ioc.getCollection('SourceData').find({'grease_data.scheduling.server': ObjectId(serverId)}):
103-
print(f"""
116+
print("""
104117
-------------------------------
105-
Job: {job['_id']}
106-
Start Time: {job['grease_data']['scheduling']['start']}
107-
End Time: {job['grease_data']['scheduling']['end']}
118+
Job: {0}
119+
Start Time: {1}
120+
End Time: {2}
108121
-------------------------------
109-
""")
122+
""".format(
123+
job['_id'],
124+
job['grease_data']['scheduling']['start'],
125+
job['grease_data']['scheduling']['end'])
126+
)
110127
if jobs:
111128
print("======================= EXECUTION =======================")
112129
for job in self.ioc.getCollection('SourceData').find({'grease_data.execution.server': ObjectId(serverId)}):
113-
print(f"""
130+
print("""
114131
-------------------------------
115-
Job: {job['_id']}
116-
Assignment Time: {job['grease_data']['execution']['assignmentTime']}
117-
Completed Time: {job['grease_data']['execution']['completeTime']}
118-
Execution Success: {job['grease_data']['execution']['executionSuccess']}
119-
Command Success: {job['grease_data']['execution']['commandSuccess']}
120-
Failures: {job['grease_data']['execution']['failures']}
121-
Return Data: {job['grease_data']['execution']['returnData']}
132+
Job: {0}
133+
Assignment Time: {1}
134+
Completed Time: {2}
135+
Execution Success: {3}
136+
Command Success: {4}
137+
Failures: {5}
138+
Return Data: {6}
122139
-------------------------------
123-
""")
140+
""".format(
141+
job['_id'],
142+
job['grease_data']['execution']['assignmentTime'],
143+
job['grease_data']['execution']['completeTime'],
144+
job['grease_data']['execution']['executionSuccess'],
145+
job['grease_data']['execution']['commandSuccess'],
146+
job['grease_data']['execution']['failures'],
147+
job['grease_data']['execution']['returnData'])
148+
)
124149
return True
125150
print("Unable to locate server")
126-
self.ioc.getLogger().error(f"Unable to load [{serverId}] server for information")
151+
self.ioc.getLogger().error("Unable to load [{0}] server for information".format(serverId))
127152
return False
128153

129154
def action_assign(self, prototype=None, role=None, node=None):
@@ -142,8 +167,8 @@ def action_assign(self, prototype=None, role=None, node=None):
142167
if prototype:
143168
job = self.imp.load(str(prototype))
144169
if not job or not isinstance(job, Command):
145-
print(f"Cannot find prototype [{prototype}] to assign check search path!")
146-
self.ioc.getLogger().error(f"Cannot find prototype [{prototype}] to assign check search path!")
170+
print("Cannot find prototype [{0}] to assign check search path!".format(prototype))
171+
self.ioc.getLogger().error("Cannot find prototype [{0}] to assign check search path!".format(prototype))
147172
return False
148173
# Cleanup job
149174
job.__del__()
@@ -162,11 +187,11 @@ def action_assign(self, prototype=None, role=None, node=None):
162187
).acknowledged
163188
if updated:
164189
print("Prototype Assigned")
165-
self.ioc.getLogger().info(f"Prototype [{prototype}] assigned to server [{serverId}]")
190+
self.ioc.getLogger().info("Prototype [{0}] assigned to server [{1}]".format(prototype, serverId))
166191
assigned = True
167192
else:
168193
print("Prototype Assignment Failed!")
169-
self.ioc.getLogger().info(f"Prototype [{prototype}] assignment failed to server [{serverId}]")
194+
self.ioc.getLogger().info("Prototype [{0}] assignment failed to server [{1}]".format(prototype, serverId))
170195
return False
171196
if role:
172197
valid, serverId = self.valid_server(node)
@@ -183,12 +208,12 @@ def action_assign(self, prototype=None, role=None, node=None):
183208
).acknowledged
184209
if updated:
185210
print("Role Assigned")
186-
self.ioc.getLogger().info(f"Role [{prototype}] assigned to server [{serverId}]")
211+
self.ioc.getLogger().info("Role [{0}] assigned to server [{1}]".format(prototype, serverId))
187212
assigned = True
188213
else:
189214
print("Role Assignment Failed!")
190215
self.ioc.getLogger().info(
191-
f"Role [{prototype}] assignment failed to server [{serverId}]")
216+
"Role [{0}] assignment failed to server [{1}]".format(prototype, serverId))
192217
return False
193218
if not assigned:
194219
print("Assignment failed, please check logs for details")
@@ -210,8 +235,8 @@ def action_unassign(self, prototype=None, role=None, node=None):
210235
if prototype:
211236
job = self.imp.load(str(prototype))
212237
if not job or not isinstance(job, Command):
213-
print(f"Cannot find prototype [{prototype}] to unassign check search path!")
214-
self.ioc.getLogger().error(f"Cannot find prototype [{prototype}] to unassign check search path!")
238+
print("Cannot find prototype [{0}] to unassign check search path!".format(prototype))
239+
self.ioc.getLogger().error("Cannot find prototype [{0}] to unassign check search path!".format(prototype))
215240
return False
216241
# Cleanup job
217242
job.__del__()
@@ -230,11 +255,11 @@ def action_unassign(self, prototype=None, role=None, node=None):
230255
).acknowledged
231256
if updated:
232257
print("Prototype Assignment Removed")
233-
self.ioc.getLogger().info(f"Prototype [{prototype}] unassigned from server [{serverId}]")
258+
self.ioc.getLogger().info("Prototype [{0}] unassigned from server [{1}]".format(prototype, serverId))
234259
unassigned = True
235260
else:
236261
print("Prototype Unassignment Failed!")
237-
self.ioc.getLogger().info(f"Prototype [{prototype}] unassignment failed from server [{serverId}]")
262+
self.ioc.getLogger().info("Prototype [{0}] unassignment failed from server [{1}]".format(prototype, serverId))
238263
return False
239264
if role:
240265
valid, serverId = self.valid_server(node)
@@ -251,12 +276,12 @@ def action_unassign(self, prototype=None, role=None, node=None):
251276
).acknowledged
252277
if updated:
253278
print("Role Removed")
254-
self.ioc.getLogger().info(f"Role [{prototype}] removed to server [{serverId}]")
279+
self.ioc.getLogger().info("Role [{0}] removed to server [{1}]".format(prototype, serverId))
255280
unassigned = True
256281
else:
257282
print("Role Removal Failed!")
258283
self.ioc.getLogger().info(
259-
f"Role [{prototype}] removal failed to server [{serverId}]")
284+
"Role [{0}] removal failed to server [{1}]".format(prototype, serverId))
260285
return False
261286
if not unassigned:
262287
print("Unassignment failed, please check logs for details")
@@ -279,36 +304,36 @@ def action_cull(self, node=None):
279304
return False
280305
if not self.monitor.deactivateServer(serverId):
281306
self.ioc.getLogger().error(
282-
f"Failed deactivating server [{serverId}]"
307+
"Failed deactivating server [{0}]".format(serverId)
283308
)
284-
print(f"Failed deactivating server [{serverId}]")
309+
print("Failed deactivating server [{0}]".format(serverId))
285310
return False
286311
self.ioc.getLogger().warning(
287-
f"Server [{serverId}] preparing to reallocate detect jobs"
312+
"Server [{0}] preparing to reallocate detect jobs".format(serverId)
288313
)
289314
if not self.monitor.rescheduleDetectJobs(serverId):
290315
self.ioc.getLogger().error(
291-
f"Failed rescheduling detect jobs [{serverId}]"
316+
"Failed rescheduling detect jobs [{0}]".format(serverId)
292317
)
293-
print(f"Failed rescheduling detect jobs [{serverId}]")
318+
print("Failed rescheduling detect jobs [{0}]".format(serverId))
294319
return False
295320
self.ioc.getLogger().warning(
296-
f"Server [{serverId}] preparing to reallocate schedule jobs"
321+
"Server [{0}] preparing to reallocate schedule jobs".format(serverId)
297322
)
298323
if not self.monitor.rescheduleScheduleJobs(serverId):
299324
self.ioc.getLogger().error(
300-
f"Failed rescheduling detect jobs [{serverId}]"
325+
"Failed rescheduling detect jobs [{0}]".format(serverId)
301326
)
302-
print(f"Failed rescheduling detect jobs [{serverId}]")
327+
print("Failed rescheduling detect jobs [{0}]".format(serverId))
303328
return False
304329
self.ioc.getLogger().warning(
305-
f"Server [{serverId}] preparing to reallocate jobs"
330+
"Server [{0}] preparing to reallocate jobs".format(serverId)
306331
)
307332
if not self.monitor.rescheduleJobs(serverId):
308333
self.ioc.getLogger().error(
309-
"Failed rescheduling detect jobs [{serverId}]"
334+
"Failed rescheduling detect jobs [{0}]".format(serverId)
310335
)
311-
print(f"Failed rescheduling detect jobs [{serverId}]")
336+
print("Failed rescheduling detect jobs [{0}]".format(serverId))
312337
return False
313338
print("Server Deactivated")
314339
return True
@@ -340,9 +365,9 @@ def action_activate(self, node=None):
340365
}
341366
}
342367
).modified_count < 1:
343-
self.ioc.getLogger().warning(f"Server [{serverId}] failed to be activated")
368+
self.ioc.getLogger().warning("Server [{0}] failed to be activated".format(serverId))
344369
return False
345-
self.ioc.getLogger().warning(f"Server [{serverId}] activated")
370+
self.ioc.getLogger().warning("Server [{0}] activated".format(serverId))
346371
return True
347372

348373
def valid_server(self, node=None):
@@ -359,10 +384,10 @@ def valid_server(self, node=None):
359384
try:
360385
server = self.ioc.getCollection('JobServer').find_one({'_id': ObjectId(str(node))})
361386
except InvalidId:
362-
self.ioc.getLogger().error(f"Invalid ObjectID passed to bridge info [{node}]")
387+
self.ioc.getLogger().error("Invalid ObjectID passed to bridge info [{0}]".format(node))
363388
return False, ""
364389
if server:
365390
return True, dict(server).get('_id')
366-
self.ioc.getLogger().error(f"Failed to find server [{node}] in the database")
391+
self.ioc.getLogger().error("Failed to find server [{0}] in the database".format(node))
367392
return False, ""
368393
return True, self.ioc.getConfig().NodeIdentity

0 commit comments

Comments
 (0)