projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some more issues at SDN assist and deleting openstack ports
[osm/RO.git]
/
osm_ro
/
vimconn_vmware.py
diff --git
a/osm_ro/vimconn_vmware.py
b/osm_ro/vimconn_vmware.py
index
d1c3977
..
09f6827
100644
(file)
--- a/
osm_ro/vimconn_vmware.py
+++ b/
osm_ro/vimconn_vmware.py
@@
-671,6
+671,9
@@
class vimconnector(vimconn.vimconnector):
networks = self.vca.get_networks(vdc.get_name())
filter_dict = {}
networks = self.vca.get_networks(vdc.get_name())
filter_dict = {}
+ if not networks:
+ vimconn.vimconnNotFoundException("Network {} not found".format(net_id))
+
for network in networks:
vdc_network_id = network.get_id().split(":")
if len(vdc_network_id) == 4 and vdc_network_id[3] == net_id:
for network in networks:
vdc_network_id = network.get_id().split(":")
if len(vdc_network_id) == 4 and vdc_network_id[3] == net_id:
@@
-686,9
+689,16
@@
class vimconnector(vimconn.vimconnector):
filter_dict["type"] = "bridge"
self.logger.debug("Returning {}".format(filter_dict))
return filter_dict
filter_dict["type"] = "bridge"
self.logger.debug("Returning {}".format(filter_dict))
return filter_dict
- except:
+ else:
+ raise vimconn.vimconnNotFoundException("Network {} not found".format(net_id))
+
+ except Exception as e:
self.logger.debug("Error in get_network")
self.logger.debug(traceback.format_exc())
self.logger.debug("Error in get_network")
self.logger.debug(traceback.format_exc())
+ if isinstance(e, vimconn.vimconnException):
+ raise
+ else:
+ raise vimconn.vimconnNotFoundException("Failed : Network not found {} ".format(e))
return filter_dict
return filter_dict