Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS
diff --git a/cluster-mgmt/bin/cassandra b/cluster-mgmt/bin/cassandra
new file mode 100755
index 0000000..262c936
--- /dev/null
+++ b/cluster-mgmt/bin/cassandra
@@ -0,0 +1,5 @@
+#! /bin/bash
+. ${HOME}/bin/func.sh
+
+#$0 $1 $2
+`basename $0` $1 $2
diff --git a/cluster-mgmt/bin/cmd b/cluster-mgmt/bin/cmd
new file mode 100755
index 0000000..262c936
--- /dev/null
+++ b/cluster-mgmt/bin/cmd
@@ -0,0 +1,5 @@
+#! /bin/bash
+. ${HOME}/bin/func.sh
+
+#$0 $1 $2
+`basename $0` $1 $2
diff --git a/cluster-mgmt/bin/config.sh b/cluster-mgmt/bin/config.sh
new file mode 100755
index 0000000..5baf2e0
--- /dev/null
+++ b/cluster-mgmt/bin/config.sh
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+. ${HOME}/bin/func.sh
+
+basename=$ONOS_CLUSTER_BASENAME
+nr_nodes=$ONOS_CLUSTER_NR_NODES
+
+for n in `seq 1 $nr_nodes`; do
+ echo "Host node$n"
+ echo "User ubuntu"
+ echo "HostName ${basename}${n}"
+done > ~/.ssh/config
+
+cd ${HOME}/bin
+for n in `seq 1 $nr_nodes`; do
+ ln -s ssh_exec node${n}
+done
diff --git a/cluster-mgmt/func.sh b/cluster-mgmt/bin/func.sh
similarity index 64%
rename from cluster-mgmt/func.sh
rename to cluster-mgmt/bin/func.sh
index e7d976d..ffd167f 100755
--- a/cluster-mgmt/func.sh
+++ b/cluster-mgmt/bin/func.sh
@@ -93,13 +93,23 @@
onos () {
case "$1" in
start)
- echo "Starting ONOS"
- dsh -g ${basename} "cd $ONOS_DIR; ./start-onos.sh start"
- dsh -w ${basename}1 "cd $ONOS_DIR; ./start-rest.sh start"
+ if [ x$2 == "x" -o x$2 == "xall" ]; then
+ echo "Starting ONOS on all nodes"
+ dsh -g ${basename} "cd $ONOS_DIR; ./start-onos.sh start"
+ dsh -w ${basename}1 "cd $ONOS_DIR; ./start-rest.sh start"
+ else
+ echo "Starting ONOS on ${basename}$2"
+ dsh -w ${basename}$2 "cd $ONOS_DIR; ./start-onos.sh start"
+ fi
;;
stop)
- echo "Stop ONOS"
- dsh -g ${basename} "cd $ONOS_DIR; ./start-onos.sh stop"
+ if [ x$2 == "x" -o x$2 == "xall" ]; then
+ echo "Stop ONOS on all nodes"
+ dsh -g ${basename} "cd $ONOS_DIR; ./start-onos.sh stop"
+ else
+ echo "Stop ONOS on ${basename}$2"
+ dsh -w ${basename}$2 "cd $ONOS_DIR; ./start-onos.sh stop"
+ fi
;;
status)
echo "Checking ONOS Status"
@@ -107,3 +117,31 @@
;;
esac
}
+switch () {
+ case "$1" in
+ local)
+ if [ x$2 == "x" -o x$2 == "xall" ]; then
+ echo "set all switches point to local controller"
+ dsh -g ${basename} "$ONOS_DIR/scripts/ctrl-local.sh"
+ else
+ dsh -w ${basename}$2 "$ONOS_DIR/scripts/ctrl-local.sh"
+ fi
+ ;;
+ all)
+ if [ x$2 == "x" -o x$2 == "xall" ]; then
+ echo "set all non-core switches point to all non-core controllers"
+ dsh -g ${basename} -x ${basename}1 "$ONOS_DIR/scripts/ctrl-ext.sh"
+ else
+ dsh -w ${basename}$2 "$ONOS_DIR/scripts/ctrl-ext.sh"
+ fi
+ ;;
+ none)
+ if [ x$2 == "x" -o x$2 == "xall" ]; then
+ echo "all non-core switches loose controller"
+ dsh -g ${basename} -x ${basename}1 "$ONOS_DIR/scripts/ctrl-none.sh"
+ else
+ dsh -w ${basename}$2 "$ONOS_DIR/scripts/ctrl-none.sh"
+ fi
+ ;;
+ esac
+}
diff --git a/cluster-mgmt/bin/onos b/cluster-mgmt/bin/onos
new file mode 100755
index 0000000..262c936
--- /dev/null
+++ b/cluster-mgmt/bin/onos
@@ -0,0 +1,5 @@
+#! /bin/bash
+. ${HOME}/bin/func.sh
+
+#$0 $1 $2
+`basename $0` $1 $2
diff --git a/cluster-mgmt/bin/ssh_exec b/cluster-mgmt/bin/ssh_exec
new file mode 100755
index 0000000..da1f210
--- /dev/null
+++ b/cluster-mgmt/bin/ssh_exec
@@ -0,0 +1,4 @@
+#! /bin/bash
+. ${HOME}/bin/func.sh
+
+ssh `basename $0`
diff --git a/cluster-mgmt/bin/start.sh b/cluster-mgmt/bin/start.sh
index bd65df7..dac6bb1 100755
--- a/cluster-mgmt/bin/start.sh
+++ b/cluster-mgmt/bin/start.sh
@@ -1,5 +1,5 @@
#! /bin/bash
-. $HOME/cluster-mgmt/func.sh
+. $HOME/bin/func.sh
onos stop
cassandra cleandb
diff --git a/cluster-mgmt/bin/status.sh b/cluster-mgmt/bin/status.sh
index 880bf10..d9a3ca2 100755
--- a/cluster-mgmt/bin/status.sh
+++ b/cluster-mgmt/bin/status.sh
@@ -1,8 +1,5 @@
#! /bin/bash
-. $HOME/cluster-mgmt/func.sh
-
-basename="onosdevb"
-nr_nodes=4
+. $HOME/bin/func.sh
onos status
cassandra status
diff --git a/cluster-mgmt/bin/stop.sh b/cluster-mgmt/bin/stop.sh
index a8f64ca..c76266a 100755
--- a/cluster-mgmt/bin/stop.sh
+++ b/cluster-mgmt/bin/stop.sh
@@ -1,8 +1,5 @@
#! /bin/bash
-. $HOME/cluster-mgmt/func.sh
-
-basename="onosdevc"
-nr_nodes=4
+. $HOME/bin/func.sh
onos stop
cassandra cleandb
diff --git a/cluster-mgmt/bin/switch b/cluster-mgmt/bin/switch
new file mode 100755
index 0000000..262c936
--- /dev/null
+++ b/cluster-mgmt/bin/switch
@@ -0,0 +1,5 @@
+#! /bin/bash
+. ${HOME}/bin/func.sh
+
+#$0 $1 $2
+`basename $0` $1 $2
diff --git a/cluster-mgmt/bin/zk b/cluster-mgmt/bin/zk
new file mode 100755
index 0000000..262c936
--- /dev/null
+++ b/cluster-mgmt/bin/zk
@@ -0,0 +1,5 @@
+#! /bin/bash
+. ${HOME}/bin/func.sh
+
+#$0 $1 $2
+`basename $0` $1 $2
diff --git a/cluster-mgmt/start-mininet.sh b/cluster-mgmt/start-mininet.sh
index 46a0239..4fb8531 100755
--- a/cluster-mgmt/start-mininet.sh
+++ b/cluster-mgmt/start-mininet.sh
@@ -12,10 +12,9 @@
exit
fi
-export CLUSTER="./cluster.txt"
dsh -g $basename 'uname -a'
-#dsh -g ${basename} 'cd ONOS/test-network/mininet; ./tunnel_onsdemo.sh start'
-#dsh -g ${basename} 'cd ONOS/test-network/mininet; ./tunnel_onsdemo.sh start'
+dsh -g ${basename} 'cd ONOS/test-network/mininet; ./tunnel_onsdemo.sh start'
+dsh -g ${basename} 'cd ONOS/test-network/mininet; ./tunnel_onsdemo.sh start'
dsh -g ${basename} 'cd ONOS/test-network/mininet; sudo mn -c'
dsh -g ${basename} 'cd ONOS/test-network/mininet; sudo ./onsdemo.py -n'
diff --git a/src/main/java/net/floodlightcontroller/core/internal/OpenflowPipelineFactory.java b/src/main/java/net/floodlightcontroller/core/internal/OpenflowPipelineFactory.java
index 5fb5c34..4485709 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OpenflowPipelineFactory.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OpenflowPipelineFactory.java
@@ -60,7 +60,7 @@
pipeline.addLast("idle", idleHandler);
pipeline.addLast("timeout", readTimeoutHandler);
pipeline.addLast("handshaketimeout",
- new HandshakeTimeoutHandler(state, timer, 15));
+ new HandshakeTimeoutHandler(state, timer, 60)); // ONOS: was 15 increased it to fix Issue #296
if (pipelineExecutor != null)
pipeline.addLast("pipelineExecutor",
new ExecutionHandler(pipelineExecutor));
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FlowManager.java b/src/main/java/net/floodlightcontroller/flowcache/FlowManager.java
index 24a0c58..320d114 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FlowManager.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FlowManager.java
@@ -5,6 +5,7 @@
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -255,44 +256,54 @@
final Runnable mapReader = new Runnable() {
public void run() {
- // log.debug("Reading Flow Entries from the Network Map...");
if (floodlightProvider == null) {
log.debug("FloodlightProvider service not found!");
return;
}
- Map<Long, IOFSwitch> mySwitches = floodlightProvider.getSwitches();
-
- Map<Long, IFlowEntry> myFlowEntries = new TreeMap<Long, IFlowEntry>();
+ Map<Long, IOFSwitch> mySwitches =
+ floodlightProvider.getSwitches();
+ Map<Long, IFlowEntry> myFlowEntries =
+ new TreeMap<Long, IFlowEntry>();
+ LinkedList<IFlowEntry> deleteFlowEntries =
+ new LinkedList<IFlowEntry>();
//
// Fetch all Flow Entries and select only my Flow Entries
+ // that need to be undated into the switches.
//
- Iterable<IFlowEntry> allFlowEntries = conn.utils().getAllFlowEntries(conn);
+ Iterable<IFlowEntry> allFlowEntries =
+ conn.utils().getAllFlowEntries(conn);
for (IFlowEntry flowEntryObj : allFlowEntries) {
- FlowEntryId flowEntryId =
- new FlowEntryId(flowEntryObj.getFlowEntryId());
+ String flowEntryIdStr = flowEntryObj.getFlowEntryId();
String userState = flowEntryObj.getUserState();
String switchState = flowEntryObj.getSwitchState();
+ String dpidStr = flowEntryObj.getSwitchDpid();
+ if ((flowEntryIdStr == null) ||
+ (userState == null) ||
+ (switchState == null) ||
+ (dpidStr == null)) {
+ log.debug("IGNORING Flow Entry entry with null fields");
+ continue;
+ }
+ FlowEntryId flowEntryId = new FlowEntryId(flowEntryIdStr);
+ Dpid dpid = new Dpid(dpidStr);
- /**
- log.debug("Found Flow Entry {}: {}",
+ /*
+ log.debug("Found Flow Entry Id = {} {}",
flowEntryId.toString(),
- "User State: " + userState +
+ "DPID = " + dpid.toString() +
+ " User State: " + userState +
" Switch State: " + switchState);
- */
-
- if (! switchState.equals("FE_SWITCH_NOT_UPDATED")) {
- // Ignore the entry: nothing to do
- continue;
- }
+ */
- Dpid dpid = new Dpid(flowEntryObj.getSwitchDpid());
+ if (! switchState.equals("FE_SWITCH_NOT_UPDATED"))
+ continue; // Ignore the entry: nothing to do
+
IOFSwitch mySwitch = mySwitches.get(dpid.value());
- if (mySwitch == null) {
- log.debug("Flow Entry ignored: not my switch (FlowEntryId = {} DPID = {})", flowEntryId.toString(), dpid.toString());
- continue;
- }
+ if (mySwitch == null)
+ continue; // Ignore the entry: not my switch
+
myFlowEntries.put(flowEntryId.value(), flowEntryObj);
}
@@ -323,10 +334,8 @@
String userState = flowEntryObj.getUserState();
String switchState = flowEntryObj.getSwitchState();
IOFSwitch mySwitch = mySwitches.get(dpid.value());
- if (mySwitch == null) {
- log.debug("Flow Entry ignored: not my switch");
- continue;
- }
+ if (mySwitch == null)
+ continue; // Shouldn't happen
//
// Create the Open Flow Flow Modification Entry to push
@@ -421,36 +430,53 @@
try {
messageDamper.write(mySwitch, fm, null);
mySwitch.flush();
+ //
+ // TODO: We should use the OpenFlow Barrier mechanism
+ // to check for errors, and update the SwitchState
+ // for a flow entry after the Barrier message is
+ // is received.
+ //
flowEntryObj.setSwitchState("FE_SWITCH_UPDATED");
if (userState.equals("FE_USER_DELETE")) {
- // Delete the entry
- IFlowPath flowObj = null;
- flowObj = conn.utils().getFlowPathByFlowEntry(conn,
- flowEntryObj);
- if (flowObj != null)
- log.debug("Found FlowPath to be deleted");
- else
- log.debug("Did not find FlowPath to be deleted");
- flowObj.removeFlowEntry(flowEntryObj);
- conn.utils().removeFlowEntry(conn, flowEntryObj);
-
- // Test whether the last flow entry
- Iterable<IFlowEntry> tmpflowEntries =
- flowObj.getFlowEntries();
- boolean found = false;
- for (IFlowEntry tmpflowEntryObj : tmpflowEntries) {
- found = true;
- break;
- }
- if (! found) {
- // Remove the Flow Path as well
- conn.utils().removeFlowPath(conn, flowObj);
- }
+ // An entry that needs to be deleted.
+ deleteFlowEntries.add(flowEntryObj);
}
} catch (IOException e) {
log.error("Failure writing flow mod from network map", e);
}
}
+
+ //
+ // Delete all entries marked for deletion
+ //
+ // TODO: We should use the OpenFlow Barrier mechanism
+ // to check for errors, and delete the Flow Entries after the
+ // Barrier message is received.
+ //
+ while (! deleteFlowEntries.isEmpty()) {
+ IFlowEntry flowEntryObj = deleteFlowEntries.poll();
+ IFlowPath flowObj =
+ conn.utils().getFlowPathByFlowEntry(conn, flowEntryObj);
+ if (flowObj == null) {
+ log.debug("Did not find FlowPath to be deleted");
+ continue;
+ }
+ flowObj.removeFlowEntry(flowEntryObj);
+ conn.utils().removeFlowEntry(conn, flowEntryObj);
+
+ // Test whether the last flow entry
+ Iterable<IFlowEntry> tmpflowEntries =
+ flowObj.getFlowEntries();
+ boolean found = false;
+ for (IFlowEntry tmpflowEntryObj : tmpflowEntries) {
+ found = true;
+ break;
+ }
+ if (! found) {
+ // Remove the Flow Path as well
+ conn.utils().removeFlowPath(conn, flowObj);
+ }
+ }
conn.endTx(Transaction.COMMIT);
if (processed_measurement_flow) {
@@ -594,7 +620,9 @@
flowPath.flowId().toString());
}
if (flowObj == null) {
- conn.endTx(Transaction.COMMIT);
+ log.error(":addFlow FlowId:{} failed: Flow object not created",
+ flowPath.flowId().toString());
+ conn.endTx(Transaction.ROLLBACK);
return false;
}
@@ -645,7 +673,9 @@
flowEntry.flowEntryId().toString());
}
if (flowEntryObj == null) {
- conn.endTx(Transaction.COMMIT);
+ log.error(":addFlow FlowEntryId:{} failed: FlowEntry object not created",
+ flowEntry.flowEntryId().toString());
+ conn.endTx(Transaction.ROLLBACK);
return false;
}
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index fa75769..11643fa 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -1230,9 +1230,8 @@
removeLinkFromStorage(lt);
// remote link from network map
- if (hasControl) {
- linkStore.update(lt, DM_OPERATION.DELETE);
- }
+ linkStore.update(lt, DM_OPERATION.DELETE);
+
// TODO Whenever link is removed, it has to checked if
// the switchports must be added to quarantine.
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
index 83abc8e..176a1a0 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
@@ -72,7 +72,7 @@
public void addOrUpdateLink(Link lt, LinkInfo linkinfo, DM_OPERATION op) {
Vertex vportSrc = null, vportDst = null;
- log.debug("addOrUpdateLink(): op {} {} {}", new Object[]{op, lt, linkinfo});
+ log.trace("addOrUpdateLink(): op {} {} {}", new Object[]{op, lt, linkinfo});
try {
// get source port vertex
diff --git a/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java b/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java
index b9d04d4..a929aa9 100644
--- a/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java
+++ b/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java
@@ -223,6 +223,7 @@
} catch (IOException e) {
//I think it's OK not to do anything here. Either the node got
//deleted correctly, or the connection went down and the node got deleted.
+ log.debug("releaseControl: caught IOException {}", dpidStr);
}
}
diff --git a/start-rest.sh b/start-rest.sh
index 3006e5e..564eccf 100755
--- a/start-rest.sh
+++ b/start-rest.sh
@@ -58,9 +58,6 @@
stop)
stop
;;
- deldb)
- deldb
- ;;
status)
status
;;
diff --git a/web/js/controller-status.js b/web/js/controller-status.js
index 1cca38f..5c1ae30 100644
--- a/web/js/controller-status.js
+++ b/web/js/controller-status.js
@@ -5,22 +5,22 @@
{name:'onos12vpc', onos: 0, cassandra: 1}] */
var barWidth = 100;
- var width = (barWidth + 10) * 4
+ var width = (barWidth + 10) * 8
var height = 50;
var Servers = d3.select("#servers").
append("svg:svg").
- attr("width", 800).
+ attr("width", 1280).
attr("height", 30);
var ContStatus = d3.select("#onos-status").
append("svg:svg").
- attr("width", 800).
+ attr("width", 1280).
attr("height", 50);
var CassandraStatus = d3.select("#cassandra-status").
append("svg:svg").
- attr("width", 800).
+ attr("width", 1280).
attr("height", 50);
d3.json(data_source, draw);
@@ -32,7 +32,7 @@
},
dataType: "json"
});
- }, 5000);
+ }, 3000);
function draw(json){
// var data = json.data;
@@ -62,6 +62,14 @@
return "green"
}else if (index == 3){
return "orange"
+ }else if (index == 4){
+ return "cyan"
+ }else if (index == 5){
+ return "magenta"
+ }else if (index == 6){
+ return "yellow"
+ }else if (index == 7){
+ return "purple"
}else{
return "black"
}
@@ -84,6 +92,14 @@
return "green"
}else if (index == 3){
return "orange"
+ }else if (index == 4){
+ return "cyan"
+ }else if (index == 5){
+ return "magenta"
+ }else if (index == 6){
+ return "yellow"
+ }else if (index == 7){
+ return "purple"
}else{
return "black"
}
@@ -133,6 +149,14 @@
return "green"
}else if (index == 3){
return "orange"
+ }else if (index == 4){
+ return "cyan"
+ }else if (index == 5){
+ return "magenta"
+ }else if (index == 6){
+ return "yellow"
+ }else if (index == 7){
+ return "purple"
}else{
return "black"
}
diff --git a/web/js/onos-topology.js b/web/js/onos-topology.js
index cea8f1a..3772127 100644
--- a/web/js/onos-topology.js
+++ b/web/js/onos-topology.js
@@ -257,12 +257,26 @@
.text(function(d) { return d.name; });
circle.attr("fill", function(d) {
- if (d.group == 1){return "red";}
- else if (d.group == 2){return "blue";}
- else if (d.group == 3){return "green";}
- else if (d.group == 4){return "orange";}
- else if (d.group == 1000){return "black";}
- else{ return "gray"; }
+ if (d.group == 1){
+ return "red"
+ }else if (d.group == 2){
+ return "blue"
+ }else if (d.group == 3){
+ return "green"
+ }else if (d.group == 4){
+ return "orange"
+ }else if (d.group == 5){
+ return "cyan"
+ }else if (d.group == 6){
+ return "magenta"
+ }else if (d.group == 7){
+ return "yellow"
+ }else if (d.group == 8){
+ return "purple"
+ }else{
+ return "gray"
+ }
+
});
path.attr("stroke", function(d) {
@@ -364,12 +378,25 @@
})
circle.attr("fill", function(d) {
- ; if (d.group == 1){return "red";}
- else if (d.group == 2){return "blue";}
- else if (d.group == 3){return "green";}
- else if (d.group == 4){return "orange";}
- else if (d.group == 1000){return "black";}
- else{ return "gray"; }
+ if (d.group == 1){
+ return "red"
+ }else if (d.group == 2){
+ return "blue"
+ }else if (d.group == 3){
+ return "green"
+ }else if (d.group == 4){
+ return "orange"
+ }else if (d.group == 5){
+ return "cyan"
+ }else if (d.group == 6){
+ return "magenta"
+ }else if (d.group == 7){
+ return "yellow"
+ }else if (d.group == 8){
+ return "purple"
+ }else{
+ return "gray"
+ }
});
// text.attr("x", function(d) { return d.x; }).attr("y", function(d) { return d.y; });
text.attr("transform", function(d) {
diff --git a/web/ons-demo/RELEASE_NOTES.txt b/web/ons-demo/RELEASE_NOTES.txt
index a9a934b..275f846 100644
--- a/web/ons-demo/RELEASE_NOTES.txt
+++ b/web/ons-demo/RELEASE_NOTES.txt
@@ -1,8 +1,18 @@
-** March 19, 2013 **
-- aggregation switch sample data DPIDs do not match official switch config.
- - switch config hacked 00:00:00:00:00:00:01:01 ==> 00:00:00:00:00:00:01:00 etc.
-- layout does not dynamically adjust when window is resized
- - refresh browser window after resizing to fix layout
+** March 25, 2013 **
+- First pass at flow chooser
+ - Uses mock data
+ - Select flow to show the flow in topology view
+ - Selected flow currently always shows "marching ants" Once iperf is setup the movement will only be when there is iperf traffic
+ - Still need to do popup flow chooser to "monitor" flows in the flow panel
+
+** March 23, 2013 **
+- Link and switch state updates dynamically
+- Link direction is indicated with arrow heads
+
+** March 22, 2013 **
+- Workarounds for Chrome v25 rendering bugs
+- Fixed broken proxy functionality in restapi2.py
+- webui should now work when hosted from a different server than the controller (where it uses gui3.onlab.us:8080) and also when run from the same server (where it uses localhost:8080)
** March 20, 2013 **
- URL parameters control functions as follows:
@@ -18,11 +28,8 @@
- Update configuration files to match test bed
- Update sample JSON files from test bed
-** March 22, 2013 **
-- Workarounds for Chrome v25 rendering bugs
-- Fixed broken proxy functionality in restapi2.py
-- webui should now work when hosted from a different server than the controller (where it uses gui3.onlab.us:8080) and also when run from the same server (where it uses localhost:8080)
-
-** March 23, 2013 **
-- Link and switch state updates dynamically
-- Link direction is indicated with arrow heads
+** March 19, 2013 **
+- aggregation switch sample data DPIDs do not match official switch config.
+ - switch config hacked 00:00:00:00:00:00:01:01 ==> 00:00:00:00:00:00:01:00 etc.
+- layout does not dynamically adjust when window is resized
+ - refresh browser window after resizing to fix layout
diff --git a/web/ons-demo/css/layout.default.css b/web/ons-demo/css/layout.default.css
index b9a5ebe..fae757d 100644
--- a/web/ons-demo/css/layout.default.css
+++ b/web/ons-demo/css/layout.default.css
@@ -33,16 +33,44 @@
}
#selectedFlows {
- height: 5em;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
}
-/* tmp */
-#selectedFlows {
+.selectedFlow {
display: -webkit-box;
- -webkit-box-align: center;
- -webkit-box-pack: center;
}
+#selectedFlowsHeader {
+ display: -webkit-box;
+}
+
+.flowIndex {
+ width: 1.5em;
+}
+
+.flowId {
+ width: 5em;
+}
+
+.srcDPID, .dstDPID {
+ width: 20em;
+}
+
+.iperf {
+ width: 100%;
+ -webkit-box-flex: 1.0;
+}
+
+.selectedFlow {
+ border-bottom: 1px solid white;
+}
+
+.selectedFlow:last-child {
+ border-bottom: none;
+}
+
+
#controllers {
display: -webkit-box;
-webkit-box-orient: vertical;
diff --git a/web/ons-demo/css/skin.default.css b/web/ons-demo/css/skin.default.css
index d3a9e61..adc4e18 100644
--- a/web/ons-demo/css/skin.default.css
+++ b/web/ons-demo/css/skin.default.css
@@ -67,6 +67,38 @@
border-bottom: 1px solid white;
}
+.selectedFlow {
+ height: 2em;
+ color: white;
+ background-color: black;
+}
+
+.selectedFlow.selected {
+ color: black;
+ background-color:#AAA;
+}
+
+path.flow {
+ fill: none;
+ stroke-width: 2px;
+ stroke: rgba(255, 255, 255, .35);
+}
+
+#selectedFlowsHeader {
+ border-top: 1px solid white;
+}
+
+.flowIndex, .flowId, .srcDPID, .dstDPID, .iperf {
+ display: -webkit-box;
+ -webkit-box-pack: center;
+ -webkit-box-align: center;
+}
+
+.flowIndex, .flowId, .srcDPID, .dstDPID {
+ border-right: 1px solid white;
+}
+
+
#controllers {
border-right: 1px solid white;
}
diff --git a/web/ons-demo/data/wm_flow_getall_json.json b/web/ons-demo/data/wm_flow_getall_json.json
index 95b4fb0..f56d017 100644
--- a/web/ons-demo/data/wm_flow_getall_json.json
+++ b/web/ons-demo/data/wm_flow_getall_json.json
@@ -1,725 +1,35 @@
[
{
"dataPath": {
- "dstPort": {
+ "srcPort": {
"dpid": {
- "value": "00:00:00:00:00:00:01:01"
+ "value": "00:00:00:00:00:00:06:02"
},
"port": {
- "value": 1
+ "value": 4
}
},
"flowEntries": [
{
"dpid": {
- "value": "00:00:00:00:00:00:03:01"
+ "value": "00:00:00:00:00:00:06:02"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x19",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x31",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x35",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 51
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x55",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x59",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 51
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x61",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x65",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 51
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x7f",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x83",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 51
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0xa3",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
+ "flowEntryId": "0x1",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
"outPort": null
- },
- {
+ }, {
"dpid": {
- "value": "00:00:00:00:00:00:03:00"
+ "value": "00:00:00:00:00:00:06:01"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 21
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0xa4",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x1",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
@@ -727,64 +37,12 @@
},
{
"dpid": {
- "value": "00:00:00:08:a2:08:f9:01"
+ "value": "00:00:00:00:ba:5e:ba:13"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0xa5",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 4
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x2",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
@@ -792,64 +50,12 @@
},
{
"dpid": {
- "value": "00:00:00:16:97:08:9a:46"
+ "value": "00:00:00:00:ba:5e:ba:11"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 4
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0xa6",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 3
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x2",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
@@ -857,1144 +63,37 @@
},
{
"dpid": {
- "value": "00:00:00:00:00:00:01:00"
+ "value": "00:00:00:00:00:00:02:01"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0xa7",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 51
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
+ "flowEntryId": "0x3",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
"outPort": null
},
{
"dpid": {
- "value": "00:00:00:00:00:00:01:01"
+ "value": "00:00:00:00:00:00:02:02"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0xa8",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x3",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
"outPort": null
}
],
- "srcPort": {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "port": {
- "value": 1
- }
- }
- },
- "flowId": {
- "value": "0x2"
- },
- "installerId": {
- "value": "host0301-host0101"
- }
- },
- {
- "dataPath": {
"dstPort": {
"dpid": {
- "value": "00:00:00:00:00:00:03:01"
+ "value": "00:00:00:00:00:00:02:02"
},
"port": {
- "value": 1
- }
- },
- "flowEntries": [
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x24",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 51
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x38",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x3c",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 51
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x4a",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x4e",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 51
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x6e",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x72",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 51
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x7a",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x7e",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x9d",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_UPDATED",
- "flowEntryUserState": "FE_USER_ADD",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 51
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x9e",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_ADD",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:16:97:08:9a:46"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 3
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x9f",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 4
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_UPDATED",
- "flowEntryUserState": "FE_USER_ADD",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:08:a2:08:f9:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 4
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0xa0",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_UPDATED",
- "flowEntryUserState": "FE_USER_ADD",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0xa1",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 21
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_UPDATED",
- "flowEntryUserState": "FE_USER_ADD",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:01"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0xa2",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:01"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:01"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_ADD",
- "inPort": null,
- "outPort": null
- }
- ],
- "srcPort": {
- "dpid": {
- "value": "00:00:00:00:00:00:01:01"
- },
- "port": {
- "value": 1
+ "value": 4
}
}
},
@@ -2002,795 +101,55 @@
"value": "0x1"
},
"installerId": {
- "value": "host0101-host0301"
+ "value": "1"
}
},
- {
+
+
+{
"dataPath": {
- "dstPort": {
+ "srcPort": {
"dpid": {
- "value": "00:00:00:00:00:00:03:02"
+ "value": "00:00:00:00:00:00:06:02"
},
"port": {
- "value": 1
+ "value": 4
}
},
"flowEntries": [
{
"dpid": {
- "value": "00:00:00:00:00:00:01:02"
+ "value": "00:00:00:00:00:00:06:02"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x2b",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
+ "flowEntryId": "0x1",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
+ "flowEntryUserState": "FE_USER_ADD",
"inPort": null,
"outPort": null
- },
- {
+ }, {
"dpid": {
- "value": "00:00:00:00:00:00:01:02"
+ "value": "00:00:00:00:00:00:06:01"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x43",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 51
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x44",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 3
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:02"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x5b",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 51
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x5c",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 3
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:02"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x73",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 51
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x74",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 3
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:02"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x8b",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 51
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x8c",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 3
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:02"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x91",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
+ "flowEntryId": "0x1",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
"outPort": null
},
{
"dpid": {
- "value": "00:00:00:00:00:00:01:00"
+ "value": "00:00:00:00:ba:5e:ba:13"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 51
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x92",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 3
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_ADD",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:16:97:08:9a:46"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 3
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x93",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 4
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x2",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
@@ -2800,62 +159,10 @@
"dpid": {
"value": "00:00:00:08:a2:08:f9:01"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 4
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x94",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x2",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
@@ -2863,64 +170,12 @@
},
{
"dpid": {
- "value": "00:00:00:00:00:00:03:00"
+ "value": "00:00:00:00:00:00:03:01"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 3
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x95",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 21
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x3",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
@@ -2928,76 +183,130 @@
},
{
"dpid": {
- "value": "00:00:00:00:00:00:03:02"
+ "value": "00:00:00:00:00:00:03:05"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x96",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:03:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:01:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x3",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
"outPort": null
}
],
- "srcPort": {
+ "dstPort": {
"dpid": {
- "value": "00:00:00:00:00:00:01:02"
+ "value": "00:00:00:00:00:00:03:05"
},
"port": {
- "value": 1
+ "value": 4
+ }
+ }
+ },
+ "flowId": {
+ "value": "0x2"
+ },
+ "installerId": {
+ "value": "1"
+ }
+ },
+
+{
+ "dataPath": {
+ "srcPort": {
+ "dpid": {
+ "value": "00:00:00:00:00:00:07:02"
+ },
+ "port": {
+ "value": 4
+ }
+ },
+ "flowEntries": [
+ {
+ "dpid": {
+ "value": "00:00:00:00:00:00:07:02"
+ },
+ "flowEntryActions": null,
+ "flowEntryErrorState": null,
+ "flowEntryId": "0x1",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
+ "flowEntryUserState": "FE_USER_ADD",
+ "inPort": null,
+ "outPort": null
+ }, {
+ "dpid": {
+ "value": "00:00:00:00:00:00:07:01"
+ },
+ "flowEntryActions": null,
+ "flowEntryErrorState": null,
+ "flowEntryId": "0x1",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
+ "flowEntryUserState": "FE_USER_ADD",
+ "inPort": null,
+ "outPort": null
+ },
+ {
+ "dpid": {
+ "value": "00:00:20:4e:7f:51:8a:35"
+ },
+ "flowEntryActions": null,
+ "flowEntryErrorState": null,
+ "flowEntryId": "0x2",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
+ "flowEntryUserState": "FE_USER_ADD",
+ "inPort": null,
+ "outPort": null
+ },
+ {
+ "dpid": {
+ "value": "00:00:00:16:97:08:9a:46"
+ },
+ "flowEntryActions": null,
+ "flowEntryErrorState": null,
+ "flowEntryId": "0x2",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
+ "flowEntryUserState": "FE_USER_ADD",
+ "inPort": null,
+ "outPort": null
+ },
+ {
+ "dpid": {
+ "value": "00:00:00:00:00:00:08:01"
+ },
+ "flowEntryActions": null,
+ "flowEntryErrorState": null,
+ "flowEntryId": "0x3",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
+ "flowEntryUserState": "FE_USER_ADD",
+ "inPort": null,
+ "outPort": null
+ },
+ {
+ "dpid": {
+ "value": "00:00:00:00:00:00:08:02"
+ },
+ "flowEntryActions": null,
+ "flowEntryErrorState": null,
+ "flowEntryId": "0x3",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
+ "flowEntryUserState": "FE_USER_ADD",
+ "inPort": null,
+ "outPort": null
+ }
+ ],
+ "dstPort": {
+ "dpid": {
+ "value": "00:00:00:00:00:00:08:02"
+ },
+ "port": {
+ "value": 4
}
}
},
@@ -3005,665 +314,40 @@
"value": "0x3"
},
"installerId": {
- "value": "host0102-host0302"
+ "value": "1"
}
},
- {
+{
"dataPath": {
- "dstPort": {
+ "srcPort": {
"dpid": {
- "value": "00:00:00:00:00:00:01:02"
+ "value": "00:00:00:00:00:00:05:02"
},
"port": {
- "value": 1
+ "value": 4
}
},
"flowEntries": [
{
"dpid": {
- "value": "00:00:00:00:00:00:01:02"
+ "value": "00:00:00:00:00:00:05:02"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x2a",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
+ "flowEntryId": "0x1",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
+ "flowEntryUserState": "FE_USER_ADD",
"inPort": null,
"outPort": null
- },
- {
+ }, {
"dpid": {
- "value": "00:00:00:00:00:00:01:00"
+ "value": "00:00:00:00:00:00:05:01"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 3
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x41",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 51
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:02"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x42",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 3
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x53",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 51
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:02"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x54",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 3
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x6b",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 51
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:02"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x6c",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:00"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 3
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x89",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 51
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:01:02"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x8a",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
- "flowEntryUserState": "FE_USER_DELETE",
- "inPort": null,
- "outPort": null
- },
- {
- "dpid": {
- "value": "00:00:00:00:00:00:03:02"
- },
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
- "flowEntryErrorState": null,
- "flowEntryId": "0x97",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 1
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x1",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
@@ -3671,64 +355,12 @@
},
{
"dpid": {
- "value": "00:00:00:00:00:00:03:00"
+ "value": "00:00:00:00:00:00:ba:12"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 21
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x98",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 3
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x2",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
@@ -3738,62 +370,10 @@
"dpid": {
"value": "00:00:00:08:a2:08:f9:01"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 2
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x99",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 4
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x2",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
@@ -3801,64 +381,12 @@
},
{
"dpid": {
- "value": "00:00:00:16:97:08:9a:46"
+ "value": "00:00:00:00:ba:5e:ba:11"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 4
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x9a",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 3
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
+ "flowEntryId": "0x2",
+ "flowEntryMatch": null,
"flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
@@ -3866,141 +394,37 @@
},
{
"dpid": {
- "value": "00:00:00:00:00:00:01:00"
+ "value": "00:00:00:00:00:00:02:01"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 3
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x9b",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 51
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
+ "flowEntryId": "0x3",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
"outPort": null
},
{
"dpid": {
- "value": "00:00:00:00:00:00:01:02"
+ "value": "00:00:00:00:00:00:02:15"
},
- "flowEntryActions": [
- {
- "actionEnqueue": null,
- "actionOutput": {
- "maxLen": 0,
- "port": {
- "value": 1
- }
- },
- "actionSetEthernetDstAddr": null,
- "actionSetEthernetSrcAddr": null,
- "actionSetIPv4DstAddr": null,
- "actionSetIPv4SrcAddr": null,
- "actionSetIpToS": null,
- "actionSetTcpUdpDstPort": null,
- "actionSetTcpUdpSrcPort": null,
- "actionSetVlanId": null,
- "actionSetVlanPriority": null,
- "actionStripVlan": null,
- "actionType": "ACTION_OUTPUT"
- }
- ],
+ "flowEntryActions": null,
"flowEntryErrorState": null,
- "flowEntryId": "0x9c",
- "flowEntryMatch": {
- "dstIPv4Net": null,
- "dstMac": {
- "value": "00:00:00:00:01:02"
- },
- "dstTcpUdpPort": null,
- "ethernetFrameType": null,
- "inPort": {
- "value": 2
- },
- "ipProto": null,
- "ipToS": null,
- "matchDstIPv4Net": false,
- "matchDstMac": true,
- "matchDstTcpUdpPort": false,
- "matchEthernetFrameType": false,
- "matchInPort": true,
- "matchIpProto": false,
- "matchIpToS": false,
- "matchSrcIPv4Net": false,
- "matchSrcMac": true,
- "matchSrcTcpUdpPort": false,
- "matchVlanId": false,
- "matchVlanPriority": false,
- "srcIPv4Net": null,
- "srcMac": {
- "value": "00:00:00:00:03:02"
- },
- "srcTcpUdpPort": null,
- "vlanId": null,
- "vlanPriority": null
- },
- "flowEntrySwitchState": "FE_SWITCH_NOT_UPDATED",
+ "flowEntryId": "0x3",
+ "flowEntryMatch": null,
+ "flowEntrySwitchState": "FE_SWITCH_UPDATED",
"flowEntryUserState": "FE_USER_ADD",
"inPort": null,
"outPort": null
}
],
- "srcPort": {
+ "dstPort": {
"dpid": {
- "value": "00:00:00:00:00:00:03:02"
+ "value": "00:00:00:00:00:00:02:15"
},
"port": {
- "value": 1
+ "value": 4
}
}
},
@@ -4008,7 +432,8 @@
"value": "0x4"
},
"installerId": {
- "value": "host0302-host0102"
+ "value": "1"
}
}
-]
\ No newline at end of file
+
+]
diff --git a/web/ons-demo/index.html b/web/ons-demo/index.html
index 36d50db..21727db 100644
--- a/web/ons-demo/index.html
+++ b/web/ons-demo/index.html
@@ -29,7 +29,14 @@
</div>
<div id='traceButton' class='button'>Trace</div>
</div>
- <div id='selectedFlows'>Selected Flows</div>
+ <div id='selectedFlowsHeader'>
+ <div class='flowIndex'></div>
+ <div class='flowId'>flow id</div>
+ <div class='srcDPID'>src</div>
+ <div class='dstDPID'>dst</div>
+ <div class='iperf'>iperf</div>
+ </div>
+ <div id='selectedFlows'></div>
<div id='topology'>
<div id='svg-container'></div>
<div class='status bottom'><span class='static'>Last updated:</span><span id='lastUpdate' class='dynamic'>Mon Mar 18 11:11:12 PDT 2013</span></div>
diff --git a/web/ons-demo/js/app.js b/web/ons-demo/js/app.js
index 2e9048d..ab5cfda 100644
--- a/web/ons-demo/js/app.js
+++ b/web/ons-demo/js/app.js
@@ -1,4 +1,4 @@
-/*global d3*/
+/*global d3, document∆*/
d3.selection.prototype.moveToFront = function() {
return this.each(function(){
@@ -6,6 +6,16 @@
});
};
+var line = d3.svg.line()
+ .x(function(d) {
+ return d.x;
+ })
+ .y(function(d) {
+ return d.y;
+ });
+
+var svg, selectedFlowsView;
+
var colors = [
'color1',
'color2',
@@ -18,8 +28,8 @@
'color9',
'color10',
'color11',
- 'color12',
-]
+ 'color12'
+];
colors.reverse();
var controllerColorMap = {};
@@ -43,6 +53,135 @@
attr('id', 'viewbox').append('svg:g').attr('transform', 'translate(500 500)');
}
+var selectedFlowsData = [
+ {selected: false, flow: null},
+ {selected: false, flow: null},
+ {selected: false, flow: null},
+ {selected: false, flow: null},
+ {selected: false, flow: null}
+];
+
+function drawFlows() {
+ // DRAW THE FLOWS
+ var flows = d3.select('svg').selectAll('.flow').data(selectedFlowsData, function (d) {
+ return d.flow ? d.flow.flowId.value : null;
+ });
+
+ flows.enter().append("svg:path")
+ .attr('class', 'flow')
+ .attr('d', function (d) {
+ if (!d.flow) {
+ return;
+ }
+ var pts = [];
+ d.flow.dataPath.flowEntries.forEach(function (flowEntry) {
+ var s = d3.select(document.getElementById(flowEntry.dpid.value));
+ var pt = document.querySelector('svg').createSVGPoint();
+ pt.x = s.attr('x');
+ pt.y = s.attr('y');
+ pt = pt.matrixTransform(s[0][0].getCTM());
+ pts.push(pt);
+ });
+ return line(pts);
+ })
+ .attr('stroke-dasharray', '3, 10')
+ .append('svg:animate')
+ .attr('attributeName', 'stroke-dashoffset')
+ .attr('attributeType', 'xml')
+ .attr('from', '500')
+ .attr('to', '-500')
+ .attr('dur', '20s')
+ .attr('repeatCount', 'indefinite');
+
+ flows.style('visibility', function (d) {
+ if (d) {
+ return d.selected ? '' : 'hidden';
+ }
+ })
+
+ flows.select('animate').attr('from', function (d) {
+ if (d.flow) {
+ if (d.selected) {
+ return '500';
+ } else {
+ return '-500';
+ }
+ }
+ });
+}
+
+function updateFlowView() {
+ selectedFlowsView.data(selectedFlowsData);
+
+ selectedFlowsView.classed('selected', function (d) {
+ if (d.flow) {
+ return d.selected;
+ }
+ });
+
+ selectedFlowsView.select('.flowId')
+ .text(function (d) {
+ if (d.flow) {
+ return d.flow.flowId.value;
+ }
+ });
+
+ selectedFlowsView.select('.srcDPID')
+ .text(function (d) {
+ if (d.flow) {
+ return d.flow.dataPath.srcPort.dpid.value;
+ }
+ });
+
+ selectedFlowsView.select('.dstDPID')
+ .text(function (d) {
+ if (d.flow) {
+ return d.flow.dataPath.dstPort.dpid.value;
+ }
+ });
+}
+
+function createFlowView() {
+ function rowEnter(d, i) {
+ var row = d3.select(this);
+
+ row.on('click', function () {
+ selectedFlowsData[i].selected = !selectedFlowsData[i].selected;
+ updateFlowView();
+ drawFlows();
+ });
+
+ row.append('div')
+ .classed('flowIndex', true)
+ .text(function () {
+ return i+1;
+ });
+
+ row.append('div')
+ .classed('flowId', true);
+
+ row.append('div')
+ .classed('srcDPID', true);
+
+ row.append('div')
+ .classed('dstDPID', true);
+
+ row.append('div')
+ .classed('iperf', true);
+ }
+
+ var flows = d3.select('#selectedFlows')
+ .selectAll('.selectedFlow')
+ .data(selectedFlowsData)
+ .enter()
+ .append('div')
+ .classed('selectedFlow', true)
+ .each(rowEnter);
+
+
+ return flows;
+}
+
function updateHeader(model) {
d3.select('#lastUpdate').text(new Date());
d3.select('#activeSwitches').text(model.edgeSwitches.length + model.aggregationSwitches.length + model.coreSwitches.length);
@@ -67,7 +206,7 @@
className: 'aggregation',
angles: []
}, {
- radius: .75,
+ radius: 0.75,
width: 18,
switches: model.coreSwitches,
className: 'core',
@@ -137,7 +276,7 @@
className: ring.className,
angle: ring.angles[i],
controller: s.controller
- }
+ };
testRing.push(testSwitch);
});
@@ -191,7 +330,7 @@
})
.attr("r", function (data) {
return data.width;
- })
+ });
// setup the mouseover behaviors
function showLabel(data, index) {
@@ -213,17 +352,17 @@
function ringUpdate(data, i) {
- nodes = d3.select(this).selectAll("g")
+ var nodes = d3.select(this).selectAll("g")
.data(data, function (data) {
return data.dpid;
- })
+ });
nodes.select('circle').attr('class', function (data, i) {
- if (data.state == 'ACTIVE') {
+ if (data.state === 'ACTIVE') {
return data.className + ' ' + controllerColorMap[data.controller];
} else {
return data.className + ' ' + 'colorInactive';
}
- })
+ });
}
// update switches
@@ -256,7 +395,7 @@
// add the text nodes which show on mouse over
nodes.append("svg:text")
- .text(function (data) {return data.dpid})
+ .text(function (data) {return data.dpid;})
.attr("x", function (data) {
if (data.angle <= 90 || data.angle >= 270 && data.angle <= 360) {
if (data.className == 'edge') {
@@ -333,14 +472,6 @@
// DRAW THE LINKS
- var line = d3.svg.line()
- .x(function(d) {
- return d.x;
- })
- .y(function(d) {
- return d.y;
- });
-// .interpolate("basis");
// key on link dpids since these will come/go during demo
var links = d3.select('svg').selectAll('.link').data(model.links, function (d) {
@@ -376,6 +507,8 @@
// remove old links
links.exit().remove();
+
+ drawFlows();
}
function updateControllers(model) {
@@ -425,13 +558,23 @@
}
var oldModel;
-function sync(svg) {
+function sync(svg, selectedFlowsView) {
var d = Date.now();
updateModel(function (newModel) {
console.log('Update time: ' + (Date.now() - d)/1000 + 's');
if (!oldModel || JSON.stringify(oldModel) != JSON.stringify(newModel)) {
updateControllers(newModel);
+
+ // fake flows right now
+ var i;
+ for (i = 0; i < newModel.flows.length; i+=1) {
+ var selected = selectedFlowsData[i] ? selectedFlowsData[i].selected : false;
+ selectedFlowsData[i].flow = newModel.flows[i];
+ selectedFlowsData[i].selected = selected;
+ }
+
+ updateFlowView(newModel);
updateTopology(svg, newModel);
} else {
console.log('no change');
@@ -448,6 +591,7 @@
}
svg = createTopologyView();
+selectedFlowsView = createFlowView();
// workaround for Chrome v25 bug
// if executed immediately, the view box transform logic doesn't work properly
// fixed in Chrome v27
@@ -456,5 +600,5 @@
// viewbox transform stuff doesn't work in combination with browser zoom
// also works in Chrome v27
d3.select('#svg-container').style('zoom', window.document.body.clientWidth/window.document.width);
- sync(svg);
+ sync(svg, selectedFlowsView);
}, 100);
diff --git a/web/ons-demo/js/model.js b/web/ons-demo/js/model.js
index 94bbdfe..5b66421 100644
--- a/web/ons-demo/js/model.js
+++ b/web/ons-demo/js/model.js
@@ -5,12 +5,12 @@
edgeSwitches: [],
aggregationSwitches: [],
coreSwitches: [],
- flows: [],
+ flows: results.flows,
controllers: results.controllers,
activeControllers: results.activeControllers,
links: results.links,
configuration: results.configuration
- }
+ };
// sort the switches
results.switches.sort(function (a, b) {
@@ -91,28 +91,35 @@
urls = proxyURLs;
}
-function makeRequest(url) {
- return function (cb) {
- d3.json(url, function (error, result) {
- if (error) {
- error = url + ' : ' + error.status;
- }
+function makeRequest(key) {
+ var url = urls[key];
+ if (url) {
+ return function (cb) {
+ d3.json(url, function (error, result) {
+ if (error) {
+ error = url + ' : ' + error.status;
+ }
- cb(error, result);
- });
+ cb(error, result);
+ });
+ }
+ } else {
+ return function (cb) {
+ cb(null, []);
+ }
}
}
function updateModel(cb) {
async.parallel({
- links: makeRequest(urls.links),
- switches: makeRequest(urls.switches),
- controllers: makeRequest(urls.controllers),
- activeControllers: makeRequest(urls.activeControllers),
- mapping: makeRequest(urls.mapping),
- configuration: makeRequest(urls.configuration)
-// flows: makeRequest(urls.flows),
+ links: makeRequest('links'),
+ switches: makeRequest('switches'),
+ controllers: makeRequest('controllers'),
+ activeControllers: makeRequest('activeControllers'),
+ mapping: makeRequest('mapping'),
+ configuration: makeRequest('configuration'),
+ flows: makeRequest('flows')
},
function(err, results) {
if (!err) {
diff --git a/web/topology_rest.py b/web/topology_rest.py
index 105c141..cdfdf24 100755
--- a/web/topology_rest.py
+++ b/web/topology_rest.py
@@ -14,7 +14,8 @@
RestIP="localhost"
RestPort=8080
#DBName="onos-network-map"
-controllers=["onosgui1", "onosgui2", "onosgui3", "onosgui4"]
+#controllers=["onosgui1", "onosgui2", "onosgui3", "onosgui4"]
+controllers=["onosgui1", "onosgui2", "onosgui3", "onosgui4", "onosgui5", "onosgui6", "onosgui7", "onosgui8"]
DEBUG=1
pp = pprint.PrettyPrinter(indent=4)
@@ -41,6 +42,11 @@
@app.route('/', methods=['GET'])
@app.route('/<filename>', methods=['GET'])
@app.route('/tpl/<filename>', methods=['GET'])
+@app.route('/ons-demo/<filename>', methods=['GET'])
+@app.route('/ons-demo/js/<filename>', methods=['GET'])
+@app.route('/ons-demo/css/<filename>', methods=['GET'])
+@app.route('/ons-demo/assets/<filename>', methods=['GET'])
+@app.route('/ons-demo/data/<filename>', methods=['GET'])
def return_file(filename="index.html"):
if request.path == "/":
fullpath = "./index.html"
@@ -61,35 +67,100 @@
return response
-init_topo1 = {
- "nodes" : [
- {"name" : "sw0", "group" : 0},
- {"name" : "sw1", "group" : 0},
- {"name" : "sw2", "group" : 0},
- {"name" : "sw3", "group" : 0},
- {"name" : "sw4", "group" : 0},
- {"name" : "sw5", "group" : 0},
- {"name" : "host0", "group" : 1}
- ],
- "links" : [
- {"source" :0, "target": 1},
- {"source" :1, "target": 0},
- {"source" :0, "target": 2},
- {"source" :2, "target": 0},
- {"source" :1, "target": 3},
- {"source" :3, "target": 1},
- {"source" :2, "target": 3},
- {"source" :3, "target": 2},
- {"source" :2, "target": 4},
- {"source" :4, "target": 2},
- {"source" :3, "target": 5},
- {"source" :5, "target": 3},
- {"source" :4, "target": 5},
- {"source" :5, "target": 4},
- {"source" :6, "target": 0},
- {"source" :0, "target": 6}
- ]
-}
+## PROXY API (allows development where the webui is served from someplace other than the controller)##
+ONOS_GUI3_HOST="http://gui3.onlab.us:8080"
+ONOS_LOCAL_HOST="http://localhost:8080" ;# for Amazon EC2
+
+@app.route("/wm/core/topology/switches/all/json")
+def switches():
+ if request.args.get('proxy') == None:
+ host = ONOS_LOCAL_HOST
+ else:
+ host = ONOS_GUI3_HOST
+
+ try:
+ command = "curl -s %s/wm/core/topology/switches/all/json" % (host)
+ print command
+ result = os.popen(command).read()
+ except:
+ print "REST IF has issue"
+ exit
+
+ resp = Response(result, status=200, mimetype='application/json')
+ return resp
+
+@app.route("/wm/core/topology/links/json")
+def links():
+ if request.args.get('proxy') == None:
+ host = ONOS_LOCAL_HOST
+ else:
+ host = ONOS_GUI3_HOST
+
+ try:
+ command = "curl -s %s/wm/core/topology/links/json" % (host)
+ print command
+ result = os.popen(command).read()
+ except:
+ print "REST IF has issue"
+ exit
+
+ resp = Response(result, status=200, mimetype='application/json')
+ return resp
+
+@app.route("/wm/flow/getall/json")
+def flows():
+ if request.args.get('proxy') == None:
+ host = ONOS_LOCAL_HOST
+ else:
+ host = ONOS_GUI3_HOST
+
+ try:
+ command = "curl -s %s/wm/flow/getall/json" % (host)
+ print command
+ result = os.popen(command).read()
+ except:
+ print "REST IF has issue"
+ exit
+
+ resp = Response(result, status=200, mimetype='application/json')
+ return resp
+
+@app.route("/wm/registry/controllers/json")
+def registry_controllers():
+ if request.args.get('proxy') == None:
+ host = ONOS_LOCAL_HOST
+ else:
+ host = ONOS_GUI3_HOST
+
+ try:
+ command = "curl -s %s/wm/registry/controllers/json" % (host)
+ print command
+ result = os.popen(command).read()
+ except:
+ print "REST IF has issue"
+ exit
+
+ resp = Response(result, status=200, mimetype='application/json')
+ return resp
+
+@app.route("/wm/registry/switches/json")
+def registry_switches():
+ if request.args.get('proxy') == None:
+ host = ONOS_LOCAL_HOST
+ else:
+ host = ONOS_GUI3_HOST
+
+ try:
+ command = "curl -s %s/wm/registry/switches/json" % (host)
+ print command
+ result = os.popen(command).read()
+ except:
+ print "REST IF has issue"
+ exit
+
+ resp = Response(result, status=200, mimetype='application/json')
+ return resp
+
def node_id(switch_array, dpid):
id = -1
@@ -100,6 +171,7 @@
return id
+## API for ON.Lab local GUI ##
@app.route('/topology', methods=['GET'])
def topology_for_gui():
try:
@@ -125,15 +197,6 @@
sw['name']=dpid
sw['group']= -1
-# if state == "ACTIVE":
-# if dpid.split(":")[5] == "0a":
-# sw['group']=1
-# if dpid.split(":")[5] == "0b":
-# sw['group']=2
-# if dpid.split(":")[5] == "0c":
-# sw['group']=3
-# if dpid.split(":")[5] == "0d":
-# sw['group']=4
if state == "INACTIVE":
sw['group']=0
switches.append(sw)
@@ -408,7 +471,6 @@
#{"entityClass":"DefaultEntityClass","mac":["7c:d1:c3:e0:8c:a3"],"ipv4":["192.168.2.102","10.1.10.35"],"vlan":[],"attachmentPoint":[{"port":13,"switchDPID":"00:01:00:12:e2:78:32:44","errorStatus":null}],"lastSeen":1357333593496}
-
## return fake stat for now
@app.route("/wm/core/switch/<switchId>/<statType>/json")
def switch_stat(switchId, statType):
@@ -571,8 +633,6 @@
pp.pprint(js)
return resp
-
-
if __name__ == "__main__":
if len(sys.argv) > 1 and sys.argv[1] == "-d":
print "-- query all switches --"