From 7483115f1b231318c7a17222eb9908cc49760236 Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Fri, 7 Sep 2012 22:19:18 +0000
Subject: [PATCH] Handle missing network_size in nova-manage

In 'nova-manage network create' --network_size should be optional.

Fixes bug 1046605

Change-Id: I25ce9acbe664810aa8fe9a3b4a2951c0fac4e41a
---
 nova/network/manager.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nova/network/manager.py b/nova/network/manager.py
index d908b7a4c36..4a6f055f6ec 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -1371,11 +1371,12 @@ def create_networks(self, context,
                     "vlan_start", "vpn_start")
         for key in int_args:
             try:
-                kwargs[key] = int(kwargs[key])
+                value = kwargs.get(key)
+                if value is None:
+                    continue
+                kwargs[key] = int(value)
             except ValueError:
                 raise ValueError(_("%s must be an integer") % key)
-            except KeyError:
-                pass
 
         # check for certain required inputs
         label = kwargs["label"]