openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "Clarify message when no probes are cleared"

This commit is contained in:
Jenkins 2014-09-13 15:29:24 +00:00 committed by Gerrit Code Review
parent ea0cceb23e 02cfe35694
commit 0e8d82a89f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/debug/commands.py
View File

@ -18,6 +18,7 @@ from neutronclient.common import utils
from neutronclient.neutron import v2_0 as client
from neutronclient.neutron.v2_0 import port
from neutron.openstack.common.gettextutils import _LI
from neutron.openstack.common import log as logging
@ -102,8 +103,8 @@ class ClearProbe(ProbeCommand):
def run(self, parsed_args):
self.log.debug('run(%s)' % parsed_args)
debug_agent = self.get_debug_agent()
debug_agent.clear_probe()
self.log.info(_('All Probes deleted '))
cleared_probes_count = debug_agent.clear_probes()
self.log.info(_LI('%d probe(s) deleted') % cleared_probes_count)
class ExecProbe(ProbeCommand):

4
neutron/debug/debug_agent.py
View File

@ -93,7 +93,8 @@ class NeutronDebugAgent():
network.subnets = obj_subnet
return network
def clear_probe(self):
def clear_probes(self):
"""Returns number of deleted probes"""
ports = self.client.list_ports(
device_id=socket.gethostname(),
device_owner=[DEVICE_OWNER_NETWORK_PROBE,
@ -101,6 +102,7 @@ class NeutronDebugAgent():
info = ports['ports']
for port in info:
self.delete_probe(port['id'])
return len(info)
def delete_probe(self, port_id):
port = dhcp.DictModel(self.client.show_port(port_id)['port'])