# Supported folders for NSD
# OSM document specifies (ns|vnf)-config folder, while Rel 4.3
# is using (ns|vnf)_config.
-NSD_FOLDERS=(scripts icons ns_config vnf_config)
+NSD_FOLDERS=(scripts charms icons ns_config vnf_config)
# Other files allowed in the descriptor base directory
ALLOWED_FILES=(README)
+ALLOWED_FILES_WILDCARDS=(README)
DESC_TYPES=(vnfd nsd)
DESC_EXTN=(yml yaml json xml)
ARCHIVE=false
CREATE_NSD=false
VENDOR='OSM'
-INTF_TYPE='VIRTIO'
+INTF_TYPE='PARAVIRT'
VCPU=2
MEMORY=4096
STORAGE=10
--vendor : Vendor name for descriptor. Default OSM
- --interface-type : Interface type [VIRTIO|SR-IOV|PCI-PASSTHROUGH|E1000]
- Default VIRTIO
+ --interface-type : Interface type [PARAVIRT|SR-IOV|PCI-PASSTHROUGH|E1000]
+ Default PARAVIRT
VM Flavour options:
CP_TYPE='VPORT'
function get_cp_type() {
case ${INTF_TYPE} in
- VIRTIO ) CP_TYPE='VPORT';;
+ PARAVIRT ) CP_TYPE='VPORT';;
SR-IOV ) CP_TYPE='VPORT';;
PCI-PASSTHROUGH ) CP_TYPE='VPORT';;
OM-MGMT ) CP_TYPE='VPORT';;
- name: eth0
type: EXTERNAL
virtual-interface:
- type: VIRTIO
+ type: PARAVIRT
external-connection-point-ref: vnf-cp0
EOF
eth=$(($i))
cat >>$desc_file <<EOF
- name: vnf-cp${eth}
- type: ${CP_TYPE}
EOF
done
for f in ${files[@]}; do
if [ $(contains "${ALLOWED_FILES[@]}" $f) == "n" ]; then
- echo "WARN: Unsupported file $f found"
+ for j in ${ALLOWED_FILES_WILDCARDS[@]}; do
+ if [[ $f != *"$j"* ]]; then
+ echo "WARN: Unsupported file $f found"
+ fi
+ done
fi
done
fi
cd $BASE_DIR
+ # Mrityunjay Yadav: Validate descriptor
+ GEN_BASEDIR=$(dirname "$0")
+ python3 $GEN_BASEDIR/validate_descriptor.py $BASE_DIR/$PKG/$descriptor
+ if [ $? -ne 0 ]; then
+ rc=$?
+ echo "ERROR: validating descriptor for $PKG ($rc)" >&2
+ exit $rc
+ fi
if [ $DRY_RUN == false ]; then
if [ $VERBOSE == true ]; then
tar zcvf "$DEST_DIR/$PKG.tar.gz" "${PKG}" ${RM}