projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5GTANGO LLCM: Added support to deploy multiple instances
[osm/vim-emu.git]
/
src
/
emuvim
/
dcemulator
/
son_emu_simple_switch_13.py
diff --git
a/src/emuvim/dcemulator/son_emu_simple_switch_13.py
b/src/emuvim/dcemulator/son_emu_simple_switch_13.py
index
ce2f544
..
2adaf80
100755
(executable)
--- a/
src/emuvim/dcemulator/son_emu_simple_switch_13.py
+++ b/
src/emuvim/dcemulator/son_emu_simple_switch_13.py
@@
-21,7
+21,8
@@
from ryu.ofproto import ofproto_v1_3
from ryu.lib.packet import packet
from ryu.lib.packet import ethernet
from ryu.lib.packet import ether_types
from ryu.lib.packet import packet
from ryu.lib.packet import ethernet
from ryu.lib.packet import ether_types
-from ryu.topology.event import EventSwitchEnter, EventSwitchLeave, EventSwitchReconnected
+from ryu.topology.event import EventSwitchEnter, EventSwitchReconnected
+
class SimpleSwitch13(app_manager.RyuApp):
OFP_VERSIONS = [ofproto_v1_3.OFP_VERSION]
class SimpleSwitch13(app_manager.RyuApp):
OFP_VERSIONS = [ofproto_v1_3.OFP_VERSION]
@@
-44,11
+45,13
@@
class SimpleSwitch13(app_manager.RyuApp):
# truncated packet data. In that case, we cannot output packets
# correctly. The bug has been fixed in OVS v2.1.0.
match = parser.OFPMatch()
# truncated packet data. In that case, we cannot output packets
# correctly. The bug has been fixed in OVS v2.1.0.
match = parser.OFPMatch()
- actions = [parser.OFPActionOutput(ofproto.OFPP_CONTROLLER,
- ofproto.OFPCML_NO_BUFFER)]
+ # actions = [parser.OFPActionOutput(ofproto.OFPP_CONTROLLER,
+ # ofproto.OFPCML_NO_BUFFER)]
+ actions = [parser.OFPActionOutput(ofproto.OFPCML_NO_BUFFER)]
self.add_flow(datapath, 0, match, actions)
self.add_flow(datapath, 0, match, actions)
- def add_flow(self, datapath, priority, match, actions, buffer_id=None):
+ def add_flow(self, datapath, priority, match,
+ actions, buffer_id=None, table_id=0):
ofproto = datapath.ofproto
parser = datapath.ofproto_parser
ofproto = datapath.ofproto
parser = datapath.ofproto_parser
@@
-57,10
+60,10
@@
class SimpleSwitch13(app_manager.RyuApp):
if buffer_id:
mod = parser.OFPFlowMod(datapath=datapath, buffer_id=buffer_id,
priority=priority, match=match,
if buffer_id:
mod = parser.OFPFlowMod(datapath=datapath, buffer_id=buffer_id,
priority=priority, match=match,
- instructions=inst)
+ instructions=inst
, table_id=table_id
)
else:
mod = parser.OFPFlowMod(datapath=datapath, priority=priority,
else:
mod = parser.OFPFlowMod(datapath=datapath, priority=priority,
- match=match, instructions=inst)
+ match=match, instructions=inst
, table_id=table_id
)
datapath.send_msg(mod)
# new switch detected
datapath.send_msg(mod)
# new switch detected
@@
-74,8
+77,7
@@
class SimpleSwitch13(app_manager.RyuApp):
# send NORMAL action for all undefined flows
ofp_parser = datapath.ofproto_parser
actions = [ofp_parser.OFPActionOutput(ofproto_v1_3.OFPP_NORMAL)]
# send NORMAL action for all undefined flows
ofp_parser = datapath.ofproto_parser
actions = [ofp_parser.OFPActionOutput(ofproto_v1_3.OFPP_NORMAL)]
- self.add_flow(datapath, 0, None, actions)
-
+ self.add_flow(datapath, 0, None, actions, table_id=0)
@set_ev_cls(ofp_event.EventOFPPacketIn, MAIN_DISPATCHER)
def _packet_in_handler(self, ev):
@set_ev_cls(ofp_event.EventOFPPacketIn, MAIN_DISPATCHER)
def _packet_in_handler(self, ev):