Bug fix for IgnoreDhcp rules after switch restart. Also fixed NPE in group handler,
and made recognizing ofdpa software more generic to handle premium versions on accton switches.
Change-Id: Ie1f40dd934c2a1adb75174c90c2d6f1b71f98d3a
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
index 65c2d6c..b45433f 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
@@ -243,6 +243,17 @@
});
}
+ @Override
+ public void removeIgnoreVlanState(IgnoreDhcpConfig config) {
+ if (config == null) {
+ ignoredVlans.clear();
+ return;
+ }
+ config.ignoredVlans().forEach((deviceId, vlanId) -> {
+ ignoredVlans.remove(deviceId, vlanId);
+ });
+ }
+
public void setDhcpServerConfigs(Collection<DhcpServerConfig> configs, List<DhcpServerInfo> serverInfoList) {
if (configs.size() == 0) {
// no config to update
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
index 3df889f..087a5c9 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
@@ -257,6 +257,17 @@
}
@Override
+ public void removeIgnoreVlanState(IgnoreDhcpConfig config) {
+ if (config == null) {
+ ignoredVlans.clear();
+ return;
+ }
+ config.ignoredVlans().forEach((deviceId, vlanId) -> {
+ ignoredVlans.remove(deviceId, vlanId);
+ });
+ }
+
+ @Override
public void processDhcpPacket(PacketContext context, BasePacket payload) {
checkNotNull(payload, "DHCP6 payload can't be null");
checkState(payload instanceof DHCP6, "Payload is not a DHCP6");
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java
index fc8bedc..4aedc83 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java
@@ -570,6 +570,8 @@
private void deviceAvailabilityChanged(Device device) {
if (deviceService.isAvailable(device.id())) {
updateIgnoreVlanConfigs();
+ } else {
+ removeIgnoreVlanState();
}
}
@@ -578,6 +580,12 @@
v4Handler.updateIgnoreVlanConfig(config);
v6Handler.updateIgnoreVlanConfig(config);
}
+
+ private void removeIgnoreVlanState() {
+ IgnoreDhcpConfig config = cfgService.getConfig(appId, IgnoreDhcpConfig.class);
+ v4Handler.removeIgnoreVlanState(config);
+ v6Handler.removeIgnoreVlanState(config);
+ }
}
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/DhcpHandler.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/DhcpHandler.java
index 475a459..49b88e8 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/DhcpHandler.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/DhcpHandler.java
@@ -171,6 +171,13 @@
void updateIgnoreVlanConfig(IgnoreDhcpConfig config);
/**
+ * Remove internal state for IgnoreDhcp.
+ *
+ * @param config the config
+ */
+ void removeIgnoreVlanState(IgnoreDhcpConfig config);
+
+ /**
* Sets DHCP FPM Enable state.
*
* @param dhcpFpmFlag flag indicating dhcpFpmEnable state