projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 194 - Openstack API v3.3
[osm/RO.git]
/
openmano
diff --git
a/openmano
b/openmano
index
11cc726
..
ab492f6
100755
(executable)
--- 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$"
'''
__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
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_
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
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_
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
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:
if args.scenario != None:
scenario = args.scenario
if not scenario:
- print "you must provide a
n
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:
return -1
myInstance["instance"]["scenario"] = _get_item_uuid("scenarios", scenario, tenant)
if args.netmap_use: