diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.java index 3228c616eb2..aed653deacf 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2022 Eurotech and/or its affiliates and others + * Copyright (c) 2011, 2024 Eurotech and/or its affiliates and others * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -22,8 +22,6 @@ import org.eclipse.kura.web.client.util.MessageUtils; import org.eclipse.kura.web.shared.model.GwtModemAuthType; import org.eclipse.kura.web.shared.model.GwtModemInterfaceConfig; -import org.eclipse.kura.web.shared.model.GwtModemPdpEntry; -import org.eclipse.kura.web.shared.model.GwtModemPdpType; import org.eclipse.kura.web.shared.model.GwtNetInterfaceConfig; import org.eclipse.kura.web.shared.model.GwtSession; import org.eclipse.kura.web.shared.model.GwtXSRFToken; @@ -79,16 +77,10 @@ interface TabModemUiUiBinder extends UiBinder { private final NetworkTabsUi tabs; private boolean dirty; private GwtModemInterfaceConfig selectedNetIfConfig; - private final Map defaultDialString = new HashMap<>(); - private String dialString; private final GwtSecurityTokenServiceAsync gwtXSRFService = GWT.create(GwtSecurityTokenService.class); private final GwtNetworkServiceAsync gwtNetworkService = GWT.create(GwtNetworkService.class); - private final ListDataProvider pdpDataProvider = new ListDataProvider<>(); - private final SingleSelectionModel pdpSelectionModel = new SingleSelectionModel<>(); - - private boolean pdpInit; @UiField FormGroup groupReset; @@ -105,8 +97,6 @@ interface TabModemUiUiBinder extends UiBinder { @UiField FormGroup groupNumber; @UiField - FormGroup groupDial; - @UiField FormGroup groupApn; @UiField @@ -120,8 +110,6 @@ interface TabModemUiUiBinder extends UiBinder { @UiField FormLabel labelNumber; @UiField - FormLabel labelDial; - @UiField FormLabel labelApn; @UiField FormLabel labelAuth; @@ -171,10 +159,6 @@ interface TabModemUiUiBinder extends UiBinder { @UiField TextBox number; @UiField - TextBox dial; - @UiField - Button buttonPdp; - @UiField TextBox apn; @UiField TextBox username; @@ -193,29 +177,6 @@ interface TabModemUiUiBinder extends UiBinder { @UiField TextBox failure; - @UiField - Modal pdpModal; - - @UiField - PanelHeader pdpTitle; - - @UiField - CellTable pdpGrid = new CellTable<>(); - - @UiField - Alert searching; - @UiField - Alert noPdp; - @UiField - Alert pdpFail; - - @UiField - Text searchingText; - @UiField - Text noPdpText; - @UiField - Text pdpFailText; - @UiField FormControlStatic model; @UiField @@ -245,8 +206,6 @@ interface TabModemUiUiBinder extends UiBinder { @UiField HelpButton numberHelp; @UiField - HelpButton dialHelp; - @UiField HelpButton apnHelp; @UiField HelpButton authHelp; @@ -272,15 +231,11 @@ interface TabModemUiUiBinder extends UiBinder { HelpButton failureHelp; public TabModemUi(GwtSession currentSession, TabIp4Ui tcp, NetworkTabsUi tabs) { - this.pdpInit = false; initWidget(uiBinder.createAndBindUi(this)); this.session = currentSession; this.tcpTab = tcp; this.tabs = tabs; - this.defaultDialString.put(HE910, "atd*99***1#"); - this.defaultDialString.put(LE910, "atd*99***2#"); - this.defaultDialString.put(DE910, "atd#777"); initForm(); initHelpButtons(); @@ -303,9 +258,6 @@ public boolean isDirty() { @Override public boolean isValid() { - if (this.dial.getText() == null || "".equals(this.dial.getText().trim())) { - this.groupDial.setValidationState(ValidationState.ERROR); - } if (this.maxfail.getText() == null || "".equals(this.maxfail.getText().trim())) { this.groupMaxfail.setValidationState(ValidationState.ERROR); } @@ -323,7 +275,6 @@ public boolean isValid() { } if (this.groupNumber.getValidationState().equals(ValidationState.ERROR) - || this.groupDial.getValidationState().equals(ValidationState.ERROR) || this.groupApn.getValidationState().equals(ValidationState.ERROR) || this.groupMaxfail.getValidationState().equals(ValidationState.ERROR) || this.groupHoldoff.getValidationState().equals(ValidationState.ERROR) @@ -365,13 +316,11 @@ public void clear() { @Override public void getUpdatedNetInterface(GwtNetInterfaceConfig updatedNetIf) { GwtModemInterfaceConfig updatedModemNetIf = (GwtModemInterfaceConfig) updatedNetIf; - updatedModemNetIf.setPdpType(GwtModemPdpType.netModemPdpIP); if (this.model.getText() != null && this.service.getText() != null) { // note - status is set in tcp/ip tab updatedModemNetIf.setPppNum(Integer.parseInt(this.number.getText())); updatedModemNetIf.setModemId(this.modem.getText().trim() != null ? this.modem.getText().trim() : ""); - updatedModemNetIf.setDialString(this.dial.getText().trim() != null ? this.dial.getText().trim() : ""); updatedModemNetIf.setApn(this.apn.getText().trim() != null ? this.apn.getText().trim() : ""); String authValue = this.auth.getSelectedValue(); @@ -402,7 +351,6 @@ public void getUpdatedNetInterface(GwtNetInterfaceConfig updatedNetIf) { updatedModemNetIf.setPppNum(this.selectedNetIfConfig.getPppNum()); updatedModemNetIf.setModemId(this.selectedNetIfConfig.getModemId()); - updatedModemNetIf.setDialString(this.selectedNetIfConfig.getDialString()); updatedModemNetIf.setApn(this.selectedNetIfConfig.getApn()); updatedModemNetIf.setAuthType(this.selectedNetIfConfig.getAuthType()); updatedModemNetIf.setUsername(this.selectedNetIfConfig.getUsername()); @@ -424,13 +372,6 @@ private void initHelpButtons() { this.networkHelp.setHelpText(MSGS.netModemToolTipNetworkTopology()); this.modemHelp.setHelpText(MSGS.netModemToolTipModemIndentifier()); this.numberHelp.setHelpText(MSGS.netModemToolTipModemInterfaceNumber()); - this.dialHelp.setHelpTextProvider(() -> { - if ("".equals(TabModemUi.this.dialString)) { - return MSGS.netModemToolTipDialStringDefault(); - } else { - return MSGS.netModemToolTipDialString(TabModemUi.this.dial.getText()); - } - }); this.apnHelp.setHelpText(MSGS.netModemToolTipApn()); this.authHelp.setHelpText(MSGS.netModemToolTipAuthentication()); this.usernameHelp.setHelpText(MSGS.netModemToolTipUsername()); @@ -488,59 +429,6 @@ private void initForm() { }); this.number.addMouseOutHandler(event -> resetHelp()); - // DIAL STRING - this.labelDial.setText(MSGS.netModemDialString() + "*"); - - this.dial.addMouseOutHandler(event -> resetHelp()); - this.dialString = ""; - String modemModel; - if (this.selectedNetIfConfig != null) { - modemModel = this.selectedNetIfConfig.getModel(); - if (modemModel != null && !modemModel.isEmpty()) { - if (modemModel.contains(HE910)) { - this.dialString = this.defaultDialString.get(HE910); - } else if (modemModel.contains(LE910)) { - this.dialString = this.defaultDialString.get(LE910); - } else if (modemModel.contains(DE910)) { - this.dialString = this.defaultDialString.get(DE910); - } else { - this.dialString = ""; - } - } - } - this.dial.addMouseOverHandler(event -> { - if (TabModemUi.this.dial.isEnabled()) { - TabModemUi.this.helpText.clear(); - if (TabModemUi.this.dialString.equals("")) { - TabModemUi.this.helpText.add(new Span(MSGS.netModemToolTipDialStringDefault())); - } else { - TabModemUi.this.helpText - .add(new Span(MSGS.netModemToolTipDialString(TabModemUi.this.dial.getText()))); - } - } - }); - this.dial.addValueChangeHandler(event -> { - setDirty(true); - if (TabModemUi.this.dial.getText() == null || "".equals(TabModemUi.this.dial.getText().trim())) { - TabModemUi.this.groupDial.setValidationState(ValidationState.ERROR); - } else { - TabModemUi.this.groupDial.setValidationState(ValidationState.NONE); - } - }); - - this.buttonPdp.addClickHandler(event -> { - if (!TabModemUi.this.pdpInit) { - initPdp(); - TabModemUi.this.pdpDataProvider.getList().clear(); - TabModemUi.this.searching.setVisible(true); - TabModemUi.this.noPdp.setVisible(false); - TabModemUi.this.pdpGrid.setVisible(false); - TabModemUi.this.pdpFail.setVisible(false); - } - initModal(); - loadPdpData(); - }); - // APN this.labelApn.setText(MSGS.netModemAPN()); this.apn.addMouseOverHandler(event -> { @@ -765,7 +653,6 @@ private void initForm() { private void resetValidations() { this.groupApn.setValidationState(ValidationState.NONE); - this.groupDial.setValidationState(ValidationState.NONE); this.groupFailure.setValidationState(ValidationState.NONE); this.groupIdle.setValidationState(ValidationState.NONE); this.groupInterval.setValidationState(ValidationState.NONE); @@ -803,7 +690,6 @@ private void update() { this.service.setText(this.selectedNetIfConfig.getConnectionType()); this.modem.setText(this.selectedNetIfConfig.getModemId()); this.number.setText(String.valueOf(this.selectedNetIfConfig.getPppNum())); - this.dial.setText(this.selectedNetIfConfig.getDialString()); this.apn.setText(this.selectedNetIfConfig.getApn()); GwtModemAuthType authType = GwtModemAuthType.netModemAuthNONE; @@ -842,8 +728,6 @@ private void refreshForm() { this.network.setEnabled(true); this.modem.setEnabled(true); this.number.setEnabled(false); - this.dial.setEnabled(true); - this.buttonPdp.setEnabled(true); this.apn.setEnabled(true); this.auth.setEnabled(true); this.username.setEnabled(true); @@ -875,7 +759,6 @@ private void refreshForm() { this.auth.setEnabled(false); this.username.setEnabled(false); this.password.setEnabled(false); - this.buttonPdp.setEnabled(false); } } } @@ -887,7 +770,6 @@ private void reset() { this.service.setText(null); this.modem.setText(null); this.number.setText(null); - this.dial.setText(null); this.apn.setText(null); this.auth.setSelectedIndex(1); this.username.setText(null); @@ -904,126 +786,4 @@ private void reset() { update(); } - private void initModal() { - this.pdpModal.setTitle("PDP Context Information"); - this.pdpTitle.setText("Available PDP Profiles"); - this.pdpModal.show(); - - this.searchingText.setText(MSGS.netModemAlertObtainingPdpInfo()); - this.noPdpText.setText(MSGS.netModemAlertNoPdp()); - this.pdpFailText.setText(MSGS.netModemAlertObtainPdpInfoFail()); - } - - private void initPdp() { - this.pdpInit = true; - TextColumn col1 = new TextColumn() { - - @Override - public String getValue(GwtModemPdpEntry object) { - return String.valueOf(object.getContextNumber()); - } - }; - col1.setCellStyleNames("status-table-row"); - this.pdpGrid.addColumn(col1, "Context Number"); - this.pdpGrid.setColumnWidth(col1, "70px"); - - TextColumn col2 = new TextColumn() { - - @Override - public String getValue(GwtModemPdpEntry object) { - return object.getPdpType(); - } - }; - col2.setCellStyleNames("status-table-row"); - this.pdpGrid.addColumn(col2, "PDP Type"); - this.pdpGrid.setColumnWidth(col2, "85px"); - - TextColumn col3 = new TextColumn() { - - @Override - public String getValue(GwtModemPdpEntry object) { - return object.getApn(); - } - }; - col3.setCellStyleNames("status-table-row"); - this.pdpGrid.addColumn(col3, "Access Point Name (APN)"); - this.pdpGrid.setColumnWidth(col3, "400px"); - - this.pdpDataProvider.addDataDisplay(this.pdpGrid); - this.pdpGrid.setSelectionModel(this.pdpSelectionModel); - - this.pdpSelectionModel.addSelectionChangeHandler(event -> { - GwtModemPdpEntry modemPdpEntry = TabModemUi.this.pdpSelectionModel.getSelectedObject(); - if (modemPdpEntry != null) { - TabModemUi.this.dial.setValue(formDialString(modemPdpEntry.getContextNumber())); - if (!modemPdpEntry.getApn().contains("new PDP context")) { - TabModemUi.this.apn.setValue(modemPdpEntry.getApn()); - } else { - TabModemUi.this.apn.setValue(""); - } - TabModemUi.this.pdpModal.hide(); - } - }); - } - - private String formDialString(int pdpContextNo) { - StringBuilder sb = new StringBuilder(); - sb.append("atd*99***"); - sb.append(pdpContextNo); - sb.append("#"); - return sb.toString(); - } - - private void loadPdpData() { - this.pdpDataProvider.getList().clear(); - this.searching.setVisible(true); - this.noPdp.setVisible(false); - this.pdpGrid.setVisible(false); - this.pdpFail.setVisible(false); - - this.gwtXSRFService.generateSecurityToken(new AsyncCallback() { - - @Override - public void onFailure(Throwable ex) { - FailureHandler.handle(ex); - } - - @Override - public void onSuccess(GwtXSRFToken token) { - TabModemUi.this.gwtNetworkService.findPdpContextInfo(token, - TabModemUi.this.selectedNetIfConfig.getName(), new AsyncCallback>() { - - @Override - public void onFailure(Throwable caught) { - TabModemUi.this.searching.setVisible(false); - TabModemUi.this.noPdp.setVisible(false); - TabModemUi.this.pdpGrid.setVisible(false); - TabModemUi.this.pdpFail.setVisible(true); - } - - @Override - public void onSuccess(List result) { - for (GwtModemPdpEntry pair : result) { - TabModemUi.this.pdpDataProvider.getList().add(pair); - } - TabModemUi.this.pdpDataProvider.flush(); - if (!TabModemUi.this.pdpDataProvider.getList().isEmpty()) { - TabModemUi.this.searching.setVisible(false); - TabModemUi.this.noPdp.setVisible(false); - int size = TabModemUi.this.pdpDataProvider.getList().size(); - TabModemUi.this.pdpGrid.setVisibleRange(0, size); - TabModemUi.this.pdpGrid.setVisible(true); - TabModemUi.this.pdpFail.setVisible(false); - } else { - TabModemUi.this.searching.setVisible(false); - TabModemUi.this.noPdp.setVisible(true); - TabModemUi.this.pdpGrid.setVisible(false); - TabModemUi.this.pdpFail.setVisible(false); - } - } - }); - } - }); - } - } diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.ui.xml b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.ui.xml index ec413bb1a46..47155e123ed 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.ui.xml +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.ui.xml @@ -2,7 +2,7 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtNetworkServiceImpl.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtNetworkServiceImpl.java index 19997694693..a55cde2dca0 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtNetworkServiceImpl.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtNetworkServiceImpl.java @@ -45,7 +45,6 @@ import org.eclipse.kura.web.shared.model.GwtFirewallNatEntry; import org.eclipse.kura.web.shared.model.GwtFirewallOpenPortEntry; import org.eclipse.kura.web.shared.model.GwtFirewallPortForwardEntry; -import org.eclipse.kura.web.shared.model.GwtModemPdpEntry; import org.eclipse.kura.web.shared.model.GwtNetInterfaceConfig; import org.eclipse.kura.web.shared.model.GwtWifiChannelFrequency; import org.eclipse.kura.web.shared.model.GwtWifiConfig; @@ -106,16 +105,7 @@ public ArrayList findWifiHotspots(GwtXSRFToken xsrfToken, S throw new GwtKuraException(GwtKuraErrorCode.INTERNAL_ERROR, e); } } - - @Override - public List findPdpContextInfo(GwtXSRFToken xsrfToken, String interfaceName) - throws GwtKuraException { - checkXSRFToken(xsrfToken); - - logger.debug("Method findPdpContextInfo not implemented yet. Returning empty list."); - return new ArrayList<>(); - } - + @Override public boolean verifyWifiCredentials(GwtXSRFToken xsrfToken, String interfaceName, GwtWifiConfig gwtWifiConfig) throws GwtKuraException { diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/GwtNetInterfaceConfigBuilder.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/GwtNetInterfaceConfigBuilder.java index 61041937909..0ad6fb227d5 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/GwtNetInterfaceConfigBuilder.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/GwtNetInterfaceConfigBuilder.java @@ -312,7 +312,6 @@ private void setModemProperties() { GwtModemInterfaceConfig gwtModemConfig = (GwtModemInterfaceConfig) this.gwtConfig; gwtModemConfig.setAuthType(EnumsParser.getGwtModemAuthType(this.properties.getModemAuthType(this.ifName))); - gwtModemConfig.setPdpType(EnumsParser.getGwtModemPdpType(this.properties.getModemPdpType(this.ifName))); gwtModemConfig.setDialString(this.properties.getModemDialString(this.ifName)); gwtModemConfig.setUsername(this.properties.getModemUsername(this.ifName)); diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/NetworkConfigurationServicePropertiesBuilder.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/NetworkConfigurationServicePropertiesBuilder.java index 6dcc5e8ca36..542c08d0adc 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/NetworkConfigurationServicePropertiesBuilder.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/NetworkConfigurationServicePropertiesBuilder.java @@ -381,8 +381,6 @@ private void setModemProperties() { this.properties.setModemAuthType(this.ifname, EnumsParser.getAuthType(Optional.ofNullable(gwtModemConfig.getAuthType()))); - this.properties.setModemPdpType(this.ifname, - EnumsParser.getPdpType(Optional.ofNullable(gwtModemConfig.getPdpType()))); this.properties.setModemDialString(this.ifname, gwtModemConfig.getDialString()); this.properties.setModemUsername(this.ifname, gwtModemConfig.getUsername()); diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/utils/EnumsParser.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/utils/EnumsParser.java index a5a3865c7b3..ca6c15a915b 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/utils/EnumsParser.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/utils/EnumsParser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Eurotech and/or its affiliates and others + * Copyright (c) 2023, 2024 Eurotech and/or its affiliates and others * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -16,13 +16,11 @@ import org.eclipse.kura.net.NetInterfaceStatus; import org.eclipse.kura.net.modem.ModemConfig.AuthType; -import org.eclipse.kura.net.modem.ModemConfig.PdpType; import org.eclipse.kura.net.wifi.WifiCiphers; import org.eclipse.kura.net.wifi.WifiMode; import org.eclipse.kura.net.wifi.WifiRadioMode; import org.eclipse.kura.net.wifi.WifiSecurity; import org.eclipse.kura.web.shared.model.GwtModemAuthType; -import org.eclipse.kura.web.shared.model.GwtModemPdpType; import org.eclipse.kura.web.shared.model.GwtNetIfStatus; import org.eclipse.kura.web.shared.model.GwtWifiCiphers; import org.eclipse.kura.web.shared.model.GwtWifiRadioMode; @@ -358,48 +356,4 @@ public static String getAuthType(Optional gwtModemAuthType) { return AuthType.NONE.name(); } - /** - * Converts values of {@link PdpType} to {@link GwtModemPdpType} - * - */ - public static GwtModemPdpType getGwtModemPdpType(Optional pdpType) { - if (pdpType.isPresent()) { - if (pdpType.get().equals(PdpType.IP.name())) { - return GwtModemPdpType.netModemPdpIP; - } - - if (pdpType.get().equals(PdpType.PPP.name())) { - return GwtModemPdpType.netModemPdpPPP; - } - - if (pdpType.get().equals(PdpType.IPv6.name())) { - return GwtModemPdpType.netModemPdpIPv6; - } - } - - return GwtModemPdpType.netModemPdpUnknown; - } - - /** - * Converts values of {@link GwtModemPdpType} to {@link PdpType.name()} - * - */ - public static String getPdpType(Optional gwtModemPdpType) { - if (gwtModemPdpType.isPresent()) { - switch (gwtModemPdpType.get()) { - case netModemPdpIP: - return PdpType.IP.name(); - case netModemPdpIPv6: - return PdpType.IPv6.name(); - case netModemPdpPPP: - return PdpType.PPP.name(); - case netModemPdpUnknown: - default: - break; - } - } - - return PdpType.UNKNOWN.name(); - } - } diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemInterfaceConfig.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemInterfaceConfig.java index 53846f7955b..d593eed224b 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemInterfaceConfig.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemInterfaceConfig.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2022 Eurotech and/or its affiliates and others + * Copyright (c) 2011, 2024 Eurotech and/or its affiliates and others * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -168,18 +168,6 @@ public void setProfileID(int id) { set("profileID", id); } - public GwtModemPdpType getPdpType() { - if (get("pdpType") != null) { - return GwtModemPdpType.valueOf((String) get("pdpType")); - } else { - return null; - } - } - - public void setPdpType(GwtModemPdpType pdpType) { - set("pdpType", pdpType.name()); - } - public String getApn() { return get("apn"); } diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemPdpEntry.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemPdpEntry.java deleted file mode 100644 index 8856fd77f2b..00000000000 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemPdpEntry.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2018, 2020 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - *******************************************************************************/ -package org.eclipse.kura.web.shared.model; - -import java.io.Serializable; - -public class GwtModemPdpEntry extends KuraBaseModel implements Serializable { - - private static final long serialVersionUID = -5616083805637215506L; - - public Integer getContextNumber() { - if (get("contextnum") != null) { - return (Integer) get("contextnum"); - } else { - return 0; - } - } - - public String getPdpType() { - return get("pdptype"); - } - - public String getApn() { - return get("apn"); - } - - public void setContextNumber(int contextnum) { - set("contextnum", contextnum); - } - - public void setPdpType(String pdptype) { - set("pdptype", pdptype); - } - - public void setApn(String apn) { - set("apn", apn); - } -} diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemPdpType.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemPdpType.java deleted file mode 100644 index 95892bf8b36..00000000000 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemPdpType.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2020 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - *******************************************************************************/ -package org.eclipse.kura.web.shared.model; - -public enum GwtModemPdpType { - netModemPdpUnknown, - netModemPdpIP, - netModemPdpPPP, - netModemPdpIPv6 -} diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtNetworkService.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtNetworkService.java index ae2a7b5af74..9a316bf9d8f 100644 --- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtNetworkService.java +++ b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtNetworkService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Eurotech and/or its affiliates and others + * Copyright (c) 2011, 2024 Eurotech and/or its affiliates and others * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -21,7 +21,6 @@ import org.eclipse.kura.web.shared.model.GwtFirewallNatEntry; import org.eclipse.kura.web.shared.model.GwtFirewallOpenPortEntry; import org.eclipse.kura.web.shared.model.GwtFirewallPortForwardEntry; -import org.eclipse.kura.web.shared.model.GwtModemPdpEntry; import org.eclipse.kura.web.shared.model.GwtNetInterfaceConfig; import org.eclipse.kura.web.shared.model.GwtWifiChannelFrequency; import org.eclipse.kura.web.shared.model.GwtWifiConfig; @@ -99,9 +98,6 @@ public List findFrequencies(GwtXSRFToken xsrfToken, Str public boolean verifyWifiCredentials(GwtXSRFToken xsrfToken, String interfaceName, GwtWifiConfig gwtWifiConfig) throws GwtKuraException; - public List findPdpContextInfo(GwtXSRFToken xsrfToken, String interfaceName) - throws GwtKuraException; - public boolean isIEEE80211ACSupported(GwtXSRFToken xsrfToken, String ifaceName) throws GwtKuraException; public List getDhcpLeases(GwtXSRFToken xsrfToken, String interfaceName) throws GwtKuraException; diff --git a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties index eae4bb344d4..78e81033071 100644 --- a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties +++ b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties @@ -639,9 +639,6 @@ netWifiAlertNoChannels=No Available Channels. netWifiAlertScanning=Scanning... netWifiAlertNoSSID=No Networks found netWifiAlertScanFail=The scan operation failed. Please retry. -netModemAlertObtainingPdpInfo=Obtaining PDP information... -netModemAlertNoPdp=No PDP profiles found -netModemAlertObtainPdpInfoFail=Failed to obtain PDP information. Please retry. netWifiPasswordVerificationStatus=Password Verification Status netWifiPasswordVerificationSuccess=Password verification successful. netWifiPasswordVerificationFailed=Failed to associate with the access point.\nPassword verification has failed. @@ -680,7 +677,6 @@ netModemConnectionType=Connection Type netModemInterfaceNum=Interface # netModemInvalidInterfaceNum="Interface Number" must be set to either 0 or positive integer. netModemIdentifier=Modem Identifier -netModemDialString=Dial String netModemAPN=APN netModemAuthType=Auth Type netModemUsername=Username @@ -703,8 +699,6 @@ netModemEnableGps=Enable GPS netModemToolTipNetworkTopology=Select the appropriate network topology. netModemToolTipModemIndentifier=Enter a unique name for the modem. netModemToolTipModemInterfaceNumber=A unique number that identifies a modem interface. For example:

An Interface # of 0 would name the modem interface ppp0

An Interface # of 1 would name the modem interface ppp1 -netModemToolTipDialString=Instructions for how the modem should attempt to connect.

A typical dial string for the detected modem is: {0} -netModemToolTipDialStringDefault=Instructions for how the modem should attempt to connect.

Typical dial strings are:
* EVDO Modems => atd#777
* HSPA Modems => atd*99***1#
For LTE Modems:
* LE910C1-EU => ATD*99***4#
* LE910C1-AP (Telstra) => ATD*99***1# or ATD*99***5#
* LE910-EU1 and LE910EU-V2 => ATD*99***2# or ATD*99***1# (modem power cycle may be required for PDP context 1)
* LE910NA-V2 (AT&T) => ATD*99***1#
* LE910NA-V2 (Verizon Wireless) => ATD*99***3#
* Quectel-EG25 => ATD*99***4#
* Other modems or mobile network operators => please consult the documentation of the modem manufacturer and the mobile network operator

NOTE: The number before '#' defines the PDP context to be used for this connection.

Click the button to display/select existing PDP profiles. netModemToolTipApn=Modem access point name (Optional parameter).

If left empty this value will be picked up from the Mobile Broadband Provider the modem is registered to.

In order to avoid misconfiguration, it is strongly suggested to set it manually. netModemToolTipAuthentication=Select modem authentication type. netModemToolTipUsername=Enter user name. diff --git a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages_ja.properties b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages_ja.properties index 434eb5a9ce1..fd94a339b52 100644 --- a/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages_ja.properties +++ b/kura/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages_ja.properties @@ -616,9 +616,6 @@ netWifiAlertNoChannels=使用可能なチャネルがありません。 netWifiAlertScanning=スキャン中… netWifiAlertNoSSID=ネットワークがみつかりません netWifiAlertScanFail=スキャン操作に失敗しました。再試行してください。 -netModemAlertObtainingPdpInfo=PDPインフォメーションを取得中… -netModemAlertNoPdp=PDPプロファイルがみつかりません -netModemAlertObtainPdpInfoFail=PDPインフォメーションの取得に失敗しました。再試行してください。 netWifiPasswordVerificationStatus=パスワード認証ステータス netWifiPasswordVerificationSuccess=パスワード認証に成功しました。 netWifiPasswordVerificationFailed=アクセスポイントの結合に失敗しました。
パスワード認証に失敗しました。 @@ -653,7 +650,6 @@ netModemConnectionType=接続タイプ netModemInterfaceNum=インターフェース # netModemInvalidInterfaceNum=インターフェースナンバーは0か正の整数である必要があります。 netModemIdentifier=モデム識別子 -netModemDialString=ダイヤル文字列 netModemAPN=APN netModemAuthType=認証タイプ netModemUsername=ユーザネーム @@ -674,8 +670,6 @@ netModemEnableGps=GPSを有効化 netModemToolTipNetworkTopology=適切なネットワークトポロジーを選択してください。 netModemToolTipModemIndentifier=モデムの一意の名称を入力してください。 netModemToolTipModemInterfaceNumber=モデムインターフェースの一意の数字を入力してください。例：

インターフェース0の#は、モデムインターフェースの名称をppp0とする。

インターフェース1の#は、モデムインターフェースの名称をppp2とする。 -netModemToolTipDialString=モデムの接続試行方法についての命令

モデム探知の典型的ダイヤル文字列は：{0} -netModemToolTipDialStringDefault=モデムの接続試行方法についての命令

典型的なダイヤル文字列：
* EVDOモデム > atd#777
* HSPAモデム> atd*99***1#
LTEモデム：
* LE910C1-EU > ATD*99***4#
* LE910C1-AP (Telstra) > ATD*99***1#またはATD*99***5#
* LE910-EU1及びLE910EU-V2 > ATD*99***2#またはATD*99***1# （モデムのパワーサイクルはPDPコンテキスト1を要求する場合があります）
* LE910NA-V2 (AT-T)> ATD*99***1#
* LE910NA-V2 （ワイヤレスバージョン）> ATD*99***3#
* Quectel-EG25 > ATD*99***5#
* 他のモデムまたはモバイルネットワークのオペレーターは、> モデム製造元のドキュメント及びモバイルネットワークオペレーターを確認してください

注意：'#'の前の数字はこの接続に使用されるPDPコンテキストを定義します。

ボタンを押して、存在するPDPプロファイルを表示・選択してください。> atd*99***1#
For LTE Modems:
* LE910C1-EU > ATD*99***4#
* LE910C1-AP (Telstra) > ATD*99***1# or ATD*99***5#
* LE910-EU1 and LE910EU-V2 > ATD*99***2# or ATD*99***1# (modem power cycle may be required for PDP context 1)
* LE910NA-V2 (AT-T) > ATD*99***1#
* LE910NA-V2 (Verizon Wireless) > ATD*99***3#
* Quectel-EG25 > ATD*99***4#
* Other modems or mobile network operators > please consult the documentation of the modem manufacturer and the mobile network operator

NOTE: The number before '#' defines the PDP context to be used for this connection.

Click the button to display/select existing PDP profiles. netModemToolTipApn=モデムアクセスポイントの名称 (オプション パラメーター)。

空のままにすると、この値はモデムが登録されているモバイル ブロードバンド プロバイダーから取得されます。

誤った設定を避けるため、手動で設定することを強くお勧めします。 netModemToolTipAuthentication=モデムの認証タイプを選択してください。 netModemToolTipUsername=ユーザネームを入力してください。