projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix issues deleting vnfd with erroneous config
[osm/RO.git]
/
openmano
diff --git
a/openmano
b/openmano
index
8f5d7cc
..
ccd22e7
100755
(executable)
--- a/
openmano
+++ b/
openmano
@@
-28,7
+28,7
@@
openmano client used to interact with openmano-server (openmanod)
"""
__author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes"
__date__ = "$09-oct-2014 09:09:48$"
"""
__author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes"
__date__ = "$09-oct-2014 09:09:48$"
-__version__ = "0.4.2
1-r531
"
+__version__ = "0.4.2
2-r532
"
version_date = "Oct 2017"
from argcomplete.completers import FilesCompleter
version_date = "Oct 2017"
from argcomplete.completers import FilesCompleter
@@
-317,6
+317,11
@@
def vnf_create(args):
vdu_list[index]['image'] = image_name_
if "image-checksum" in vdu_list[index]:
del vdu_list[index]["image-checksum"]
vdu_list[index]['image'] = image_name_
if "image-checksum" in vdu_list[index]:
del vdu_list[index]["image-checksum"]
+ if vdu_list[index].get("alternative-images"):
+ for a_image in vdu_list[index]["alternative-images"]:
+ a_image['image'] = image_name_
+ if "image-checksum" in a_image:
+ del a_image["image-checksum"]
else: # image name in volumes
vdu_list[index]["volumes"][0]["image"] = image_name_
if "image-checksum" in vdu_list[index]["volumes"][0]:
else: # image name in volumes
vdu_list[index]["volumes"][0]["image"] = image_name_
if "image-checksum" in vdu_list[index]["volumes"][0]:
@@
-332,6
+337,9
@@
def vnf_create(args):
if api_version == "/v3":
if vdu_list[index].get("image"):
vdu_list[index]['image-checksum'] = image_checksum_
if api_version == "/v3":
if vdu_list[index].get("image"):
vdu_list[index]['image-checksum'] = image_checksum_
+ if vdu_list[index].get("alternative-images"):
+ for a_image in vdu_list[index]["alternative-images"]:
+ a_image['image-checksum'] = image_checksum_
else: # image name in volumes
vdu_list[index]["volumes"][0]["image-checksum"] = image_checksum_
else:
else: # image name in volumes
vdu_list[index]["volumes"][0]["image-checksum"] = image_checksum_
else:
@@
-1017,8
+1025,9
@@
def datacenter_attach(args):
datacenter_dict['vim_password'] = args.password
if args.config!=None:
datacenter_dict["config"] = _load_file_or_yaml(args.config)
datacenter_dict['vim_password'] = args.password
if args.config!=None:
datacenter_dict["config"] = _load_file_or_yaml(args.config)
+
payload_req = json.dumps( {"datacenter": datacenter_dict })
payload_req = json.dumps( {"datacenter": datacenter_dict })
-
+
#print payload_req
URLrequest = "http://%s:%s/openmano/%s/datacenters/%s" %(mano_host, mano_port, tenant, datacenter)
#print payload_req
URLrequest = "http://%s:%s/openmano/%s/datacenters/%s" %(mano_host, mano_port, tenant, datacenter)