X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fdescriptor_topics.py;h=98a41d1eb3ded395567413c82aa12217adab27fd;hp=969586653487455895d317c88d7935f108b811f5;hb=646773d46821cc2a5461423021e87034a5aa86e9;hpb=f354389ef8f0dd9768d63753336e83d6f6a9bc8c diff --git a/osm_nbi/descriptor_topics.py b/osm_nbi/descriptor_topics.py index 9695866..98a41d1 100644 --- a/osm_nbi/descriptor_topics.py +++ b/osm_nbi/descriptor_topics.py @@ -31,6 +31,7 @@ from time import time from uuid import uuid4 from re import fullmatch from zipfile import ZipFile +from urllib.parse import urlparse from osm_nbi.validation import ( ValidationError, pdu_new_schema, @@ -858,12 +859,18 @@ class VnfdTopic(DescriptorTopic): @staticmethod def validate_helm_chart(indata): + def is_url(url): + result = urlparse(url) + return all([result.scheme, result.netloc]) + kdus = indata.get("kdu", []) for kdu in kdus: helm_chart_value = kdu.get("helm-chart") if not helm_chart_value: continue - if not valid_helm_chart_re.match(helm_chart_value): + if not ( + valid_helm_chart_re.match(helm_chart_value) or is_url(helm_chart_value) + ): raise EngineException( "helm-chart '{}' is not valid".format(helm_chart_value), http_code=HTTPStatus.UNPROCESSABLE_ENTITY,