Remove havana compat from nova.cert.rpcapi
Since we only support upgrading from N-1 to N, there's no need to keep around this older upgrade related code. Change-Id: Ie13f98da84f3d631efea2670fbc926b69b405284
This commit is contained in:
parent
3ada19a650
commit
b2a2e1b8fc
|
@ -68,55 +68,36 @@ class CertAPI(object):
|
||||||
CONF.upgrade_levels.cert)
|
CONF.upgrade_levels.cert)
|
||||||
self.client = rpc.get_client(target, version_cap=version_cap)
|
self.client = rpc.get_client(target, version_cap=version_cap)
|
||||||
|
|
||||||
def _get_compat_version(self, current, havana_compat):
|
|
||||||
if not self.client.can_send_version(current):
|
|
||||||
return havana_compat
|
|
||||||
return current
|
|
||||||
|
|
||||||
def revoke_certs_by_user(self, ctxt, user_id):
|
def revoke_certs_by_user(self, ctxt, user_id):
|
||||||
# NOTE(russellb) Havana compat
|
cctxt = self.client.prepare()
|
||||||
version = self._get_compat_version('2.0', '1.0')
|
|
||||||
cctxt = self.client.prepare(version=version)
|
|
||||||
return cctxt.call(ctxt, 'revoke_certs_by_user', user_id=user_id)
|
return cctxt.call(ctxt, 'revoke_certs_by_user', user_id=user_id)
|
||||||
|
|
||||||
def revoke_certs_by_project(self, ctxt, project_id):
|
def revoke_certs_by_project(self, ctxt, project_id):
|
||||||
# NOTE(russellb) Havana compat
|
cctxt = self.client.prepare()
|
||||||
version = self._get_compat_version('2.0', '1.0')
|
|
||||||
cctxt = self.client.prepare(version=version)
|
|
||||||
return cctxt.call(ctxt, 'revoke_certs_by_project',
|
return cctxt.call(ctxt, 'revoke_certs_by_project',
|
||||||
project_id=project_id)
|
project_id=project_id)
|
||||||
|
|
||||||
def revoke_certs_by_user_and_project(self, ctxt, user_id, project_id):
|
def revoke_certs_by_user_and_project(self, ctxt, user_id, project_id):
|
||||||
# NOTE(russellb) Havana compat
|
cctxt = self.client.prepare()
|
||||||
version = self._get_compat_version('2.0', '1.0')
|
|
||||||
cctxt = self.client.prepare(version=version)
|
|
||||||
return cctxt.call(ctxt, 'revoke_certs_by_user_and_project',
|
return cctxt.call(ctxt, 'revoke_certs_by_user_and_project',
|
||||||
user_id=user_id, project_id=project_id)
|
user_id=user_id, project_id=project_id)
|
||||||
|
|
||||||
def generate_x509_cert(self, ctxt, user_id, project_id):
|
def generate_x509_cert(self, ctxt, user_id, project_id):
|
||||||
# NOTE(russellb) Havana compat
|
cctxt = self.client.prepare()
|
||||||
version = self._get_compat_version('2.0', '1.0')
|
|
||||||
cctxt = self.client.prepare(version=version)
|
|
||||||
return cctxt.call(ctxt, 'generate_x509_cert',
|
return cctxt.call(ctxt, 'generate_x509_cert',
|
||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
project_id=project_id)
|
project_id=project_id)
|
||||||
|
|
||||||
def fetch_ca(self, ctxt, project_id):
|
def fetch_ca(self, ctxt, project_id):
|
||||||
# NOTE(russellb) Havana compat
|
cctxt = self.client.prepare()
|
||||||
version = self._get_compat_version('2.0', '1.0')
|
|
||||||
cctxt = self.client.prepare(version=version)
|
|
||||||
return cctxt.call(ctxt, 'fetch_ca', project_id=project_id)
|
return cctxt.call(ctxt, 'fetch_ca', project_id=project_id)
|
||||||
|
|
||||||
def fetch_crl(self, ctxt, project_id):
|
def fetch_crl(self, ctxt, project_id):
|
||||||
# NOTE(russellb) Havana compat
|
cctxt = self.client.prepare()
|
||||||
version = self._get_compat_version('2.0', '1.0')
|
|
||||||
cctxt = self.client.prepare(version=version)
|
|
||||||
return cctxt.call(ctxt, 'fetch_crl', project_id=project_id)
|
return cctxt.call(ctxt, 'fetch_crl', project_id=project_id)
|
||||||
|
|
||||||
def decrypt_text(self, ctxt, project_id, text):
|
def decrypt_text(self, ctxt, project_id, text):
|
||||||
# NOTE(russellb) Havana compat
|
cctxt = self.client.prepare()
|
||||||
version = self._get_compat_version('2.0', '1.0')
|
|
||||||
cctxt = self.client.prepare(version=version)
|
|
||||||
return cctxt.call(ctxt, 'decrypt_text',
|
return cctxt.call(ctxt, 'decrypt_text',
|
||||||
project_id=project_id,
|
project_id=project_id,
|
||||||
text=text)
|
text=text)
|
||||||
|
|
|
@ -37,7 +37,6 @@ class CertRpcAPITestCase(test.NoDBTestCase):
|
||||||
self.assertEqual(rpcapi.client.target.topic, CONF.cert_topic)
|
self.assertEqual(rpcapi.client.target.topic, CONF.cert_topic)
|
||||||
|
|
||||||
orig_prepare = rpcapi.client.prepare
|
orig_prepare = rpcapi.client.prepare
|
||||||
expected_version = kwargs.pop('version', rpcapi.client.target.version)
|
|
||||||
|
|
||||||
with contextlib.nested(
|
with contextlib.nested(
|
||||||
mock.patch.object(rpcapi.client, 'call'),
|
mock.patch.object(rpcapi.client, 'call'),
|
||||||
|
@ -49,75 +48,37 @@ class CertRpcAPITestCase(test.NoDBTestCase):
|
||||||
prepare_mock.return_value = rpcapi.client
|
prepare_mock.return_value = rpcapi.client
|
||||||
rpc_mock.return_value = 'foo'
|
rpc_mock.return_value = 'foo'
|
||||||
csv_mock.side_effect = (
|
csv_mock.side_effect = (
|
||||||
lambda v: orig_prepare(version=v).can_send_version())
|
lambda v: orig_prepare().can_send_version())
|
||||||
|
|
||||||
retval = getattr(rpcapi, method)(ctxt, **kwargs)
|
retval = getattr(rpcapi, method)(ctxt, **kwargs)
|
||||||
self.assertEqual(retval, rpc_mock.return_value)
|
self.assertEqual(retval, rpc_mock.return_value)
|
||||||
|
|
||||||
prepare_mock.assert_called_once_with(version=expected_version)
|
prepare_mock.assert_called_once_with()
|
||||||
rpc_mock.assert_called_once_with(ctxt, method, **kwargs)
|
rpc_mock.assert_called_once_with(ctxt, method, **kwargs)
|
||||||
|
|
||||||
def test_revoke_certs_by_user(self):
|
def test_revoke_certs_by_user(self):
|
||||||
self._test_cert_api('revoke_certs_by_user', user_id='fake_user_id')
|
self._test_cert_api('revoke_certs_by_user', user_id='fake_user_id')
|
||||||
|
|
||||||
# NOTE(russellb) Havana compat
|
|
||||||
self.flags(cert='havana', group='upgrade_levels')
|
|
||||||
self._test_cert_api('revoke_certs_by_user', user_id='fake_user_id',
|
|
||||||
version='1.0')
|
|
||||||
|
|
||||||
def test_revoke_certs_by_project(self):
|
def test_revoke_certs_by_project(self):
|
||||||
self._test_cert_api('revoke_certs_by_project',
|
self._test_cert_api('revoke_certs_by_project',
|
||||||
project_id='fake_project_id')
|
project_id='fake_project_id')
|
||||||
|
|
||||||
# NOTE(russellb) Havana compat
|
|
||||||
self.flags(cert='havana', group='upgrade_levels')
|
|
||||||
self._test_cert_api('revoke_certs_by_project',
|
|
||||||
project_id='fake_project_id', version='1.0')
|
|
||||||
|
|
||||||
def test_revoke_certs_by_user_and_project(self):
|
def test_revoke_certs_by_user_and_project(self):
|
||||||
self._test_cert_api('revoke_certs_by_user_and_project',
|
self._test_cert_api('revoke_certs_by_user_and_project',
|
||||||
user_id='fake_user_id',
|
user_id='fake_user_id',
|
||||||
project_id='fake_project_id')
|
project_id='fake_project_id')
|
||||||
|
|
||||||
# NOTE(russellb) Havana compat
|
|
||||||
self.flags(cert='havana', group='upgrade_levels')
|
|
||||||
self._test_cert_api('revoke_certs_by_user_and_project',
|
|
||||||
user_id='fake_user_id',
|
|
||||||
project_id='fake_project_id', version='1.0')
|
|
||||||
|
|
||||||
def test_generate_x509_cert(self):
|
def test_generate_x509_cert(self):
|
||||||
self._test_cert_api('generate_x509_cert',
|
self._test_cert_api('generate_x509_cert',
|
||||||
user_id='fake_user_id',
|
user_id='fake_user_id',
|
||||||
project_id='fake_project_id')
|
project_id='fake_project_id')
|
||||||
|
|
||||||
# NOTE(russellb) Havana compat
|
|
||||||
self.flags(cert='havana', group='upgrade_levels')
|
|
||||||
self._test_cert_api('generate_x509_cert',
|
|
||||||
user_id='fake_user_id',
|
|
||||||
project_id='fake_project_id', version='1.0')
|
|
||||||
|
|
||||||
def test_fetch_ca(self):
|
def test_fetch_ca(self):
|
||||||
self._test_cert_api('fetch_ca', project_id='fake_project_id')
|
self._test_cert_api('fetch_ca', project_id='fake_project_id')
|
||||||
|
|
||||||
# NOTE(russellb) Havana compat
|
|
||||||
self.flags(cert='havana', group='upgrade_levels')
|
|
||||||
self._test_cert_api('fetch_ca', project_id='fake_project_id',
|
|
||||||
version='1.0')
|
|
||||||
|
|
||||||
def test_fetch_crl(self):
|
def test_fetch_crl(self):
|
||||||
self._test_cert_api('fetch_crl', project_id='fake_project_id')
|
self._test_cert_api('fetch_crl', project_id='fake_project_id')
|
||||||
|
|
||||||
# NOTE(russellb) Havana compat
|
|
||||||
self.flags(cert='havana', group='upgrade_levels')
|
|
||||||
self._test_cert_api('fetch_crl', project_id='fake_project_id',
|
|
||||||
version='1.0')
|
|
||||||
|
|
||||||
def test_decrypt_text(self):
|
def test_decrypt_text(self):
|
||||||
self._test_cert_api('decrypt_text',
|
self._test_cert_api('decrypt_text',
|
||||||
project_id='fake_project_id', text='blah')
|
project_id='fake_project_id', text='blah')
|
||||||
|
|
||||||
# NOTE(russellb) Havana compat
|
|
||||||
self.flags(cert='havana', group='upgrade_levels')
|
|
||||||
self._test_cert_api('decrypt_text',
|
|
||||||
project_id='fake_project_id', text='blah',
|
|
||||||
version='1.0')
|
|
||||||
|
|
Loading…
Reference in New Issue