Skip to content

Fixes by autopep8 action #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: add-ditella-8r-1c-srv6-pm
Choose a base branch
from
Open

Fixes by autopep8 action #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions nets-in-progress/ditella-8r-1c-srv6-pm/isis8d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
NODE_MANAGER_GRPC_PORT = os.getenv('NODE_MANAGER_GRPC_PORT', None)



class BaseNode(Host):

def __init__(self, name, *args, **kwargs):
Expand Down Expand Up @@ -343,7 +342,8 @@ def simple_test():
add_nodes_to_etc_hosts()

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

Expand Down Expand Up @@ -414,6 +414,5 @@ def __main():
simple_test()



if __name__ == '__main__':
__main()
12 changes: 5 additions & 7 deletions nets-in-progress/ditella-8r-1c-srv6-pm/isis8d.py.backup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,20 +350,20 @@ def simple_test():
add_nodes_to_etc_hosts()

# Castagnacci-Ditella Progetto

# Step 1. Recuperare sender & Reflector scelti dell'utente
sender = net.get(choosed_sender)
reflector = net.get(choosed_reflector)

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

# Step 2. Execute on reflector, twampy cmd
print("REFLECTOR", reflector.name, "Is sniffing")
#reflector.cmd("./reflector &")
#sleep(2)
# sleep(2)

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



# Remove Mininet nodes from /etc/hosts
if ADD_ETC_HOSTS:
remove_nodes_from_etc_hosts(net)
Expand Down Expand Up @@ -418,7 +416,8 @@ def __main():
while not sender_choosed or not reflector_chosed:
print("Here are the routers in the current mininet topology:")
print("r1\nr2\nr3\nr4\nr5\nr6\nr7\nr8")
print("Please choose a Sender and Receiver to be used for Delay Measurement (TWAMP)")
print(
"Please choose a Sender and Receiver to be used for Delay Measurement (TWAMP)")
if not sender_choosed:
choosed_sender = input("Choose the Router 'Sender': ")
if choosed_sender in possible_routers:
Expand Down Expand Up @@ -462,6 +461,5 @@ def __main():
simple_test()



if __name__ == '__main__':
__main()
62 changes: 31 additions & 31 deletions nets-in-progress/ditella-8r-1c-srv6-pm/twamp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,37 @@


class TWAMPTPacketSender(Packet):
name ="TWAMPPacketSender"
fields_desc=[IntField("SequenceNumber",0),
BitField("FirstPartTimestamp",0,32),
BitField("SecondPartTimestamp",0,32),
BitEnumField("S", 0, 1, {0: " no external synchronization",
1: "external synchronization"}),
BitField("Z",0,1),
BitField("Scale",0,6),
BitField("Multiplier",1,8)] #manca il padding
name = "TWAMPPacketSender"
fields_desc = [IntField("SequenceNumber", 0),
BitField("FirstPartTimestamp", 0, 32),
BitField("SecondPartTimestamp", 0, 32),
BitEnumField("S", 0, 1, {0: " no external synchronization",
1: "external synchronization"}),
BitField("Z", 0, 1),
BitField("Scale", 0, 6),
BitField("Multiplier", 1, 8)] # manca il padding


class TWAMPTPacketReflector(Packet):
name ="TWAMPPacketReflector"
fields_desc=[IntField("SequenceNumber",0),
BitField("FirstPartTimestamp",0,32),
BitField("SecondPartTimestamp",0,32),
BitEnumField("S", 0, 1, {0: " no external synchronization",
1: "external synchronization"}),
BitField("Z",0,1),
BitField("Scale",0,6),
BitField("Multiplier",1,8),
BitField("MBZ",0,16),
BitField("FirstPartTimestampReceiver",0,32),
BitField("SecondPartTimestampReceiver",0,32),
IntField("SequenceNumberSender",0),
BitField("FirstPartTimestampSender",0,32),
BitField("SecondPartTimestampSender",0,32),
BitEnumField("SSender", 0, 1, {0: " no external synchronization",
1: "external synchronization"}),
BitField("ZSender ",0,1),
BitField("ScaleSender",0,6),
BitField("MultiplierSender",1,8),
BitField("MBZ",0,16),
ByteField("SenderTTL",255)] #manca il padding
name = "TWAMPPacketReflector"
fields_desc = [IntField("SequenceNumber", 0),
BitField("FirstPartTimestamp", 0, 32),
BitField("SecondPartTimestamp", 0, 32),
BitEnumField("S", 0, 1, {0: " no external synchronization",
1: "external synchronization"}),
BitField("Z", 0, 1),
BitField("Scale", 0, 6),
BitField("Multiplier", 1, 8),
BitField("MBZ", 0, 16),
BitField("FirstPartTimestampReceiver", 0, 32),
BitField("SecondPartTimestampReceiver", 0, 32),
IntField("SequenceNumberSender", 0),
BitField("FirstPartTimestampSender", 0, 32),
BitField("SecondPartTimestampSender", 0, 32),
BitEnumField("SSender", 0, 1, {0: " no external synchronization",
1: "external synchronization"}),
BitField("ZSender ", 0, 1),
BitField("ScaleSender", 0, 6),
BitField("MultiplierSender", 1, 8),
BitField("MBZ", 0, 16),
ByteField("SenderTTL", 255)] # manca il padding
Loading