From 09adf885918946e03722b3b5473af46c7950bb0c Mon Sep 17 00:00:00 2001 From: Vu Cong Tuan Date: Fri, 6 Apr 2018 16:08:45 +0700 Subject: [PATCH] test_servicetype: Service Type model to OVO Change-Id: If6f59b1eb5ff869ec793304339f03fda185758c7 Partially-Implements: blueprint adopt-oslo-versioned-objects-for-db --- neutron/tests/unit/extensions/test_servicetype.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/neutron/tests/unit/extensions/test_servicetype.py b/neutron/tests/unit/extensions/test_servicetype.py index c9252cc817d..e51fec0f45a 100644 --- a/neutron/tests/unit/extensions/test_servicetype.py +++ b/neutron/tests/unit/extensions/test_servicetype.py @@ -24,9 +24,9 @@ import webob.exc as webexc import webtest from neutron.api import extensions -from neutron.db.models import servicetype as st_model from neutron.db import servicetype_db as st_db from neutron.extensions import servicetype +from neutron.objects import servicetype as servicetype_obj from neutron.services import provider_configuration as provconf from neutron.tests.unit.api import test_extensions from neutron.tests.unit.api.v2 import test_base @@ -152,11 +152,9 @@ class ServiceTypeManagerTestCase(testlib_api.SqlTestCase): constants.LOADBALANCER, 'lbaas1', uuidutils.generate_uuid()) - self.assertEqual(ctx.session. - query(st_model.ProviderResourceAssociation).count(), - 1) - assoc = ctx.session.query(st_model.ProviderResourceAssociation).one() - ctx.session.delete(assoc) + self.assertEqual( + 1, servicetype_obj.ProviderResourceAssociation.count(ctx)) + servicetype_obj.ProviderResourceAssociation.delete_objects(ctx) def test_invalid_resource_association(self): self._set_override([constants.LOADBALANCER +