From 94ba8b7a2cd8f03763d4ab25223cba690ecf8585 Mon Sep 17 00:00:00 2001 From: Brandon Palm Date: Fri, 9 Oct 2015 08:52:58 -0500 Subject: [PATCH] Replaced deprecated isotime() function The agents_db.py was using a deprecated function 'isotime()'. I removed the deprecated function and replaced it with: datetime.datetime.isoformat() https://docs.python.org/2/library/datetime.html Change-Id: I32b6096fb1a42caef529db0a71fa52f7de5706f5 Closes-Bug: #1504557 --- neutron/db/agents_db.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/neutron/db/agents_db.py b/neutron/db/agents_db.py index 324601629..2a9aeb734 100644 --- a/neutron/db/agents_db.py +++ b/neutron/db/agents_db.py @@ -13,6 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. +import datetime + from eventlet import greenthread from oslo_config import cfg from oslo_db import exception as db_exc @@ -371,8 +373,8 @@ class AgentExtRpcCallback(object): agent_state = kwargs['agent_state']['agent_state'] self._check_clock_sync_on_agent_start(agent_state, time) if self.START_TIME > time: - time_agent = timeutils.isotime(time) - time_server = timeutils.isotime(self.START_TIME) + time_agent = datetime.datetime.isoformat(time) + time_server = datetime.datetime.isoformat(self.START_TIME) log_dict = {'agent_time': time_agent, 'server_time': time_server} LOG.debug("Stale message received with timestamp: %(agent_time)s. " "Skipping processing because it's older than the " @@ -393,13 +395,15 @@ class AgentExtRpcCallback(object): diff = abs(timeutils.delta_seconds(time_server_now, agent_time)) if diff > cfg.CONF.agent_down_time: agent_name = agent_state['agent_type'] - time_agent = timeutils.isotime(agent_time) + time_agent = datetime.datetime.isoformat(agent_time) + host = agent_state['host'] log_dict = {'host': host, 'agent_name': agent_name, 'agent_time': time_agent, 'threshold': cfg.CONF.agent_down_time, - 'serv_time': timeutils.isotime(time_server_now), + 'serv_time': (datetime.datetime.isoformat + (time_server_now)), 'diff': diff} LOG.error(_LE("Message received from the host: %(host)s " "during the registration of %(agent_name)s has " -- 2.45.2