Skip to content

Commit beda3b7

Browse files
pgawlowiczpgawlowicz
committed
python3
1 parent 8a62906 commit beda3b7

32 files changed

+238
-238
lines changed

‎basic/wishful_simple_agent

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

44
import logging
@@ -32,7 +32,7 @@ try:
3232
#Start agent
3333
agent.run()
3434
except KeyboardInterrupt:
35-
print "Agent exits"
35+
print("Agent exits")
3636
finally:
3737
#Stop agent
3838
agent.stop()

‎basic/wishful_simple_controller

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

44
import datetime
@@ -31,29 +31,29 @@ nodes = []
3131
@controller.new_node_callback()
3232
def new_node(node):
3333
nodes.append(node)
34-
print "New node appeared:"
35-
print node
34+
print("New node appeared:")
35+
print(node)
3636

3737

3838
@controller.node_exit_callback()
3939
def node_exit(node, reason):
4040
if node in nodes:
4141
nodes.remove(node);
42-
print "NodeExit : NodeID : {} Reason : {}".format(node.id, reason)
42+
print("NodeExit : NodeID : {} Reason : {}".format(node.id, reason))
4343

4444

4545
@controller.set_default_callback()
4646
def default_callback(group, node, cmd, data):
47-
print "{} DEFAULT CALLBACK : Group: {}, NodeName: {}, Cmd: {}, Returns: {}".format(datetime.datetime.now(), group, node.name, cmd, data)
47+
print("{} DEFAULT CALLBACK : Group: {}, NodeName: {}, Cmd: {}, Returns: {}".format(datetime.datetime.now(), group, node.name, cmd, data))
4848

4949

5050
@controller.add_callback(upis.radio.get_channel)
5151
def get_channel_reponse(group, node, data):
52-
print "{} get_channel_reponse : Group:{}, NodeId:{}, msg:{}".format(datetime.datetime.now(), group, node.id, data)
52+
print("{} get_channel_reponse : Group:{}, NodeId:{}, msg:{}".format(datetime.datetime.now(), group, node.id, data))
5353

5454

5555
def print_response(group, node, data):
56-
print "{} Print response : Group:{}, NodeIP:{}, Result:{}".format(datetime.datetime.now(), group, node.ip, data)
56+
print("{} Print response : Group:{}, NodeIP:{}, Result:{}".format(datetime.datetime.now(), group, node.ip, data))
5757

5858

5959
try:
@@ -62,9 +62,8 @@ try:
6262

6363
#control loop
6464
while True:
65-
gevent.sleep(10)
66-
print "\n"
67-
print "Connected nodes", [str(node.name) for node in nodes]
65+
print("\n")
66+
print("Connected nodes", [str(node.name) for node in nodes])
6867
if nodes:
6968
#execute non-blocking function immediately
7069
controller.blocking(False).node(nodes[0]).radio.iface("wlan0").set_power(12)
@@ -81,9 +80,10 @@ try:
8180

8281
#execute blocking function immediately
8382
result = controller.node(nodes[0]).radio.iface("wlan1").get_channel()
84-
print "{} Channel is: {}".format(datetime.datetime.now(), result)
83+
print("{} Channel is: {}".format(datetime.datetime.now(), result))
84+
gevent.sleep(10)
8585

8686
except KeyboardInterrupt:
87-
print "Controller exits"
87+
print("Controller exits")
8888
finally:
8989
controller.stop()

‎basic_local/wishful_simple_local_controller

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

44
import datetime
@@ -32,14 +32,14 @@ controller = agent.get_local_controller()
3232

3333
@controller.add_callback(upis.radio.get_power)
3434
def get_power_reponse(data):
35-
print "{} get_power_reponse : {}".format(datetime.datetime.now(),data)
35+
print("{} get_power_reponse : {}".format(datetime.datetime.now(),data))
3636

3737
@controller.set_default_callback()
3838
def default_callback(cmd, data):
39-
print "{} DEFAULT CALLBACK : Cmd: {}, Returns: {}".format(datetime.datetime.now(), cmd, data)
39+
print("{} DEFAULT CALLBACK : Cmd: {}, Returns: {}".format(datetime.datetime.now(), cmd, data))
4040

4141
def print_response(data):
42-
print "{} Specific callback for function call; Print response : {}".format(datetime.datetime.now(),data)
42+
print("{} Specific callback for function call; Print response : {}".format(datetime.datetime.now(),data))
4343

4444

4545
try:
@@ -48,7 +48,7 @@ try:
4848

4949
#control loop
5050
while True:
51-
print "\nNext iteration:"
51+
print("\nNext iteration:")
5252
#execute non-blocking function immediately
5353
controller.blocking(False).radio.iface("wlan0").set_power(12)
5454

@@ -64,12 +64,12 @@ try:
6464

6565
#execute blocking function immediately
6666
result = controller.radio.iface("wlan1").get_channel()
67-
print "{} Channel is: {}".format(datetime.datetime.now(), result)
67+
print("{} Channel is: {}".format(datetime.datetime.now(), result))
6868

6969
time.sleep(15)
7070

7171
except KeyboardInterrupt:
72-
print "Local Controller exits"
72+
print("Local Controller exits")
7373

7474
finally:
7575
agent.stop()

‎edca/wishful_simple_agent

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

44
"""

‎edca/wishful_simple_controller

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

44
"""
@@ -42,22 +42,22 @@ nodes = []
4242

4343

4444
@controller.new_node_callback()
45-
def printNodeName(node):
45+
def new_node(node):
4646
nodes.append(node)
47-
print "New node appeared:"
48-
print node
47+
print("New node appeared:")
48+
print(node)
4949

5050

5151
@controller.node_exit_callback()
52-
def printNodeName(node, reason):
52+
def node_exit(node, reason):
5353
if node in nodes:
5454
nodes.remove(node);
55-
print "NodeExit : NodeID : {} Reason : {}".format(node.id, reason)
55+
print("NodeExit : NodeID : {} Reason : {}".format(node.id, reason))
5656

5757

5858
@controller.set_default_callback()
5959
def default_callback(group, node, cmd, data):
60-
print "DEFAULT CALLBACK : Group: {}, NodeId: {}, Cmd: {}, Returns: {}".format(group, node.id, cmd, data)
60+
print("DEFAULT CALLBACK : Group: {}, NodeId: {}, Cmd: {}, Returns: {}".format(group, node.id, cmd, data))
6161

6262

6363
def main(args):
@@ -76,8 +76,8 @@ def main(args):
7676
#control loop
7777
while True:
7878
gevent.sleep(10)
79-
print "\n"
80-
print "Connected nodes", [str(node.name) for node in nodes]
79+
print("\n")
80+
print("Connected nodes", [str(node.name) for node in nodes])
8181
if nodes:
8282
controller.blocking(False).nodes(nodes[0]).radio.iface("wlan0").set_mac_access_parameters(queueId=0, qParam=edcaParams)
8383

‎generator/wishful_simple_agent

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

44
"""

‎generator/wishful_simple_controller

+34-34
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

44
"""
@@ -44,37 +44,37 @@ nodes = []
4444

4545

4646
@controller.new_node_callback()
47-
def newNode(node):
47+
def new_node(node):
4848
nodes.append(node)
49-
print "New node appeared:"
50-
print node
49+
print("New node appeared:")
50+
print(node)
5151

5252

5353
@controller.node_exit_callback()
54-
def nodeExit(node, reason):
54+
def node_exit(node, reason):
5555
if node in nodes:
5656
nodes.remove(node);
57-
print "NodeExit : NodeName : {} Reason : {}".format(node.name, reason)
57+
print("NodeExit : NodeName : {} Reason : {}".format(node.name, reason))
5858

5959

6060
@controller.set_default_callback()
6161
def default_callback(group, node, cmd, data):
62-
print "DEFAULT CALLBACK : Group: {}, NodeName: {}, Cmd: {}, Returns: {}".format(group, node.name, cmd, data)
62+
print("DEFAULT CALLBACK : Group: {}, NodeName: {}, Cmd: {}, Returns: {}".format(group, node.name, cmd, data))
6363

6464

6565
def upi_based_rule_matched(group, node, ruleId, data):
66-
print "{} UPI based Rule in node: {} with id: {} was matched; Data: {}".format(datetime.datetime.now(), node.name, ruleId, data)
66+
print("{} UPI based Rule in node: {} with id: {} was matched; Data: {}".format(datetime.datetime.now(), node.name, ruleId, data))
6767

6868
def pkt_based_rule_matched(group, node, ruleId, data):
69-
print "{} Pkt Rule in node: {} with id: {} was matched; Data: {}".format(datetime.datetime.now(), node.name, ruleId, data)
69+
print("{} Pkt Rule in node: {} with id: {} was matched; Data: {}".format(datetime.datetime.now(), node.name, ruleId, data))
7070

7171
def pkt_based_rule(group, node, ruleId, pkt):
72-
print "{} Pkt Rule in node: {} with id: {} was matched;".format(datetime.datetime.now(), node.name, ruleId)
72+
print("{} Pkt Rule in node: {} with id: {} was matched;".format(datetime.datetime.now(), node.name, ruleId))
7373
try:
74-
print pkt.show()
74+
print(pkt.show())
7575
except:
76-
print pkt
77-
print ""
76+
print(pkt)
77+
print("")
7878

7979

8080
def main(args):
@@ -94,105 +94,105 @@ def main(args):
9494

9595
#control loop
9696
while True:
97-
print "Connected nodes", [str(node.name) for node in nodes]
97+
print("Connected nodes", [str(node.name) for node in nodes])
9898
if nodes:
9999
#######################################################################################
100-
print "{} Get new generator".format(datetime.datetime.now())
100+
print("{} Get new generator".format(datetime.datetime.now()))
101101
myGenerator = controller.nodes(nodes[0]).generator.start(
102102
event=TimeEvent(func=upis.radio.get_noise, kwargs={}, interval=0.2, iface="wlan0"))
103103

104-
print "{} New generator with ID: {}".format(datetime.datetime.now(), myGenerator.id)
104+
print("{} New generator with ID: {}".format(datetime.datetime.now(), myGenerator.id))
105105

106106
sampleNum = 5
107107
i = 0
108108
for sample in myGenerator:
109-
print i, sample
109+
print(i, sample)
110110
i = i + 1
111111
if i == sampleNum:
112112
break
113113

114114
retVal = myGenerator.stop()
115-
print "{} Generator with ID: {} was {}".format(datetime.datetime.now(), myGenerator.id, retVal)
115+
print("{} Generator with ID: {} was {}".format(datetime.datetime.now(), myGenerator.id, retVal))
116116
gevent.sleep(2)
117117

118118
#######################################################################################
119-
print "{} Get new generator".format(datetime.datetime.now())
119+
print("{} Get new generator".format(datetime.datetime.now()))
120120
myGenerator = controller.nodes(nodes[0]).generator.start(
121121
event=TimeEvent(func=upis.radio.get_rssi, kwargs={}, iface="wlan0"),
122122
filters=[MovAvgFilter(10)])
123123

124-
print "{} New generator with ID: {}".format(datetime.datetime.now(), myGenerator.id)
124+
print("{} New generator with ID: {}".format(datetime.datetime.now(), myGenerator.id))
125125

126126
sampleNum = 5
127127
i = 0
128128
for sample in myGenerator:
129-
print i, sample
129+
print(i, sample)
130130
i = i + 1
131131
if i == sampleNum:
132132
break
133133

134134
retVal = myGenerator.stop()
135-
print "{} Generator with ID: {} was {}".format(datetime.datetime.now(), myGenerator.id, retVal)
135+
print("{} Generator with ID: {} was {}".format(datetime.datetime.now(), myGenerator.id, retVal))
136136
gevent.sleep(2)
137137

138138
#######################################################################################
139-
print "{} Get new generator".format(datetime.datetime.now())
139+
print("{} Get new generator".format(datetime.datetime.now()))
140140
myGenerator = controller.nodes(nodes[0]).generator.start(
141141
event=PktEvent(iface="eth0"),
142142
pktMatch=PktMatch("icmp"),
143143
selector=FieldSelector("IP.ttl"))
144144

145-
print "{} New generator with ID: {}".format(datetime.datetime.now(), myGenerator.id)
145+
print("{} New generator with ID: {}".format(datetime.datetime.now(), myGenerator.id))
146146

147147
sampleNum = 5
148148
i = 0
149149
for sample in myGenerator:
150-
print i, sample
150+
print(i, sample)
151151
i = i + 1
152152
if i == sampleNum:
153153
break
154154

155155
retVal = myGenerator.stop()
156-
print "{} Generator with ID: {} was {}".format(datetime.datetime.now(), myGenerator.id, retVal)
156+
print("{} Generator with ID: {} was {}".format(datetime.datetime.now(), myGenerator.id, retVal))
157157
gevent.sleep(2)
158158

159159
#######################################################################################
160-
print "{} Get new generator".format(datetime.datetime.now())
160+
print("{} Get new generator".format(datetime.datetime.now()))
161161
myGenerator = controller.nodes(nodes[0]).generator.start(
162162
event=PktEvent(iface="eth0"),
163163
selector=FieldSelector("IP.dst"))
164164

165-
print "{} New generator with ID: {}".format(datetime.datetime.now(), myGenerator.id)
165+
print("{} New generator with ID: {}".format(datetime.datetime.now(), myGenerator.id))
166166

167167
sampleNum = 5
168168
i = 0
169169
for sample in myGenerator:
170-
print i, sample
170+
print(i, sample)
171171
i = i + 1
172172
if i == sampleNum:
173173
break
174174

175175
retVal = myGenerator.stop()
176-
print "{} Generator with ID: {} was {}".format(datetime.datetime.now(), myGenerator.id, retVal)
176+
print("{} Generator with ID: {} was {}".format(datetime.datetime.now(), myGenerator.id, retVal))
177177
gevent.sleep(2)
178178

179179
#######################################################################################
180-
print "{} Get new generator".format(datetime.datetime.now())
180+
print("{} Get new generator".format(datetime.datetime.now()))
181181
myGenerator = controller.nodes(nodes[0]).generator.start(
182182
event=PktEvent(iface="eth0"))
183183

184-
print "{} New generator with ID: {}".format(datetime.datetime.now(), myGenerator.id)
184+
print("{} New generator with ID: {}".format(datetime.datetime.now(), myGenerator.id))
185185

186186
sampleNum = 5
187187
i = 0
188188
for pkt in myGenerator:
189-
print i, pkt.show()
189+
print(i, pkt.show())
190190
i = i + 1
191191
if i == sampleNum:
192192
break
193193

194194
retVal = myGenerator.stop()
195-
print "{} Generator with ID: {} was {}".format(datetime.datetime.now(), myGenerator.id, retVal)
195+
print("{} Generator with ID: {} was {}".format(datetime.datetime.now(), myGenerator.id, retVal))
196196
gevent.sleep(2)
197197

198198
#######################################################################################

0 commit comments

Comments
 (0)