Change the 'savanna-db' scheme to 'internal-db'
The url scheme indicating internal store for job binaries has been changed from 'savanna-db' to 'internal-db'. All of the constant strings in the code referencing 'savanna-db' have been changed. Partial-Implements: blueprint savanna-renaming-service Change-Id: I94baab611570679bfff817bde2e5400a63d364ca
This commit is contained in:
parent
d39024a207
commit
ee3f27a43a
@ -223,8 +223,7 @@ class JobBinary(object):
|
||||
tenant_id
|
||||
name
|
||||
description
|
||||
url - URLs may be the following: internal-db://URL, internal-swift://,
|
||||
external-swift://
|
||||
url - URLs may be the following: internal-db://URL, swift://
|
||||
extra - extra may contain not only user-password but e.g. auth-token
|
||||
"""
|
||||
|
||||
|
@ -21,7 +21,7 @@ from sahara.swift import utils as su
|
||||
|
||||
def get_raw_binary(job_binary):
|
||||
url = job_binary.url
|
||||
if url.startswith("savanna-db://"):
|
||||
if url.startswith("internal-db://"):
|
||||
res = db.get_raw_data(context.ctx(), job_binary)
|
||||
|
||||
# TODO(mattf): remove support for OLD_SWIFT_INTERNAL_PREFIX
|
||||
|
@ -20,7 +20,7 @@ conductor = c.API
|
||||
|
||||
|
||||
def get_raw_data(context, job_binary):
|
||||
# url example: 'internal-db://JobBinaryInternal-UUID
|
||||
binary_internal_id = job_binary.url[len("savanna-db://"):]
|
||||
# url example: 'internal-db://JobBinaryInternal-UUID'
|
||||
binary_internal_id = job_binary.url[len("internal-db://"):]
|
||||
return conductor.job_binary_internal_get_raw_data(context,
|
||||
binary_internal_id)
|
||||
|
@ -56,6 +56,6 @@ def check_job_binary(data, **kwargs):
|
||||
job_binary_location_type.startswith(su.OLD_SWIFT_INTERNAL_PREFIX)):
|
||||
if not extra.get("user") or not extra.get("password"):
|
||||
raise e.BadJobBinaryException()
|
||||
if job_binary_location_type.startswith("savanna-db"):
|
||||
internal_uid = job_binary_location_type[len("savanna-db://"):]
|
||||
if job_binary_location_type.startswith("internal-db"):
|
||||
internal_uid = job_binary_location_type[len("internal-db://"):]
|
||||
b.check_job_binary_internal_exists(internal_uid)
|
||||
|
@ -72,7 +72,7 @@ class EDPTest(base.ITestCase):
|
||||
self._create_job_binary_internals(name, data))
|
||||
job_binary_list.append(
|
||||
self._create_job_binary(
|
||||
name, 'savanna-db://%s' % job_binary_internal_list[-1]))
|
||||
name, 'internal-db://%s' % job_binary_internal_list[-1]))
|
||||
|
||||
def _delete_job(self, execution_job, job_id, job_binary_list,
|
||||
job_binary_internal_list, input_id, output_id):
|
||||
|
@ -79,7 +79,7 @@ SAMPLE_JOB_BINARY = {
|
||||
"tenant_id": "test_tenant",
|
||||
"name": "job_binary_test",
|
||||
"description": "test_dec",
|
||||
"url": "savanna-db://test_binary",
|
||||
"url": "internal-db://test_binary",
|
||||
}
|
||||
|
||||
|
||||
|
@ -394,7 +394,7 @@ def _create_job(id, job_binary, type):
|
||||
def _create_job_binary(id, type):
|
||||
binary = mock.Mock()
|
||||
binary.id = id
|
||||
binary.url = "savanna-db://42"
|
||||
binary.url = "internal-db://42"
|
||||
if edp.compare_job_type(type, 'Pig'):
|
||||
binary.name = "script.pig"
|
||||
elif edp.compare_job_type(type, 'MapReduce', 'Java'):
|
||||
|
@ -28,7 +28,7 @@ class TestJobBinaryValidation(u.ValidationTestCase):
|
||||
def test_creation(self):
|
||||
data = {
|
||||
"name": "main.jar",
|
||||
"url": "savanna-db://3e4651a5-1f08-4880-94c4-596372b37c64",
|
||||
"url": "internal-db://3e4651a5-1f08-4880-94c4-596372b37c64",
|
||||
"extra": {
|
||||
"user": "user",
|
||||
"password": "password"
|
||||
@ -62,8 +62,8 @@ class TestJobBinaryValidation(u.ValidationTestCase):
|
||||
self._assert_create_object_validation(
|
||||
data={
|
||||
"name": "main.jar",
|
||||
"url": "savanna-db://abacaba",
|
||||
"url": "internal-db://abacaba",
|
||||
},
|
||||
bad_req_i=(1, "VALIDATION_ERROR",
|
||||
"'savanna-db://abacaba' is not a "
|
||||
"'internal-db://abacaba' is not a "
|
||||
"'valid_job_location'"))
|
||||
|
@ -46,8 +46,8 @@ def validate_name_format(entry):
|
||||
|
||||
@jsonschema.FormatChecker.cls_checks('valid_job_location')
|
||||
def validate_job_location_format(entry):
|
||||
if entry.startswith('savanna-db://'):
|
||||
return uuidutils.is_uuid_like(entry[len("savanna-db://"):])
|
||||
if entry.startswith('internal-db://'):
|
||||
return uuidutils.is_uuid_like(entry[len("internal-db://"):])
|
||||
|
||||
# TODO(mattf): remove support for OLD_SWIFT_INTERNAL_PREFIX
|
||||
if entry.startswith(su.SWIFT_INTERNAL_PREFIX) or (
|
||||
|
Loading…
Reference in New Issue
Block a user