Merge "Removed support of swift-internal prefix"
This commit is contained in:
commit
1d9dd186c8
@ -24,9 +24,7 @@ def get_raw_binary(job_binary):
|
|||||||
if url.startswith("internal-db://"):
|
if url.startswith("internal-db://"):
|
||||||
res = db.get_raw_data(context.ctx(), job_binary)
|
res = db.get_raw_data(context.ctx(), job_binary)
|
||||||
|
|
||||||
# TODO(mattf): remove support for OLD_SWIFT_INTERNAL_PREFIX
|
if url.startswith(su.SWIFT_INTERNAL_PREFIX):
|
||||||
if url.startswith(su.SWIFT_INTERNAL_PREFIX) or (
|
|
||||||
url.startswith(su.OLD_SWIFT_INTERNAL_PREFIX)):
|
|
||||||
res = i_swift.get_raw_data(context.ctx(), job_binary)
|
res = i_swift.get_raw_data(context.ctx(), job_binary)
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
@ -47,9 +47,7 @@ def get_raw_data(context, job_binary):
|
|||||||
|
|
||||||
conn = _get_conn(user, password)
|
conn = _get_conn(user, password)
|
||||||
|
|
||||||
# TODO(mattf): remove support for OLD_SWIFT_INTERNAL_PREFIX
|
if not (job_binary.url.startswith(su.SWIFT_INTERNAL_PREFIX)):
|
||||||
if not (job_binary.url.startswith(su.SWIFT_INTERNAL_PREFIX) or
|
|
||||||
job_binary.url.startswith(su.OLD_SWIFT_INTERNAL_PREFIX)):
|
|
||||||
# This should have been guaranteed already,
|
# This should have been guaranteed already,
|
||||||
# but we'll check just in case.
|
# but we'll check just in case.
|
||||||
raise ex.BadJobBinaryException(
|
raise ex.BadJobBinaryException(
|
||||||
|
@ -51,9 +51,7 @@ JOB_BINARY_SCHEMA = {
|
|||||||
def check_job_binary(data, **kwargs):
|
def check_job_binary(data, **kwargs):
|
||||||
job_binary_location_type = data["url"]
|
job_binary_location_type = data["url"]
|
||||||
extra = data.get("extra", {})
|
extra = data.get("extra", {})
|
||||||
# TODO(mattf): remove support for OLD_SWIFT_INTERNAL_PREFIX
|
if job_binary_location_type.startswith(su.SWIFT_INTERNAL_PREFIX):
|
||||||
if job_binary_location_type.startswith(su.SWIFT_INTERNAL_PREFIX) or (
|
|
||||||
job_binary_location_type.startswith(su.OLD_SWIFT_INTERNAL_PREFIX)):
|
|
||||||
if not extra.get("user") or not extra.get("password"):
|
if not extra.get("user") or not extra.get("password"):
|
||||||
raise e.BadJobBinaryException()
|
raise e.BadJobBinaryException()
|
||||||
if job_binary_location_type.startswith("internal-db"):
|
if job_binary_location_type.startswith("internal-db"):
|
||||||
|
@ -22,8 +22,6 @@ from sahara import context
|
|||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
|
||||||
SWIFT_INTERNAL_PREFIX = "swift://"
|
SWIFT_INTERNAL_PREFIX = "swift://"
|
||||||
# TODO(mattf): remove support for OLD_SWIFT_INTERNAL_PREFIX
|
|
||||||
OLD_SWIFT_INTERNAL_PREFIX = "swift-internal://"
|
|
||||||
SWIFT_URL_SUFFIX_START = '.'
|
SWIFT_URL_SUFFIX_START = '.'
|
||||||
SWIFT_URL_SUFFIX = SWIFT_URL_SUFFIX_START + 'sahara'
|
SWIFT_URL_SUFFIX = SWIFT_URL_SUFFIX_START + 'sahara'
|
||||||
|
|
||||||
|
@ -48,17 +48,6 @@ class TestJobBinaryValidation(u.ValidationTestCase):
|
|||||||
"To work with JobBinary located in internal "
|
"To work with JobBinary located in internal "
|
||||||
"swift add 'user' and 'password' to extra"))
|
"swift add 'user' and 'password' to extra"))
|
||||||
|
|
||||||
# TODO(mattf): remove support for OLD_SWIFT_INTERNAL_PREFIX
|
|
||||||
def test_job_binary_create_swift_with_old_prefix(self):
|
|
||||||
self._assert_create_object_validation(
|
|
||||||
data={
|
|
||||||
"name": "j_o_w",
|
|
||||||
"url": su.OLD_SWIFT_INTERNAL_PREFIX + "o.sahara/k"
|
|
||||||
},
|
|
||||||
bad_req_i=(1, "BAD_JOB_BINARY",
|
|
||||||
"To work with JobBinary located in internal "
|
|
||||||
"swift add 'user' and 'password' to extra"))
|
|
||||||
|
|
||||||
def test_job_binary_create_internal(self):
|
def test_job_binary_create_internal(self):
|
||||||
self._assert_create_object_validation(
|
self._assert_create_object_validation(
|
||||||
data={
|
data={
|
||||||
|
@ -53,9 +53,7 @@ def validate_job_location_format(entry):
|
|||||||
if entry.startswith('internal-db://'):
|
if entry.startswith('internal-db://'):
|
||||||
return uuidutils.is_uuid_like(entry[len("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):
|
||||||
if entry.startswith(su.SWIFT_INTERNAL_PREFIX) or (
|
|
||||||
entry.startswith(su.OLD_SWIFT_INTERNAL_PREFIX)):
|
|
||||||
# TODO(nprivalova):add hostname validation
|
# TODO(nprivalova):add hostname validation
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
Loading…
Reference in New Issue
Block a user