x/python-ganttclient
Code Issues Proposed changes

Improvements to nova-manage: network list now includes vlan and projectID, added servers list filtered by zone if needed

Browse Source
This commit is contained in:
Mike Scherbakov
2011-07-02 01:28:13 +04:00
parent e5ba44799d
commit e74e66f69c
1 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
bin/nova-manage
View File

@@ -615,15 +615,19 @@ class NetworkCommands(object):
def list(self):
"""List all created networks"""
print "%-18s\t%-15s\t%-15s\t%-15s" % (_('network'),
_('netmask'),
_('start address'),
'DNS')
print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % (_('network'),
_('netmask'),
_('start address'),
_('DNS'),
_('VlanID'),
'project')
for network in db.network_get_all(context.get_admin_context()):
print "%-18s\t%-15s\t%-15s\t%-15s" % (network.cidr,
network.netmask,
network.dhcp_start,
network.dns)
print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % (network.cidr,
network.netmask,
network.dhcp_start,
network.dns,
network.vlan,
network.project_id)
def delete(self, fixed_range):
"""Deletes a network"""
@@ -812,6 +816,28 @@ class ServiceCommands(object):
{"method": "update_available_resource"})
class ServerCommands(object):
"""List servers"""
def list(self, zone=None):
"""Show a list of all servers. Filter by zone.
args: [zone]"""
print "%-25s\t%-15s" % (_('host'),
_('zone'))
ctxt = context.get_admin_context()
now = utils.utcnow()
services = db.service_get_all(ctxt)
if zone:
services = [s for s in services if s['availability_zone'] == zone]
servers = []
for srv in services:
if not [s for s in servers if s['host'] == srv['host']]:
servers.append(srv)
for srv in servers:
print "%-25s\t%-15s" % (srv['host'], srv['availability_zone'])
class DbCommands(object):
"""Class for managing the database."""
@@ -1191,6 +1217,7 @@ CATEGORIES = [
('project', ProjectCommands),
('role', RoleCommands),
('service', ServiceCommands),
('server', ServerCommands),
('shell', ShellCommands),
('user', UserCommands),
('version', VersionCommands),