Merge branch 'master' of github.com:OPENNETWORKINGLAB/ONOS
diff --git a/src/main/java/net/onrc/onos/flow/FlowManagerImpl.java b/src/main/java/net/onrc/onos/flow/FlowManagerImpl.java
index a516108..7cf1cab 100644
--- a/src/main/java/net/onrc/onos/flow/FlowManagerImpl.java
+++ b/src/main/java/net/onrc/onos/flow/FlowManagerImpl.java
@@ -77,26 +77,32 @@
@Override
- public boolean installRemoteFlowEntry(FlowEntry entry) {
+ public boolean installRemoteFlowEntry(FlowPath flowPath,
+ FlowEntry entry) {
// TODO Auto-generated method stub
return false;
}
@Override
- public boolean removeRemoteFlowEntry(FlowEntry entry) {
+ public boolean removeRemoteFlowEntry(FlowPath flowPath,
+ FlowEntry entry) {
return false;
// TODO Auto-generated method stub
}
@Override
- public boolean installFlowEntry(IOFSwitch mySwitch, FlowEntry flowEntry) {
+ public boolean installFlowEntry(IOFSwitch mySwitch,
+ FlowPath flowPath,
+ FlowEntry flowEntry) {
// TODO Auto-generated method stub
return false;
}
@Override
- public boolean removeFlowEntry(IOFSwitch mySwitch, FlowEntry flowEntry) {
+ public boolean removeFlowEntry(IOFSwitch mySwitch,
+ FlowPath flowPath,
+ FlowEntry flowEntry) {
// TODO Auto-generated method stub
return false;
}
diff --git a/web/topology_rest.py b/web/topology_rest.py
index 74129e3..e7e1d83 100755
--- a/web/topology_rest.py
+++ b/web/topology_rest.py
@@ -809,7 +809,7 @@
flow_nr=int(ret)
flow_nr += 1
- command = "/home/ubuntu/ONOS/web/add_flow.py %d %s %s %s %s %s matchSrcMac %s matchDstMac %s" % (flow_nr, "dummy", src_dpid, src_port, dst_dpid, dst_port, srcMAC, dstMAC)
+ command = "/home/ubuntu/ONOS/web/add_flow.py -m onos %d %s %s %s %s %s matchSrcMac %s matchDstMac %s" % (flow_nr, "dummy", src_dpid, src_port, dst_dpid, dst_port, srcMAC, dstMAC)
print command
errcode = os.popen(command).read()
return errcode