cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject [15/50] [abbrv] git commit: updated refs/heads/vmware-datamodel to 57444fc
Date Thu, 09 May 2013 18:01:30 GMT
Adding isolation method to the zone creation of marvin

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/808b49b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/808b49b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/808b49b2

Branch: refs/heads/vmware-datamodel
Commit: 808b49b21685ec850230c121492127f2047830c7
Parents: b8642c8
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Tue May 7 15:28:20 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue May 7 15:29:10 2013 +0530

----------------------------------------------------------------------
 setup/dev/advanced.cfg                             |    3 +++
 setup/dev/basic.cfg                                |    3 +++
 tools/marvin/marvin/configGenerator.py             |    1 +
 tools/marvin/marvin/deployDataCenter.py            |    1 +
 .../marvin/marvin/sandbox/advanced/advanced_env.py |    3 +++
 tools/marvin/marvin/sandbox/basic/basic_env.py     |    1 +
 .../sandbox/demo/simulator/simulator_setup.py      |    2 ++
 7 files changed, 14 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/808b49b2/setup/dev/advanced.cfg
----------------------------------------------------------------------
diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg
index 4315989..63e435b 100644
--- a/setup/dev/advanced.cfg
+++ b/setup/dev/advanced.cfg
@@ -46,6 +46,9 @@
                             "broadcastdomainrange": "ZONE",
                             "name": "VpcVirtualRouter"
                         }
+                    ],
+                    "isolationmethods": [
+                             "VLAN"
                     ]
                 }
             ],

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/808b49b2/setup/dev/basic.cfg
----------------------------------------------------------------------
diff --git a/setup/dev/basic.cfg b/setup/dev/basic.cfg
index 3f56a3c..326874d 100644
--- a/setup/dev/basic.cfg
+++ b/setup/dev/basic.cfg
@@ -42,6 +42,9 @@
                             "broadcastdomainrange": "Pod",
                             "name": "SecurityGroupProvider"
                         }
+                    ],
+                    "isolationmethods": [
+                             "L3"
                     ]
                 }
             ],

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/808b49b2/tools/marvin/marvin/configGenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py
index e2a6a24..4e82bbe 100644
--- a/tools/marvin/marvin/configGenerator.py
+++ b/tools/marvin/marvin/configGenerator.py
@@ -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'

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/808b49b2/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 5ca1ebf..2168592 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/808b49b2/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 db78a84..bf880f3 100644
--- a/tools/marvin/marvin/sandbox/advanced/advanced_env.py
+++ b/tools/marvin/marvin/sandbox/advanced/advanced_env.py
@@ -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)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/808b49b2/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 e588fdc..cf1869f 100644
--- a/tools/marvin/marvin/sandbox/basic/basic_env.py
+++ b/tools/marvin/marvin/sandbox/basic/basic_env.py
@@ -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)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/808b49b2/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py b/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py
index e4ec9b7..d45d482 100644
--- a/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py
+++ b/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py
@@ -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')
     


Mime
View raw message