From 98afec075c9c2f79dcd9c476057150c47f5ba6c4 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Thu, 9 Aug 2012 14:16:51 +0530 Subject: [PATCH] Correcting the example configurations for advanced and basic zone Zones will now be have to configured with physical networks, their traffic types and the providers with the devices supporting the service --- tools/marvin/marvin/sandbox/advanced/advanced_env.py | 10 ++++++++++ tools/marvin/marvin/sandbox/basic/basic_env.py | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/tools/marvin/marvin/sandbox/advanced/advanced_env.py b/tools/marvin/marvin/sandbox/advanced/advanced_env.py index 701a3a3f58a..17633e8ec2e 100644 --- a/tools/marvin/marvin/sandbox/advanced/advanced_env.py +++ b/tools/marvin/marvin/sandbox/advanced/advanced_env.py @@ -31,6 +31,16 @@ def describeResources(config): z.name = 'Sandbox-%s'%(config.get('cloudstack', 'hypervisor')) z.networktype = 'Advanced' z.guestcidraddress = '10.1.1.0/24' + + vpcprovider = provider() + vpcprovider.name = 'VpcVirtualRouter' + + pn = physical_network() + pn.name = "Sandbox-pnet" + pn.traffictypes = [traffictype("Guest"), traffictype("Management"), traffictype("Public")] + pn.providers.append(vpcprovider) + + z.physical_networks.append(pn) p = pod() p.name = 'POD0' diff --git a/tools/marvin/marvin/sandbox/basic/basic_env.py b/tools/marvin/marvin/sandbox/basic/basic_env.py index 07b6a9b7008..d47434c2d31 100644 --- a/tools/marvin/marvin/sandbox/basic/basic_env.py +++ b/tools/marvin/marvin/sandbox/basic/basic_env.py @@ -31,6 +31,17 @@ def describeResources(config): z.name = 'Sandbox-%s'%(config.get('cloudstack', 'hypervisor')) z.networktype = 'Basic' z.securitygroupenabled = 'true' + + sgprovider = provider() + sgprovider.broadcastdomainrange = 'Pod' + sgprovider.name = 'SecurityGroupProvider' + + pn = physical_network() + pn.name = "Sandbox-pnet" + pn.traffictypes = [traffictype("Guest"), traffictype("Management")] + pn.providers.append(sgprovider) + + z.physical_networks.append(pn) p = pod() p.name = 'POD0'