x
/
novajoin
Code Issues Proposed changes

Merge "Handle no project_name returned from keystone"

This commit is contained in:
Jenkins 2017-05-30 21:04:13 +00:00 committed by Gerrit Code Review
parent 652c5f96d7 70596c8b2c
commit e75f3bd343
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
novajoin/join.py
View File

@ -177,7 +177,14 @@ class JoinController(Controller):
hostclass = metadata.get('ipa_hostclass')
if hostclass:
# Only look up project_name when hostclass is requested to
# save a round-trip with Keystone.
project_name = keystone_client.get_project_name(project_id)
if project_name is None:
msg = 'No such project-id, %s' % project_id
LOG.error(msg)
raise base.Fault(webob.exc.HTTPBadRequest(explanation=msg))
allowed_hostclass = self._get_allowed_hostclass(project_name)
LOG.debug('hostclass %s, allowed_classes %s' %
(hostclass, allowed_hostclass))

65
novajoin/tests/unit/api/v1/test_api.py
View File

@ -195,6 +195,41 @@ class JoinTest(test.TestCase):
# because in all likelihood the keytab cannot be read (and
# probably doesn't exist. This can be ignored.
@mock.patch('novajoin.keystone_client.get_project_name')
@mock.patch('novajoin.join.get_instance')
@mock.patch('novajoin.join.get_default_image_service')
@mock.patch('novajoin.util.get_domain')
def test_valid_hostclass_request(self, mock_get_domain, mock_get_image,
mock_get_instance,
mock_get_project_name):
mock_get_image.return_value = FakeImageService()
mock_get_instance.return_value = fake.fake_instance
mock_get_domain.return_value = "test"
mock_get_project_name.return_value = "test"
body = {"metadata": {"ipa_enroll": "True"},
"instance-id": fake.INSTANCE_ID,
"project-id": fake.PROJECT_ID,
"image-id": fake.IMAGE_ID,
"hostname": "test"}
req = fakes.HTTPRequest.blank('/v1')
req.method = 'POST'
req.content_type = "application/json"
req.body = jsonutils.dump_as_bytes(body)
res_dict = self.join_controller.create(req, body)
# There should be no OTP because IPA shouldn't be
# configured, but we'll handle both cases.
if res_dict.get('ipaotp'):
self.assertThat(res_dict.get('ipaotp'),
MatchesRegex('^[a-z0-9]{32}'))
self.assertEqual(len(res_dict.get('ipaotp', 0)), 32)
self.assertEqual(res_dict.get('hostname'), 'test.test')
# Note that on failures this will generate to stdout a Krb5Error
# because in all likelihood the keytab cannot be read (and
# probably doesn't exist. This can be ignored.
@mock.patch('novajoin.join.get_instance')
@mock.patch('novajoin.join.get_default_image_service')
def test_invalid_instance_id(self, mock_get_image, mock_get_instance):
@ -220,3 +255,33 @@ class JoinTest(test.TestCase):
assert fault.status_int == 400
else:
assert(False)
@mock.patch('novajoin.join.get_instance')
@mock.patch('novajoin.join.get_default_image_service')
@mock.patch('novajoin.keystone_client.get_project_name')
@mock.patch('novajoin.util.get_domain')
def test_invalid_project_id(self, mock_get_domain, mock_get_project_name,
mock_get_image, mock_get_instance):
mock_get_image.return_value = FakeImageService()
mock_get_instance.return_value = None
mock_get_project_name.return_value = None
mock_get_domain.return_value = "test"
body = {"metadata": {"ipa_enroll": "True", "ipa_hostclass": "foo"},
"instance-id": fake.INSTANCE_ID,
"project-id": "invalid",
"image-id": fake.IMAGE_ID,
"hostname": "test"}
req = fakes.HTTPRequest.blank('/v1')
req.method = 'POST'
req.content_type = "application/json"
req.body = jsonutils.dump_as_bytes(body)
# Not using assertRaises because the exception is wrapped as
# a Fault
try:
self.join_controller.create(req, body)
except Fault as fault:
assert fault.status_int == 400
else:
assert(False)