ONOS-7924 Fix unable to set role for OpenFlow switch
Change-Id: I612450b8f649c055b04a68afaad93ec645984bdc
diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java
index f3e8437..9713002 100644
--- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java
+++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java
@@ -94,7 +94,7 @@
roleToSend = OFNiciraControllerRole.ROLE_OTHER;
log.debug("Sending Nx Role.SLAVE to switch {}.", sw);
}
- int xid = sw.getNextTransactionId();
+ long xid = sw.getNextTransactionId();
OFExperimenter roleRequest = OFFactories.getFactory(OFVersion.OF_10)
.buildNiciraControllerRoleRequest()
.setXid(xid)
@@ -122,7 +122,7 @@
+ " Should only be used for queries.", sw);
}
- int xid = sw.getNextTransactionId();
+ long xid = sw.getNextTransactionId();
OFRoleRequest rrm = sw.factory()
.buildRoleRequest()
.setRole(roleToSend)
@@ -182,7 +182,7 @@
@Override
public synchronized RoleRecvStatus deliverRoleReply(RoleReplyInfo rri)
throws SwitchStateException {
- int xid = (int) rri.getXid();
+ long xid = rri.getXid();
RoleState receivedRole = rri.getRole();
RoleState expectedRole = pendingReplies.getIfPresent(xid);