cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [42/50] git commit: CS-9919 Support for Nexus Swiches (Cisco Vswitches)
Date Sun, 27 May 2012 22:30:44 GMT
CS-9919 Support for Nexus Swiches (Cisco Vswitches)

Description:

	Increasing the window for xmlstream.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6d896951
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6d896951
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6d896951

Branch: refs/heads/master
Commit: 6d896951b3e921fa86c5618bb497629526ac8df2
Parents: d933358
Author: Sateesh Chodapuneedi <sateesh.chodapuneedi@citrix.com>
Authored: Mon May 14 04:58:44 2012 +0530
Committer: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
Committed: Fri May 25 17:41:31 2012 -0700

----------------------------------------------------------------------
 .../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java  |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6d896951/utils/src/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java b/utils/src/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java
index a81b1c3..59bbbbf 100644
--- a/utils/src/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java
+++ b/utils/src/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java
@@ -1,20 +1,20 @@
 package com.cloud.utils.cisco.n1kv.vsm;
 
-import org.apache.log4j.Logger;
-
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
 
+import org.apache.log4j.Logger;
+
 import com.cloud.utils.Pair;
-import com.cloud.utils.ssh.*;
-import com.trilead.ssh2.Session;
-import com.trilead.ssh2.Connection;
-import com.trilead.ssh2.ChannelCondition;
 import com.cloud.utils.cisco.n1kv.vsm.VsmCommand.BindingType;
 import com.cloud.utils.cisco.n1kv.vsm.VsmCommand.PortProfileType;
 import com.cloud.utils.cisco.n1kv.vsm.VsmCommand.SwitchPortMode;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.ssh.SSHCmdHelper;
+import com.trilead.ssh2.ChannelCondition;
+import com.trilead.ssh2.Connection;
+import com.trilead.ssh2.Session;
 
 public class NetconfHelper {
     private static final Logger s_logger = Logger.getLogger(NetconfHelper.class);
@@ -183,7 +183,7 @@ public class NetconfHelper {
             while (true) {
                 if (inputStream.available() == 0) {
                     int conditions = _session.waitForCondition(ChannelCondition.STDOUT_DATA
-                            | ChannelCondition.STDERR_DATA | ChannelCondition.EOF, 2000);
+                            | ChannelCondition.STDERR_DATA | ChannelCondition.EOF, 3000);
 
                     if ((conditions & ChannelCondition.TIMEOUT) != 0) {
                         break;


Mime
View raw message