Use googleapiclient import instead of apiclient

apiclient alias will be removed upstream in the future according
to the changelog.

Change-Id: I896a52c5e17632ab7a65cf0f9b894cccf0f5687b
Closes-Bug: #1556020

diff --git a/cinder/backup/drivers/google.py b/cinder/backup/drivers/google.py
index 6c2cb11819cfffdc9a52df423d18d17c812e6fba..f2a7c46aad893364320fdc6af0df1b4c7357f41d 100644 (file)
--- a/cinder/backup/drivers/google.py
+++ b/cinder/backup/drivers/google.py
@@ -30,9 +30,9 @@ import base64
 import hashlib
 import httplib2
 
-from apiclient import discovery
-from apiclient import errors
-from apiclient import http
+from googleapiclient import discovery
+from googleapiclient import errors
+from googleapiclient import http
 from oauth2client import client
 from oslo_config import cfg
 from oslo_log import log as logging

diff --git a/cinder/tests/unit/backup/fake_google_client.py b/cinder/tests/unit/backup/fake_google_client.py
index b8d5ac4c4b8a3215de6e6214376dcea1e25c6366..703a030fc49751977d3841543c9de447d233e8e6 100644 (file)
--- a/cinder/tests/unit/backup/fake_google_client.py
+++ b/cinder/tests/unit/backup/fake_google_client.py
@@ -18,7 +18,7 @@ import json
 import os
 import zlib
 
-from apiclient import errors
+from googleapiclient import errors
 from oauth2client import client
 from oslo_utils import units
 import six