projects
/
osm
/
RO.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
7725a1e
)
Merge "fixed small typo at basictest"
author
garciadeblas
<gerardo.garciadeblas@telefonica.com>
Tue, 4 Oct 2016 08:06:31 +0000
(10:06 +0200)
committer
Gerrit Code Review
<root@osm.etsi.org>
Tue, 4 Oct 2016 08:06:31 +0000
(10:06 +0200)
nfvo.py
patch
|
blob
|
history
diff --git
a/nfvo.py
b/nfvo.py
index
e803206
..
2998c38
100644
(file)
--- a/
nfvo.py
+++ b/
nfvo.py
@@
-344,7
+344,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")