commit 1cc0d44cfcac6dd5086d97397de072101a1f6611
author garciadeblas <gerardo.garciadeblas@telefonica.com> Tue Oct 04 10:06:31 2016 +0200
committer Gerrit Code Review <root@osm.etsi.org> Tue Oct 04 10:06:31 2016 +0200
tree 7b7a467aa66feeeac1bced47512d2c22b3168978
parent 41f18bea4579ddd058832c9e36a2278f7da6cbff
parent 7725a1e3552fe32fae12e94d47595c4789d3b809

Merge "fixed small typo at basictest"

nfvo.py

diff --git a/nfvo.py b/nfvo.py
index e803206..2998c38 100644
--- a/nfvo.py
+++ b/nfvo.py
@@ -344,7 +344,7 @@
             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")