Skip to content

Commit bdcf002

Browse files
feat: Dropped DHCPv6 method (#20)
Dropped method dhcpv6 Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>
1 parent 7b1be7b commit bdcf002

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabIp6Ui.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public class TabIp6Ui extends Composite implements NetworkTab {
5050
private static final String STATUS_LAN = "netIPv6StatusEnabledLAN";
5151
private static final String STATUS_WAN = "netIPv6StatusEnabledWAN";
5252
private static final String CONFIGURE_AUTO = "netIPv6MethodAuto";
53-
private static final String CONFIGURE_DHCP = "netIPv6MethodDhcp";
5453
private static final String CONFIGURE_MANUAL = "netIPv6MethodManual";
5554
private static final String AUTOCONF_EUI64 = "netIPv6AddressGenModeEUI64";
5655
private static final String AUTOCONF_STABLEPRIVACY = "netIPv6AddressGenModeStablePrivacy";
@@ -248,7 +247,6 @@ private void initStatusField() {
248247

249248
private void initConfigureField() {
250249
this.configure.addItem(MessageUtils.get(CONFIGURE_AUTO), CONFIGURE_AUTO);
251-
this.configure.addItem(MessageUtils.get(CONFIGURE_DHCP), CONFIGURE_DHCP);
252250
this.configure.addItem(MessageUtils.get(CONFIGURE_MANUAL), CONFIGURE_MANUAL);
253251

254252
this.configure.addMouseOverHandler(event -> {
@@ -560,15 +558,13 @@ private void refreshFieldsBasedOnSelectedValues() {
560558
this.dns.setText("");
561559
}
562560

563-
if (this.configure.getSelectedValue().equals(CONFIGURE_AUTO)
564-
|| this.configure.getSelectedValue().equals(CONFIGURE_DHCP)) {
561+
if (this.configure.getSelectedValue().equals(CONFIGURE_AUTO)) {
565562
this.ip.setEnabled(false);
566563
this.subnet.setEnabled(false);
567564
this.gateway.setEnabled(false);
568565
}
569566

570-
if (this.configure.getSelectedValue().equals(CONFIGURE_MANUAL)
571-
|| this.configure.getSelectedValue().equals(CONFIGURE_DHCP)) {
567+
if (this.configure.getSelectedValue().equals(CONFIGURE_MANUAL)) {
572568
this.autoconfiguration.setEnabled(false);
573569
this.privacy.setEnabled(false);
574570
}

bundles/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/ValidationMessages.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ netIPv6StatusDisabled=Disabled
116116
netIPv6StatusEnabledLAN=Enabled for LAN
117117
netIPv6StatusEnabledWAN=Enabled for WAN
118118

119-
netIPv6MethodAuto=Stateless Address Auto-Configuration (SLAAC)
120-
netIPv6MethodDhcp=Using DHCPv6
119+
netIPv6MethodAuto=Auto
121120
netIPv6MethodManual=Manually
122121

123122
netIPv6AddressGenModeEUI64=EUI64

0 commit comments

Comments
 (0)