elasticIp added as virtual network in basic zone
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/02d33344 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/02d33344 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/02d33344 Branch: refs/heads/master Commit: 02d33344bdaa5fe46c1add35fa49b72e428e09ef Parents: 3eb75b5 Author: Prasanna Santhanam <t...@apache.org> Authored: Thu Sep 6 17:35:57 2012 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Wed Sep 12 18:48:34 2012 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/deployDataCenter.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/02d33344/tools/marvin/marvin/deployDataCenter.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index 038d725..571d5a4 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)
