From e4cb0d3a93ddc4cae40c4a8c570c7e7d2a0061ff Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Tue, 28 Sep 2010 10:34:32 -0700
Subject: get rid of network indexes and make networks into a pool

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

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index baa1cb4db..40d690e30 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -72,6 +72,7 @@ from nova import flags
 from nova import quota
 from nova import utils
 from nova.auth import manager
+from nova.network import manager as network_manager
 from nova.cloudpipe import pipelib
 
 
@@ -321,6 +322,25 @@ class FloatingIpCommands(object):
                                   floating_ip['address'],
                                   instance)
 
+class NetworkCommands(object):
+    """Class for managing networks."""
+
+    def create(self, num_networks=None, network_size=None,
+               vlan_start=None, vpn_start=None):
+        """Creates floating ips for host by range
+        arguments: [num_networks=FLAG], [network_size=FLAG],
+                   [vlan_start=FLAG, vpn_start=FLAG]"""
+        if not num_networks:
+            num_networks = FLAGS.num_networks
+        if not network_size:
+            network_size = FLAGS.network_size
+        if not vlan_start:
+            vlan_start = FLAGS.vlan_start
+        if not vpn_start:
+            vpn_start = FLAGS.vpn_start
+        net_manager = network_manager.VlanManager()
+        net_manager.create_networks(None, int(num_networks), int(network_size),
+                                    int(vlan_start), int(vpn_start))
 
 CATEGORIES = [
     ('user', UserCommands),
@@ -328,7 +348,8 @@ CATEGORIES = [
     ('role', RoleCommands),
     ('shell', ShellCommands),
     ('vpn', VpnCommands),
-    ('floating', FloatingIpCommands)
+    ('floating', FloatingIpCommands),
+    ('network', NetworkCommands)
 ]
 
 
@@ -394,9 +415,9 @@ def main():
         fn(*argv)
         sys.exit(0)
     except TypeError:
-        print "Wrong number of arguments supplied"
+        print "Possible wrong number of arguments supplied"
         print "%s %s: %s" % (category, action, fn.__doc__)
-        sys.exit(2)
+        raise
 
 if __name__ == '__main__':
     main()
-- 
cgit 


From c9d2b8bcb365f326a47df93920c11be2ca054b18 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Thu, 30 Sep 2010 23:04:53 -0700
Subject: Fixed flat network manager with network index gone.

Both managers use ips created through nova manage.

Use of project_get_network is minimized to make way for managers that
would prefer to use cluste or host based ips instead of project based ips.
---
 bin/nova-manage | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index d421b997a..6da2efe95 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -375,11 +375,14 @@ class FloatingIpCommands(object):
 class NetworkCommands(object):
     """Class for managing networks."""
 
-    def create(self, num_networks=None, network_size=None,
-               vlan_start=None, vpn_start=None):
-        """Creates floating ips for host by range
-        arguments: [num_networks=FLAG], [network_size=FLAG],
-                   [vlan_start=FLAG, vpn_start=FLAG]"""
+    def create(self, fixed_range=None, num_networks=None,
+               network_size=None, vlan_start=None, vpn_start=None):
+        """Creates fixed ips for host by range
+        arguments: [fixed_range=FLAG], [num_networks=FLAG],
+                   [network_size=FLAG], [vlan_start=FLAG],
+                   [vpn_start=FLAG]"""
+        if not fixed_range:
+            fixed_range = FLAGS.fixed_range
         if not num_networks:
             num_networks = FLAGS.num_networks
         if not network_size:
@@ -388,9 +391,10 @@ class NetworkCommands(object):
             vlan_start = FLAGS.vlan_start
         if not vpn_start:
             vpn_start = FLAGS.vpn_start
-        net_manager = network_manager.VlanManager()
-        net_manager.create_networks(None, int(num_networks), int(network_size),
-                                    int(vlan_start), int(vpn_start))
+        net_manager = utils.import_object(FLAGS.network_manager)
+        net_manager.create_networks(None, fixed_range, int(num_networks),
+                                    int(network_size), int(vlan_start),
+                                    int(vpn_start))
 
 CATEGORIES = [
     ('user', UserCommands),
-- 
cgit