From 02d33344bdaa5fe46c1add35fa49b72e428e09ef Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Thu, 6 Sep 2012 17:35:57 +0530 Subject: [PATCH] elasticIp added as virtual network in basic zone --- tools/marvin/marvin/deployDataCenter.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index 038d7253686..571d5a4ff72 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -109,7 +109,7 @@ class deployDataCenters(): self.createClusters(pod.clusters, zoneId, podId) def createVlanIpRanges(self, mode, ipranges, zoneId, podId=None,\ - networkId=None): + networkId=None, forvirtualnetwork=None): if ipranges is None: return for iprange in ipranges: @@ -125,7 +125,10 @@ class deployDataCenters(): vlanipcmd.zoneid = zoneId vlanipcmd.vlan = iprange.vlan if mode == "Basic": - vlanipcmd.forvirtualnetwork = "false" + if forvirtualnetwork: + vlanipcmd.forvirtualnetwork = "true" + else: + vlanipcmd.forvirtualnetwork = "false" else: vlanipcmd.forvirtualnetwork = "true" @@ -309,7 +312,7 @@ class deployDataCenters(): self.createpods(zone.pods, zoneId, networkid) if self.isEipElbZone(zone): self.createVlanIpRanges(zone.networktype, zone.ipranges, \ - zoneId) + zoneId, forvirtualnetwork=True) if zone.networktype == "Advanced": self.createpods(zone.pods, zoneId)