From 7f8595b88df2271c278ae59b6d187b5c3b8dde40 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Wed, 16 Feb 2011 12:15:48 +0100
Subject: added functionality to nova-manage to list created networks

---
 bin/nova-manage           | 12 ++++++++++++
 nova/db/api.py            |  5 +++++
 nova/db/sqlalchemy/api.py |  9 +++++++++
 3 files changed, 26 insertions(+)

diff --git a/bin/nova-manage b/bin/nova-manage
index 7835ca551..f7cf77adb 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -499,6 +499,18 @@ class NetworkCommands(object):
                                     vlan_start=int(vlan_start),
                                     vpn_start=int(vpn_start))
 
+    def list(self):
+        """List all created networks"""
+        print "%-18s\t%-15s\t%-15s\t%-15s" % ('CIDR',
+                                              'netmask',
+                                              'dhcp_start',
+                                              'DNS')
+        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)
+
 
 class ServiceCommands(object):
     """Enable and disable running services"""
diff --git a/nova/db/api.py b/nova/db/api.py
index 789cb8ebb..d06f3731f 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -500,6 +500,11 @@ def network_get(context, network_id):
     return IMPL.network_get(context, network_id)
 
 
+def network_get_all(context):
+    """Return all defined networks."""
+    return IMPL.network_get_all(context)
+
+
 # pylint: disable-msg=C0103
 def network_get_associated_fixed_ips(context, network_id):
     """Get all network's ips that have been associated."""
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 02855e7a9..a11572947 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1056,6 +1056,15 @@ def network_get(context, network_id, session=None):
     return result
 
 
+@require_admin_context
+def network_get_all(context):
+    session = get_session()
+    result = session.query(models.Network)
+    if not result:
+        raise exception.NotFound('No networks defined')
+    return result
+
+
 # NOTE(vish): pylint complains because of the long method name, but
 #             it fits with the names of the rest of the methods
 # pylint: disable-msg=C0103
-- 
cgit 


From bf7ec579786d3f02e63fc870fdfcb1e9c2674f05 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Thu, 17 Feb 2011 15:14:45 +0100
Subject: added i18n of 'No networks defined'

---
 nova/db/sqlalchemy/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index a11572947..65436ab0f 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1061,7 +1061,7 @@ def network_get_all(context):
     session = get_session()
     result = session.query(models.Network)
     if not result:
-        raise exception.NotFound('No networks defined')
+        raise exception.NotFound(_('No networks defined'))
     return result
 
 
-- 
cgit 


From 5b97ee78b1bc2073bca0204caf92ae4560ec1e8e Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Thu, 17 Feb 2011 16:46:55 +0100
Subject: added more I18N

---
 bin/nova-manage | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index f7cf77adb..c64277908 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -501,9 +501,9 @@ class NetworkCommands(object):
 
     def list(self):
         """List all created networks"""
-        print "%-18s\t%-15s\t%-15s\t%-15s" % ('CIDR',
-                                              'netmask',
-                                              'dhcp_start',
+        print "%-18s\t%-15s\t%-15s\t%-15s" % (_('network'),
+                                              _('netmask'),
+                                              _('start address'),
                                               'DNS')
         for network in db.network_get_all(context.get_admin_context()):
             print "%-18s\t%-15s\t%-15s\t%-15s" % (network.cidr,
-- 
cgit