From 63ba1ddfb9ddfb47c7e0c564fea3ad8edf2bd19a Mon Sep 17 00:00:00 2001
From: John Dilley <john.dilley@citrix.com>
Date: Mon, 30 Jun 2014 14:23:50 +0000
Subject: [PATCH] CLOUDSTACK-7010: Add domain to createZones in marvin

---
 tools/marvin/marvin/configGenerator.py  | 1 +
 tools/marvin/marvin/deployDataCenter.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py
index 8daaaa9d59c..6055f46723e 100644
--- a/tools/marvin/marvin/configGenerator.py
+++ b/tools/marvin/marvin/configGenerator.py
@@ -88,6 +88,7 @@ class zone(object):
         self.pods = []
         self.secondaryStorages = []
         self.cacheStorages = []
+        self.domain = None
 
 
 class trafficType(object):
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index a2fbd4abbc6..ae48839828f 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -695,6 +695,7 @@ class DeployDataCenters(object):
                 zonecmd.securitygroupenabled = zone.securitygroupenabled
                 zonecmd.localstorageenabled = zone.localstorageenabled
                 zonecmd.networktype = zone.networktype
+                zonecmd.domain = zone.domain
                 if zone.securitygroupenabled != "true":
                     zonecmd.guestcidraddress = zone.guestcidraddress
                 zoneId = self.createZone(zonecmd)