openstack
/
sahara
Code Issues Proposed changes

Fix import of common libraries from Manila client 

Manila removed the copy of oslo inclubated code (following a global goal for
Ocata) and this lead to some changes post-Newton. See:
https://review.openstack.org/#/c/377604/

Change-Id: Ibda32791aa9b64966cd18daf001416e57a2c5e93
This commit is contained in:
Luigi Toscano 2016-11-11 11:57:07 +01:00
parent a18c8a897a
commit 04d73360f7
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sahara/tests/unit/service/test_shares.py
View File

@ -14,7 +14,10 @@
# limitations under the License.
from manilaclient.openstack.common.apiclient import exceptions as manila_ex
try:
from manilaclient.common.apiclient import exceptions as manila_ex
except ImportError:
from manilaclient.openstack.common.apiclient import exceptions as manila_ex
import mock
from oslo_utils import uuidutils
import testtools

5
sahara/tests/unit/service/validation/test_share_validations.py
View File

@ -13,7 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from manilaclient.openstack.common.apiclient import exceptions as manila_ex
try:
from manilaclient.common.apiclient import exceptions as manila_ex
except ImportError:
from manilaclient.openstack.common.apiclient import exceptions as manila_ex
import mock
from sahara.service.validations import shares

5
sahara/utils/openstack/manila.py
View File

@ -14,7 +14,10 @@
# limitations under the License.
import manilaclient.client as manila_client
from manilaclient.openstack.common.apiclient import exceptions as manila_ex
try:
from manilaclient.common.apiclient import exceptions as manila_ex
except ImportError:
from manilaclient.openstack.common.apiclient import exceptions as manila_ex
from oslo_config import cfg
from sahara import context