diff options
author | Stefan Kobza <skobza@cisco.com> | 2016-03-05 10:19:16 +0100 |
---|---|---|
committer | Stefan Kobza <skobza@cisco.com> | 2016-04-08 09:57:10 +0000 |
commit | 8f77a1ac982b07802f0fb209f589708c27f3e9c5 (patch) | |
tree | 989205e4cfea2255b96e75ec2b77f513410d9279 /resources/libraries/python/ssh.py | |
parent | bea34e37b99cd3312dfb5733edea7586fbc8e1c6 (diff) |
Add Vagrantfile for local testing.
Vagrantfile contains 3 VMs as of now, 2 DUTs 1 TG, with these notes:
- login is csit/csit
- by default provision script installs all deb packages from the dir
where Vagrantfile is
- developed for, and only tested on vbox (someone can pick up vmware)
- All nodes have 1 shared mgmt network: 192.168.255.0/24
- hosts have these IP addresses in host-only network
TG : 192.168.255.100
DUT1 : 192.168.255.101
DUT2 : 192.168.255.102
- script created to download MAC address information
- PCI addresses are always the same for vbox (not sure about vmware)
HOWTO (will create a wiki page once one is created for CSIT project):
- copy Vagrantfile to separate dir on host
- vagrant up --parallel
sit-back-and-relax
- from VM that has access to the same host-only network (192.168.255.0 above)
- copy your ssh-key to csit@192.168.255.{101,102,250} using
ssh-copy-id
- cd ${csit_dir}
- virtualenv & pip as in README
- export PYTHONPATH=${csit_dir}
- resources/tools/topology/update_topology.py -v -f
-o topologies/available/vagrant_pci.yaml \
topologies/available/vagrant.yaml
- pybot -L TRACE \
-v TOPOLOGY_PATH:topologies/available/vagrant_pci.yaml -s \
"ipv4" tests
- see tests results
Change-Id: Ic27626605a9c820bca977b38f4e8ca37d1504ff5
Signed-off-by: Stefan Kobza <skobza@cisco.com>
Diffstat (limited to 'resources/libraries/python/ssh.py')
-rw-r--r-- | resources/libraries/python/ssh.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py index a94eec4e91..6914d528d6 100644 --- a/resources/libraries/python/ssh.py +++ b/resources/libraries/python/ssh.py @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import socket import paramiko from paramiko import RSAKey import StringIO @@ -95,11 +96,17 @@ class SSH(object): self._ssh.get_transport().getpeername(), end-start)) stdout = "" - while True: - buf = chan.recv(self.__MAX_RECV_BUF) - stdout += buf - if not buf: - break + try: + while True: + buf = chan.recv(self.__MAX_RECV_BUF) + stdout += buf + if not buf: + break + except socket.timeout: + logger.error('Caught timeout exception, current contents ' + 'of buffer: {0}'.format(stdout)) + raise + stderr = "" while True: |