Merge "Replace create_test_network with network object"

neutron/tests/unit/objects/qos/test_policy.py

@@ -17,6 +17,7 @@ import testtools
 from neutron.common import exceptions as n_exc
 from neutron.db import models_v2
 from neutron.objects.db import api as db_api
+from neutron.objects import network as net_obj
 from neutron.objects.qos import policy
 from neutron.objects.qos import rule
 from neutron.services.qos import qos_consts
@@ -179,9 +180,9 @@ class QosPolicyDbObjectTestCase(test_base.BaseDbObjectTestCase,
     def test_attach_and_get_multiple_policy_networks(self):
 
         net1_id = self._network['id']
-        net2 = db_api.create_object(self.context,
-                                    models_v2.Network,
-                                    {'name': 'test-network2'})
+        net2 = net_obj.Network(self.context,
+                               name='test-network2')
+        net2.create()
         net2_id = net2['id']
 
         obj = self._create_test_policy()

neutron/tests/unit/objects/test_base.py

@@ -32,12 +32,12 @@ from neutron.common import utils
 from neutron import context
 from neutron.db import db_base_plugin_v2
 from neutron.db import model_base
-from neutron.db import models_v2
 from neutron.db import segments_db
 from neutron import objects
 from neutron.objects import base
 from neutron.objects import common_types
 from neutron.objects.db import api as obj_db_api
+from neutron.objects import network as net_obj
 from neutron.objects import ports
 from neutron.objects import rbac_db
 from neutron.objects import subnet
@@ -1090,17 +1090,16 @@ class BaseDbObjectTestCase(_BaseObjectTestCase,
                     ]
 
     def _create_test_network(self):
-        # TODO(ihrachys): replace with network.create() once we get an object
-        # implementation for networks
-        self._network = obj_db_api.create_object(self.context,
-                                                 models_v2.Network,
-                                                 {'name': 'test-network1'})
+        self._network = net_obj.Network(self.context,
+                                       name='test-network1')
+        self._network.create()
 
     def _create_network(self):
         name = "test-network-%s" % tools.get_random_string(4)
-        return obj_db_api.create_object(self.context,
-                                        models_v2.Network,
-                                        {'name': name})
+        _network = net_obj.Network(self.context,
+                                   name=name)
+        _network.create()
+        return _network
 
     def _create_test_subnet(self, network):
         test_subnet = {

neutron/tests/unit/objects/test_ports.py

@@ -16,7 +16,6 @@ from oslo_utils import uuidutils
 import testscenarios
 
 from neutron.db.models import securitygroup as sg_models
-from neutron.db import models_v2
 from neutron.objects import base as obj_base
 from neutron.objects.db import api as obj_db_api
 from neutron.objects import network
@@ -98,11 +97,9 @@ class PortBindingVifDetailsTestCase(testscenarios.WithScenarios,
         return port
 
     def _create_test_network(self):
-        # TODO(ihrachys): replace with network.create() once we get an object
-        # implementation for networks
-        self._network = obj_db_api.create_object(self.context,
-                                                 models_v2.Network,
-                                                 {'name': 'test-network1'})
+        self._network = network.Network(self.context,
+                                        name='test-network1')
+        self._network.create()
 
     def _make_object(self, fields):
         fields = obj_test_base.get_non_synthetic_fields(