Upgraded to bazel 3.7.2 and rules_nodejs 2.3.2
Change-Id: If53686f2475c4f367909de577b4da95de8e16768
diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index e40b14d..c7a31ef 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -413,7 +413,7 @@
private void handlePortRequest(InternalPortUpDownEvent event) {
DeviceId deviceId = event.deviceId();
checkNotNull(deviceId, DEVICE_ID_NULL);
- checkNotNull(deviceId, PORT_NUMBER_NULL);
+ checkNotNull(event.portNumber(), PORT_NUMBER_NULL);
checkState(mastershipService.isLocalMaster(deviceId), EVENT_NON_MASTER);
changePortStateAtMaster(event.deviceId(), event.portNumber(), event.isEnable());
}
@@ -435,7 +435,7 @@
public void changePortState(DeviceId deviceId, PortNumber portNumber,
boolean enable) {
checkNotNull(deviceId, DEVICE_ID_NULL);
- checkNotNull(deviceId, PORT_NUMBER_NULL);
+ checkNotNull(portNumber, PORT_NUMBER_NULL);
NodeId masterId = mastershipService.getMasterFor(deviceId);
if (masterId == null) {
diff --git a/core/net/src/main/java/org/onosproject/net/region/impl/RegionManager.java b/core/net/src/main/java/org/onosproject/net/region/impl/RegionManager.java
index c1b9327..fa27c87 100644
--- a/core/net/src/main/java/org/onosproject/net/region/impl/RegionManager.java
+++ b/core/net/src/main/java/org/onosproject/net/region/impl/RegionManager.java
@@ -139,7 +139,7 @@
List<Set<NodeId>> masterNodeIds) {
checkNotNull(regionId, REGION_ID_NULL);
checkNotNull(name, NAME_NULL);
- checkNotNull(name, REGION_TYPE_NULL);
+ checkNotNull(type, REGION_TYPE_NULL);
return store.createRegion(regionId, name, type, genAnnots(regionId),
masterNodeIds == null ? of() : masterNodeIds);
@@ -150,7 +150,7 @@
List<Set<NodeId>> masterNodeIds) {
checkNotNull(regionId, REGION_ID_NULL);
checkNotNull(name, NAME_NULL);
- checkNotNull(name, REGION_TYPE_NULL);
+ checkNotNull(type, REGION_TYPE_NULL);
return store.updateRegion(regionId, name, type, genAnnots(regionId),
masterNodeIds == null ? of() : masterNodeIds);
diff --git a/core/net/src/main/java/org/onosproject/net/topology/impl/TopologyManager.java b/core/net/src/main/java/org/onosproject/net/topology/impl/TopologyManager.java
index d972601..280df9e 100644
--- a/core/net/src/main/java/org/onosproject/net/topology/impl/TopologyManager.java
+++ b/core/net/src/main/java/org/onosproject/net/topology/impl/TopologyManager.java
@@ -116,7 +116,7 @@
public TopologyCluster getCluster(Topology topology, ClusterId clusterId) {
checkPermission(TOPOLOGY_READ);
checkNotNull(topology, TOPOLOGY_NULL);
- checkNotNull(topology, CLUSTER_ID_NULL);
+ checkNotNull(clusterId, CLUSTER_ID_NULL);
return store.getCluster(topology, clusterId);
}
@@ -124,7 +124,7 @@
public Set<DeviceId> getClusterDevices(Topology topology, TopologyCluster cluster) {
checkPermission(TOPOLOGY_READ);
checkNotNull(topology, TOPOLOGY_NULL);
- checkNotNull(topology, CLUSTER_NULL);
+ checkNotNull(cluster, CLUSTER_NULL);
return store.getClusterDevices(topology, cluster);
}
@@ -132,7 +132,7 @@
public Set<Link> getClusterLinks(Topology topology, TopologyCluster cluster) {
checkPermission(TOPOLOGY_READ);
checkNotNull(topology, TOPOLOGY_NULL);
- checkNotNull(topology, CLUSTER_NULL);
+ checkNotNull(cluster, CLUSTER_NULL);
return store.getClusterLinks(topology, cluster);
}
diff --git a/core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java b/core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java
index f5b26c2..9272668 100644
--- a/core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java
@@ -34,6 +34,7 @@
import org.onosproject.net.mcast.McastRoute;
import org.onosproject.store.service.TestStorageService;
+import java.util.Arrays;
import java.util.List;
import static junit.framework.Assert.fail;
@@ -141,13 +142,13 @@
private void validateEvents(McastEvent.Type... evs) {
if (events.size() != evs.length) {
fail(String.format("Mismatch number of events# obtained -> %s : expected %s",
- events, evs));
+ events, Arrays.toString(evs)));
}
for (int i = 0; i < evs.length; i++) {
if (evs[i] != events.get(i).type()) {
fail(String.format("Mismatched events# obtained -> %s : expected %s",
- events, evs));
+ events, Arrays.toString(evs)));
}
}
}
diff --git a/core/net/src/test/java/org/onosproject/net/pi/impl/PiCriterionTranslatorsTest.java b/core/net/src/test/java/org/onosproject/net/pi/impl/PiCriterionTranslatorsTest.java
index ee27ef2..ce3584f 100644
--- a/core/net/src/test/java/org/onosproject/net/pi/impl/PiCriterionTranslatorsTest.java
+++ b/core/net/src/test/java/org/onosproject/net/pi/impl/PiCriterionTranslatorsTest.java
@@ -319,7 +319,7 @@
@Test
public void testMplsCriterion() throws Exception {
- MplsLabel mplsLabel = MplsLabel.mplsLabel(random.nextInt(2 ^ 20));
+ MplsLabel mplsLabel = MplsLabel.mplsLabel(random.nextInt(1 << 20));
int bitWidth = 32;
MplsCriterion criterion = (MplsCriterion) Criteria.matchMplsLabel(mplsLabel);
@@ -357,9 +357,9 @@
@Test
public void testSctpPortCriterion() throws Exception {
- TpPort value1 = TpPort.tpPort(random.nextInt(2 ^ 16));
- TpPort value2 = TpPort.tpPort(random.nextInt(2 ^ 16));
- TpPort mask = TpPort.tpPort(random.nextInt(2 ^ 16));
+ TpPort value1 = TpPort.tpPort(random.nextInt(1 << 16));
+ TpPort value2 = TpPort.tpPort(random.nextInt(1 << 16));
+ TpPort mask = TpPort.tpPort(random.nextInt(1 << 16));
int bitWidth = 16;
@@ -377,7 +377,7 @@
@Test
public void testTcpFlagsCriterion() throws Exception {
- int pbbIsid = random.nextInt(2 ^ 12);
+ int pbbIsid = random.nextInt(1 << 12);
int bitWidth = 12;
TcpFlagsCriterion criterion = (TcpFlagsCriterion) Criteria.matchTcpFlags(pbbIsid);
@@ -389,9 +389,9 @@
@Test
public void testTcpPortCriterion() throws Exception {
- TpPort value1 = TpPort.tpPort(random.nextInt(2 ^ 16));
- TpPort value2 = TpPort.tpPort(random.nextInt(2 ^ 16));
- TpPort mask = TpPort.tpPort(random.nextInt(2 ^ 16));
+ TpPort value1 = TpPort.tpPort(random.nextInt(1 << 16));
+ TpPort value2 = TpPort.tpPort(random.nextInt(1 << 16));
+ TpPort mask = TpPort.tpPort(random.nextInt(1 << 16));
int bitWidth = 16;