commit 9492abb0ff4d72221b6b8b8fe56311c50fc6ed5e
author Andreas Papazois <andreas.papazois@gmail.com> Fri Mar 11 09:38:41 2016 +0200
committer Gerrit Code Review <gerrit@onlab.us> Wed Mar 23 16:58:55 2016 +0000
tree 36002425ef434b19469433d086134f25cc612ee5
parent 709e4fe330fe2e42b721088434914e00b6905d9d

Cleanup of trimming on NetConf replies.

Change-Id: I7d3b031893328af33949bea4166423434ded1424

drivers/cisco/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java

diff --git a/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java b/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java
index 4a9cced..04c6822 100644
--- a/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java
+++ b/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java
@@ -58,8 +58,7 @@
                                  .data().deviceId()).getSession();
         String reply;
         try {
-            //TODO remove XML triming if preceeds in Session
-            reply = session.requestSync(addInterfaceToVlanBuilder(intf, vlanId)).trim();
+            reply = session.requestSync(addInterfaceToVlanBuilder(intf, vlanId));
         } catch (NetconfException e) {
             log.error("Failed to configure VLAN ID {} on device {} interface {}.",
                       vlanId, deviceId, intf, e);
@@ -122,8 +121,7 @@
                                  .data().deviceId()).getSession();
         String reply;
         try {
-            //TODO remove XML triming if preceeds in Session
-            reply = session.requestSync(removeInterfaceFromVlanBuilder(intf, vlanId)).trim();
+            reply = session.requestSync(removeInterfaceFromVlanBuilder(intf, vlanId));
         } catch (NetconfException e) {
             log.error("Failed to remove VLAN ID {} from device {} interface {}.",
                       vlanId, deviceId, intf, e);
@@ -185,8 +183,7 @@
                                  .data().deviceId()).getSession();
         String reply;
         try {
-            //TODO remove XML triming if preceeds in Session
-            reply = session.requestSync(addTrunkInterfaceBuilder(intf, vlanId)).trim();
+            reply = session.requestSync(addTrunkInterfaceBuilder(intf, vlanId));
         } catch (NetconfException e) {
             log.error("Failed to configure trunk mode for VLAN ID {} on device {} interface {}.",
                       vlanId, deviceId, intf, e);
@@ -250,8 +247,7 @@
                              .data().deviceId()).getSession();
     String reply;
     try {
-        //TODO remove XML triming if preceeds in Session
-        reply = session.requestSync(removeTrunkInterfaceBuilder(intf, vlanId)).trim();
+        reply = session.requestSync(removeTrunkInterfaceBuilder(intf, vlanId));
     } catch (NetconfException e) {
         log.error("Failed to remove trunk mode for VLAN ID {} on device {} interface {}.",
                   vlanId, deviceId, intf, e);