Merge "Use "datetime.datetime.isoformat" instead of "timeutils.isotime""

This commit is contained in:
Zuul 2020-03-20 11:14:55 +00:00 committed by Gerrit Code Review
commit c9ddbfc7da

View File

@ -1539,16 +1539,17 @@ class TestOVNMechanismDriver(test_plugin.Ml2PluginV2TestCase):
fake_context, fake_port['id'], const.PORT_STATUS_ACTIVE) fake_context, fake_port['id'], const.PORT_STATUS_ACTIVE)
def _add_chassis_agent(self, nb_cfg, agent_type, updated_at=None): def _add_chassis_agent(self, nb_cfg, agent_type, updated_at=None):
updated_at = updated_at or datetime.datetime.utcnow()
chassis = mock.Mock() chassis = mock.Mock()
chassis.nb_cfg = nb_cfg chassis.nb_cfg = nb_cfg
chassis.uuid = uuid.uuid4() chassis.uuid = uuid.uuid4()
chassis.external_ids = {ovn_const.OVN_LIVENESS_CHECK_EXT_ID_KEY: chassis.external_ids = {ovn_const.OVN_LIVENESS_CHECK_EXT_ID_KEY:
timeutils.isotime(updated_at)} datetime.datetime.isoformat(updated_at)}
if agent_type == ovn_const.OVN_METADATA_AGENT: if agent_type == ovn_const.OVN_METADATA_AGENT:
chassis.external_ids.update({ chassis.external_ids.update({
ovn_const.OVN_AGENT_METADATA_SB_CFG_KEY: nb_cfg, ovn_const.OVN_AGENT_METADATA_SB_CFG_KEY: nb_cfg,
ovn_const.METADATA_LIVENESS_CHECK_EXT_ID_KEY: ovn_const.METADATA_LIVENESS_CHECK_EXT_ID_KEY:
timeutils.isotime(updated_at)}) datetime.datetime.isoformat(updated_at)})
return chassis return chassis