commit 57f42afc992efe1da538d3058af0be2b8d7f0971
author garciadeblas <gerardo.garciadeblas@telefonica.com> Tue Oct 04 10:08:05 2016 +0200
committer Gerrit Code Review <root@osm.etsi.org> Tue Oct 04 10:08:05 2016 +0200
tree 26b86d9a0e045502bd9cab93a05299b16449c46a
parent 1cc0d44cfcac6dd5086d97397de072101a1f6611
parent 8b413241c07347b196b81f5c340137fa8963b1e1

Merge "allow running test_vimconn without user ssh keys. Change installation to copy .gitignore with common parameters"

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")