etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding isolation method to the zone creation of marvin 

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-05-07 15:28:20 +05:30
parent b8642c80ef
commit 808b49b216
7 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup/dev/advanced.cfg
View File

@ -46,6 +46,9 @@
"broadcastdomainrange": "ZONE",
"name": "VpcVirtualRouter"
}
],
"isolationmethods": [
"VLAN"
]
}
],

3
setup/dev/basic.cfg
View File

@ -42,6 +42,9 @@
"broadcastdomainrange": "Pod",
"name": "SecurityGroupProvider"
}
],
"isolationmethods": [
"L3"
]
}
],

1
tools/marvin/marvin/configGenerator.py
View File

@ -133,6 +133,7 @@ class physical_network():
self.traffictypes = []
self.broadcastdomainrange = 'Zone'
self.vlan = None
self.isolationmethods = []
'''enable default virtual router provider'''
vrouter = provider()
vrouter.name = 'VirtualRouter'

1
tools/marvin/marvin/deployDataCenter.py
View File

@ -169,6 +169,7 @@ class deployDataCenters():
phynet = createPhysicalNetwork.createPhysicalNetworkCmd()
phynet.zoneid = zoneid
phynet.name = net.name
phynet.isolationmethods = net.isolationmethods
phynetwrk = self.apiClient.createPhysicalNetwork(phynet)
self.addTrafficTypes(phynetwrk.id, net.traffictypes)
return phynetwrk

3
tools/marvin/marvin/sandbox/advanced/advanced_env.py
View File

@ -46,6 +46,7 @@ def describeResources(config):
z.name = 'Sandbox-%s'%(config.get('cloudstack', 'hypervisor'))
z.networktype = 'Advanced'
z.guestcidraddress = '10.1.1.0/24'
z.securitygroupenabled = 'false'
vpcprovider = provider()
vpcprovider.name = 'VpcVirtualRouter'
@ -57,6 +58,7 @@ def describeResources(config):
pn.traffictypes = [traffictype("Guest"),
traffictype("Management", {"simulator" : "cloud-simulator-mgmt"}),
traffictype("Public", {"simulator":"cloud-simulator-public"})]
pn.isolationmethods = ["VLAN"]
pn.providers.append(vpcprovider)
pn2 = physical_network()
@ -64,6 +66,7 @@ def describeResources(config):
pn2.vlan = config.get('cloudstack', 'pnet2.vlan')
pn2.tags = ["cloud-simulator-guest"]
pn2.traffictypes = [traffictype('Guest', {'simulator': 'cloud-simulator-guest'})]
pn2.isolationmethods = ["VLAN"]
pn2.providers.append(vpcprovider)
z.physical_networks.append(pn)

1
tools/marvin/marvin/sandbox/basic/basic_env.py
View File

@ -55,6 +55,7 @@ def describeResources(config):
pn = physical_network()
pn.name = "Sandbox-pnet"
pn.traffictypes = [traffictype("Guest"), traffictype("Management")]
pn.isolationmethods = ["L3"]
pn.providers.append(sgprovider)
z.physical_networks.append(pn)

2
tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py
View File

@ -41,6 +41,7 @@ def describeResources(config):
z.name = 'Sandbox-%s'%(config.get('environment', 'hypervisor'))
z.networktype = 'Advanced'
z.guestcidraddress = '10.1.1.0/24'
z.securitygroupenabled = 'false'
vpcprovider = provider()
vpcprovider.name = 'VpcVirtualRouter'
@ -48,6 +49,7 @@ def describeResources(config):
pn = physical_network()
pn.name = "Sandbox-pnet"
pn.traffictypes = [traffictype("Guest"), traffictype("Management"), traffictype("Public")]
pn.isolationmethods = ["VLAN"]
pn.providers.append(vpcprovider)
pn.vlan = config.get('cloudstack', 'zone.vlan')