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 6fb2fe901bc4f4479e6a2bb087870927be7318a2 Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Tue, 26 Jul 2011 10:03:16 -0700
Subject: added warning when size of subnet(s) being created are larger than
 FLAG.network_size in attempt to alleviate confusion.  For example, currently
 when 'nova-manage network create foo 192.168.0.0/16', the result is that it
 creates a 192.168.0.0/24 instead without any indication to why.

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

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index b63bd326f..da9538e39 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -56,6 +56,7 @@
 import gettext
 import glob
 import json
+import math
 import netaddr
 import os
 import sys
@@ -669,6 +670,14 @@ class NetworkCommands(object):
             num_networks = FLAGS.num_networks
         if not network_size:
             network_size = FLAGS.network_size
+            fixnet = netaddr.IPNetwork(fixed_range)
+            each_subnet_size = fixnet.size / int(num_networks)
+            if each_subnet_size > network_size:
+                subnet = 32 - int(math.log(network_size, 2))
+                oversize_msg = _('Subnet(s) too large, defaulting to /%s.'
+                                 '  To override, specify network_size flag.'
+                                 % subnet)
+                print oversize_msg
         if not multi_host:
             multi_host = FLAGS.multi_host
         else:
-- 
cgit 


From e239dc589982a0d90eb8a50967af05a10d5e4d5b Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Tue, 26 Jul 2011 13:12:34 -0700
Subject: fixed per peer review

---
 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 da9538e39..ca60d28d6 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -676,7 +676,7 @@ class NetworkCommands(object):
                 subnet = 32 - int(math.log(network_size, 2))
                 oversize_msg = _('Subnet(s) too large, defaulting to /%s.'
                                  '  To override, specify network_size flag.'
-                                 % subnet)
+                                ) % subnet
                 print oversize_msg
         if not multi_host:
             multi_host = FLAGS.multi_host
-- 
cgit 


From 1fb2a1b1f0b7a59193344103bdbb7d58b3a6e7c2 Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Fri, 29 Jul 2011 14:53:38 -0500
Subject: require either v4 or v6

---
 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 75d74903c..3c50e4fc8 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -662,8 +662,9 @@ class NetworkCommands(object):
         # check for certain required inputs
         if not label:
             raise exception.NetworkNotCreated(req='--label')
-        if not fixed_range_v4:
-            raise exception.NetworkNotCreated(req='--fixed_range_v4')
+        if not (fixed_range_v4 or fixed_range_v6):
+            req = '--fixed_range_v4 or --fixed_range_v6'
+            raise exception.NetworkNotCreated(req=req)
 
         bridge = bridge or FLAGS.flat_network_bridge
         if not bridge:
-- 
cgit 


From 241bc43166dd174bd64ef4eda1ab368a5a312799 Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Fri, 29 Jul 2011 15:05:53 -0500
Subject: stwart the switch to just fixed_range

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

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 3c50e4fc8..1c3bd9984 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -632,6 +632,7 @@ class NetworkCommands(object):
 
     @args('--label', dest="label", metavar='<label>',
             help='Label for network (ex: public)')
+    @args('--fixed_range', dest="fixed_range", help='IP subnet (v4 or v6)')
     @args('--fixed_range_v4', dest="fixed_range_v4", metavar='<x.x.x.x/yy>',
             help='IPv4 subnet (ex: 10.0.0.0/8)')
     @args('--num_networks', dest="num_networks", metavar='<number>',
@@ -653,17 +654,18 @@ class NetworkCommands(object):
             help='Multi host')
     @args('--dns1', dest="dns1", metavar="<DNS Address>", help='First DNS')
     @args('--dns2', dest="dns2", metavar="<DNS Address>", help='Second DNS')
-    def create(self, label=None, fixed_range_v4=None, num_networks=None,
+    def create(self, label=None, fixed_range=None, num_networks=None,
                network_size=None, multi_host=None, vlan_start=None,
                vpn_start=None, fixed_range_v6=None, gateway_v6=None,
-               bridge=None, bridge_interface=None, dns1=None, dns2=None):
+               bridge=None, bridge_interface=None, dns1=None, dns2=None,
+               fixed_range_v4=None):
         """Creates fixed ips for host by range"""
 
         # check for certain required inputs
         if not label:
             raise exception.NetworkNotCreated(req='--label')
-        if not (fixed_range_v4 or fixed_range_v6):
-            req = '--fixed_range_v4 or --fixed_range_v6'
+        if not fixed_range and not (fixed_range_v4 or fixed_range_v6):
+            req = 'one of --fixed_range --fixed_range_v4 or --fixed_range_v6'
             raise exception.NetworkNotCreated(req=req)
 
         bridge = bridge or FLAGS.flat_network_bridge
-- 
cgit 


From 0f94eba2792244f03bbc5be3879ceedaaed148fa Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Fri, 29 Jul 2011 16:09:57 -0500
Subject: either v4 or v6 is required

---
 bin/nova-manage | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 1c3bd9984..a40e420f9 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -632,7 +632,6 @@ class NetworkCommands(object):
 
     @args('--label', dest="label", metavar='<label>',
             help='Label for network (ex: public)')
-    @args('--fixed_range', dest="fixed_range", help='IP subnet (v4 or v6)')
     @args('--fixed_range_v4', dest="fixed_range_v4", metavar='<x.x.x.x/yy>',
             help='IPv4 subnet (ex: 10.0.0.0/8)')
     @args('--num_networks', dest="num_networks", metavar='<number>',
@@ -654,18 +653,17 @@ class NetworkCommands(object):
             help='Multi host')
     @args('--dns1', dest="dns1", metavar="<DNS Address>", help='First DNS')
     @args('--dns2', dest="dns2", metavar="<DNS Address>", help='Second DNS')
-    def create(self, label=None, fixed_range=None, num_networks=None,
+    def create(self, label=None, fixed_range_v4=None, num_networks=None,
                network_size=None, multi_host=None, vlan_start=None,
                vpn_start=None, fixed_range_v6=None, gateway_v6=None,
-               bridge=None, bridge_interface=None, dns1=None, dns2=None,
-               fixed_range_v4=None):
+               bridge=None, bridge_interface=None, dns1=None, dns2=None):
         """Creates fixed ips for host by range"""
 
         # check for certain required inputs
         if not label:
             raise exception.NetworkNotCreated(req='--label')
-        if not fixed_range and not (fixed_range_v4 or fixed_range_v6):
-            req = 'one of --fixed_range --fixed_range_v4 or --fixed_range_v6'
+        if not (fixed_range_v4 or fixed_range_v6):
+            req = '--fixed_range_v4 or --fixed_range_v6'
             raise exception.NetworkNotCreated(req=req)
 
         bridge = bridge or FLAGS.flat_network_bridge
@@ -692,16 +690,6 @@ class NetworkCommands(object):
             if FLAGS.network_manager in interface_required:
                 raise exception.NetworkNotCreated(req='--bridge_interface')
 
-        if FLAGS.use_ipv6:
-            fixed_range_v6 = fixed_range_v6 or FLAGS.fixed_range_v6
-            if not fixed_range_v6:
-                raise exception.NetworkNotCreated(req='with use_ipv6, '
-                                                      '--fixed_range_v6')
-            gateway_v6 = gateway_v6 or FLAGS.gateway_v6
-            if not gateway_v6:
-                raise exception.NetworkNotCreated(req='with use_ipv6, '
-                                                      '--gateway_v6')
-
         # sanitize other input using FLAGS if necessary
         if not num_networks:
             num_networks = FLAGS.num_networks
-- 
cgit 


From 54f0ad92cf4f94097e62fc0e51fdc1403504a04b Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Fri, 29 Jul 2011 16:10:45 -0500
Subject: the netmask is implied by the cidr, so use that to display the v6
 subnet

---
 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 a40e420f9..807753a2e 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -726,8 +726,8 @@ class NetworkCommands(object):
     def list(self):
         """List all created networks"""
         print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % (
-                                                  _('network'),
-                                                  _('netmask'),
+                                                  _('IPv4'),
+                                                  _('IPv6'),
                                                   _('start address'),
                                                   _('DNS1'),
                                                   _('DNS2'),
@@ -736,7 +736,7 @@ class NetworkCommands(object):
         for network in db.network_get_all(context.get_admin_context()):
             print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % (
                                         network.cidr,
-                                        network.netmask,
+                                        network.cidr_v6,
                                         network.dhcp_start,
                                         network.dns1,
                                         network.dns2,
-- 
cgit 


From 07646e85841a4f7c81e80254ac63715bece2aadd Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 2 Aug 2011 10:09:58 -0400
Subject: removing compute monitor

---
 bin/nova-instancemonitor | 59 ------------------------------------------------
 bin/nova-logspool        |  1 -
 bin/nova-objectstore     |  2 +-
 3 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100755 bin/nova-instancemonitor

(limited to 'bin')

diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor
deleted file mode 100755
index b9d4e49d7..000000000
--- a/bin/nova-instancemonitor
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-  Daemon for Nova RRD based instance resource monitoring.
-"""
-
-import gettext
-import os
-import sys
-from twisted.application import service
-
-# If ../nova/__init__.py exists, add ../ to Python search path, so that
-# it will override what happens to be installed in /usr/(local/)lib/python...
-possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
-                                   os.pardir,
-                                   os.pardir))
-if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
-    sys.path.insert(0, possible_topdir)
-
-gettext.install('nova', unicode=1)
-
-from nova import log as logging
-from nova import utils
-from nova import twistd
-from nova.compute import monitor
-
-LOG = logging.getLogger('nova.instancemonitor')
-
-
-if __name__ == '__main__':
-    utils.default_flagfile()
-    twistd.serve(__file__)
-
-if __name__ == '__builtin__':
-    LOG.warn(_('Starting instance monitor'))
-    # pylint: disable=C0103
-    monitor = monitor.InstanceMonitor()
-
-    # This is the parent service that twistd will be looking for when it
-    # parses this file, return it so that we can get it into globals below
-    application = service.Application('nova-instancemonitor')
-    monitor.setServiceParent(application)
diff --git a/bin/nova-logspool b/bin/nova-logspool
index 097459b12..a876f4c71 100644
--- a/bin/nova-logspool
+++ b/bin/nova-logspool
@@ -81,7 +81,6 @@ class LogReader(object):
                 if level == 'ERROR':
                     self.handle_logged_error(line)
                 elif level == '[-]' and self.last_error:
-                    # twisted stack trace line
                     clean_line = " ".join(line.split(" ")[6:])
                     self.last_error.trace = self.last_error.trace + clean_line
                 else:
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 1aef3a255..4d5aec445 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -18,7 +18,7 @@
 #    under the License.
 
 """
-  Twisted daemon for nova objectstore. Supports S3 API.
+  Daemon for nova objectstore. Supports S3 API.
 """
 
 import gettext
-- 
cgit 


From bfb5a5e1204bf868b5db8d8d038b63d0899665ce Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Wed, 3 Aug 2011 00:11:52 -0700
Subject: updated to work w/ changes after merged trunk fixing var renaming. 
 the logic which forces default to FLAGS.network_size if requested cidr was
 larger, was also applying to requested cidrs smaller than FLAGS.network_size.
   Requested cidrs smaller than FLAGS.network_size should be ignored and not
 overriden.

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

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 78cc96818..f53021581 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -695,15 +695,18 @@ class NetworkCommands(object):
         if not num_networks:
             num_networks = FLAGS.num_networks
         if not network_size:
-            network_size = FLAGS.network_size
-            fixnet = netaddr.IPNetwork(fixed_range)
+            #network_size = FLAGS.network_size
+            fixnet = netaddr.IPNetwork(fixed_range_v4)
             each_subnet_size = fixnet.size / int(num_networks)
-            if each_subnet_size > network_size:
+            if each_subnet_size > FLAGS.network_size:
+                network_size = FLAGS.network_size
                 subnet = 32 - int(math.log(network_size, 2))
                 oversize_msg = _('Subnet(s) too large, defaulting to /%s.'
                                  '  To override, specify network_size flag.'
                                 ) % subnet
                 print oversize_msg
+            else:
+                network_size = fixnet.size
         if not multi_host:
             multi_host = FLAGS.multi_host
         else:
-- 
cgit 


From f942a7f22acb6a6719a3de778ba55ca25ea0ee68 Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Wed, 3 Aug 2011 00:16:52 -0700
Subject: forgot to remove comment

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

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index f53021581..f272351c2 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -695,7 +695,6 @@ class NetworkCommands(object):
         if not num_networks:
             num_networks = FLAGS.num_networks
         if not network_size:
-            #network_size = FLAGS.network_size
             fixnet = netaddr.IPNetwork(fixed_range_v4)
             each_subnet_size = fixnet.size / int(num_networks)
             if each_subnet_size > FLAGS.network_size:
-- 
cgit 


From ca79470843ff351623d07378ab553b2548cb8dc0 Mon Sep 17 00:00:00 2001
From: Mandell Degerness <mdegerne@gmail.com>
Date: Thu, 4 Aug 2011 10:43:16 -0700
Subject: Fix to nova-ajax-console-proxy to use the new syntax.

create_consumer and create_connection abstractions were added recently.
---
 bin/nova-ajax-console-proxy | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy
index 21cf68007..2329581a2 100755
--- a/bin/nova-ajax-console-proxy
+++ b/bin/nova-ajax-console-proxy
@@ -114,11 +114,11 @@ class AjaxConsoleProxy(object):
                 AjaxConsoleProxy.tokens[kwargs['token']] =  \
                     {'args': kwargs, 'last_activity': time.time()}
 
-        conn = rpc.Connection.instance(new=True)
-        consumer = rpc.TopicAdapterConsumer(
-                       connection=conn,
-                       proxy=TopicProxy,
-                       topic=FLAGS.ajax_console_proxy_topic)
+        conn = rpc.create_connection(new=True)
+        consumer = rpc.create_consumer(
+                       conn,
+                       FLAGS.ajax_console_proxy_topic,
+                       TopicProxy)
 
         def delete_expired_tokens():
             now = time.time()
-- 
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