From 3f700fe6819b3633c7c902a27b26bbeb68b9c3d2 Mon Sep 17 00:00:00 2001 From: Vincent Llorens Date: Tue, 8 Nov 2016 11:10:56 +0100 Subject: [PATCH] Clean up oslo imports We used to put `try / except ImportError` around oslo lib imports to support both the `oslo_lib` and `oslo.lib` name patterns. It is now useless since the newer versions of these libs all support the `import oslo_lib` pattern. Tested on CentOS 7 with the OpenStack Liberty repository. Tested on Ubuntu 14.04 with OpenStack Liberty CloudArchive repository. Change-Id: I91a14baea4df0d66db4818bdcaf895b0e2a62245 Sem-Ver: bugfix --- .../fairshare_manager.py | 7 +----- synergy_scheduler_manager/keystone_manager.py | 8 +----- synergy_scheduler_manager/nova_manager.py | 25 +++---------------- synergy_scheduler_manager/queue_manager.py | 6 +---- synergy_scheduler_manager/quota_manager.py | 6 +---- .../scheduler_manager.py | 6 +---- 6 files changed, 9 insertions(+), 49 deletions(-) diff --git a/synergy_scheduler_manager/fairshare_manager.py b/synergy_scheduler_manager/fairshare_manager.py index 3adb414..3548902 100644 --- a/synergy_scheduler_manager/fairshare_manager.py +++ b/synergy_scheduler_manager/fairshare_manager.py @@ -4,12 +4,7 @@ import threading from common.user import User from datetime import datetime from datetime import timedelta - -try: - from oslo_config import cfg -except ImportError: - from oslo.config import cfg - +from oslo_config import cfg from synergy.common.manager import Manager __author__ = "Lisa Zangrando" diff --git a/synergy_scheduler_manager/keystone_manager.py b/synergy_scheduler_manager/keystone_manager.py index 4ce8477..93cf299 100644 --- a/synergy_scheduler_manager/keystone_manager.py +++ b/synergy_scheduler_manager/keystone_manager.py @@ -2,11 +2,6 @@ import json import logging import requests -try: - from oslo_config import cfg -except ImportError: - from oslo.config import cfg - from common.endpoint import Endpoint from common.project import Project from common.role import Role @@ -14,8 +9,7 @@ from common.service import Service from common.token import Token from common.trust import Trust from common.user import User - - +from oslo_config import cfg from synergy.common.manager import Manager diff --git a/synergy_scheduler_manager/nova_manager.py b/synergy_scheduler_manager/nova_manager.py index 6df54af..985f79f 100644 --- a/synergy_scheduler_manager/nova_manager.py +++ b/synergy_scheduler_manager/nova_manager.py @@ -5,6 +5,7 @@ import hashlib import hmac import json import logging +import oslo_messaging as oslo_msg import requests from common.block_device import BlockDeviceMapping @@ -19,27 +20,9 @@ from nova.compute.rpcapi import ComputeAPI from nova.conductor.rpcapi import ComputeTaskAPI from nova.conductor.rpcapi import ConductorAPI from nova.objects import base as objects_base - -try: - from oslo_config import cfg -except ImportError: - from oslo.config import cfg - -try: - import oslo_messaging as oslo_msg -except ImportError: - import oslo.messaging as oslo_msg - -try: - from oslo_serialization import jsonutils -except ImportError: - from oslo.serialization import jsonutils - -try: - from oslo_versionedobjects import base as ovo_base -except ImportError: - from oslo.versionedobjects import base as ovo_base - +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_versionedobjects import base as ovo_base from sqlalchemy import create_engine from sqlalchemy.exc import SQLAlchemyError from synergy.common.manager import Manager diff --git a/synergy_scheduler_manager/queue_manager.py b/synergy_scheduler_manager/queue_manager.py index bfe366d..4330197 100644 --- a/synergy_scheduler_manager/queue_manager.py +++ b/synergy_scheduler_manager/queue_manager.py @@ -1,11 +1,7 @@ import logging -try: - from oslo_config import cfg -except ImportError: - from oslo.config import cfg - from common.queue import QueueDB +from oslo_config import cfg from sqlalchemy import create_engine from synergy.common.manager import Manager diff --git a/synergy_scheduler_manager/quota_manager.py b/synergy_scheduler_manager/quota_manager.py index 98a5176..8e2a0be 100644 --- a/synergy_scheduler_manager/quota_manager.py +++ b/synergy_scheduler_manager/quota_manager.py @@ -1,12 +1,8 @@ import ConfigParser import logging -try: - from oslo_config import cfg -except ImportError: - from oslo.config import cfg - from common.quota import SharedQuota +from oslo_config import cfg from synergy.common.manager import Manager diff --git a/synergy_scheduler_manager/scheduler_manager.py b/synergy_scheduler_manager/scheduler_manager.py index db2f31a..10d60b0 100644 --- a/synergy_scheduler_manager/scheduler_manager.py +++ b/synergy_scheduler_manager/scheduler_manager.py @@ -1,15 +1,11 @@ import logging import re -try: - from oslo_config import cfg -except ImportError: - from oslo.config import cfg - from common.flavor import Flavor from common.quota import SharedQuota from common.request import Request from common.server import Server +from oslo_config import cfg from synergy.common.manager import Manager from threading import Thread