From: Jörgen Karlsson <jorgen.w.karlsson@ericsson.com>
Date: Tue, 26 May 2015 16:48:02 +0000 (+0200)
Subject: make cidr optional in network section
X-Git-Tag: brahmaputra.1.0~239
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F661%2F2;p=yardstick.git

make cidr optional in network section

cidr defaults to '10.0.1.0/24' if not specified

Change-Id: I12b25be8d4e4be3b56cf71096dfab439f91cf7d1
JIRA: -
Signed-off-by: Jörgen Karlsson <jorgen.w.karlsson@ericsson.com>
---

diff --git a/yardstick/benchmark/context/model.py b/yardstick/benchmark/context/model.py
index ff56fc7fc..768c1d381 100644
--- a/yardstick/benchmark/context/model.py
+++ b/yardstick/benchmark/context/model.py
@@ -82,7 +82,7 @@ class Network(Object):
         super(Network, self).__init__(name, context)
         self.stack_name = context.name + "-" + self.name
         self.subnet_stack_name = self.stack_name + "-subnet"
-        self.subnet_cidr = attrs["cidr"]
+        self.subnet_cidr = attrs.get('cidr', '10.0.1.0/24')
         self.router = None
 
         if "external_network" in attrs: