diff --git a/neutron/agent/rpc.py b/neutron/agent/rpc.py index 11bf79784c5..38fa4de1274 100644 --- a/neutron/agent/rpc.py +++ b/neutron/agent/rpc.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. +from datetime import datetime import itertools from oslo_log import log as logging import oslo_messaging -from oslo_utils import timeutils from oslo_utils import uuidutils from neutron.common import constants @@ -80,7 +80,7 @@ class PluginReportStateAPI(object): agent_state['uuid'] = uuidutils.generate_uuid() kwargs = { 'agent_state': {'agent_state': agent_state}, - 'time': timeutils.strtime(), + 'time': datetime.utcnow().isoformat(), } method = cctxt.call if use_call else cctxt.cast return method(context, 'report_state', **kwargs) diff --git a/neutron/tests/fullstack/fullstack_fixtures.py b/neutron/tests/fullstack/fullstack_fixtures.py index 63ae92649bf..7db1af123cd 100644 --- a/neutron/tests/fullstack/fullstack_fixtures.py +++ b/neutron/tests/fullstack/fullstack_fixtures.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from datetime import datetime from distutils import spawn import functools import os @@ -21,7 +22,6 @@ from neutronclient.common import exceptions as nc_exc from neutronclient.v2_0 import client from oslo_config import cfg from oslo_log import log as logging -from oslo_utils import timeutils from neutron.agent.linux import async_process from neutron.agent.linux import utils @@ -56,7 +56,7 @@ class ProcessFixture(fixtures.Fixture): cmd = [spawn.find_executable(self.exec_name), '--log-dir', log_dir, - '--log-file', timeutils.strtime(fmt=fmt)] + '--log-file', datetime.utcnow().strftime(fmt)] for filename in self.config_filenames: cmd += ['--config-file', filename] self.process = async_process.AsyncProcess(cmd) diff --git a/neutron/tests/unit/extensions/test_agent.py b/neutron/tests/unit/extensions/test_agent.py index ff805b469e3..546b18467f0 100644 --- a/neutron/tests/unit/extensions/test_agent.py +++ b/neutron/tests/unit/extensions/test_agent.py @@ -14,11 +14,11 @@ # under the License. import copy +from datetime import datetime import time from oslo_config import cfg from oslo_log import log as logging -from oslo_utils import timeutils from oslo_utils import uuidutils from webob import exc @@ -108,10 +108,10 @@ class AgentDBTestMixIn(object): callback = agents_db.AgentExtRpcCallback() callback.report_state(self.adminContext, agent_state={'agent_state': lbaas_hosta}, - time=timeutils.strtime()) + time=datetime.utcnow().isoformat()) callback.report_state(self.adminContext, agent_state={'agent_state': lbaas_hostb}, - time=timeutils.strtime()) + time=datetime.utcnow().isoformat()) res += [lbaas_hosta, lbaas_hostb] return res