test_l3_dvr_db: switch to OVO for Agent
Change-Id: I42609b1c5aa2e15f240ed2108fd8b5ed445d350a Partially-Implements: blueprint adopt-oslo-versioned-objects-for-db
This commit is contained in:
parent
1ca38a1e1e
commit
49018b593c
|
@ -29,10 +29,10 @@ from neutron.db import agents_db
|
||||||
from neutron.db import common_db_mixin
|
from neutron.db import common_db_mixin
|
||||||
from neutron.db import l3_dvr_db
|
from neutron.db import l3_dvr_db
|
||||||
from neutron.db import l3_dvrscheduler_db
|
from neutron.db import l3_dvrscheduler_db
|
||||||
from neutron.db.models import agent as agent_model
|
|
||||||
from neutron.db.models import l3 as l3_models
|
from neutron.db.models import l3 as l3_models
|
||||||
from neutron.db import models_v2
|
from neutron.db import models_v2
|
||||||
from neutron.extensions import l3
|
from neutron.extensions import l3
|
||||||
|
from neutron.objects import agent as agent_obj
|
||||||
from neutron.objects import router as router_obj
|
from neutron.objects import router as router_obj
|
||||||
from neutron.tests.unit.db import test_db_base_plugin_v2
|
from neutron.tests.unit.db import test_db_base_plugin_v2
|
||||||
|
|
||||||
|
@ -476,12 +476,14 @@ class L3DvrTestCase(test_db_base_plugin_v2.NeutronDbPluginV2TestCase):
|
||||||
self.mixin._get_agent_gw_ports_exist_for_network = mock.Mock(
|
self.mixin._get_agent_gw_ports_exist_for_network = mock.Mock(
|
||||||
return_value=fport_db)
|
return_value=fport_db)
|
||||||
|
|
||||||
fipagent = agent_model.Agent(
|
fipagent = agent_obj.Agent(
|
||||||
|
self.ctx,
|
||||||
|
id=_uuid(),
|
||||||
binary='foo-agent',
|
binary='foo-agent',
|
||||||
host='host',
|
host='host',
|
||||||
agent_type='L3 agent',
|
agent_type='L3 agent',
|
||||||
topic='foo_topic',
|
topic='foo_topic',
|
||||||
configurations='{"agent_mode": "dvr_no_external"}')
|
configurations={"agent_mode": "dvr_no_external"})
|
||||||
self.mixin._get_agent_by_type_and_host = mock.Mock(
|
self.mixin._get_agent_by_type_and_host = mock.Mock(
|
||||||
return_value=fipagent)
|
return_value=fipagent)
|
||||||
fport = self.mixin.create_fip_agent_gw_port_if_not_exists(
|
fport = self.mixin.create_fip_agent_gw_port_if_not_exists(
|
||||||
|
@ -490,12 +492,14 @@ class L3DvrTestCase(test_db_base_plugin_v2.NeutronDbPluginV2TestCase):
|
||||||
'host')
|
'host')
|
||||||
self.assertIsNone(fport)
|
self.assertIsNone(fport)
|
||||||
|
|
||||||
fipagent = agent_model.Agent(
|
fipagent = agent_obj.Agent(
|
||||||
|
self.ctx,
|
||||||
|
id=_uuid(),
|
||||||
binary='foo-agent',
|
binary='foo-agent',
|
||||||
host='host',
|
host='host',
|
||||||
agent_type='L3 agent',
|
agent_type='L3 agent',
|
||||||
topic='foo_topic',
|
topic='foo_topic',
|
||||||
configurations='{"agent_mode": "dvr"}')
|
configurations={"agent_mode": "dvr"})
|
||||||
self.mixin._get_agent_by_type_and_host = mock.Mock(
|
self.mixin._get_agent_by_type_and_host = mock.Mock(
|
||||||
return_value=fipagent)
|
return_value=fipagent)
|
||||||
fport = self.mixin.create_fip_agent_gw_port_if_not_exists(
|
fport = self.mixin.create_fip_agent_gw_port_if_not_exists(
|
||||||
|
|
Loading…
Reference in New Issue