Skip to content

Commit 23f984a

Browse files
cscarpittacscarpitta
committed
autopep8 action fixes
1 parent b1186da commit 23f984a

File tree

6 files changed

+142
-137
lines changed

6 files changed

+142
-137
lines changed

‎nets-in-progress/ditella-8r-1c-srv6-pm/isis8d.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
NODE_MANAGER_GRPC_PORT = os.getenv('NODE_MANAGER_GRPC_PORT', None)
4949

5050

51-
5251
class BaseNode(Host):
5352

5453
def __init__(self, name, *args, **kwargs):
@@ -343,7 +342,8 @@ def simple_test():
343342
add_nodes_to_etc_hosts()
344343

345344
# This waiting time is needed because after several tests we noticed that
346-
# it is needed some time to let each node of the topology to be set up correctly
345+
# it is needed some time to let each node of the topology to be set up
346+
# correctly
347347
print("Waiting the components of the topology to set up correctly (40 seconds)")
348348
sleep(40)
349349

@@ -414,6 +414,5 @@ def __main():
414414
simple_test()
415415

416416

417-
418417
if __name__ == '__main__':
419418
__main()

‎nets-in-progress/ditella-8r-1c-srv6-pm/isis8d.py.backup

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -350,20 +350,20 @@ def simple_test():
350350
add_nodes_to_etc_hosts()
351351

352352
# Castagnacci-Ditella Progetto
353-
353+
354354
# Step 1. Recuperare sender & Reflector scelti dell'utente
355355
sender = net.get(choosed_sender)
356356
reflector = net.get(choosed_reflector)
357357

358358
# waiting sender to setup (after several test, we noticed that removing the sleep
359359
# will cause this command to fail)
360360
print("Waiting the routers to set up... (40 sec)")
361-
#sleep(20)
361+
# sleep(20)
362362

363363
# Step 2. Execute on reflector, twampy cmd
364364
print("REFLECTOR", reflector.name, "Is sniffing")
365365
#reflector.cmd("./reflector &")
366-
#sleep(2)
366+
# sleep(2)
367367

368368
print("SENDER", sender.name, "Is sending (scapy crafted) TWAMP packets")
369369
# Step 4. Execute on sender twampy cmd
@@ -372,8 +372,6 @@ def simple_test():
372372
# -----------------------------
373373
CLI(net)
374374

375-
376-
377375
# Remove Mininet nodes from /etc/hosts
378376
if ADD_ETC_HOSTS:
379377
remove_nodes_from_etc_hosts(net)
@@ -418,7 +416,8 @@ def __main():
418416
while not sender_choosed or not reflector_chosed:
419417
print("Here are the routers in the current mininet topology:")
420418
print("r1\nr2\nr3\nr4\nr5\nr6\nr7\nr8")
421-
print("Please choose a Sender and Receiver to be used for Delay Measurement (TWAMP)")
419+
print(
420+
"Please choose a Sender and Receiver to be used for Delay Measurement (TWAMP)")
422421
if not sender_choosed:
423422
choosed_sender = input("Choose the Router 'Sender': ")
424423
if choosed_sender in possible_routers:
@@ -462,6 +461,5 @@ def __main():
462461
simple_test()
463462

464463

465-
466464
if __name__ == '__main__':
467465
__main()

‎nets-in-progress/ditella-8r-1c-srv6-pm/twamp.py

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,37 @@
44

55

66
class TWAMPTPacketSender(Packet):
7-
name ="TWAMPPacketSender"
8-
fields_desc=[IntField("SequenceNumber",0),
9-
BitField("FirstPartTimestamp",0,32),
10-
BitField("SecondPartTimestamp",0,32),
11-
BitEnumField("S", 0, 1, {0: " no external synchronization",
12-
1: "external synchronization"}),
13-
BitField("Z",0,1),
14-
BitField("Scale",0,6),
15-
BitField("Multiplier",1,8)] #manca il padding
7+
name = "TWAMPPacketSender"
8+
fields_desc = [IntField("SequenceNumber", 0),
9+
BitField("FirstPartTimestamp", 0, 32),
10+
BitField("SecondPartTimestamp", 0, 32),
11+
BitEnumField("S", 0, 1, {0: " no external synchronization",
12+
1: "external synchronization"}),
13+
BitField("Z", 0, 1),
14+
BitField("Scale", 0, 6),
15+
BitField("Multiplier", 1, 8)] # manca il padding
1616

1717

1818
class TWAMPTPacketReflector(Packet):
19-
name ="TWAMPPacketReflector"
20-
fields_desc=[IntField("SequenceNumber",0),
21-
BitField("FirstPartTimestamp",0,32),
22-
BitField("SecondPartTimestamp",0,32),
23-
BitEnumField("S", 0, 1, {0: " no external synchronization",
24-
1: "external synchronization"}),
25-
BitField("Z",0,1),
26-
BitField("Scale",0,6),
27-
BitField("Multiplier",1,8),
28-
BitField("MBZ",0,16),
29-
BitField("FirstPartTimestampReceiver",0,32),
30-
BitField("SecondPartTimestampReceiver",0,32),
31-
IntField("SequenceNumberSender",0),
32-
BitField("FirstPartTimestampSender",0,32),
33-
BitField("SecondPartTimestampSender",0,32),
34-
BitEnumField("SSender", 0, 1, {0: " no external synchronization",
35-
1: "external synchronization"}),
36-
BitField("ZSender ",0,1),
37-
BitField("ScaleSender",0,6),
38-
BitField("MultiplierSender",1,8),
39-
BitField("MBZ",0,16),
40-
ByteField("SenderTTL",255)] #manca il padding
19+
name = "TWAMPPacketReflector"
20+
fields_desc = [IntField("SequenceNumber", 0),
21+
BitField("FirstPartTimestamp", 0, 32),
22+
BitField("SecondPartTimestamp", 0, 32),
23+
BitEnumField("S", 0, 1, {0: " no external synchronization",
24+
1: "external synchronization"}),
25+
BitField("Z", 0, 1),
26+
BitField("Scale", 0, 6),
27+
BitField("Multiplier", 1, 8),
28+
BitField("MBZ", 0, 16),
29+
BitField("FirstPartTimestampReceiver", 0, 32),
30+
BitField("SecondPartTimestampReceiver", 0, 32),
31+
IntField("SequenceNumberSender", 0),
32+
BitField("FirstPartTimestampSender", 0, 32),
33+
BitField("SecondPartTimestampSender", 0, 32),
34+
BitEnumField("SSender", 0, 1, {0: " no external synchronization",
35+
1: "external synchronization"}),
36+
BitField("ZSender ", 0, 1),
37+
BitField("ScaleSender", 0, 6),
38+
BitField("MultiplierSender", 1, 8),
39+
BitField("MBZ", 0, 16),
40+
ByteField("SenderTTL", 255)] # manca il padding

0 commit comments

Comments
 (0)