From 7c10ff7d574690728d4b9184b704fce214d03fbf Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Wed, 27 Jul 2011 11:44:14 -0500
Subject: [PATCH 2/6] updated nova-manage create network. better help, handling
 of required args, and exceptions. Also updated FLAG flat_network_bridge to
 default to None

---
 bin/nova-manage          | 89 ++++++++++++++++++++++------------------
 nova/tests/fake_flags.py |  1 +
 2 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index b63bd326..c1a5d8c5 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -631,21 +631,24 @@ class NetworkCommands(object):
     """Class for managing networks."""
 
     @args('--label', dest="label", metavar='<label>',
-            help='Label(ex: public)')
+            help='Label for network (ex: public)')
     @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>',
-            help='Network')
+            help='IPv4 subnet (ex: 10.0.0.0/8)')
     @args('--num_networks', dest="num_networks", metavar='<number>',
-            help='How many networks create')
+            help='Number of networks to create')
     @args('--network_size', dest="network_size", metavar='<number>',
-            help='How many hosts in network')
+            help='Number of IPs per network')
     @args('--vlan', dest="vlan_start", metavar='<vlan id>', help='vlan id')
     @args('--vpn', dest="vpn_start", help='vpn start')
-    @args('--fixed_range_v6', dest="fixed_range_v6", help='fixed ipv6 range')
+    @args('--fixed_range_v6', dest="fixed_range_v6",
+          help='IPv6 subnet (ex: fe80::/64')
     @args('--gateway_v6', dest="gateway_v6", help='ipv6 gateway')
-    @args('--flat_network_bridge', dest="flat_network_bridge",
-            metavar='<flat network bridge>', help='Flat_network_bridge')
+    @args('--bridge', dest="bridge",
+            metavar='<bridge>',
+            help='VIFs on this network are connected to this bridge')
     @args('--bridge_interface', dest="bridge_interface",
-            metavar='<bridge interface>', help='Bridge_interface')
+            metavar='<bridge interface>',
+            help='the bridge is connected to this interface')
     @args('--multi_host', dest="multi_host", metavar="<'T'|'F'>",
             help='Multi host')
     @args('--dns1', dest="dns1", metavar="<DNS Address>", help='First DNS')
@@ -653,18 +656,31 @@ class NetworkCommands(object):
     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,
-               flat_network_bridge=None, bridge_interface=None,
-               dns1=None, dns2=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:
-            msg = _('a label (ex: public) is required to create networks.')
-            print msg
-            raise TypeError(msg)
+            raise exception.NetworkNotCreated(req='label')
         if not fixed_range:
-            msg = _('Fixed range in the form of 10.0.0.0/8 is '
-                    'required to create networks.')
-            print msg
-            raise TypeError(msg)
+            raise exception.NetworkNotCreated(req='fixed range')
+
+        bridge = bridge or FLAGS.flat_network_bridge
+        if not bridge:
+            raise exception.NetworkNotCreated(req='bridge')
+            #TODO(tr3buchet) flat_network_bridge FLAG needs to go away
+            #                or be renamed to bridge
+
+        bridge_interface = bridge_interface or FLAGS.flat_interface or \
+                           FLAGS.vlan_interface
+        if not bridge_interface:
+            interface_required = ['nova.network.manager.FlatDHCPManager',
+                                  'nova.network.manager.VlanManager']
+            # ensure that bridge interface is set if certain managers are used
+            if FLAGS.network_manager in interface_required:
+                raise exception.NetworkNotCreated(req='bridge interface')
+
+        # sanitize other input using FLAGS if necessary
         if not num_networks:
             num_networks = FLAGS.num_networks
         if not network_size:
@@ -679,34 +695,27 @@ class NetworkCommands(object):
             vpn_start = FLAGS.vpn_start
         if not fixed_range_v6:
             fixed_range_v6 = FLAGS.fixed_range_v6
-        if not flat_network_bridge:
-            flat_network_bridge = FLAGS.flat_network_bridge
-        if not bridge_interface:
-            bridge_interface = FLAGS.flat_interface or FLAGS.vlan_interface
         if not gateway_v6:
             gateway_v6 = FLAGS.gateway_v6
         if not dns1 and FLAGS.flat_network_dns:
             dns1 = FLAGS.flat_network_dns
-        net_manager = utils.import_object(FLAGS.network_manager)
 
-        try:
-            net_manager.create_networks(context.get_admin_context(),
-                                        label=label,
-                                        cidr=fixed_range,
-                                        multi_host=multi_host,
-                                        num_networks=int(num_networks),
-                                        network_size=int(network_size),
-                                        vlan_start=int(vlan_start),
-                                        vpn_start=int(vpn_start),
-                                        cidr_v6=fixed_range_v6,
-                                        gateway_v6=gateway_v6,
-                                        bridge=flat_network_bridge,
-                                        bridge_interface=bridge_interface,
-                                        dns1=dns1,
-                                        dns2=dns2)
-        except ValueError, e:
-            print e
-            raise e
+        # create the network
+        net_manager = utils.import_object(FLAGS.network_manager)
+        net_manager.create_networks(context.get_admin_context(),
+                                    label=label,
+                                    cidr=fixed_range,
+                                    multi_host=multi_host,
+                                    num_networks=int(num_networks),
+                                    network_size=int(network_size),
+                                    vlan_start=int(vlan_start),
+                                    vpn_start=int(vpn_start),
+                                    cidr_v6=fixed_range_v6,
+                                    gateway_v6=gateway_v6,
+                                    bridge=bridge,
+                                    bridge_interface=bridge_interface,
+                                    dns1=dns1,
+                                    dns2=dns2)
 
     def list(self):
         """List all created networks"""
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 2297d2f0..07321649 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -42,3 +42,4 @@ FLAGS['iscsi_num_targets'].SetDefault(8)
 FLAGS['verbose'].SetDefault(True)
 FLAGS['sqlite_db'].SetDefault("tests.sqlite")
 FLAGS['use_ipv6'].SetDefault(True)
+FLAGS['flat_network_bridge'].SetDefault('br100')

From 568dbdd14aadd9dbf0526d3bd91024807d56b335 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Wed, 27 Jul 2011 13:34:45 -0500
Subject: [PATCH 3/6] updated the bridge arg requirements based on manager

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

diff --git a/bin/nova-manage b/bin/nova-manage
index c1a5d8c5..09a65fc0 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -667,16 +667,16 @@ class NetworkCommands(object):
 
         bridge = bridge or FLAGS.flat_network_bridge
         if not bridge:
-            raise exception.NetworkNotCreated(req='bridge')
-            #TODO(tr3buchet) flat_network_bridge FLAG needs to go away
-            #                or be renamed to bridge
+            bridge_required = ['nova.network.manager.FlatManager',
+                               'nova.network.manager.FlatDHCPManager']
+            if FLAGS.network_manager in bridge_required:
+                raise exception.NetworkNotCreated(req='bridge')
 
         bridge_interface = bridge_interface or FLAGS.flat_interface or \
                            FLAGS.vlan_interface
         if not bridge_interface:
             interface_required = ['nova.network.manager.FlatDHCPManager',
                                   'nova.network.manager.VlanManager']
-            # ensure that bridge interface is set if certain managers are used
             if FLAGS.network_manager in interface_required:
                 raise exception.NetworkNotCreated(req='bridge interface')
 

From ef903221eca8d4ccf5667e89459e732980f34dac Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Wed, 27 Jul 2011 13:49:36 -0500
Subject: [PATCH 4/6] added ipv6 requirements to nova-manage network create.
 changed --network to --fixed_range_v4

---
 bin/nova-manage | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 09a65fc0..76a3874c 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -632,7 +632,7 @@ class NetworkCommands(object):
 
     @args('--label', dest="label", metavar='<label>',
             help='Label for network (ex: public)')
-    @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>',
+    @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>',
             help='Number of networks to create')
@@ -653,7 +653,7 @@ 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):
@@ -661,16 +661,16 @@ class NetworkCommands(object):
 
         # check for certain required inputs
         if not label:
-            raise exception.NetworkNotCreated(req='label')
-        if not fixed_range:
-            raise exception.NetworkNotCreated(req='fixed range')
+            raise exception.NetworkNotCreated(req='--label')
+        if not fixed_range_v4:
+            raise exception.NetworkNotCreated(req='--fixed_range_v4')
 
         bridge = bridge or FLAGS.flat_network_bridge
         if not bridge:
             bridge_required = ['nova.network.manager.FlatManager',
                                'nova.network.manager.FlatDHCPManager']
             if FLAGS.network_manager in bridge_required:
-                raise exception.NetworkNotCreated(req='bridge')
+                raise exception.NetworkNotCreated(req='--bridge')
 
         bridge_interface = bridge_interface or FLAGS.flat_interface or \
                            FLAGS.vlan_interface
@@ -678,7 +678,17 @@ class NetworkCommands(object):
             interface_required = ['nova.network.manager.FlatDHCPManager',
                                   'nova.network.manager.VlanManager']
             if FLAGS.network_manager in interface_required:
-                raise exception.NetworkNotCreated(req='bridge interface')
+                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:
@@ -693,10 +703,6 @@ class NetworkCommands(object):
             vlan_start = FLAGS.vlan_start
         if not vpn_start:
             vpn_start = FLAGS.vpn_start
-        if not fixed_range_v6:
-            fixed_range_v6 = FLAGS.fixed_range_v6
-        if not gateway_v6:
-            gateway_v6 = FLAGS.gateway_v6
         if not dns1 and FLAGS.flat_network_dns:
             dns1 = FLAGS.flat_network_dns
 
@@ -704,7 +710,7 @@ class NetworkCommands(object):
         net_manager = utils.import_object(FLAGS.network_manager)
         net_manager.create_networks(context.get_admin_context(),
                                     label=label,
-                                    cidr=fixed_range,
+                                    cidr=fixed_range_v4,
                                     multi_host=multi_host,
                                     num_networks=int(num_networks),
                                     network_size=int(network_size),

From f09b858fecc84d481e6eb4185a0e4441d7a962db Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Wed, 27 Jul 2011 17:19:19 -0500
Subject: [PATCH 5/6] --bridge defaults to br100 but with a deprecation warning
 and to be removed in d4

---
 bin/nova-manage | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 76a3874c..ef0ae0fb 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -670,7 +670,16 @@ class NetworkCommands(object):
             bridge_required = ['nova.network.manager.FlatManager',
                                'nova.network.manager.FlatDHCPManager']
             if FLAGS.network_manager in bridge_required:
-                raise exception.NetworkNotCreated(req='--bridge')
+                # TODO(tr3buchet) - swap print statement and following line for
+                #                   raise statement in diablo 4
+                print _('--bridge parameter required or FLAG '
+                        'flat_network_bridge must be set to create networks'
+                        'WARNING! ACHTUNG! Setting the bridge to br100 '
+                        'automatically is deprecated and will be removed in '
+                        'Diablo milestone 4')
+                time.sleep(10)
+                bridge = 'br100'
+                #raise exception.NetworkNotCreated(req='--bridge')
 
         bridge_interface = bridge_interface or FLAGS.flat_interface or \
                            FLAGS.vlan_interface

From 0edb2c4e58fcc81d73bd84aa822fb6318e07a08e Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Wed, 27 Jul 2011 17:24:39 -0500
Subject: [PATCH 6/6] typo

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

diff --git a/bin/nova-manage b/bin/nova-manage
index ef0ae0fb..75d74903 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -673,10 +673,10 @@ class NetworkCommands(object):
                 # TODO(tr3buchet) - swap print statement and following line for
                 #                   raise statement in diablo 4
                 print _('--bridge parameter required or FLAG '
-                        'flat_network_bridge must be set to create networks'
+                        'flat_network_bridge must be set to create networks\n'
                         'WARNING! ACHTUNG! Setting the bridge to br100 '
                         'automatically is deprecated and will be removed in '
-                        'Diablo milestone 4')
+                        'Diablo milestone 4. Prepare yourself accordingly.')
                 time.sleep(10)
                 bridge = 'br100'
                 #raise exception.NetworkNotCreated(req='--bridge')