projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lightweight exception capturing, logging
[osm/RO.git]
/
osm_ro
/
vimconn_openstack.py
diff --git
a/osm_ro/vimconn_openstack.py
b/osm_ro/vimconn_openstack.py
index
117171e
..
85b8dc8
100644
(file)
--- a/
osm_ro/vimconn_openstack.py
+++ b/
osm_ro/vimconn_openstack.py
@@
-714,7
+714,7
@@
class vimconnector(vimconn.vimconnector):
new_flavor=self.nova.flavors.create(name,
ram,
vcpus,
new_flavor=self.nova.flavors.create(name,
ram,
vcpus,
- flavor_data.get('disk',
1
),
+ flavor_data.get('disk',
0
),
is_public=flavor_data.get('is_public', True)
)
#add metadata
is_public=flavor_data.get('is_public', True)
)
#add metadata
@@
-1283,8
+1283,9
@@
class vimconnector(vimconn.vimconnector):
if not v: # skip already deleted
continue
try:
if not v: # skip already deleted
continue
try:
- if k.startswith("port:"):
- self.neutron.delete_port(k.strip("port:"))
+ k_item, _, k_id = k.partition(":")
+ if k_item == "port":
+ self.neutron.delete_port(k_id)
except Exception as e:
self.logger.error("Error deleting port: {}: {}".format(type(e).__name__, e))
except Exception as e:
self.logger.error("Error deleting port: {}: {}".format(type(e).__name__, e))
@@
-1308,12
+1309,12
@@
class vimconnector(vimconn.vimconnector):
if not v: # skip already deleted
continue
try:
if not v: # skip already deleted
continue
try:
- if k.startswith("volume:"):
- volume_id = k.strip("volume:")
- if self.cinder.volumes.get(
volume
_id).status != 'available':
+ k_item, _, k_id = k.partition(":")
+ if k_item == "volume":
+ if self.cinder.volumes.get(
k
_id).status != 'available':
keep_waiting = True
else:
keep_waiting = True
else:
- self.cinder.volumes.delete(
volume
_id)
+ self.cinder.volumes.delete(
k
_id)
except Exception as e:
self.logger.error("Error deleting volume: {}: {}".format(type(e).__name__, e))
if keep_waiting:
except Exception as e:
self.logger.error("Error deleting volume: {}: {}".format(type(e).__name__, e))
if keep_waiting: