From: velandy Date: Tue, 16 May 2017 20:52:03 +0000 (+0200) Subject: Merge "[Bug 270] Copy icons to UI filesystem location when descriptor is copied.... X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=07181141631b508937d606b55cdc92d04e7f27ec;hp=a5a2298cfcd2ddbb66189aca45fb4eb7ba31b395;p=osm%2FSO.git Merge "[Bug 270] Copy icons to UI filesystem location when descriptor is copied. Also delete icons from the same location when file is deleted." into v2.0 --- diff --git a/BUILD.sh b/BUILD.sh index ab1e685c..4eb05776 100755 --- a/BUILD.sh +++ b/BUILD.sh @@ -114,10 +114,10 @@ fi if [[ $PLATFORM == ub16 ]]; then PLATFORM_REPOSITORY=${1:-OSM} - PLATFORM_VERSION=${2:-4.4.2.0.60195} + PLATFORM_VERSION=${2:-4.4.2.1.61839} elif [[ $PLATFORM == fc20 ]]; then PLATFORM_REPOSITORY=${1:-OSM} # change to OSM when published - PLATFORM_VERSION=${2:-4.4.2.0.60195} + PLATFORM_VERSION=${2:-4.4.2.1.61839} else echo "Internal error: unknown platform $PLATFORM" exit 1 diff --git a/models/openmano/python/rift/openmano/rift2openmano.py b/models/openmano/python/rift/openmano/rift2openmano.py index b1d1c8b0..61e195b0 100755 --- a/models/openmano/python/rift/openmano/rift2openmano.py +++ b/models/openmano/python/rift/openmano/rift2openmano.py @@ -615,9 +615,12 @@ def rift2openmano_vnfd(rift_vnfd, rift_nsd): # Add Openmano devices device = {} device["type"] = volume.device_type - device["image name"] = volume.image - if volume.has_field("image_checksum"): - device["image checksum"] = volume.image_checksum + if volume.has_field("size"): + device["size"] = volume.size + if volume.has_field("image"): + device["image name"] = volume.image + if volume.has_field("image_checksum"): + device["image checksum"] = volume.image_checksum vnfc["devices"].append(device) vnfc_boot_data_init = False