Merge changes I46c903b7,I7128529e into v2.0

* changes:
  RIFT 16526 Copy the icon image also to the UI logos location for UI update.
  RIFT 16501 get-package-endpoint now requires a valid package-type.

diff --git a/BUILD.sh b/BUILD.sh
index ab1e685..4eb0577 100755 (executable)
--- 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 b1d1c8b..61e195b 100755 (executable)
--- 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