[tr064] fix comment in SOAP request (#9671)

* fix comment in SAOP request
* fix typo in channel-name

Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>

diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/util/Util.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/util/Util.java
index d5884b91a08cd51ca628dc27ca6e716858e759d6..6aa65a13aac45a4a02b4f2c0689bd47f49ce2d78 100644 (file)
--- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/util/Util.java
+++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/util/Util.java
@@ -219,7 +219,8 @@ public class Util {
                             parameters.forEach(parameter -> {
                                 // remove comment: split parameter at '#', discard everything after that and remove
                                 // trailing spaces
-                                String normalizedParameter = UIDUtils.encode(parameter.split("#")[0].trim());
+                                String rawParameter = parameter.split("#")[0].trim();
+                                String normalizedParameter = UIDUtils.encode(rawParameter);
                                 ChannelUID channelUID = new ChannelUID(thing.getUID(),
                                         channelId + "_" + normalizedParameter);
                                 ChannelBuilder channelBuilder = ChannelBuilder
@@ -228,7 +229,7 @@ public class Util {
                                         .withLabel(channelTypeDescription.getLabel() + " " + parameter);
                                 thingBuilder.withChannel(channelBuilder.build());
                                 Tr064ChannelConfig channelConfig1 = new Tr064ChannelConfig(channelConfig);
-                                channelConfig1.setParameter(parameter);
+                                channelConfig1.setParameter(rawParameter);
                                 channels.put(channelUID, channelConfig1);
                             });
                         }

diff --git a/bundles/org.openhab.binding.tr064/src/main/resources/channels.xml b/bundles/org.openhab.binding.tr064/src/main/resources/channels.xml
index 2958727b9afd68ab16038ac96d2521908f504c89..7f705b1ae7f537d1b8d47927aeea11344ab11d9b 100644 (file)
--- a/bundles/org.openhab.binding.tr064/src/main/resources/channels.xml
+++ b/bundles/org.openhab.binding.tr064/src/main/resources/channels.xml
@@ -236,7 +236,7 @@
                        serviceId="urn:WANDSLIfConfig-com:serviceId:WANDSLInterfaceConfig1"/>
                <getAction name="GetInfo" argument="NewDownstreamAttenuation"/>
        </channel>
-       <channel name="dslUpstreamAttentuation" label="DSL Upstream Attenuation">
+       <channel name="dslUpstreamAttenuation" label="DSL Upstream Attenuation">
                <item type="Number:Dimensionless" unit="dB" statePattern="%.1f dB"/>
                <service deviceType="urn:dslforum-org:device:WANDevice:1"
                        serviceId="urn:WANDSLIfConfig-com:serviceId:WANDSLInterfaceConfig1"/>