Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fixed Group and meter id bugs"
[controller.git]
/
opendaylight
/
sal
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
action
/
Enqueue.java
diff --git
a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Enqueue.java
b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Enqueue.java
index b3891c8337b1f2bba4012f378a65f6d3e5e5c7ca..c711e67f9ee33d91831194f05837094c8552de4e 100644
(file)
--- a/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Enqueue.java
+++ b/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Enqueue.java
@@
-21,6
+21,8
@@
public class Enqueue extends Action {
private static final long serialVersionUID = 1L;
@XmlElement
private NodeConnector port;
private static final long serialVersionUID = 1L;
@XmlElement
private NodeConnector port;
+ @XmlElement
+ private int queue;
/* Dummy constructor for JAXB */
@SuppressWarnings("unused")
/* Dummy constructor for JAXB */
@SuppressWarnings("unused")
@@
-30,9
+32,25
@@
public class Enqueue extends Action {
public Enqueue(NodeConnector port) {
type = ActionType.ENQUEUE;
this.port = port;
public Enqueue(NodeConnector port) {
type = ActionType.ENQUEUE;
this.port = port;
+ this.queue = 0;
+ }
+
+ public Enqueue(NodeConnector port, int queue) {
+ type = ActionType.ENQUEUE;
+ this.port = port;
+ this.queue = queue;
}
public NodeConnector getPort() {
return port;
}
}
public NodeConnector getPort() {
return port;
}
+
+ public int getQueue() {
+ return queue;
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s[%s:%s]", type, port, queue);
+ }
}
}