openstack/kuryr-libnetwork
Code Issues Proposed changes

Merge "Upgrade from docker-py to docker"

Browse Source
This commit is contained in:
Jenkins
2017-06-24 14:47:52 +00:00
committed by Gerrit Code Review
parent f4102b4868 3bdbf04bae
commit 876993243b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kuryr_libnetwork/tests/fullstack/kuryr_base.py
View File

@@ -81,7 +81,7 @@ class KuryrBaseTest(base.BaseTestCase):
"""
def setUp(self):
super(KuryrBaseTest, self).setUp()
self.docker_client = docker.Client(
self.docker_client = docker.APIClient(
base_url='tcp://0.0.0.0:2375')
try:
self.neutron_client = get_neutron_client_from_env()

2
rally-jobs/plugins/context/docker_networks.py
View File

@@ -52,7 +52,7 @@ class DockerNetworkContext(context.Context):
def setup(self):
"""Create kuryr or non-kuryr docker network, and prepare image cache"""
try:
docker_client = docker.Client(base_url="tcp://0.0.0.0:2375")
docker_client = docker.APIClient(base_url="tcp://0.0.0.0:2375")
if self.config["is_kuryr"]:
ipam = {

2
rally-jobs/plugins/scenarios/utils.py
View File

@@ -27,7 +27,7 @@ class KuryrScenario(scenario.OpenStackScenario):
def __init__(self, context=None, admin_clients=None, clients=None):
super(KuryrScenario, self).__init__(context, admin_clients, clients)
self.docker_client = docker.Client(base_url='tcp://0.0.0.0:2375')
self.docker_client = docker.APIClient(base_url='tcp://0.0.0.0:2375')
@atomic.action_timer("kuryr.list_networks")
def _list_networks(self, network_list_args):

2
test-requirements.txt
View File

@@ -5,7 +5,7 @@
coverage>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT
docker-py>=1.8.1 # Apache-2.0
docker>=2.0.0 # Apache-2.0
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
os-testr>=0.8.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0