CORD-414 Editing hash groups buckets in the OF-DPA driver instead of
creating new groups.
Also in this commit - fix for NPE in groups cli, and removal of unnecessary
cpqd-ofdpa3 driver.
Change-Id: I2a5dd183cb38ed901caa5a806791b77e9d92d93c
diff --git a/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java
index 76f2c38..8c9cfcf 100644
--- a/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java
@@ -107,8 +107,13 @@
if (state != null && !state.equals("any")) {
s = GroupState.valueOf(state.toUpperCase());
}
- Iterable<Device> devices = (uri == null) ? deviceService.getDevices() :
- Collections.singletonList(deviceService.getDevice(DeviceId.deviceId(uri)));
+ Iterable<Device> devices = deviceService.getDevices();
+ if (uri != null) {
+ Device dev = deviceService.getDevice(DeviceId.deviceId(uri));
+ if (dev != null) {
+ devices = Collections.singletonList(dev);
+ }
+ }
for (Device d : devices) {
if (s == null) {
groups = newArrayList(groupService.getGroups(d.id()));