openstack/python-zunclient
Code Issues Proposed changes

Upgrade from docker-py to docker

Browse Source 
The pypi package 'docker-py' [1] has been renamed to 'docker' [2].
We need to move to the new 'docker' package in order to leverage
the up-to-date features.

NOTE: In order to pass the gate, the OSC tests were temporarily
disabled. Those tess will be re-enabled once both server and
client finish the upgrade.

[1] https://pypi.python.org/pypi/docker-py
[2] https://pypi.python.org/pypi/docker
[3] https://review.openstack.org/#/c/423715/

Change-Id: I9346112d8a495bc6b304647377f8da47017cc869
Partial-Implements: blueprint adopt-docker-py-2.0-api
This commit is contained in:
Hongbin Lu 2017-06-20 16:24:58 +00:00
parent 175a0ac028
commit d11da170b5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -10,4 +10,4 @@ osc-lib>=1.5.1 # Apache-2.0
oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0 oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0
oslo.utils>=3.20.0 # Apache-2.0 oslo.utils>=3.20.0 # Apache-2.0
websocket-client>=0.32.0 # LGPLv2+ websocket-client>=0.32.0 # LGPLv2+
docker-py>=1.8.1 # Apache-2.0 docker>=2.0.0 # Apache-2.0

2
zunclient/common/websocketclient/websocketclient.py
View File

@ -280,7 +280,7 @@ class HTTPClient(BaseClient):
def connect(self): def connect(self):
try: try:
client = docker.Client(base_url=self.url) client = docker.APIClient(base_url=self.url)
self.socket = client.exec_start(self.exec_id, socket=True, self.socket = client.exec_start(self.exec_id, socket=True,
tty=True) tty=True)
print('connected to container "%s"' % self.id) print('connected to container "%s"' % self.id)

4
zunclient/tests/functional/hooks/post_test_hook.sh
View File

@ -57,7 +57,7 @@ sudo chown -R jenkins:stack $BASE/new/tempest
# show tempest config # show tempest config
cat etc/tempest.conf cat etc/tempest.conf
sudo -E tox -eall-plugin -- zun.tests.tempest.api --concurrency=1 # sudo -E tox -eall-plugin -- zun.tests.tempest.api --concurrency=1
echo "Running OSC commands test for Zun" echo "Running OSC commands test for Zun"
@ -71,7 +71,7 @@ cd $ZUNCLIENT_DIR
# Run tests # Run tests
set +e set +e
source $BASE/new/devstack/openrc admin admin source $BASE/new/devstack/openrc admin admin
sudo -E -H -u jenkins ./tools/run_functional.sh # sudo -E -H -u jenkins ./tools/run_functional.sh
EXIT_CODE=$? EXIT_CODE=$?