CLOUDSTACK-6222: Fix the marvin config generator scripts to include new syntax changes in marvin code and fix the logFolderPath
Signed-off-by: SrikanteswaraRao Talluri <[email protected]> Conflicts: tools/marvin/marvin/configGenerator.py Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fd1b983d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fd1b983d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fd1b983d Branch: refs/heads/master Commit: fd1b983d03ec9f30690eac5aac508d4ea09e9e18 Parents: d70ef2a Author: SrikanteswaraRao Talluri <[email protected]> Authored: Tue Mar 11 16:07:28 2014 +0530 Committer: SrikanteswaraRao Talluri <[email protected]> Committed: Tue Mar 11 16:13:45 2014 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/configGenerator.py | 2 +- .../marvin/sandbox/advanced/advanced_env.py | 23 ++++++++------------ .../marvin/sandbox/advancedsg/advancedsg_env.py | 18 +++++---------- tools/marvin/marvin/sandbox/basic/basic_env.py | 16 +++++--------- .../sandbox/demo/simulator/simulator_setup.py | 16 +++++--------- 5 files changed, 26 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fd1b983d/tools/marvin/marvin/configGenerator.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py index 605832c..43b4d7c 100644 --- a/tools/marvin/marvin/configGenerator.py +++ b/tools/marvin/marvin/configGenerator.py @@ -61,7 +61,7 @@ class cloudstackConfiguration(object): self.mgtSvr = [] self.dbSvr = None self.globalConfig = [] - self.logger = [] + self.logger = None self.TestData = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fd1b983d/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 1728e61..f3d3064 100644 --- a/tools/marvin/marvin/sandbox/advanced/advanced_env.py +++ b/tools/marvin/marvin/sandbox/advanced/advanced_env.py @@ -54,22 +54,22 @@ def describeResources(config): lbprovider = provider() lbprovider.name = 'InternalLbVm' - pn = physical_network() + pn = physicalNetwork() pn.name = "Sandbox-pnet" pn.vlan = config.get('cloudstack', 'pnet.vlan') pn.tags = ["cloud-simulator-public"] - pn.traffictypes = [traffictype("Guest"), - traffictype("Management", {"simulator" : "cloud-simulator-mgmt"}), - traffictype("Public", {"simulator":"cloud-simulator-public"})] + pn.traffictypes = [trafficType("Guest"), + trafficType("Management", {"simulator" : "cloud-simulator-mgmt"}), + trafficType("Public", {"simulator":"cloud-simulator-public"})] pn.isolationmethods = ["VLAN"] pn.providers.append(vpcprovider) pn.providers.append(lbprovider) - pn2 = physical_network() + pn2 = physicalNetwork() pn2.name = "Sandbox-pnet2" pn2.vlan = config.get('cloudstack', 'pnet2.vlan') pn2.tags = ["cloud-simulator-guest"] - pn2.traffictypes = [traffictype('Guest', {'simulator': 'cloud-simulator-guest'})] + pn2.traffictypes = [trafficType('Guest', {'simulator': 'cloud-simulator-guest'})] pn2.isolationmethods = ["VLAN"] pn2.providers.append(vpcprovider) pn2.providers.append(lbprovider) @@ -137,16 +137,11 @@ def describeResources(config): [zs.globalConfig.append(cfg) for cfg in getGlobalSettings(config)] ''''add loggers''' - testClientLogger = logger() - testClientLogger.name = 'TestClient' - testClientLogger.file = 'testclient.log' + testLogger = logger() + testLogger.logFolderPath = '/tmp/' + zs.logger = testLogger - testCaseLogger = logger() - testCaseLogger.name = 'TestCase' - testCaseLogger.file = 'testcase.log' - zs.logger.append(testClientLogger) - zs.logger.append(testCaseLogger) return zs http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fd1b983d/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py b/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py index 9cf4a0a..284ea2e 100644 --- a/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py +++ b/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py @@ -51,11 +51,11 @@ def describeResources(config): sgprovider.broadcastdomainrange = 'ZONE' sgprovider.name = 'SecurityGroupProvider' - pn = physical_network() + pn = physicalNetwork() pn.name = "Sandbox-pnet" pn.tags = ["cloud-simulator-pnet"] - pn.traffictypes = [traffictype("Guest"), - traffictype("Management", {"simulator" : "cloud-simulator-mgmt"})] + pn.traffictypes = [trafficType("Guest"), + trafficType("Management", {"simulator" : "cloud-simulator-mgmt"})] pn.isolationmethods = ["VLAN"] pn.providers.append(sgprovider) @@ -121,16 +121,10 @@ def describeResources(config): [zs.globalConfig.append(cfg) for cfg in getGlobalSettings(config)] ''''add loggers''' - testClientLogger = logger() - testClientLogger.name = 'TestClient' - testClientLogger.file = 'testclient.log' + testLogger = logger() + testLogger.logFolderPath = '/tmp/' + zs.logger = testLogger - testCaseLogger = logger() - testCaseLogger.name = 'TestCase' - testCaseLogger.file = 'testcase.log' - - zs.logger.append(testClientLogger) - zs.logger.append(testCaseLogger) return zs http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fd1b983d/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 bf106fc..6198163 100644 --- a/tools/marvin/marvin/sandbox/basic/basic_env.py +++ b/tools/marvin/marvin/sandbox/basic/basic_env.py @@ -52,9 +52,9 @@ def describeResources(config): sgprovider.broadcastdomainrange = 'Pod' sgprovider.name = 'SecurityGroupProvider' - pn = physical_network() + pn = physicalNetwork() pn.name = "Sandbox-pnet" - pn.traffictypes = [traffictype("Guest"), traffictype("Management")] + pn.traffictypes = [trafficType("Guest"), trafficType("Management")] pn.isolationmethods = ["L3"] pn.providers.append(sgprovider) @@ -119,16 +119,10 @@ def describeResources(config): [zs.globalConfig.append(cfg) for cfg in getGlobalSettings(config)] ''''add loggers''' - testClientLogger = logger() - testClientLogger.name = 'TestClient' - testClientLogger.file = '/var/log/testclient.log' + testLogger = logger() + testLogger.logFolderPath = '/tmp/' + zs.logger = testLogger - testCaseLogger = logger() - testCaseLogger.name = 'TestCase' - testCaseLogger.file = '/var/log/testcase.log' - - zs.logger.append(testClientLogger) - zs.logger.append(testCaseLogger) return zs http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fd1b983d/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 d45d482..08b20cc 100644 --- a/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py +++ b/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py @@ -46,9 +46,9 @@ def describeResources(config): vpcprovider = provider() vpcprovider.name = 'VpcVirtualRouter' - pn = physical_network() + pn = physicalNetwork() pn.name = "Sandbox-pnet" - pn.traffictypes = [traffictype("Guest"), traffictype("Management"), traffictype("Public")] + pn.traffictypes = [trafficType("Guest"), trafficType("Management"), trafficType("Public")] pn.isolationmethods = ["VLAN"] pn.providers.append(vpcprovider) pn.vlan = config.get('cloudstack', 'zone.vlan') @@ -120,16 +120,10 @@ def describeResources(config): [zs.globalConfig.append(cfg) for cfg in getGlobalSettings(config)] ''''add loggers''' - testClientLogger = logger() - testClientLogger.name = 'TestClient' - testClientLogger.file = '/var/log/testclient.log' + testLogger = logger() + testLogger.logFolderPath = '/tmp/' + zs.logger = testLogger - testCaseLogger = logger() - testCaseLogger.name = 'TestCase' - testCaseLogger.file = '/var/log/testcase.log' - - zs.logger.append(testClientLogger) - zs.logger.append(testCaseLogger) return zs
