[ONOS-5764]Decoder is returning Null
Change-Id: I51dabe5a7133df6e5766cb3ed3c36a596936263b
diff --git a/apps/yms/ut/src/test/resources/ychTestResourceFiles/combinedrootname.xml b/apps/yms/ut/src/test/resources/ychTestResourceFiles/combinedrootname.xml
index 1997f3d..04078f1 100644
--- a/apps/yms/ut/src/test/resources/ychTestResourceFiles/combinedrootname.xml
+++ b/apps/yms/ut/src/test/resources/ychTestResourceFiles/combinedrootname.xml
@@ -5,94 +5,92 @@
<running/>
</target>
<filter xmlns="ydt.filter-type" type="subtree">
- <Combined xmlns="ych:combined">
- <attributes>
- <origin>
- <value>123</value>
- </origin>
- <multi-exit-disc>
- <med>456</med>
- </multi-exit-disc>
- <local-pref>
- <pref>23</pref>
- </local-pref>
- <aigp>
- <aigp-tlv>
- <metric>456</metric>
- </aigp-tlv>
- </aigp>
- <unrecognized-attributes>
- <partial>false</partial>
- <transitive>false</transitive>
- <type>1</type>
- <value>QUJD</value>
- </unrecognized-attributes>
- <unrecognized-attributes>
- <partial>true</partial>
- <transitive>true</transitive>
- <type>2</type>
- <value>QUJD</value>
- </unrecognized-attributes>
- <unrecognized-attributes>
- <partial>true</partial>
- <transitive>false</transitive>
- <type>3</type>
- <value>QUJD</value>
- </unrecognized-attributes>
- <unrecognized-attributes>
- <partial>false</partial>
- <transitive>true</transitive>
- <type>4</type>
- <value>QUJD</value>
- </unrecognized-attributes>
- <bgp-parameters>
- <optional-capabilities>
- <c-parameters>
- <as4-bytes-capability>
- <as-number>11</as-number>
- </as4-bytes-capability>
- </c-parameters>
- </optional-capabilities>
- <optional-capabilities>
- <c-parameters>
- <as4-bytes-capability>
- <as-number>22</as-number>
- </as4-bytes-capability>
- </c-parameters>
- </optional-capabilities>
- <optional-capabilities>
- <c-parameters>
- <as4-bytes-capability>
- <as-number>33</as-number>
- </as4-bytes-capability>
- </c-parameters>
- </optional-capabilities>
- </bgp-parameters>
- <bgp-parameters>
- <optional-capabilities>
- <c-parameters>
- <as4-bytes-capability>
- <as-number>33</as-number>
- </as4-bytes-capability>
- </c-parameters>
- </optional-capabilities>
- <optional-capabilities>
- <c-parameters>
- <as4-bytes-capability>
- <as-number>33</as-number>
- </as4-bytes-capability>
- </c-parameters>
- </optional-capabilities>
- <optional-capabilities>
- <c-parameters>
- <as4-bytes-capability>
- <as-number>33</as-number>
- </as4-bytes-capability>
- </c-parameters>
- </optional-capabilities>
- </bgp-parameters>
- </attributes>
- </Combined>
+ <attributes xmlns="ych:combined">
+ <origin>
+ <value>123</value>
+ </origin>
+ <multi-exit-disc>
+ <med>456</med>
+ </multi-exit-disc>
+ <local-pref>
+ <pref>23</pref>
+ </local-pref>
+ <aigp>
+ <aigp-tlv>
+ <metric>456</metric>
+ </aigp-tlv>
+ </aigp>
+ <unrecognized-attributes>
+ <partial>false</partial>
+ <transitive>false</transitive>
+ <type>1</type>
+ <value>QUJD</value>
+ </unrecognized-attributes>
+ <unrecognized-attributes>
+ <partial>true</partial>
+ <transitive>true</transitive>
+ <type>2</type>
+ <value>QUJD</value>
+ </unrecognized-attributes>
+ <unrecognized-attributes>
+ <partial>true</partial>
+ <transitive>false</transitive>
+ <type>3</type>
+ <value>QUJD</value>
+ </unrecognized-attributes>
+ <unrecognized-attributes>
+ <partial>false</partial>
+ <transitive>true</transitive>
+ <type>4</type>
+ <value>QUJD</value>
+ </unrecognized-attributes>
+ <bgp-parameters>
+ <optional-capabilities>
+ <c-parameters>
+ <as4-bytes-capability>
+ <as-number>11</as-number>
+ </as4-bytes-capability>
+ </c-parameters>
+ </optional-capabilities>
+ <optional-capabilities>
+ <c-parameters>
+ <as4-bytes-capability>
+ <as-number>22</as-number>
+ </as4-bytes-capability>
+ </c-parameters>
+ </optional-capabilities>
+ <optional-capabilities>
+ <c-parameters>
+ <as4-bytes-capability>
+ <as-number>33</as-number>
+ </as4-bytes-capability>
+ </c-parameters>
+ </optional-capabilities>
+ </bgp-parameters>
+ <bgp-parameters>
+ <optional-capabilities>
+ <c-parameters>
+ <as4-bytes-capability>
+ <as-number>33</as-number>
+ </as4-bytes-capability>
+ </c-parameters>
+ </optional-capabilities>
+ <optional-capabilities>
+ <c-parameters>
+ <as4-bytes-capability>
+ <as-number>33</as-number>
+ </as4-bytes-capability>
+ </c-parameters>
+ </optional-capabilities>
+ <optional-capabilities>
+ <c-parameters>
+ <as4-bytes-capability>
+ <as-number>33</as-number>
+ </as4-bytes-capability>
+ </c-parameters>
+ </optional-capabilities>
+ </bgp-parameters>
+ </attributes>
</filter>
</edit-config>
</rpc>
\ No newline at end of file
diff --git a/apps/yms/ut/src/test/resources/ychTestResourceFiles/configrootname.xml b/apps/yms/ut/src/test/resources/ychTestResourceFiles/configrootname.xml
index c8509f1..64c25aa 100644
--- a/apps/yms/ut/src/test/resources/ychTestResourceFiles/configrootname.xml
+++ b/apps/yms/ut/src/test/resources/ychTestResourceFiles/configrootname.xml
@@ -4,17 +4,13 @@
<target>
<running/>
</target>
- <config xmlns:xc="urn:ietf:params:xml:ns:netconf:base:1.0">
- <Logistics-manager xmlns="ydt.root">
- <Customs-supervisor>abc</Customs-supervisor>
- <Purchasing-supervisor xmlns="ydt.root">
- <purchasing-specialist>bcd</purchasing-specialist>
- <support>cde</support>
- </Purchasing-supervisor>
- </Logistics-manager>
- <merchandisersupervisor xmlns="ydt.Merchandiser-supervisor">
- <supervisor>abc</supervisor>
- </merchandisersupervisor>
+ <config>
+ <Customs-supervisor xmlns="ydt.root">abc</Customs-supervisor>
+ <Purchasing-supervisor xmlns="ydt.root">
+ <purchasing-specialist>bcd</purchasing-specialist>
+ <support>cde</support>
+ </Purchasing-supervisor>
+ <supervisor xmlns="ydt.Merchandiser-supervisor">abc</supervisor>
</config>
</edit-config>
</rpc>
\ No newline at end of file
diff --git a/apps/yms/ut/src/test/resources/ychTestResourceFiles/configrootnameOperationType.xml b/apps/yms/ut/src/test/resources/ychTestResourceFiles/configrootnameOperationType.xml
index 6cecea49..ce63205 100644
--- a/apps/yms/ut/src/test/resources/ychTestResourceFiles/configrootnameOperationType.xml
+++ b/apps/yms/ut/src/test/resources/ychTestResourceFiles/configrootnameOperationType.xml
@@ -4,17 +4,13 @@
<target>
<running/>
</target>
- <config xmlns:xc="urn:ietf:params:xml:ns:netconf:base:1.0">
- <Logistics-manager xmlns="ydt.root">
- <Customs-supervisor>abc</Customs-supervisor>
- <Purchasing-supervisor xmlns="ydt.root" operation="delete">
- <purchasing-specialist>bcd</purchasing-specialist>
- <support>cde</support>
- </Purchasing-supervisor>
- </Logistics-manager>
- <merchandisersupervisor xmlns="ydt.Merchandiser-supervisor">
- <supervisor>abc</supervisor>
- </merchandisersupervisor>
+ <config>
+ <Customs-supervisor xmlns="ydt.root">abc</Customs-supervisor>
+ <Purchasing-supervisor xmlns="ydt.root" operation="delete">
+ <purchasing-specialist>bcd</purchasing-specialist>
+ <support>cde</support>
+ </Purchasing-supervisor>
+ <supervisor xmlns="ydt.Merchandiser-supervisor">abc</supervisor>
</config>
</edit-config>
</rpc>
\ No newline at end of file
diff --git a/apps/yms/ut/src/test/resources/ychTestResourceFiles/getReply.xml b/apps/yms/ut/src/test/resources/ychTestResourceFiles/getReply.xml
index b6d11fe..0b836d3 100644
--- a/apps/yms/ut/src/test/resources/ychTestResourceFiles/getReply.xml
+++ b/apps/yms/ut/src/test/resources/ychTestResourceFiles/getReply.xml
@@ -2,10 +2,8 @@
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"
xmlns:ex="http://example.net/content/1.0">
<data>
- <Logistics-manager xmlns="ydt.root">
- <Purchasing-supervisor xmlns="ydt.root">
- <purchasing-specialist>bcd</purchasing-specialist>
- </Purchasing-supervisor>
- </Logistics-manager>
+ <Purchasing-supervisor xmlns="ydt.root">
+ <purchasing-specialist>bcd</purchasing-specialist>
+ </Purchasing-supervisor>
</data>
</rpc-reply>
\ No newline at end of file
diff --git a/apps/yms/ut/src/test/resources/ychTestResourceFiles/getconfigReply.xml b/apps/yms/ut/src/test/resources/ychTestResourceFiles/getconfigReply.xml
index e27beab..bf3fc7b 100644
--- a/apps/yms/ut/src/test/resources/ychTestResourceFiles/getconfigReply.xml
+++ b/apps/yms/ut/src/test/resources/ychTestResourceFiles/getconfigReply.xml
@@ -1,8 +1,6 @@
<rpc message-id="101"
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<data>
- <merchandisersupervisor xmlns="ydt.Merchandiser-supervisor">
- <supervisor>abc</supervisor>
- </merchandisersupervisor>
+ <supervisor xmlns="ydt.Merchandiser-supervisor">abc</supervisor>
</data>
</rpc>
\ No newline at end of file
diff --git a/apps/yms/ut/src/test/resources/ychTestResourceFiles/getconfigrootname.xml b/apps/yms/ut/src/test/resources/ychTestResourceFiles/getconfigrootname.xml
index df69691..0c35df5 100644
--- a/apps/yms/ut/src/test/resources/ychTestResourceFiles/getconfigrootname.xml
+++ b/apps/yms/ut/src/test/resources/ychTestResourceFiles/getconfigrootname.xml
@@ -5,9 +5,7 @@
<running/>
</source>
<filter type="subtree">
- <merchandisersupervisor xmlns="ydt.Merchandiser-supervisor">
- <supervisor>abc</supervisor>
- </merchandisersupervisor>
+ <supervisor xmlns="ydt.Merchandiser-supervisor">abc</supervisor>
</filter>
</get-config>
</rpc>
\ No newline at end of file
diff --git a/apps/yms/ut/src/test/resources/ychTestResourceFiles/getrootname.xml b/apps/yms/ut/src/test/resources/ychTestResourceFiles/getrootname.xml
index 9773893..b7fc97d 100644
--- a/apps/yms/ut/src/test/resources/ychTestResourceFiles/getrootname.xml
+++ b/apps/yms/ut/src/test/resources/ychTestResourceFiles/getrootname.xml
@@ -2,11 +2,9 @@
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<get>
<filter type="subtree">
- <Logistics-manager xmlns="ydt.root">
- <Purchasing-supervisor xmlns="ydt.root">
- <purchasing-specialist>bcd</purchasing-specialist>
- </Purchasing-supervisor>
- </Logistics-manager>
+ <Purchasing-supervisor xmlns="ydt.root">
+ <purchasing-specialist>bcd</purchasing-specialist>
+ </Purchasing-supervisor>
</filter>
</get>
</rpc>
\ No newline at end of file