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

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

diff --git a/bin/nova-manage b/bin/nova-manage
index 75d74903..3c50e4fc 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:

From c10f77cd59b1e47822989880a7c744eabd5036b5 Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Fri, 29 Jul 2011 15:05:53 -0500
Subject: [PATCH 2/5] stwart the switch to just fixed_range

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

diff --git a/bin/nova-manage b/bin/nova-manage
index 3c50e4fc..1c3bd998 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

From 8c1f95dd322258da2297299342a05731a6794491 Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Fri, 29 Jul 2011 16:09:57 -0500
Subject: [PATCH 3/5] either v4 or v6 is required

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

diff --git a/bin/nova-manage b/bin/nova-manage
index 1c3bd998..a40e420f 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

From 1625f04681fd99d612367d27711768b6e4addc81 Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Fri, 29 Jul 2011 16:10:45 -0500
Subject: [PATCH 4/5] 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(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index a40e420f..807753a2 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,

From 1aabe13f674aa2d8b7b8e06e502bd39f2dff3c41 Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Mon, 1 Aug 2011 13:37:22 -0500
Subject: [PATCH 5/5] it makes the pep8, or else it gets the vim again

---
 nova/tests/test_db_api.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index 54448f9d..0c07cbb7 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -57,7 +57,7 @@ class DbApiTestCase(test.TestCase):
     def test_instance_get_project_vpn(self):
         values = {'instance_type_id': FLAGS.default_instance_type,
                   'image_ref': FLAGS.vpn_image_id,
-                  'project_id': self.project_id
+                  'project_id': self.project_id,
                  }
         instance = db.instance_create(self.context, values)
         result = db.instance_get_project_vpn(self.context.elevated(),
@@ -67,7 +67,7 @@ class DbApiTestCase(test.TestCase):
     def test_instance_get_project_vpn_joins(self):
         values = {'instance_type_id': FLAGS.default_instance_type,
                   'image_ref': FLAGS.vpn_image_id,
-                  'project_id': self.project_id
+                  'project_id': self.project_id,
                  }
         instance = db.instance_create(self.context, values)
         _setup_networking(instance['id'])