commit bebdb5089aabe1fa22bd70149f8c68c7240c7f10
author A.R Karthick <kramanar@ciena.com> Thu Nov 03 14:28:19 2016 -0700
committer Karthick Ramanarayanan <kramanar@ciena.com> Thu Nov 03 14:32:35 2016 -0700
tree f42200757bf4fb6cadb1b5f07232fbb83adfa681
parent d90093b684aea81d527203756c4e9ef3ceb96ab4

Fix to update docker-py to 1.9.0 version to avoid exec command hangs through docker-py client.
Also remove the links for ovs interfaces from linux during cleanup.
This would enable the containers to be configured again with the peer interfaces on setup

Change-Id: I923c7ebec2ff0724eb59af11a4c21a260a56772c
(cherry picked from commit e463106a73117bb328ad66c9285120a51bd30f98)

src/test/setup/cord-test.py

diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index a58a097..9b52c59 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -92,7 +92,7 @@
             self.start(rm = False, volumes = volumes, environment = env,
                        host_config = host_config, tty = True)
 
-    def execute_switch(self, cmd, shell = True):
+    def execute_switch(self, cmd, shell = False):
         if self.olt:
             return os.system(cmd)
         return self.execute(cmd, shell = shell)
@@ -194,7 +194,8 @@
                     cmds = ('brctl delif {} {}'.format(intf_host, local_if),
                             'ip link del {}'.format(local_if))
                 else:
-                    cmds = ('ovs-vsctl del-port {} {}'.format(intf_host, local_if),)
+                    cmds = ('ovs-vsctl del-port {} {}'.format(intf_host, local_if),
+                            'ip link del {}'.format(local_if))
 
             for cmd in cmds:
                 res += os.system(cmd)

src/test/setup/prerequisites.sh

diff --git a/src/test/setup/prerequisites.sh b/src/test/setup/prerequisites.sh
index 709fbff..21920c4 100755
--- a/src/test/setup/prerequisites.sh
+++ b/src/test/setup/prerequisites.sh
@@ -31,7 +31,7 @@
 pip install scapy==2.3.2
 pip install monotonic
 pip install configObj
-pip install -U docker-py
+pip install docker-py==1.9.0
 pip install -U pyyaml
 pip install -U nsenter
 pip install -U pyroute2

src/test/utils/CordContainer.py

diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 5120b7a..957aa00 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -172,7 +172,7 @@
                     ip.link('set', index=guest, state='up')
                 index += 1
 
-    def execute(self, cmd, tty = True, stream = False, shell = True):
+    def execute(self, cmd, tty = True, stream = False, shell = False):
         res = 0
         if type(cmd) == str:
             cmds = (cmd,)