X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmano;h=ab492f6dcef5e4ba6f22741f18c42639fac06306;hb=f70d0961a1266d6c4a0a4ce0aab18a5b9c8721ef;hp=11cc726fb3804accd6b918ee0dd6d56d5ad7368b;hpb=1448045b943223a05604d65e1da72b36797d54ed;p=osm%2FRO.git

diff --git a/openmano b/openmano
index 11cc726f..ab492f6d 100755
--- a/openmano
+++ b/openmano
@@ -28,8 +28,8 @@ openmano client used to interact with openmano-server (openmanod)
 '''
 __author__="Alfonso Tierno, Gerardo Garcia"
 __date__ ="$09-oct-2014 09:09:48$"
-__version__="0.4.8-r512"
-version_date="Oct 2016"
+__version__="0.4.9-r515"
+version_date="Jan 2017"
 
 from argcomplete.completers import FilesCompleter
 import os
@@ -263,11 +263,17 @@ def vnf_create(args):
                 for image_path_ in args.image_path.split(","):
                     #print "image-path", image_path_
                     myvnf['vnf']['VNFC'][index]['VNFC image']=image_path_
+                    if "image name" in myvnf['vnf']['VNFC'][index]:
+                        del myvnf['vnf']['VNFC'][index]["image name"]
+                    if "image checksum" in myvnf['vnf']['VNFC'][index]:
+                        del myvnf['vnf']['VNFC'][index]["image checksum"]
                     index=index+1
-            if args.image_name:
+            if args.image_name: #image name precedes if both are supplied
                 index=0
                 for image_name_ in args.image_name.split(","):
                     myvnf['vnf']['VNFC'][index]['image name']=image_name_
+                    if "VNFC image" in myvnf['vnf']['VNFC'][index]:
+                        del myvnf['vnf']['VNFC'][index]["VNFC image"]
                     index=index+1
             if args.image_checksum:
                 index=0
@@ -591,7 +597,7 @@ def instance_create(args):
     if args.scenario != None:
         scenario = args.scenario
     if not scenario:
-        print "you must provide an scenario in the file descriptor or with --scenario"
+        print "you must provide a scenario in the file descriptor or with --scenario"
         return -1
     myInstance["instance"]["scenario"] = _get_item_uuid("scenarios", scenario, tenant)
     if args.netmap_use: