Obsolete oslo-incubator modules - timeutils

This change is part of a multi-part change set to handle obsolete and
graduated oslo modules.

This commit handles the timeutils module.

The change here is to remove it from openstack-common.conf and point
all modules who used to use that at oslo.utils. This also involves a
change to requirements.txt.

I have rebased this change and made it dependent on the change in
https://review.openstack.org/#/c/129292/

Change-Id: I31176c0a78e734bfad3b40b2ec634ea8f362d81b
Partial-Bug: #1380789
blueprint: retire-unused-oslo-incubator-modules

openstack-common.conf

@@ -19,7 +19,6 @@ module=processutils
 module=rpc
 module=service
 module=threadgroup
-module=timeutils
 module=utils
 module=versionutils
 module=wsgi

trove/common/utils.py

@@ -27,13 +27,13 @@ from eventlet.timeout import Timeout
 from passlib import utils as passlib_utils
 
 from oslo.utils import importutils
+from oslo.utils import timeutils
 
 from trove.common import cfg
 from trove.common import exception
 from trove.openstack.common import log as logging
 from trove.openstack.common import loopingcall
 from trove.openstack.common import processutils
-from trove.openstack.common import timeutils
 from trove.openstack.common import utils as openstack_utils
 from trove.openstack.common.gettextutils import _
 

trove/guestagent/common/timeutils.py

@@ -1,4 +1,4 @@
-from trove.openstack.common import timeutils
+from oslo.utils import timeutils
 from datetime import datetime
 
 

trove/limits/views.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 import datetime
-from trove.openstack.common import timeutils
+from oslo.utils import timeutils
 
 
 class LimitView(object):

trove/taskmanager/models.py

@@ -21,6 +21,8 @@ from cinderclient import exceptions as cinder_exceptions
 from eventlet import greenthread
 from novaclient import exceptions as nova_exceptions
 
+from oslo.utils import timeutils
+
 from trove.backup import models as bkup_models
 from trove.backup.models import Backup
 from trove.backup.models import DBBackup
@@ -64,7 +66,6 @@ from trove.instance.models import InstanceServiceStatus
 from trove.openstack.common import log as logging
 from trove.openstack.common.gettextutils import _
 from trove.openstack.common.notifier import api as notifier
-from trove.openstack.common import timeutils
 from trove.quota.quota import run_with_quotas
 import trove.common.remote as remote
 

trove/tests/api/limits.py

@@ -19,11 +19,12 @@
 from nose.tools import assert_equal
 from nose.tools import assert_true
 
+from oslo.utils import timeutils
+
 from proboscis import before_class
 from proboscis import test
 
 from trove.common import cfg
-from trove.openstack.common import timeutils
 from trove.tests.util import create_dbaas_client
 from troveclient.compat import exceptions
 from datetime import datetime

trove/tests/unittests/taskmanager/test_models.py

@@ -21,6 +21,7 @@ from novaclient import exceptions as nova_exceptions
 import novaclient.v1_1.servers
 import novaclient.v1_1.flavors
 import cinderclient.v2.client as cinderclient
+from oslo.utils import timeutils
 import trove.backup.models
 import trove.common.context
 from trove.datastore import models as datastore_models
@@ -40,10 +41,8 @@ from trove.instance.models import InstanceServiceStatus
 from trove.instance.models import InstanceStatus
 from trove.instance.models import DBInstance
 from trove.instance.tasks import InstanceTasks
-
 from trove.tests.unittests.util import util
 from trove.common import utils
-from trove.openstack.common import timeutils
 from swiftclient.client import ClientException
 from tempfile import NamedTemporaryFile
 import os