feat: removed dial string and pdp from modem UI (#5354)

* feat: removed dial string and pdp from modem UI Signed-off-by: MMaiero <[email protected]> * fix: Aligned cleanup also for Japanese Signed-off-by: MMaiero <[email protected]> * chore: additional cleanup of stale properties Signed-off-by: MMaiero <[email protected]> * chore: Updated copyright headers Signed-off-by: MMaiero <[email protected]> * chore: Updated missed copyright header Signed-off-by: MMaiero <[email protected]> --------- Signed-off-by: MMaiero <[email protected]>
eclipse-kura · Sep 24, 2024 · 65ba195 · 65ba195
1 parent 2a24ff2
commit 65ba195
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 435 deletions.
diff --git a/...rg.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.java b/...rg.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.java
diff --git a/....eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.ui.xml b/....eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabModemUi.ui.xml
@@ -2,7 +2,7 @@
 
 <!--
 
-    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
@@ -94,17 +94,6 @@
                                 <b:TextBox b:id="number"
                                     ui:field="number" />
                             </b:FormGroup>
-
-                            <b:FormGroup ui:field="groupDial">
-                                <b:FormLabel for="dial"
-                                    ui:field="labelDial" />
-                                <util:HelpButton
-                                    ui:field="dialHelp" />
-                                <b:TextBox b:id="dial"
-                                    ui:field="dial" />
-                                <b:Button ui:field="buttonPdp"
-                                    icon="SEARCH" iconFixedWidth="true" />
-                            </b:FormGroup>
 
                             <b:FormGroup ui:field="groupApn">
                                 <b:FormLabel for="apn"
@@ -254,28 +243,5 @@
             </b:Column>
         </b:Column>
 
-        <!-- Modem (PDP) Modal -->
-        <b:Modal closable="true" dataKeyboard="true" ui:field="pdpModal" b:id="pdpModal">
-            <b:ModalBody>
-                <b:Panel>
-                    <b:PanelHeader ui:field="pdpTitle" />
-                    <b:PanelBody addStyleNames='{style.scrollable}'>
-                        <gwt:CellTable bordered="true"
-                            condensed="true" striped="true" hover="true"
-                            ui:field="pdpGrid" />
-                        <b:Alert type="INFO" ui:field="searching">
-                            <b.html:Text ui:field="searchingText" />
-                        </b:Alert>
-                        <b:Alert type="WARNING" ui:field="noPdp">
-                            <b.html:Text ui:field="noPdpText" />
-                        </b:Alert>
-                        <b:Alert type="DANGER" ui:field="pdpFail">
-                            <b.html:Text ui:field="pdpFailText" />
-                        </b:Alert>
-                    </b:PanelBody>
-                </b:Panel>
-            </b:ModalBody>
-        </b:Modal>
-
     </b:Container>
 </ui:UiBinder> 
diff --git a/...rg.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtNetworkServiceImpl.java b/...rg.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<GwtWifiHotspotEntry> findWifiHotspots(GwtXSRFToken xsrfToken, S
             throw new GwtKuraException(GwtKuraErrorCode.INTERNAL_ERROR, e);
         }
     }
-
-    @Override
-    public List<GwtModemPdpEntry> 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/...ain/java/org/eclipse/kura/web/server/net2/configuration/GwtNetInterfaceConfigBuilder.java b/...ain/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/...ipse/kura/web/server/net2/configuration/NetworkConfigurationServicePropertiesBuilder.java b/...ipse/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/...g.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/utils/EnumsParser.java b/...g.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> gwtModemAuthType) {
         return AuthType.NONE.name();
     }
 
-    /**
-     * Converts values of {@link PdpType} to {@link GwtModemPdpType}
-     * 
-     */
-    public static GwtModemPdpType getGwtModemPdpType(Optional<String> 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> 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/...se.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemInterfaceConfig.java b/...se.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/...g.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemPdpEntry.java b/...g.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemPdpEntry.java
diff --git a/...rg.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemPdpType.java b/...rg.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/model/GwtModemPdpType.java
diff --git a/...clipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtNetworkService.java b/...clipse.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<GwtWifiChannelFrequency> findFrequencies(GwtXSRFToken xsrfToken, Str
     public boolean verifyWifiCredentials(GwtXSRFToken xsrfToken, String interfaceName, GwtWifiConfig gwtWifiConfig)
             throws GwtKuraException;
 
-    public List<GwtModemPdpEntry> findPdpContextInfo(GwtXSRFToken xsrfToken, String interfaceName)
-            throws GwtKuraException;
-
     public boolean isIEEE80211ACSupported(GwtXSRFToken xsrfToken, String ifaceName) throws GwtKuraException;
 
     public List<String> getDhcpLeases(GwtXSRFToken xsrfToken, String interfaceName) throws GwtKuraException;

diff --git a/...pse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties b/...pse.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: <br><br>An Interface # of 0 would name the modem interface ppp0<br><br>An Interface # of 1 would name the modem interface ppp1
-netModemToolTipDialString=Instructions for how the modem should attempt to connect.<br><br>A typical dial string for the detected modem is: <b>{0}</b>
-netModemToolTipDialStringDefault=Instructions for how the modem should attempt to connect.<br><br>Typical dial strings are:<br>* EVDO Modems => <b>atd#777</b><br>* HSPA Modems => <b>atd*99***1#</b><br>For LTE Modems: <br>* LE910C1-EU => <b>ATD*99***4#</b><br>* LE910C1-AP (Telstra) => <b>ATD*99***1# or ATD*99***5#</b><br>* LE910-EU1 and LE910EU-V2 => <b>ATD*99***2# or ATD*99***1# (modem power cycle may be required for PDP context 1)</b><br>* LE910NA-V2 (AT&T) => <b>ATD*99***1#</b><br>* LE910NA-V2 (Verizon Wireless) => <b>ATD*99***3#</b><br>* Quectel-EG25 => <b>ATD*99***4#</b><br>* Other modems or mobile network operators => <b>please consult the documentation of the modem manufacturer and the mobile network operator</b><br><br>NOTE: The number before '#' defines the PDP context to be used for this connection.<br><br>Click the button to display/select existing PDP profiles. 
 netModemToolTipApn=Modem access point name (Optional parameter).<br><br>If left empty this value will be picked up from the Mobile Broadband Provider the modem is registered to.<br><br>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.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages_ja.properties b/....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=アクセスポイントの結合に失敗しました。<br>パスワード認証に失敗しました。
@@ -653,7 +650,6 @@ netModemConnectionType=接続タイプ
 netModemInterfaceNum=インターフェース #
 netModemInvalidInterfaceNum=インターフェースナンバーは0か正の整数である必要があります。
 netModemIdentifier=モデム識別子
-netModemDialString=ダイヤル文字列
 netModemAPN=APN
 netModemAuthType=認証タイプ
 netModemUsername=ユーザネーム
@@ -674,8 +670,6 @@ netModemEnableGps=GPSを有効化
 netModemToolTipNetworkTopology=適切なネットワークトポロジーを選択してください。
 netModemToolTipModemIndentifier=モデムの一意の名称を入力してください。
 netModemToolTipModemInterfaceNumber=モデムインターフェースの一意の数字を入力してください。例：<br><br>インターフェース0の#は、モデムインターフェースの名称をppp0とする。<br><br>インターフェース1の#は、モデムインターフェースの名称をppp2とする。
-netModemToolTipDialString=モデムの接続試行方法についての命令<br><br>モデム探知の典型的ダイヤル文字列は：<b>{0}</b>
-netModemToolTipDialStringDefault=モデムの接続試行方法についての命令<br><br>典型的なダイヤル文字列：<br>* EVDOモデム > <b>atd#777</b><br>* HSPAモデム> <b>atd*99***1#</b><br>LTEモデム： <br>* LE910C1-EU > <b>ATD*99***4#</b><br>* LE910C1-AP (Telstra) > <b>ATD*99***1#またはATD*99***5#</b><br>* LE910-EU1及びLE910EU-V2 > <b>ATD*99***2#またはATD*99***1# （モデムのパワーサイクルはPDPコンテキスト1を要求する場合があります）</b><br>* LE910NA-V2 (AT-T)> <b>ATD*99***1#</b><br>* LE910NA-V2 （ワイヤレスバージョン）> <b>ATD*99***3#</b><br>* Quectel-EG25 > <b>ATD*99***5#</b><br>* 他のモデムまたはモバイルネットワークのオペレーターは、> <b>モデム製造元のドキュメント及びモバイルネットワークオペレーターを確認してください</b><br><br>注意：'#'の前の数字はこの接続に使用されるPDPコンテキストを定義します。<br><br>ボタンを押して、存在するPDPプロファイルを表示・選択してください。> <b>atd*99***1#</b><br>For LTE Modems: <br>* LE910C1-EU > <b>ATD*99***4#</b><br>* LE910C1-AP (Telstra) > <b>ATD*99***1# or ATD*99***5#</b><br>* LE910-EU1 and LE910EU-V2 > <b>ATD*99***2# or ATD*99***1# (modem power cycle may be required for PDP context 1)</b><br>* LE910NA-V2 (AT-T) > <b>ATD*99***1#</b><br>* LE910NA-V2 (Verizon Wireless) > <b>ATD*99***3#</b><br>* Quectel-EG25 > <b>ATD*99***4#</b><br>* Other modems or mobile network operators > <b>please consult the documentation of the modem manufacturer and the mobile network operator</b><br><br>NOTE: The number before '#' defines the PDP context to be used for this connection.<br><br>Click the button to display/select existing PDP profiles. 
 netModemToolTipApn=モデムアクセスポイントの名称 (オプション パラメーター)。<br><br>空のままにすると、この値はモデムが登録されているモバイル ブロードバンド プロバイダーから取得されます。<br><br>誤った設定を避けるため、手動で設定することを強くお勧めします。
 netModemToolTipAuthentication=モデムの認証タイプを選択してください。
 netModemToolTipUsername=ユーザネームを入力してください。