diff --git a/drivers/ciena/waveserverai/src/test/resources/response/discoverDeviceDetails.xml b/drivers/ciena/waveserverai/src/test/resources/response/discoverDeviceDetails.xml
new file mode 100644
index 0000000..1741218
--- /dev/null
+++ b/drivers/ciena/waveserverai/src/test/resources/response/discoverDeviceDetails.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rpc-reply>
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"
+      xmlns:ncx="http://netconfcentral.org/ns/yuma-ncx">
+    <waveserver-chassis xmlns="urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-chassis">
+        <identification>
+            <type>waveserver chassis</type>
+            <model>Waveserver Ai Chassis</model>
+            <description>Waveserver Ai Chassis 3-slot, 1RU</description>
+            <serial-number>M000</serial-number>
+            <part-number>186-1010-900</part-number>
+            <revision>001</revision>
+            <manufacture-date>05032017</manufacture-date>
+        </identification>
+        <mac-addresses>
+            <chassis>
+                <base>00:23:8a:fa:45:52</base>
+                <block-size>5</block-size>
+            </chassis>
+        </mac-addresses>
+    </waveserver-chassis>
+    <waveserver-software xmlns="urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-software">
+        <status>
+            <software-operational-state>normal</software-operational-state>
+            <upgrade-operational-state>idle</upgrade-operational-state>
+            <committed-version>waveserver-1.1.0.302</committed-version>
+            <active-version>waveserver-1.1.0.302</active-version>
+            <upgrade-to-version/>
+            <last-operation/>
+            <upgrade-log>https://10.132.241.91/upgrade_log/sw.log</upgrade-log>
+        </status>
+    </waveserver-software>
+    <waveserver-system xmlns="urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-system">
+        <host-name>
+            <current-host-name>hostnameWaveServer</current-host-name>
+            <config-host-name>hostnameWaveServer</config-host-name>
+            <dhcp-host-name/>
+        </host-name>
+    </waveserver-system>
+</data>
+</rpc-reply>
\ No newline at end of file
diff --git a/drivers/ciena/waveserverai/src/test/resources/response/discoverLldp.xml b/drivers/ciena/waveserverai/src/test/resources/response/discoverLldp.xml
new file mode 100644
index 0000000..f69083e
--- /dev/null
+++ b/drivers/ciena/waveserverai/src/test/resources/response/discoverLldp.xml
@@ -0,0 +1,728 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rpc-reply>
+<data>
+    <waveserver-lldp xmlns="urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-lldp">
+        <chassis>
+            <state>
+                <admin-state>enabled</admin-state>
+                <notification-interval>5</notification-interval>
+            </state>
+            <id>
+            </id>
+            <time-to-live>0</time-to-live>
+            <system-capabilities>
+                <capabilities/>
+                <capability-enabled/>
+            </system-capabilities>
+            <local-management-address-table>
+                <address-table>
+                    <index>0</index>
+                    <address>10.184.165.44</address>
+                    <subtype>ipv4</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </address-table>
+                <address-table>
+                    <index>1</index>
+                    <address>2620:11b:d06d:f113:eeb0:e1ff:fe17:ac20</address>
+                    <subtype>ipv6</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </address-table>
+            </local-management-address-table>
+            <statistics>
+            </statistics>
+        </chassis>
+        <port>
+            <port-id>3-1</port-id>
+            <properties>
+                <mode>disabled</mode>
+                <notification>off</notification>
+            </properties>
+            <statistics>
+                <out-packets-total>0</out-packets-total>
+                <in-packets-total>0</in-packets-total>
+                <in-err-packets-discarded>0</in-err-packets-discarded>
+                <in-errored-tlv>0</in-errored-tlv>
+                <tlv-discarded>0</tlv-discarded>
+                <unknown-tlv>0</unknown-tlv>
+                <aged-out-total>0</aged-out-total>
+            </statistics>
+            <local>
+                <id>
+                    <id>3/1</id>
+                    <sub-type>interface-alias</sub-type>
+                    <descriptor/>
+                </id>
+                <specification-802-3>
+                    <mac-physical-config>
+                        <auto-negotiation-support>not-supported</auto-negotiation-support>
+                        <auto-negotiation-status>enabled</auto-negotiation-status>
+                        <pmd-auto-negotiation-advertised-capability>b-full-duplex-pause</pmd-auto-negotiation-advertised-capability>
+                        <operational-mau-type>unknown</operational-mau-type>
+                    </mac-physical-config>
+                    <power-via-mdi>
+                        <port-class>pd</port-class>
+                        <mdi>not-supported</mdi>
+                        <mdi-power-support>disabled</mdi-power-support>
+                        <pair-control>cannot</pair-control>
+                        <power-pair>not-support</power-pair>
+                        <power-class>not-support</power-class>
+                    </power-via-mdi>
+                    <max-frame-size>0</max-frame-size>
+                </specification-802-3>
+                <local-management-address-table>
+                    <index>0</index>
+                    <address>10.184.165.44</address>
+                    <subtype>ipv4</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+                <local-management-address-table>
+                    <index>1</index>
+                    <address>2620:11b:d06d:f113:eeb0:e1ff:fe17:ac20</address>
+                    <subtype>ipv6</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+            </local>
+            <remote>
+                <chassis>
+                    <chassis-id>
+                        <chassis-id-subtype>unknown</chassis-id-subtype>
+                        <system-name/>
+                        <system-description/>
+                    </chassis-id>
+                    <time-to-live>0</time-to-live>
+                    <system-capabilities>
+                        <capabilities/>
+                        <capability-enabled/>
+                    </system-capabilities>
+                    <management-address-table>
+                        <index>0</index>
+                        <address/>
+                        <subtype>reserved</subtype>
+                        <interface-subtype>unknown</interface-subtype>
+                        <oid-if-number>0</oid-if-number>
+                        <oid/>
+                    </management-address-table>
+                </chassis>
+                <port>
+                    <id>
+                        <id/>
+                        <sub-type>unknown</sub-type>
+                        <descriptor/>
+                    </id>
+                    <specification-802-3>
+                        <mac-physical-config>
+                            <auto-negotiation-support>not-supported</auto-negotiation-support>
+                            <auto-negotiation-status>disabled</auto-negotiation-status>
+                            <pmd-auto-negotiation-advertised-capability>unknown</pmd-auto-negotiation-advertised-capability>
+                            <operational-mau-type>unknown</operational-mau-type>
+                        </mac-physical-config>
+                        <power-via-mdi>
+                            <port-class>pd</port-class>
+                            <mdi>not-supported</mdi>
+                            <mdi-power-support>disabled</mdi-power-support>
+                            <pair-control>cannot</pair-control>
+                            <power-pair>not-support</power-pair>
+                            <power-class>not-support</power-class>
+                        </power-via-mdi>
+                        <max-frame-size>0</max-frame-size>
+                    </specification-802-3>
+                    <organization-definition-information-table>
+                        <index>0</index>
+                        <oui/>
+                        <subtype>0</subtype>
+                        <information/>
+                    </organization-definition-information-table>
+                    <unrecognized-tlv-table>
+                        <index>0</index>
+                        <type>0</type>
+                        <length>0</length>
+                        <value/>
+                    </unrecognized-tlv-table>
+                </port>
+            </remote>
+        </port>
+        <port>
+            <port-id>3-2</port-id>
+            <properties>
+                <mode>disabled</mode>
+                <notification>off</notification>
+            </properties>
+            <statistics>
+                <out-packets-total>0</out-packets-total>
+                <in-packets-total>0</in-packets-total>
+                <in-err-packets-discarded>0</in-err-packets-discarded>
+                <in-errored-tlv>0</in-errored-tlv>
+                <tlv-discarded>0</tlv-discarded>
+                <unknown-tlv>0</unknown-tlv>
+                <aged-out-total>0</aged-out-total>
+            </statistics>
+            <local>
+                <id>
+                    <id>3/2</id>
+                    <sub-type>interface-alias</sub-type>
+                    <descriptor/>
+                </id>
+                <specification-802-3>
+                    <mac-physical-config>
+                        <auto-negotiation-support>not-supported</auto-negotiation-support>
+                        <auto-negotiation-status>enabled</auto-negotiation-status>
+                        <pmd-auto-negotiation-advertised-capability>b-full-duplex-pause</pmd-auto-negotiation-advertised-capability>
+                        <operational-mau-type>unknown</operational-mau-type>
+                    </mac-physical-config>
+                    <power-via-mdi>
+                        <port-class>pd</port-class>
+                        <mdi>not-supported</mdi>
+                        <mdi-power-support>disabled</mdi-power-support>
+                        <pair-control>cannot</pair-control>
+                        <power-pair>not-support</power-pair>
+                        <power-class>not-support</power-class>
+                    </power-via-mdi>
+                    <max-frame-size>0</max-frame-size>
+                </specification-802-3>
+                <local-management-address-table>
+                    <index>0</index>
+                    <address>10.184.165.44</address>
+                    <subtype>ipv4</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+                <local-management-address-table>
+                    <index>1</index>
+                    <address>2620:11b:d06d:f113:eeb0:e1ff:fe17:ac20</address>
+                    <subtype>ipv6</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+            </local>
+            <remote>
+                <chassis>
+                    <chassis-id>
+                        <chassis-id-subtype>unknown</chassis-id-subtype>
+                        <system-name/>
+                        <system-description/>
+                    </chassis-id>
+                    <time-to-live>0</time-to-live>
+                    <system-capabilities>
+                        <capabilities/>
+                        <capability-enabled/>
+                    </system-capabilities>
+                    <management-address-table>
+                        <index>0</index>
+                        <address/>
+                        <subtype>reserved</subtype>
+                        <interface-subtype>unknown</interface-subtype>
+                        <oid-if-number>0</oid-if-number>
+                        <oid/>
+                    </management-address-table>
+                </chassis>
+                <port>
+                    <id>
+                        <id/>
+                        <sub-type>unknown</sub-type>
+                        <descriptor/>
+                    </id>
+                    <specification-802-3>
+                        <mac-physical-config>
+                            <auto-negotiation-support>not-supported</auto-negotiation-support>
+                            <auto-negotiation-status>disabled</auto-negotiation-status>
+                            <pmd-auto-negotiation-advertised-capability>unknown</pmd-auto-negotiation-advertised-capability>
+                            <operational-mau-type>unknown</operational-mau-type>
+                        </mac-physical-config>
+                        <power-via-mdi>
+                            <port-class>pd</port-class>
+                            <mdi>not-supported</mdi>
+                            <mdi-power-support>disabled</mdi-power-support>
+                            <pair-control>cannot</pair-control>
+                            <power-pair>not-support</power-pair>
+                            <power-class>not-support</power-class>
+                        </power-via-mdi>
+                        <max-frame-size>0</max-frame-size>
+                    </specification-802-3>
+                    <organization-definition-information-table>
+                        <index>0</index>
+                        <oui/>
+                        <subtype>0</subtype>
+                        <information/>
+                    </organization-definition-information-table>
+                    <unrecognized-tlv-table>
+                        <index>0</index>
+                        <type>0</type>
+                        <length>0</length>
+                        <value/>
+                    </unrecognized-tlv-table>
+                </port>
+            </remote>
+        </port>
+        <port>
+            <port-id>3-3</port-id>
+            <properties>
+                <mode>snoop</mode>
+                <notification>off</notification>
+            </properties>
+            <statistics>
+                <out-packets-total>0</out-packets-total>
+                <in-packets-total>3745</in-packets-total>
+                <in-err-packets-discarded>0</in-err-packets-discarded>
+                <in-errored-tlv>0</in-errored-tlv>
+                <tlv-discarded>0</tlv-discarded>
+                <unknown-tlv>0</unknown-tlv>
+                <aged-out-total>4</aged-out-total>
+            </statistics>
+            <local>
+                <id>
+                    <id>3/3</id>
+                    <sub-type>interface-alias</sub-type>
+                    <descriptor>100 Gig Ethernet Port</descriptor>
+                </id>
+                <specification-802-3>
+                    <mac-physical-config>
+                        <auto-negotiation-support>not-supported</auto-negotiation-support>
+                        <auto-negotiation-status>enabled</auto-negotiation-status>
+                        <pmd-auto-negotiation-advertised-capability>b-full-duplex-pause</pmd-auto-negotiation-advertised-capability>
+                        <operational-mau-type>unknown</operational-mau-type>
+                    </mac-physical-config>
+                    <power-via-mdi>
+                        <port-class>pd</port-class>
+                        <mdi>not-supported</mdi>
+                        <mdi-power-support>disabled</mdi-power-support>
+                        <pair-control>cannot</pair-control>
+                        <power-pair>not-support</power-pair>
+                        <power-class>not-support</power-class>
+                    </power-via-mdi>
+                    <max-frame-size>0</max-frame-size>
+                </specification-802-3>
+                <local-management-address-table>
+                    <index>0</index>
+                    <address>10.184.165.44</address>
+                    <subtype>ipv4</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+                <local-management-address-table>
+                    <index>1</index>
+                    <address>2620:11b:d06d:f113:eeb0:e1ff:fe17:ac20</address>
+                    <subtype>ipv6</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+            </local>
+            <remote>
+                <chassis>
+                    <chassis-id>
+                        <chassis-id> 0x1C1161CF4280</chassis-id>
+                        <chassis-id-subtype>mac-address</chassis-id-subtype>
+                        <system-name>5170-S3</system-name>
+                        <system-description>CN5170</system-description>
+                    </chassis-id>
+                    <time-to-live>120</time-to-live>
+                    <system-capabilities>
+                        <capabilities/>
+                        <capability-enabled/>
+                    </system-capabilities>
+                    <management-address-table>
+                        <index>0</index>
+                        <address/>
+                        <subtype>reserved</subtype>
+                        <interface-subtype>unknown</interface-subtype>
+                        <oid-if-number>0</oid-if-number>
+                        <oid/>
+                    </management-address-table>
+                </chassis>
+                <port>
+                    <id>
+                        <id>41</id>
+                        <sub-type>interface-name</sub-type>
+                        <descriptor>QSFP28 100 Gig Ethernet Port</descriptor>
+                    </id>
+                    <specification-802-3>
+                        <mac-physical-config>
+                            <auto-negotiation-support>not-supported</auto-negotiation-support>
+                            <auto-negotiation-status>disabled</auto-negotiation-status>
+                            <pmd-auto-negotiation-advertised-capability>unknown</pmd-auto-negotiation-advertised-capability>
+                            <operational-mau-type>unknown</operational-mau-type>
+                        </mac-physical-config>
+                        <power-via-mdi>
+                            <port-class>pd</port-class>
+                            <mdi>not-supported</mdi>
+                            <mdi-power-support>disabled</mdi-power-support>
+                            <pair-control>cannot</pair-control>
+                            <power-pair>not-support</power-pair>
+                            <power-class>not-support</power-class>
+                        </power-via-mdi>
+                        <max-frame-size>1526</max-frame-size>
+                    </specification-802-3>
+                    <organization-definition-information-table>
+                        <index>0</index>
+                        <oui/>
+                        <subtype>0</subtype>
+                        <information/>
+                    </organization-definition-information-table>
+                    <unrecognized-tlv-table>
+                        <index>0</index>
+                        <type>0</type>
+                        <length>0</length>
+                        <value/>
+                    </unrecognized-tlv-table>
+                </port>
+            </remote>
+        </port>
+        <port>
+            <port-id>3-4</port-id>
+            <properties>
+                <mode>snoop</mode>
+                <notification>off</notification>
+            </properties>
+            <statistics>
+                <out-packets-total>0</out-packets-total>
+                <in-packets-total>3736</in-packets-total>
+                <in-err-packets-discarded>0</in-err-packets-discarded>
+                <in-errored-tlv>0</in-errored-tlv>
+                <tlv-discarded>0</tlv-discarded>
+                <unknown-tlv>0</unknown-tlv>
+                <aged-out-total>4</aged-out-total>
+            </statistics>
+            <local>
+                <id>
+                    <id>3/4</id>
+                    <sub-type>interface-alias</sub-type>
+                    <descriptor>100 Gig Ethernet Port</descriptor>
+                </id>
+                <specification-802-3>
+                    <mac-physical-config>
+                        <auto-negotiation-support>not-supported</auto-negotiation-support>
+                        <auto-negotiation-status>enabled</auto-negotiation-status>
+                        <pmd-auto-negotiation-advertised-capability>b-full-duplex-pause</pmd-auto-negotiation-advertised-capability>
+                        <operational-mau-type>unknown</operational-mau-type>
+                    </mac-physical-config>
+                    <power-via-mdi>
+                        <port-class>pd</port-class>
+                        <mdi>not-supported</mdi>
+                        <mdi-power-support>disabled</mdi-power-support>
+                        <pair-control>cannot</pair-control>
+                        <power-pair>not-support</power-pair>
+                        <power-class>not-support</power-class>
+                    </power-via-mdi>
+                    <max-frame-size>0</max-frame-size>
+                </specification-802-3>
+                <local-management-address-table>
+                    <index>0</index>
+                    <address>10.184.165.44</address>
+                    <subtype>ipv4</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+                <local-management-address-table>
+                    <index>1</index>
+                    <address>2620:11b:d06d:f113:eeb0:e1ff:fe17:ac20</address>
+                    <subtype>ipv6</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+            </local>
+            <remote>
+                <chassis>
+                    <chassis-id>
+                        <chassis-id> 0x1C1161CF4280</chassis-id>
+                        <chassis-id-subtype>mac-address</chassis-id-subtype>
+                        <system-name>5170-S3</system-name>
+                        <system-description>CN5170</system-description>
+                    </chassis-id>
+                    <time-to-live>120</time-to-live>
+                    <system-capabilities>
+                        <capabilities/>
+                        <capability-enabled/>
+                    </system-capabilities>
+                    <management-address-table>
+                        <index>0</index>
+                        <address/>
+                        <subtype>reserved</subtype>
+                        <interface-subtype>unknown</interface-subtype>
+                        <oid-if-number>0</oid-if-number>
+                        <oid/>
+                    </management-address-table>
+                </chassis>
+                <port>
+                    <id>
+                        <id>43</id>
+                        <sub-type>interface-name</sub-type>
+                        <descriptor>QSFP28 100 Gig Ethernet Port</descriptor>
+                    </id>
+                    <specification-802-3>
+                        <mac-physical-config>
+                            <auto-negotiation-support>not-supported</auto-negotiation-support>
+                            <auto-negotiation-status>disabled</auto-negotiation-status>
+                            <pmd-auto-negotiation-advertised-capability>unknown</pmd-auto-negotiation-advertised-capability>
+                            <operational-mau-type>unknown</operational-mau-type>
+                        </mac-physical-config>
+                        <power-via-mdi>
+                            <port-class>pd</port-class>
+                            <mdi>not-supported</mdi>
+                            <mdi-power-support>disabled</mdi-power-support>
+                            <pair-control>cannot</pair-control>
+                            <power-pair>not-support</power-pair>
+                            <power-class>not-support</power-class>
+                        </power-via-mdi>
+                        <max-frame-size>1526</max-frame-size>
+                    </specification-802-3>
+                    <organization-definition-information-table>
+                        <index>0</index>
+                        <oui/>
+                        <subtype>0</subtype>
+                        <information/>
+                    </organization-definition-information-table>
+                    <unrecognized-tlv-table>
+                        <index>0</index>
+                        <type>0</type>
+                        <length>0</length>
+                        <value/>
+                    </unrecognized-tlv-table>
+                </port>
+            </remote>
+        </port>
+        <port>
+            <port-id>3-5</port-id>
+            <properties>
+                <mode>snoop</mode>
+                <notification>off</notification>
+            </properties>
+            <statistics>
+                <out-packets-total>0</out-packets-total>
+                <in-packets-total>3744</in-packets-total>
+                <in-err-packets-discarded>0</in-err-packets-discarded>
+                <in-errored-tlv>0</in-errored-tlv>
+                <tlv-discarded>0</tlv-discarded>
+                <unknown-tlv>0</unknown-tlv>
+                <aged-out-total>3</aged-out-total>
+            </statistics>
+            <local>
+                <id>
+                    <id>3/5</id>
+                    <sub-type>interface-alias</sub-type>
+                    <descriptor>100 Gig Ethernet Port</descriptor>
+                </id>
+                <specification-802-3>
+                    <mac-physical-config>
+                        <auto-negotiation-support>not-supported</auto-negotiation-support>
+                        <auto-negotiation-status>enabled</auto-negotiation-status>
+                        <pmd-auto-negotiation-advertised-capability>b-full-duplex-pause</pmd-auto-negotiation-advertised-capability>
+                        <operational-mau-type>unknown</operational-mau-type>
+                    </mac-physical-config>
+                    <power-via-mdi>
+                        <port-class>pd</port-class>
+                        <mdi>not-supported</mdi>
+                        <mdi-power-support>disabled</mdi-power-support>
+                        <pair-control>cannot</pair-control>
+                        <power-pair>not-support</power-pair>
+                        <power-class>not-support</power-class>
+                    </power-via-mdi>
+                    <max-frame-size>0</max-frame-size>
+                </specification-802-3>
+                <local-management-address-table>
+                    <index>0</index>
+                    <address>10.184.165.44</address>
+                    <subtype>ipv4</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+                <local-management-address-table>
+                    <index>1</index>
+                    <address>2620:11b:d06d:f113:eeb0:e1ff:fe17:ac20</address>
+                    <subtype>ipv6</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+            </local>
+            <remote>
+                <chassis>
+                    <chassis-id>
+                        <chassis-id> 0x1C1161CF4280</chassis-id>
+                        <chassis-id-subtype>mac-address</chassis-id-subtype>
+                        <system-name>5170-S3</system-name>
+                        <system-description>CN5170</system-description>
+                    </chassis-id>
+                    <time-to-live>120</time-to-live>
+                    <system-capabilities>
+                        <capabilities/>
+                        <capability-enabled/>
+                    </system-capabilities>
+                    <management-address-table>
+                        <index>0</index>
+                        <address/>
+                        <subtype>reserved</subtype>
+                        <interface-subtype>unknown</interface-subtype>
+                        <oid-if-number>0</oid-if-number>
+                        <oid/>
+                    </management-address-table>
+                </chassis>
+                <port>
+                    <id>
+                        <id>42</id>
+                        <sub-type>interface-name</sub-type>
+                        <descriptor>QSFP28 100 Gig Ethernet Port</descriptor>
+                    </id>
+                    <specification-802-3>
+                        <mac-physical-config>
+                            <auto-negotiation-support>not-supported</auto-negotiation-support>
+                            <auto-negotiation-status>disabled</auto-negotiation-status>
+                            <pmd-auto-negotiation-advertised-capability>unknown</pmd-auto-negotiation-advertised-capability>
+                            <operational-mau-type>unknown</operational-mau-type>
+                        </mac-physical-config>
+                        <power-via-mdi>
+                            <port-class>pd</port-class>
+                            <mdi>not-supported</mdi>
+                            <mdi-power-support>disabled</mdi-power-support>
+                            <pair-control>cannot</pair-control>
+                            <power-pair>not-support</power-pair>
+                            <power-class>not-support</power-class>
+                        </power-via-mdi>
+                        <max-frame-size>1526</max-frame-size>
+                    </specification-802-3>
+                    <organization-definition-information-table>
+                        <index>0</index>
+                        <oui/>
+                        <subtype>0</subtype>
+                        <information/>
+                    </organization-definition-information-table>
+                    <unrecognized-tlv-table>
+                        <index>0</index>
+                        <type>0</type>
+                        <length>0</length>
+                        <value/>
+                    </unrecognized-tlv-table>
+                </port>
+            </remote>
+        </port>
+        <port>
+            <port-id>3-7</port-id>
+            <properties>
+                <mode>snoop</mode>
+                <notification>off</notification>
+            </properties>
+            <statistics>
+                <out-packets-total>0</out-packets-total>
+                <in-packets-total>3735</in-packets-total>
+                <in-err-packets-discarded>0</in-err-packets-discarded>
+                <in-errored-tlv>0</in-errored-tlv>
+                <tlv-discarded>0</tlv-discarded>
+                <unknown-tlv>0</unknown-tlv>
+                <aged-out-total>4</aged-out-total>
+            </statistics>
+            <local>
+                <id>
+                    <id>3/7</id>
+                    <sub-type>interface-alias</sub-type>
+                    <descriptor>100 Gig Ethernet Port</descriptor>
+                </id>
+                <specification-802-3>
+                    <mac-physical-config>
+                        <auto-negotiation-support>not-supported</auto-negotiation-support>
+                        <auto-negotiation-status>enabled</auto-negotiation-status>
+                        <pmd-auto-negotiation-advertised-capability>b-full-duplex-pause</pmd-auto-negotiation-advertised-capability>
+                        <operational-mau-type>unknown</operational-mau-type>
+                    </mac-physical-config>
+                    <power-via-mdi>
+                        <port-class>pd</port-class>
+                        <mdi>not-supported</mdi>
+                        <mdi-power-support>disabled</mdi-power-support>
+                        <pair-control>cannot</pair-control>
+                        <power-pair>not-support</power-pair>
+                        <power-class>not-support</power-class>
+                    </power-via-mdi>
+                    <max-frame-size>0</max-frame-size>
+                </specification-802-3>
+                <local-management-address-table>
+                    <index>0</index>
+                    <address>10.184.165.44</address>
+                    <subtype>ipv4</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+                <local-management-address-table>
+                    <index>1</index>
+                    <address>2620:11b:d06d:f113:eeb0:e1ff:fe17:ac20</address>
+                    <subtype>ipv6</subtype>
+                    <interface-subtype>if-index</interface-subtype>
+                    <oid-if-number>1</oid-if-number>
+                    <oid>1.3.6.1.2.1.2.2.1.1.1</oid>
+                </local-management-address-table>
+            </local>
+            <remote>
+                <chassis>
+                    <chassis-id>
+                        <chassis-id> 0x1C1161D07180</chassis-id>
+                        <chassis-id-subtype>mac-address</chassis-id-subtype>
+                        <system-name>5170-S4</system-name>
+                        <system-description>CN5170</system-description>
+                    </chassis-id>
+                    <time-to-live>120</time-to-live>
+                    <system-capabilities>
+                        <capabilities/>
+                        <capability-enabled/>
+                    </system-capabilities>
+                    <management-address-table>
+                        <index>0</index>
+                        <address/>
+                        <subtype>reserved</subtype>
+                        <interface-subtype>unknown</interface-subtype>
+                        <oid-if-number>0</oid-if-number>
+                        <oid/>
+                    </management-address-table>
+                </chassis>
+                <port>
+                    <id>
+                        <id>41</id>
+                        <sub-type>interface-name</sub-type>
+                        <descriptor>QSFP28 100 Gig Ethernet Port</descriptor>
+                    </id>
+                    <specification-802-3>
+                        <mac-physical-config>
+                            <auto-negotiation-support>not-supported</auto-negotiation-support>
+                            <auto-negotiation-status>disabled</auto-negotiation-status>
+                            <pmd-auto-negotiation-advertised-capability>unknown</pmd-auto-negotiation-advertised-capability>
+                            <operational-mau-type>unknown</operational-mau-type>
+                        </mac-physical-config>
+                        <power-via-mdi>
+                            <port-class>pd</port-class>
+                            <mdi>not-supported</mdi>
+                            <mdi-power-support>disabled</mdi-power-support>
+                            <pair-control>cannot</pair-control>
+                            <power-pair>not-support</power-pair>
+                            <power-class>not-support</power-class>
+                        </power-via-mdi>
+                        <max-frame-size>1526</max-frame-size>
+                    </specification-802-3>
+                    <organization-definition-information-table>
+                        <index>0</index>
+                        <oui/>
+                        <subtype>0</subtype>
+                        <information/>
+                    </organization-definition-information-table>
+                    <unrecognized-tlv-table>
+                        <index>0</index>
+                        <type>0</type>
+                        <length>0</length>
+                        <value/>
+                    </unrecognized-tlv-table>
+                </port>
+            </remote>
+        </port>
+    </waveserver-lldp>
+</data>
+</rpc-reply>
\ No newline at end of file
diff --git a/drivers/ciena/waveserverai/src/test/resources/response/discoverPortDetails.xml b/drivers/ciena/waveserverai/src/test/resources/response/discoverPortDetails.xml
new file mode 100644
index 0000000..b171159
--- /dev/null
+++ b/drivers/ciena/waveserverai/src/test/resources/response/discoverPortDetails.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rpc-reply>
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"
+      xmlns:ncx="http://netconfcentral.org/ns/yuma-ncx">
+    <waveserver-ports xmlns="urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-port">
+        <ports>
+            <port-id>1-1</port-id>
+            <id>
+                <name>1/1</name>
+                <label/>
+                <type>otn</type>
+                <rate>unknown</rate>
+                <speed>421.0330</speed>
+                <interface-type>i-nni</interface-type>
+            </id>
+            <state>
+                <admin-state>enabled</admin-state>
+                <operational-state>lower-layer-down</operational-state>
+                <operational-state-duration>260956</operational-state-duration>
+            </state>
+        </ports>
+        <ports>
+            <port-id>1-2</port-id>
+            <id>
+                <name>1/2</name>
+                <label/>
+                <type>otn</type>
+                <rate>unknown</rate>
+                <speed>421.0330</speed>
+                <interface-type>i-nni</interface-type>
+            </id>
+            <state>
+                <admin-state>enabled</admin-state>
+                <operational-state>up</operational-state>
+                <operational-state-duration>258738</operational-state-duration>
+            </state>
+        </ports>
+        <ports>
+            <port-id>1-3</port-id>
+            <id>
+                <name>1/3</name>
+                <label/>
+                <type>ethernet</type>
+                <rate>100GE</rate>
+                <speed>103.1250</speed>
+                <interface-type>uni</interface-type>
+            </id>
+            <state>
+                <admin-state>enabled</admin-state>
+                <operational-state>up</operational-state>
+                <operational-state-duration>260740</operational-state-duration>
+            </state>
+        </ports>
+        <ports>
+            <port-id>1-7</port-id>
+            <id>
+                <name>1/7</name>
+                <label/>
+                <type>ethernet</type>
+                <rate>100GE</rate>
+                <speed>103.1250</speed>
+                <interface-type>uni</interface-type>
+            </id>
+            <state>
+                <admin-state>enabled</admin-state>
+                <operational-state>up</operational-state>
+                <operational-state-duration>258933</operational-state-duration>
+            </state>
+        </ports>
+    </waveserver-ports>
+</data>
+</rpc-reply>
\ No newline at end of file
diff --git a/drivers/ciena/waveserverai/src/test/resources/response/discoverPortStatistics.xml b/drivers/ciena/waveserverai/src/test/resources/response/discoverPortStatistics.xml
new file mode 100644
index 0000000..c26839d
--- /dev/null
+++ b/drivers/ciena/waveserverai/src/test/resources/response/discoverPortStatistics.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rpc-reply>
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"
+      xmlns:ncx="http://netconfcentral.org/ns/yuma-ncx">
+    <waveserver-pm xmlns="urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-pm">
+        <ethernet-performance-instances>
+            <instance-name>1-3-Ethernet</instance-name>
+            <current-bin>
+                <statistics>
+                    <interface-counts>
+                        <rx>
+                            <bytes>
+                                <value>555</value>
+                                <invalid-data-flag>false</invalid-data-flag>
+                                <supported>true</supported>
+                            </bytes>
+                            <packets>
+                                <value>777</value>
+                                <invalid-data-flag>false</invalid-data-flag>
+                                <supported>true</supported>
+                            </packets>
+                        </rx>
+                        <tx>
+                            <bytes>
+                                <value>0</value>
+                                <invalid-data-flag>false</invalid-data-flag>
+                                <supported>true</supported>
+                            </bytes>
+                            <packets>
+                                <value>0</value>
+                                <invalid-data-flag>false</invalid-data-flag>
+                                <supported>true</supported>
+                            </packets>
+                        </tx>
+                    </interface-counts>
+                </statistics>
+            </current-bin>
+        </ethernet-performance-instances>
+        <ethernet-performance-instances>
+            <instance-name>1-7-Ethernet</instance-name>
+            <current-bin>
+                <statistics>
+                    <interface-counts>
+                        <rx>
+                            <bytes>
+                                <value>111</value>
+                                <invalid-data-flag>false</invalid-data-flag>
+                                <supported>true</supported>
+                            </bytes>
+                            <packets>
+                                <value>222</value>
+                                <invalid-data-flag>false</invalid-data-flag>
+                                <supported>true</supported>
+                            </packets>
+                        </rx>
+                        <tx>
+                            <bytes>
+                                <value>333</value>
+                                <invalid-data-flag>false</invalid-data-flag>
+                                <supported>true</supported>
+                            </bytes>
+                            <packets>
+                                <value>444</value>
+                                <invalid-data-flag>false</invalid-data-flag>
+                                <supported>true</supported>
+                            </packets>
+                        </tx>
+                    </interface-counts>
+                </statistics>
+            </current-bin>
+        </ethernet-performance-instances>
+    </waveserver-pm>
+</data>
+</rpc-reply>
\ No newline at end of file