diff options
| -rw-r--r-- | catalog/packages/biz/ns_descriptor.py | 4 | ||||
| -rw-r--r-- | catalog/packages/serializers/catalog_serializers.py | 25 | ||||
| -rw-r--r-- | catalog/pub/utils/toscaparser/testdata/vnf/vSBC.csar | bin | 0 -> 11516 bytes | |||
| -rwxr-xr-x | docker/Dockerfile | 2 |
4 files changed, 21 insertions, 10 deletions
diff --git a/catalog/packages/biz/ns_descriptor.py b/catalog/packages/biz/ns_descriptor.py index df070f96..c0b067f1 100644 --- a/catalog/packages/biz/ns_descriptor.py +++ b/catalog/packages/biz/ns_descriptor.py @@ -133,7 +133,7 @@ class NsDescriptor(object): nsd_id = nsd.get("ns", {}).get("properties", {}).get("descriptor_id", "") nsd_name = nsd.get("ns", {}).get("properties", {}).get("name", "") nsd_version = nsd.get("ns", {}).get("properties", {}).get("version", "") - nsd_desginer = nsd.get("ns", {}).get("properties", {}).get("desginer", "") + nsd_designer = nsd.get("ns", {}).get("properties", {}).get("designer", "") invariant_id = nsd.get("ns", {}).get("properties", {}).get("invariant_id", "") if nsd_id == "": raise CatalogException("nsd_id(%s) does not exist in metadata." % nsd_id) @@ -163,7 +163,7 @@ class NsDescriptor(object): ns_pkgs.update( nsdId=nsd_id, nsdName=nsd_name, - nsdDesginer=nsd_desginer, + nsdDesginer=nsd_designer, nsdDescription=nsd.get("description", ""), nsdVersion=nsd_version, invariantId=invariant_id, diff --git a/catalog/packages/serializers/catalog_serializers.py b/catalog/packages/serializers/catalog_serializers.py index 265661db..90006c92 100644 --- a/catalog/packages/serializers/catalog_serializers.py +++ b/catalog/packages/serializers/catalog_serializers.py @@ -147,29 +147,40 @@ class NfPackageDistributeRequestSerializer(serializers.Serializer): class NfPackageInfoSerializer(serializers.Serializer): vnfdId = serializers.CharField( help_text="VNFD ID", - required=True, + required=False, + allow_null=True, allow_blank=True) vnfPackageId = serializers.CharField( help_text="VNF Package ID", required=True) vnfdProvider = serializers.CharField( - help_text="VNFD Provider", required=True, allow_blank=True) + help_text="VNFD Provider", + required=False, + allow_null=True, + allow_blank=True) vnfdVersion = serializers.CharField( - help_text="VNFD Version", required=True, allow_blank=True) + help_text="VNFD Version", + required=False, + allow_null=True, + allow_blank=True) vnfVersion = serializers.CharField( help_text="VNF Version", - required=True, + required=False, + allow_null=True, allow_blank=True) csarName = serializers.CharField( help_text="CSAR Name", - required=True, + required=False, + allow_null=True, allow_blank=True) vnfdModel = serializers.CharField( help_text="VNFD Model", - required=True, + required=False, + allow_null=True, allow_blank=True) downloadUrl = serializers.CharField( help_text="URL to download VNFD Model", - required=True, + required=False, + allow_null=True, allow_blank=True) diff --git a/catalog/pub/utils/toscaparser/testdata/vnf/vSBC.csar b/catalog/pub/utils/toscaparser/testdata/vnf/vSBC.csar Binary files differnew file mode 100644 index 00000000..921eafde --- /dev/null +++ b/catalog/pub/utils/toscaparser/testdata/vnf/vSBC.csar diff --git a/docker/Dockerfile b/docker/Dockerfile index 46565d5f..c4ae5587 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -28,7 +28,7 @@ ADD . /service WORKDIR /service # get binary zip from nexus - vfc-nfvo-catalog -RUN wget -q -O vfc-nfvo-catalog.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.catalog&a=vfc-nfvo-catalog&v=LATEST&e=zip' && \ +RUN wget -q -O vfc-nfvo-catalog.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.catalog&a=vfc-nfvo-catalog&v=LATEST&e=zip' && \ unzip vfc-nfvo-catalog.zip && \ rm -rf vfc-nfvo-catalog.zip |