From a7f796c0a3dbccb74ba3fe51e3885c716bc88592 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Mon, 14 Feb 2011 10:43:22 -0800
Subject: fix for bug #716847 - if a volume has not been assigned to a host,
 then delete from db and skip rpc

---
 bin/nova-manage | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 7835ca551..e4c0684c4 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -579,6 +579,13 @@ class VolumeCommands(object):
         ctxt = context.get_admin_context()
         volume = db.volume_get(ctxt, param2id(volume_id))
         host = volume['host']
+
+        if not host:
+            print "Volume not yet assigned to host."
+            print "Deleting volume from database and skipping rpc."
+            db.volume_destroy(ctxt, param2id(volume_id))
+            return
+
         if volume['status'] == 'in-use':
             print "Volume is in-use."
             print "Detach volume from instance and then try again."
-- 
cgit 


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 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'bin')

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"""
-- 
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(-)

(limited to 'bin')

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