From a806ce43d32e8d5ac064b79dd623c01be4489126 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@apache.org>
Date: Tue, 26 Mar 2013 14:11:36 -0700
Subject: [PATCH] QuickCloud: allow specification of network offering name in
 datacenter config. The deployDatacenter python script will use this to pick
 the network offering during creation of the default network in a basic zone

---
 tools/devcloud/quickcloud.cfg           | 1 +
 tools/marvin/marvin/deployDataCenter.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/devcloud/quickcloud.cfg b/tools/devcloud/quickcloud.cfg
index 0e1fb4fb208..a2613d22bdb 100644
--- a/tools/devcloud/quickcloud.cfg
+++ b/tools/devcloud/quickcloud.cfg
@@ -54,6 +54,7 @@
             "securitygroupenabled": "true", 
             "localstorageenabled": "true",
             "networktype": "Basic", 
+            "networkofferingname": "QuickCloudNoServices", 
             "pods": [
                 {
                     "endip": "192.168.56.220", 
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 42bc5f9ebef..d3653958fdd 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -299,10 +299,11 @@ class deployDataCenters():
 
             if zone.networktype == "Basic":
                 listnetworkoffering = listNetworkOfferings.listNetworkOfferingsCmd()
-                
                 listnetworkoffering.name = "DefaultSharedNetscalerEIPandELBNetworkOffering" \
                         if len(filter(lambda x : x.typ == 'Public', zone.physical_networks[0].traffictypes)) > 0 \
                         else "DefaultSharedNetworkOfferingWithSGService"
+                if zone.networkofferingname  is not None:
+                   listnetworkoffering.name = zone.networkofferingname 
 
                 listnetworkofferingresponse = \
                 self.apiClient.listNetworkOfferings(listnetworkoffering)