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
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/aa8fee4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/aa8fee4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/aa8fee4f Branch: refs/heads/master Commit: aa8fee4fac330a760e68d0ca526b45741bcc5e1b Parents: 614131a Author: Prasanna Santhanam <prasanna.santha...@citrix.com> Authored: Thu Aug 9 14:16:51 2012 +0530 Committer: Prasanna Santhanam <prasanna.santha...@citrix.com> Committed: Thu Aug 9 15:31:51 2012 +0530 ---------------------------------------------------------------------- .../marvin/marvin/sandbox/advanced/advanced_env.py | 10 ++++++++++ tools/marvin/marvin/sandbox/basic/basic_env.py | 11 +++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aa8fee4f/tools/marvin/marvin/sandbox/advanced/advanced_env.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/sandbox/advanced/advanced_env.py b/tools/marvin/marvin/sandbox/advanced/advanced_env.py index fa504c3..136629f 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' http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aa8fee4f/tools/marvin/marvin/sandbox/basic/basic_env.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/sandbox/basic/basic_env.py b/tools/marvin/marvin/sandbox/basic/basic_env.py index 6274a2b..7c2a0b1 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'
