[tr064] Add support for PPP connections (#9222)

* add PPP external IP
* fix connection status
* fix PPP uptime

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

diff --git a/bundles/org.openhab.binding.tr064/README.md b/bundles/org.openhab.binding.tr064/README.md
index d49730bead3e50fe8ebcd7ab5fd10680de8a6aa0..30f762c6a7ec88e432ba135f7e066d7160756aac 100644 (file)
--- a/bundles/org.openhab.binding.tr064/README.md
+++ b/bundles/org.openhab.binding.tr064/README.md
@@ -96,9 +96,12 @@ This is an optional parameter and multiple values are allowed.
 | `tamEnable`                | `Switch`                  |          | Enable/Disable the answering machine with the given index.     |
 | `tamNewMessages`           | `Number`                  |          | The number of new messages of the given answering machine.     |
 | `uptime`                   | `Number:Time`             |          | Uptime                                                         |
+| `pppUptime`                | `Number:Time`             |          | Uptime (if using PPP)                                          |
 | `wanAccessType`            | `String`                  |     x    | Access Type                                                    |
 | `wanConnectionStatus`      | `String`                  |          | Connection Status                                              |
+| `wanPppConnectionStatus`   | `String`                  |          | Connection Status (if using PPP)                               |
 | `wanIpAddress`             | `String`                  |     x    | WAN IP Address                                                 |
+| `wanPppIpAddress`          | `String`                  |     x    | WAN IP Address (if using PPP)                                  |
 | `wanMaxDownstreamRate`     | `Number:DataTransferRate` |     x    | Max. Downstream Rate                                           |
 | `wanMaxUpstreamRate`       | `Number:DataTransferRate` |     x    | Max. Upstream Rate                                             |
 | `wanPhysicalLinkStatus`    | `String`                  |     x    | Link Status                                                    |

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 dfa3a7ca1d6872828211203f9a8a84f1f6723270..91e0a824fa690ba0ca884d51b7615a69ea9cf243 100644 (file)
--- a/bundles/org.openhab.binding.tr064/src/main/resources/channels.xml
+++ b/bundles/org.openhab.binding.tr064/src/main/resources/channels.xml
@@ -244,18 +244,34 @@
                        serviceId="urn:WANIPConnection-com:serviceId:WANIPConnection1"/>
                <getAction name="GetInfo" argument="NewExternalIPAddress"/>
        </channel>
+       <channel name="wanPppIpAddress" label="WAN PPP-IP Address">
+               <item type="String"/>
+               <service deviceType="urn:dslforum-org:device:WANConnectionDevice:1"
+                       serviceId="urn:WANPPPConnection-com:serviceId:WANPPPConnection1"/>
+               <getAction name="GetInfo" argument="NewExternalIPAddress"/>
+       </channel>
        <channel name="wanConnectionStatus" label="Connection Status">
                <item type="String"/>
                <service deviceType="urn:dslforum-org:device:WANConnectionDevice:1"
                        serviceId="urn:WANIPConnection-com:serviceId:WANIPConnection1"/>
                <getAction name="GetInfo" argument="NewConnectionStatus"/>
        </channel>
+       <channel name="wanPppConnectionStatus" label="Connection Status">
+               <item type="String"/>
+               <service deviceType="urn:dslforum-org:device:WANConnectionDevice:1"
+                       serviceId="urn:WANPPPConnection-com:serviceId:WANPPPConnection1"/>
+               <getAction name="GetInfo" argument="NewConnectionStatus"/>
+       </channel>
        <channel name="uptime" label="Uptime">
                <item type="Number:Time" unit="s" statePattern="%d s"/>
                <service deviceType="urn:dslforum-org:device:WANConnectionDevice:1"
                        serviceId="urn:WANIPConnection-com:serviceId:WANIPConnection1"/>
                <getAction name="GetInfo" argument="NewUptime"/>
        </channel>
-
-
+       <channel name="pppUptime" label="Uptime">
+               <item type="Number:Time" unit="s" statePattern="%d s"/>
+               <service deviceType="urn:dslforum-org:device:WANConnectionDevice:1"
+                       serviceId="urn:WANPPPConnection-com:serviceId:WANPPPConnection1"/>
+               <getAction name="GetInfo" argument="NewUptime"/>
+       </channel>
 </channels>