projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pin black version in tox.ini to 23.12.1
[osm/RO.git]
/
RO-VIM-openstack
/
osm_rovim_openstack
/
vimconn_openstack.py
diff --git
a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
index
70b3f21
..
9d47437
100644
(file)
--- a/
RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
+++ b/
RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
@@
-645,9
+645,10
@@
class vimconnector(vimconn.VimConnector):
# TODO parse input and translate to VIM format (openmano_schemas.new_vminstance_response_schema)
server_dict = server.to_dict()
try:
# TODO parse input and translate to VIM format (openmano_schemas.new_vminstance_response_schema)
server_dict = server.to_dict()
try:
- server_dict["flavor"]["id"] = self.nova.flavors.find(
- name=server_dict["flavor"]["original_name"]
- ).id
+ if server_dict["flavor"].get("original_name"):
+ server_dict["flavor"]["id"] = self.nova.flavors.find(
+ name=server_dict["flavor"]["original_name"]
+ ).id
except nClient.exceptions.NotFound as e:
self.logger.warning(str(e.message))
return server_dict
except nClient.exceptions.NotFound as e:
self.logger.warning(str(e.message))
return server_dict
@@
-2988,11
+2989,7
@@
class vimconnector(vimconn.VimConnector):
k_id (str): Port id in the VIM
"""
try:
k_id (str): Port id in the VIM
"""
try:
- port_dict = self.neutron.list_ports()
- existing_ports = [port["id"] for port in port_dict["ports"] if port_dict]
-
- if k_id in existing_ports:
- self.neutron.delete_port(k_id)
+ 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))
@@
-3946,9
+3943,10
@@
class vimconnector(vimconn.VimConnector):
all_servers = self.nova.servers.list(detailed=True)
try:
for server in all_servers:
all_servers = self.nova.servers.list(detailed=True)
try:
for server in all_servers:
- server.flavor["id"] = self.nova.flavors.find(
- name=server.flavor["original_name"]
- ).id
+ if server.flavor.get("original_name"):
+ server.flavor["id"] = self.nova.flavors.find(
+ name=server.flavor["original_name"]
+ ).id
except nClient.exceptions.NotFound as e:
self.logger.warning(str(e.message))
all_ports = self.neutron.list_ports()
except nClient.exceptions.NotFound as e:
self.logger.warning(str(e.message))
all_ports = self.neutron.list_ports()