feat(nm): Modem APN as an optional parameter (#5350)

* Made apn an optional parameter Signed-off-by: pierantoniomerlino <[email protected]> * Fixed nm apn test Signed-off-by: pierantoniomerlino <[email protected]> --------- Signed-off-by: pierantoniomerlino <[email protected]>
eclipse-kura · Sep 12, 2024 · 402e5e6 · 402e5e6
1 parent 634a04c
commit 402e5e6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/....eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/configuration/NMSettingsConverter.java b/....eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/configuration/NMSettingsConverter.java
@@ -425,7 +425,8 @@ private static void configureIp6MethodManual(NetworkProperties props, String dev
         settings.put("address-data", new Variant<>(addressData, "aa{sv}"));
     }
 
-    private static void configureIp6MethodAuto(NetworkProperties props, String deviceId, Map<String, Variant<?>> settings) {
+    private static void configureIp6MethodAuto(NetworkProperties props, String deviceId,
+            Map<String, Variant<?>> settings) {
         settings.put(NM_SETTINGS_IPV6_METHOD, new Variant<>("auto"));
 
         Optional<String> addressGenerationMode = props.getOpt(String.class,
@@ -568,8 +569,8 @@ private static Map<String, Variant<?>> createWPA2WPA3EnterpriseSettings() {
     public static Map<String, Variant<?>> buildGsmSettings(NetworkProperties props, String deviceId) {
         Map<String, Variant<?>> settings = new HashMap<>();
 
-        String apn = props.get(String.class, "net.interface.%s.config.apn", deviceId);
-        settings.put("apn", new Variant<>(apn));
+        Optional<String> apn = props.getOpt(String.class, "net.interface.%s.config.apn", deviceId);
+        apn.ifPresent(apnString -> settings.put("apn", new Variant<>(apnString)));
 
         Optional<String> username = props.getOpt(String.class, "net.interface.%s.config.username", deviceId);
         username.ifPresent(usernameString -> settings.put("username", new Variant<>(usernameString)));

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
@@ -306,11 +306,6 @@ public boolean isValid() {
         if (this.dial.getText() == null || "".equals(this.dial.getText().trim())) {
             this.groupDial.setValidationState(ValidationState.ERROR);
         }
-        if (this.apn.getText() == null || "".equals(this.apn.getText().trim())) {
-            if (this.apn.isEnabled()) {
-                this.groupApn.setValidationState(ValidationState.ERROR);
-            }
-        }
         if (this.maxfail.getText() == null || "".equals(this.maxfail.getText().trim())) {
             this.groupMaxfail.setValidationState(ValidationState.ERROR);
         }
@@ -547,26 +542,15 @@ private void initForm() {
         });
 
         // APN
-        this.labelApn.setText(MSGS.netModemAPN() + "*");
+        this.labelApn.setText(MSGS.netModemAPN());
         this.apn.addMouseOverHandler(event -> {
             if (TabModemUi.this.apn.isEnabled()) {
                 TabModemUi.this.helpText.clear();
                 TabModemUi.this.helpText.add(new Span(MSGS.netModemToolTipApn()));
             }
         });
         this.apn.addMouseOutHandler(event -> resetHelp());
-        this.apn.addValueChangeHandler(event -> {
-            setDirty(true);
-            if (TabModemUi.this.apn.getText() == null || "".equals(TabModemUi.this.apn.getText().trim())) {
-                if (TabModemUi.this.apn.isEnabled()) {
-                    TabModemUi.this.groupApn.setValidationState(ValidationState.ERROR);
-                } else {
-                    TabModemUi.this.groupApn.setValidationState(ValidationState.NONE);
-                }
-            } else {
-                TabModemUi.this.groupApn.setValidationState(ValidationState.NONE);
-            }
-        });
+        this.apn.addValueChangeHandler(event -> setDirty(true));
 
         // AUTH TYPE
         this.labelAuth.setText(MSGS.netModemAuthType());
@@ -672,7 +656,7 @@ private void initForm() {
                 TabModemUi.this.groupMaxfail.setValidationState(ValidationState.NONE);
             }
         });
-        
+
         this.labelHoldoff.setText(MSGS.netModemHoldoff() + "*");
         this.holdoff.addMouseOverHandler(event -> {
             if (TabModemUi.this.holdoff.isEnabled()) {

diff --git a/...kura.nm.test/src/test/java/org/eclipse/kura/nm/configuration/NMSettingsConverterTest.java b/...kura.nm.test/src/test/java/org/eclipse/kura/nm/configuration/NMSettingsConverterTest.java
@@ -1129,12 +1129,12 @@ public void build80211WirelessSecuritySettingsShouldThrowWhenGivenMalformedSecur
     }
 
     @Test
-    public void buildGsmSettingsShouldThrowWithMissingRequiredArgument() {
+    public void buildGsmSettingsShouldNotThrowWithNoArgument() {
         givenNetworkPropsCreatedWithTheMap(this.internetNetworkPropertiesInstanciationMap);
 
         whenBuildGsmSettingsIsRunWith(this.networkProperties, "ttyACM0");
 
-        thenExceptionOccurred(NoSuchElementException.class);
+        thenNoExceptionOccurred();
     }
 
     @Test