Skip to content

Commit 48f3505

Browse files
zhuflstephenfin
authored andcommitted
tests: Remove 'stub_out_trusted_certs'
We don't fetch TrustedCert objects like this. Instead, we simply access 'instance.trusted_certs', which has already been configured earlier in the '_action_rebuild' method in 'nova.api.openstack.compute.servers'. Change-Id: Ib4950728d461a12ddfb8794c3c5be7ea07167fbb
1 parent 97e1a6b commit 48f3505

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3587,7 +3587,6 @@ def setUp(self):
35873587
@mock.patch('nova.compute.api.API.get')
35883588
def _rebuild_server(self, mock_get, certs=None,
35893589
conf_enabled=True, conf_certs=None):
3590-
fakes.stub_out_trusted_certs(self, certs=certs)
35913590
ctx = self.req.environ['nova.context']
35923591
mock_get.return_value = fakes.stub_instance_obj(ctx,
35933592
vm_state=vm_states.ACTIVE, trusted_certs=certs,

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -111,30 +111,6 @@ def no_key_pair(context, user_id):
111111
testcase.stub_out('nova.db.api.key_pair_get_all_by_user', no_key_pair)
112112

113113

114-
def stub_out_trusted_certs(test, certs=None):
115-
def fake_trusted_certs(cls, context, instance_uuid):
116-
return objects.TrustedCerts(ids=trusted_certs)
117-
118-
def fake_instance_extra(context, instance_uuid, columns):
119-
if columns is ['trusted_certs']:
120-
return {'trusted_certs': trusted_certs}
121-
else:
122-
return {'numa_topology': None,
123-
'pci_requests': None,
124-
'flavor': None,
125-
'vcpu_model': None,
126-
'trusted_certs': trusted_certs,
127-
'migration_context': None}
128-
129-
trusted_certs = []
130-
if certs:
131-
trusted_certs = certs
132-
test.stub_out('nova.objects.TrustedCerts.get_by_instance_uuid',
133-
fake_trusted_certs)
134-
test.stub_out('nova.db.instance_extra_get_by_instance_uuid',
135-
fake_instance_extra)
136-
137-
138114
def stub_out_instance_quota(test, allowed, quota, resource='instances'):
139115
def fake_reserve(context, **deltas):
140116
requested = deltas.pop(resource, 0)

0 commit comments

Comments
 (0)