From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Tue, 4 Oct 2016 12:27:59 +0000 (+0200)
Subject: Merge "v0.4.62 Get properly a vimconn error at image/flavor list/create"
X-Git-Tag: v1.0.0~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=1c8d4875c3aa60998b54761d45fbd1b31da0c0d1;hp=5e91eb8987aea037647103633909bf894bbed3c5;p=osm%2FRO.git

Merge "v0.4.62 Get properly a vimconn error at image/flavor list/create"
---

diff --git a/nfvo.py b/nfvo.py
index 005e065b..9f360ce1 100644
--- a/nfvo.py
+++ b/nfvo.py
@@ -354,7 +354,7 @@ def create_or_use_flavor(mydb, vims, flavor_dict, rollback_list, only_create_at_
             if 'extended' in flavor_dict and flavor_dict['extended']!=None:
                 dev_nb=0
                 for device in flavor_dict['extended'].get('devices',[]):
-                    if "image" not in device or "image name" not in device:
+                    if "image" not in device and "image name" not in device:
                         continue
                     image_dict={}
                     image_dict['name']=device.get('image name',flavor_dict['name']+str(dev_nb)+"-img")