fixed of13 glitches
Change-Id: Iaaaec162cc3b33f25912da8b06e509d1ff7e2ec4
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java b/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java
index b47bada..992270f 100644
--- a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java
+++ b/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java
@@ -122,7 +122,7 @@
//FIXME fix below when we actually use generation ids
.setGenerationId(U64.ZERO)
.build();
- sw.sendMsg(rrm);
+ sw.write(rrm);
return xid;
}
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFSwitchImplOVS13.java b/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFSwitchImplOVS13.java
index 05ffdd1..6bb4586 100644
--- a/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFSwitchImplOVS13.java
+++ b/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFSwitchImplOVS13.java
@@ -138,7 +138,7 @@
.buildBarrierRequest()
.setXid(xid)
.build();
- sendMsg(br);
+ write(br);
}
@Override
@@ -227,7 +227,7 @@
.setHardTimeout(0)
.setXid(getNextTransactionId())
.build();
- sendMsg(tableMissEntry);
+ write(tableMissEntry);
}
}
diff --git a/openflow/openflowj/gen-src/main/java/org/projectfloodlight/openflow/protocol/OFType.java b/openflow/openflowj/gen-src/main/java/org/projectfloodlight/openflow/protocol/OFType.java
index aef779f..51de582 100644
--- a/openflow/openflowj/gen-src/main/java/org/projectfloodlight/openflow/protocol/OFType.java
+++ b/openflow/openflowj/gen-src/main/java/org/projectfloodlight/openflow/protocol/OFType.java
@@ -40,15 +40,15 @@
PORT_STATUS,
PACKET_OUT,
FLOW_MOD,
+ GROUP_MOD,
PORT_MOD,
+ TABLE_MOD,
STATS_REQUEST,
STATS_REPLY,
BARRIER_REQUEST,
BARRIER_REPLY,
QUEUE_GET_CONFIG_REQUEST,
QUEUE_GET_CONFIG_REPLY,
- GROUP_MOD,
- TABLE_MOD,
ROLE_REQUEST,
ROLE_REPLY,
GET_ASYNC_REQUEST,