projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 2157 to resolve issues with IETF L2VPN WIM connector
[osm/RO.git]
/
RO-VIM-aws
/
osm_rovim_aws
/
vimconn_aws.py
diff --git
a/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py
b/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py
index
5a937d6
..
5fc0704
100644
(file)
--- a/
RO-VIM-aws/osm_rovim_aws/vimconn_aws.py
+++ b/
RO-VIM-aws/osm_rovim_aws/vimconn_aws.py
@@
-141,9
+141,9
@@
class vimconnector(vimconn.VimConnector):
try:
if flavor_data[0] == "@": # read from a file
with open(flavor_data[1:], "r") as stream:
try:
if flavor_data[0] == "@": # read from a file
with open(flavor_data[1:], "r") as stream:
- self.flavor_info = yaml.
load(stream, Loader=yaml.Loader
)
+ self.flavor_info = yaml.
safe_load(stream
)
else:
else:
- self.flavor_info = yaml.
load(flavor_data, Loader=yaml.Loader
)
+ self.flavor_info = yaml.
safe_load(flavor_data
)
except yaml.YAMLError as e:
self.flavor_info = None
except yaml.YAMLError as e:
self.flavor_info = None
@@
-948,7
+948,7
@@
class vimconnector(vimconn.VimConnector):
except Exception as e:
self.format_vimconn_exception(e)
except Exception as e:
self.format_vimconn_exception(e)
- def delete_vminstance(self, vm_id, created_items=None, volumes_
2
hold=None):
+ def delete_vminstance(self, vm_id, created_items=None, volumes_
to_
hold=None):
"""Removes a VM instance from VIM
Returns the instance identifier"""
try:
"""Removes a VM instance from VIM
Returns the instance identifier"""
try: