Skip to content

Commit 939e331

Browse files
[cli]: NAT show commands newline issue after migrated to Python3 (sonic-net#1204)
Signed-off-by: Akhilesh Samineni <akhilesh.samineni@broadcom.com>
1 parent 599b43a commit 939e331

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

scripts/natconfig

+16-16
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ class NatConfig(object):
238238
for napt in self.static_napt_data:
239239
output.append([napt[0], napt[1], napt[2], napt[3], napt[4], napt[5], napt[6]])
240240

241-
print()
241+
print("")
242242
print(tabulate(output, HEADER))
243-
print()
243+
print("")
244244

245245
def display_pool(self):
246246
"""
@@ -253,9 +253,9 @@ class NatConfig(object):
253253
for nat in self.nat_pool_data:
254254
output.append([nat[0], nat[1], nat[2]])
255255

256-
print()
256+
print("")
257257
print(tabulate(output, HEADER))
258-
print()
258+
print("")
259259

260260
def display_binding(self):
261261
"""
@@ -268,9 +268,9 @@ class NatConfig(object):
268268
for nat in self.nat_binding_data:
269269
output.append([nat[0], nat[1], nat[2], nat[3], nat[4]])
270270

271-
print()
271+
print("")
272272
print(tabulate(output, HEADER))
273-
print()
273+
print("")
274274

275275
def display_global(self):
276276
"""
@@ -280,31 +280,31 @@ class NatConfig(object):
280280

281281
global_data = self.config_db.get_entry('NAT_GLOBAL', 'Values')
282282
if global_data:
283-
print()
283+
print("")
284284
if 'admin_mode' in global_data:
285-
print("Admin Mode :", global_data['admin_mode'])
285+
print("Admin Mode : {}".format(global_data['admin_mode']))
286286
else:
287287
print("Admin Mode : disabled")
288288
if 'nat_timeout' in global_data:
289-
print("Global Timeout :", global_data['nat_timeout'], "secs")
289+
print("Global Timeout : {}".format(global_data['nat_timeout'], "secs"))
290290
else:
291291
print("Global Timeout : 600 secs")
292292
if 'nat_tcp_timeout' in global_data:
293-
print("TCP Timeout :", global_data['nat_tcp_timeout'], "secs")
293+
print("TCP Timeout : {}".format(global_data['nat_tcp_timeout'], "secs"))
294294
else:
295295
print("TCP Timeout : 86400 secs")
296296
if 'nat_udp_timeout' in global_data:
297-
print("UDP Timeout :", global_data['nat_udp_timeout'], "secs")
297+
print("UDP Timeout : {}".format(global_data['nat_udp_timeout'], "secs"))
298298
else:
299299
print("UDP Timeout : 300 secs")
300-
print()
300+
print("")
301301
else:
302-
print()
302+
print("")
303303
print("Admin Mode : disabled")
304304
print("Global Timeout : 600 secs")
305305
print("TCP Timeout : 86400 secs")
306306
print("UDP Timeout : 300 secs")
307-
print()
307+
print("")
308308
return
309309

310310
def display_nat_zone(self):
@@ -318,9 +318,9 @@ class NatConfig(object):
318318
for nat in self.nat_zone_data:
319319
output.append([nat[0], nat[1]])
320320

321-
print()
321+
print("")
322322
print(tabulate(output, HEADER))
323-
print()
323+
print("")
324324

325325
def main():
326326
parser = argparse.ArgumentParser(description='Display the nat configuration information',

scripts/natshow

+5-5
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ class NatShow(object):
331331
totalEntries = int(self.static_nat_entries) + int(self.dynamic_nat_entries) + int(self.static_napt_entries) + int(self.dynamic_napt_entries)
332332
totalEntries += (int(self.static_twice_nat_entries) + int(self.dynamic_twice_nat_entries) + int(self.static_twice_napt_entries) + int(self.dynamic_twice_napt_entries))
333333

334-
print()
334+
print("")
335335
print("Static NAT Entries ..................... {}".format(self.static_nat_entries))
336336
print("Static NAPT Entries ..................... {}".format(self.static_napt_entries))
337337
print("Dynamic NAT Entries ..................... {}".format(self.dynamic_nat_entries))
@@ -343,7 +343,7 @@ class NatShow(object):
343343
print("Total SNAT/SNAPT Entries ..................... {}".format(self.snat_entries))
344344
print("Total DNAT/DNAPT Entries ..................... {}".format(self.dnat_entries))
345345
print("Total Entries ..................... {}".format(totalEntries))
346-
print()
346+
print("")
347347

348348
def display_translations(self):
349349
"""
@@ -357,7 +357,7 @@ class NatShow(object):
357357
output.append([nat[0], nat[1], nat[2], nat[3], nat[4]])
358358

359359
print(tabulate(output, HEADER))
360-
print()
360+
print("")
361361

362362
def display_statistics(self):
363363
"""
@@ -370,9 +370,9 @@ class NatShow(object):
370370
for nat in self.nat_statistics_list:
371371
output.append([nat[0], nat[1], nat[2], nat[3], nat[4]])
372372

373-
print()
373+
print("")
374374
print(tabulate(output, HEADER))
375-
print()
375+
print("")
376376

377377
def main():
378378
parser = argparse.ArgumentParser(description='Display the nat information',

0 commit comments

Comments
 (0)