From 40a9488b4b96fa809bd18f4a06018186a488507a Mon Sep 17 00:00:00 2001
From: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date: Thu, 14 Jul 2011 22:34:49 +0400
Subject: added commands

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

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 7dfe91698..5a934b613 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -518,6 +518,27 @@ class FixedIpCommands(object):
                     fixed_ip['address'],
                     mac_address, hostname, host)
 
+    def reserve(self, address):
+        """Mark fixed ip as reserved
+        arguments: address"""
+        self._set_reserved(address, True)
+
+    def waste(self, address):
+        """Mark fixed ip as free to use
+        arguments: address"""
+        self._set_reserved(address, False)
+
+    def _set_reserved(self, address, reserved):
+        ctxt = context.get_admin_context()
+
+        try:
+            fixed_ip = db.fixed_ip_get_by_address(ctxt, address)
+            db.fixed_ip_update(ctxt, fixed_ip['address'],
+                                {'reserved': reserved})
+        except exception.NotFound as ex:
+            print "error: %s" % ex
+            sys.exit(2)
+
 
 class FloatingIpCommands(object):
     """Class for managing floating ip."""
-- 
cgit 


From a77f10ee052fdafeb9d52407695719397c52e68d Mon Sep 17 00:00:00 2001
From: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date: Fri, 5 Aug 2011 19:45:17 +0400
Subject: methods renamed

---
 bin/nova-manage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index ba08f136b..6f71bc403 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -601,7 +601,7 @@ class FixedIpCommands(object):
 
     @args('--address', dest="address", metavar='<ip address>',
           help='IP address')
-    def waste(self, address):
+    def unreserve(self, address):
         """Mark fixed ip as free to use
         arguments: address"""
         self._set_reserved(address, False)
-- 
cgit 


From 8a87a3ecc0bc9fe524f42950ec0d50124bb5b2b6 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 5 Aug 2011 15:25:12 -0700
Subject: Pass a real context object into image service calls

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

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index f272351c2..7b4923021 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1235,11 +1235,12 @@ class ImageCommands(object):
                               is_public, architecture)
 
     def _lookup(self, old_image_id):
+        elevated = context.get_admin_context()
         try:
             internal_id = ec2utils.ec2_id_to_id(old_image_id)
-            image = self.image_service.show(context, internal_id)
+            image = self.image_service.show(elevated, internal_id)
         except (exception.InvalidEc2Id, exception.ImageNotFound):
-            image = self.image_service.show_by_name(context, old_image_id)
+            image = self.image_service.show_by_name(elevated, old_image_id)
         return image['id']
 
     def _old_to_new(self, old):
-- 
cgit