From aa8fee4fac330a760e68d0ca526b45741bcc5e1b 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 fa504c3890e..136629fe944 100644 --- a/tools/marvin/marvin/sandbox/advanced/advanced_env.py +++ b/tools/marvin/marvin/sandbox/advanced/advanced_env.py @@ -46,6 +46,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 6274a2b988e..7c2a0b1d957 100644 --- a/tools/marvin/marvin/sandbox/basic/basic_env.py +++ b/tools/marvin/marvin/sandbox/basic/basic_env.py @@ -47,6 +47,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'