Merge "tests: Remove 'stub_out_trusted_certs'"

Author: Zuul

nova/tests/unit/api/openstack/compute/test_servers.py

@@ -3593,7 +3593,6 @@ def setUp(self):
     @mock.patch('nova.compute.api.API.get')
     def _rebuild_server(self, mock_get, certs=None,
                         conf_enabled=True, conf_certs=None):
-        fakes.stub_out_trusted_certs(self, certs=certs)
         ctx = self.req.environ['nova.context']
         mock_get.return_value = fakes.stub_instance_obj(ctx,
             vm_state=vm_states.ACTIVE, trusted_certs=certs,

nova/tests/unit/api/openstack/fakes.py

@@ -113,30 +113,6 @@ def no_key_pair(context, user_id):
             'nova.db.main.api.key_pair_get_all_by_user', no_key_pair)
 
 
-def stub_out_trusted_certs(test, certs=None):
-    def fake_trusted_certs(cls, context, instance_uuid):
-        return objects.TrustedCerts(ids=trusted_certs)
-
-    def fake_instance_extra(context, instance_uuid, columns):
-        if columns is ['trusted_certs']:
-            return {'trusted_certs': trusted_certs}
-        else:
-            return {'numa_topology': None,
-                    'pci_requests': None,
-                    'flavor': None,
-                    'vcpu_model': None,
-                    'trusted_certs': trusted_certs,
-                    'migration_context': None}
-
-    trusted_certs = []
-    if certs:
-        trusted_certs = certs
-    test.stub_out('nova.objects.TrustedCerts.get_by_instance_uuid',
-                  fake_trusted_certs)
-    test.stub_out('nova.db.instance_extra_get_by_instance_uuid',
-                  fake_instance_extra)
-
-
 def stub_out_instance_quota(test, allowed, quota, resource='instances'):
     def fake_reserve(context, **deltas):
         requested = deltas.pop(resource, 0)