diff --git a/monitoring-for-openstack/oschecks/neutron.py b/monitoring-for-openstack/oschecks/neutron.py index 97ba3b7..77c9394 100644 --- a/monitoring-for-openstack/oschecks/neutron.py +++ b/monitoring-for-openstack/oschecks/neutron.py @@ -158,15 +158,15 @@ class Novautils(object): "Won't create test floating ip. " "Please check and delete.") - def get_network_id(self, router_name): + def get_network_id(self, ext_network_name): if not self.msgs: if not self.network_id: try: self.network_id = self.nova_client.list_networks( - name=router_name, fields='id')['networks'][0]['id'] + name=ext_network_name, fields='id')['networks'][0]['id'] except Exception: - self.msgs.append("Cannot find ext router named '%s'." - % router_name) + self.msgs.append("Cannot find ext network named '%s'." + % ext_network_name) def create_floating_ip(self): if not self.msgs: @@ -245,9 +245,9 @@ def _check_neutron_floating_ip(): """default value prevents the removal of """ """any existing floating ip""") - parser.add_argument('--ext_router_name', metavar='ext_router_name', + parser.add_argument('--ext_network_name', metavar='ext_network_name', type=str, default='public', - help='Name of the "public" router (public by default)') + help='Name of the "public" external network (public by default)') parser.add_argument('--verbose', action='count', help='Print requests on stderr.') @@ -288,7 +288,7 @@ def _check_neutron_floating_ip(): if args.floating_ip: util.check_existing_floatingip(args.floating_ip, args.force_delete) - util.get_network_id(args.ext_router_name) + util.get_network_id(args.ext_network_name) util.create_floating_ip() util.delete_floating_ip()