You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/03/22 15:11:23 UTC
[1/5] git commit: refs/heads/bvt - Simulator Config for advanced zone
deployment
Updated Branches:
refs/heads/bvt f8c77ca54 -> 4a6782b8f
Simulator Config for advanced zone deployment
Moving it to a convenient location under setup/dev/
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b842eeb9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b842eeb9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b842eeb9
Branch: refs/heads/bvt
Commit: b842eeb9916f1ba02aee0264c77c784303f7ed15
Parents: f8c77ca
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Mar 22 19:37:07 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Mar 22 19:37:07 2013 +0530
----------------------------------------------------------------------
setup/dev/advanced.cfg | 195 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 195 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b842eeb9/setup/dev/advanced.cfg
----------------------------------------------------------------------
diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg
new file mode 100644
index 0000000..da6c942
--- /dev/null
+++ b/setup/dev/advanced.cfg
@@ -0,0 +1,195 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+{
+ "zones": [
+ {
+ "name": "Sandbox-simulator",
+ "guestcidraddress": "10.1.1.0/24",
+ "dns1": "10.147.28.6",
+ "physical_networks": [
+ {
+ "broadcastdomainrange": "Zone",
+ "vlan": "100-200",
+ "name": "Sandbox-pnet",
+ "traffictypes": [
+ {
+ "typ": "Guest"
+ },
+ {
+ "typ": "Management"
+ },
+ {
+ "typ": "Public"
+ }
+ ],
+ "providers": [
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VirtualRouter"
+ },
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VpcVirtualRouter"
+ }
+ ]
+ }
+ ],
+ "ipranges": [
+ {
+ "startip": "192.168.2.2",
+ "endip": "192.168.2.200",
+ "netmask": "255.255.255.0",
+ "vlan": "50",
+ "gateway": "192.168.2.1"
+ }
+ ],
+ "networktype": "Advanced",
+ "pods": [
+ {
+ "endip": "172.16.15.200",
+ "name": "POD0",
+ "startip": "172.16.15.2",
+ "netmask": "255.255.255.0",
+ "clusters": [
+ {
+ "clustername": "C0",
+ "hypervisor": "simulator",
+ "hosts": [
+ {
+ "username": "root",
+ "url": "http://sim/c0/h0",
+ "password": "password"
+ },
+ {
+ "username": "root",
+ "url": "http://sim/c0/h1",
+ "password": "password"
+ }
+ ],
+ "clustertype": "CloudManaged",
+ "primaryStorages": [
+ {
+ "url": "nfs://10.147.28.6:/export/home/sandbox/primary",
+ "name": "PS0"
+ }
+ ]
+ }
+ ],
+ "gateway": "172.16.15.1"
+ }
+ ],
+ "internaldns1": "10.147.28.6",
+ "secondaryStorages": [
+ {
+ "url": "nfs://10.147.28.6:/export/home/sandbox/secondary"
+ }
+ ]
+ }
+ ],
+ "dbSvr": {
+ "dbSvr": "localhost",
+ "passwd": "cloud",
+ "db": "cloud",
+ "port": 3306,
+ "user": "cloud"
+ },
+ "logger": [
+ {
+ "name": "TestClient",
+ "file": "/tmp/testclient.log"
+ },
+ {
+ "name": "TestCase",
+ "file": "/tmp/testcase.log"
+ }
+ ],
+ "globalConfig": [
+ {
+ "name": "network.gc.wait",
+ "value": "60"
+ },
+ {
+ "name": "storage.cleanup.interval",
+ "value": "300"
+ },
+ {
+ "name": "vm.op.wait.interval",
+ "value": "5"
+ },
+ {
+ "name": "default.page.size",
+ "value": "10000"
+ },
+ {
+ "name": "network.gc.interval",
+ "value": "60"
+ },
+ {
+ "name": "instance.name",
+ "value": "QA"
+ },
+ {
+ "name": "workers",
+ "value": "10"
+ },
+ {
+ "name": "account.cleanup.interval",
+ "value": "600"
+ },
+ {
+ "name": "guest.domain.suffix",
+ "value": "sandbox.simulator"
+ },
+ {
+ "name": "expunge.delay",
+ "value": "60"
+ },
+ {
+ "name": "vm.allocation.algorithm",
+ "value": "random"
+ },
+ {
+ "name": "expunge.interval",
+ "value": "60"
+ },
+ {
+ "name": "expunge.workers",
+ "value": "3"
+ },
+ {
+ "name": "check.pod.cidrs",
+ "value": "true"
+ },
+ {
+ "name": "secstorage.allowed.internal.sites",
+ "value": "10.147.28.0/24"
+ },
+ {
+ "name": "direct.agent.load.size",
+ "value": "1000"
+ }
+ ],
+ "mgtSvr": [
+ {
+ "mgtSvrIp": "localhost",
+ "passwd": "password",
+ "user": "root",
+ "port": 8096
+ }
+ ]
+}
[2/5] git commit: refs/heads/bvt - remove the old configs in the
sandbox
Posted by ts...@apache.org.
remove the old configs in the sandbox
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cf9c78b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cf9c78b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cf9c78b2
Branch: refs/heads/bvt
Commit: cf9c78b2af47f7b40390afe7267b86617b7c6619
Parents: b842eeb
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Mar 22 19:38:15 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Mar 22 19:38:15 2013 +0530
----------------------------------------------------------------------
.../marvin/sandbox/demo/simulator/simulator.cfg | 196 ---------------
1 files changed, 0 insertions(+), 196 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf9c78b2/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg b/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg
deleted file mode 100644
index ca79460..0000000
--- a/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg
+++ /dev/null
@@ -1,196 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-{
- "zones": [
- {
- "name": "Sandbox-simulator",
- "guestcidraddress": "10.1.1.0/24",
- "dns1": "10.147.28.6",
- "vlan": "100-200",
- "physical_networks": [
- {
- "broadcastdomainrange": "Zone",
- "name": "Sandbox-pnet",
- "traffictypes": [
- {
- "typ": "Guest"
- },
- {
- "typ": "Management"
- },
- {
- "typ": "Public"
- }
- ],
- "providers": [
- {
- "broadcastdomainrange": "ZONE",
- "name": "VirtualRouter"
- },
- {
- "broadcastdomainrange": "ZONE",
- "name": "VpcVirtualRouter"
- }
- ]
- }
- ],
- "ipranges": [
- {
- "startip": "192.168.2.2",
- "endip": "192.168.2.200",
- "netmask": "255.255.255.0",
- "vlan": "50",
- "gateway": "192.168.2.1"
- }
- ],
- "networktype": "Advanced",
- "pods": [
- {
- "endip": "172.16.15.200",
- "name": "POD0",
- "startip": "172.16.15.2",
- "netmask": "255.255.255.0",
- "clusters": [
- {
- "clustername": "C0",
- "hypervisor": "simulator",
- "hosts": [
- {
- "username": "root",
- "url": "http://sim/c0/h0",
- "password": "password"
- },
- {
- "username": "root",
- "url": "http://sim/c0/h1",
- "password": "password"
- }
- ],
- "clustertype": "CloudManaged",
- "primaryStorages": [
- {
- "url": "nfs://10.147.28.6:/export/home/sandbox/primary",
- "name": "PS0"
- }
- ]
- }
- ],
- "gateway": "172.16.15.1"
- }
- ],
- "internaldns1": "10.147.28.6",
- "secondaryStorages": [
- {
- "url": "nfs://10.147.28.6:/export/home/sandbox/secondary"
- }
- ]
- }
- ],
- "dbSvr": {
- "dbSvr": "localhost",
- "passwd": "cloud",
- "db": "cloud",
- "port": 3306,
- "user": "cloud"
- },
- "logger": [
- {
- "name": "TestClient",
- "file": "/tmp/testclient.log"
- },
- {
- "name": "TestCase",
- "file": "/tmp/testcase.log"
- }
- ],
- "globalConfig": [
- {
- "name": "network.gc.wait",
- "value": "60"
- },
- {
- "name": "storage.cleanup.interval",
- "value": "300"
- },
- {
- "name": "vm.op.wait.interval",
- "value": "5"
- },
- {
- "name": "default.page.size",
- "value": "10000"
- },
- {
- "name": "network.gc.interval",
- "value": "60"
- },
- {
- "name": "instance.name",
- "value": "QA"
- },
- {
- "name": "workers",
- "value": "10"
- },
- {
- "name": "account.cleanup.interval",
- "value": "600"
- },
- {
- "name": "guest.domain.suffix",
- "value": "sandbox.simulator"
- },
- {
- "name": "expunge.delay",
- "value": "60"
- },
- {
- "name": "vm.allocation.algorithm",
- "value": "random"
- },
- {
- "name": "expunge.interval",
- "value": "60"
- },
- {
- "name": "expunge.workers",
- "value": "3"
- },
- {
- "name": "check.pod.cidrs",
- "value": "true"
- },
- {
- "name": "secstorage.allowed.internal.sites",
- "value": "10.147.28.0/24"
- },
- {
- "name": "direct.agent.load.size",
- "value": "1000"
- }
- ],
- "mgtSvr": [
- {
- "mgtSvrIp": "localhost",
- "passwd": "password",
- "user": "root",
- "port": 8096
- }
- ]
-}
[4/5] git commit: refs/heads/bvt - the ostype of CentOS is the 64-bit
template
Posted by ts...@apache.org.
the ostype of CentOS is the 64-bit template
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b6f429a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b6f429a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b6f429a
Branch: refs/heads/bvt
Commit: 1b6f429a51871adf281e8fd515520d668dbf4479
Parents: e140556
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Mar 22 19:39:50 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Mar 22 19:39:50 2013 +0530
----------------------------------------------------------------------
setup/db/templates.simulator.sql | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b6f429a/setup/db/templates.simulator.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.simulator.sql b/setup/db/templates.simulator.sql
index 1324623..a804450 100755
--- a/setup/db/templates.simulator.sql
+++ b/setup/db/templates.simulator.sql
@@ -19,4 +19,4 @@
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, image_data_store_id)
VALUES (10, UUID(), 'simulator-domR', 'SystemVM Template (simulator)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://nfs1.lab.vmops.com/templates/routing/debian/latest/systemvm.vhd.bz2', '', 0, 'SystemVM Template (simulator)', 'VHD', 15, 0, 1, 'Simulator', 1);
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, image_data_store_id)
- VALUES (11, UUID(), 'simulator-Centos', 'CentOS 5.3(64-bit) no GUI (Simulator)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://nfs1.lab.vmops.com/templates/centos53-x86_64/latest/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2', '', 0, 'CentOS 5.3(64-bit) no GUI (Simulator)', 'VHD', 11, 1, 1, 'Simulator', 1);
+ VALUES (11, UUID(), 'simulator-Centos', 'CentOS 5.3(64-bit) no GUI (Simulator)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://nfs1.lab.vmops.com/templates/centos53-x86_64/latest/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2', '', 0, 'CentOS 5.3(64-bit) no GUI (Simulator)', 'VHD', 12, 1, 1, 'Simulator', 1);
[5/5] git commit: refs/heads/bvt - optionally launch the simulator
spring context as -Dsimulator
Posted by ts...@apache.org.
optionally launch the simulator spring context as -Dsimulator
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a6782b8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a6782b8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a6782b8
Branch: refs/heads/bvt
Commit: 4a6782b8f116938d3b23e73f71e62d5b3722e87e
Parents: 1b6f429
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Mar 22 19:40:32 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Mar 22 19:40:32 2013 +0530
----------------------------------------------------------------------
client/pom.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a6782b8/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 7565029..c696741 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -393,6 +393,22 @@
</configuration>
</execution>
<execution>
+ <id>process-simulator-context</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target if="${simulator}">
+ <echo>test</echo>
+ <replaceregexp
+ file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
+ match="classpath:componentContext.xml"
+ replace="classpath:simulatorComponentContext.xml" byline="true" />
+ </target>
+ </configuration>
+ </execution>
+ <execution>
<id>process-nonoss-spring-context</id>
<phase>process-resources</phase>
<goals>
[3/5] git commit: refs/heads/bvt - deployRunner to run when no format
is given
Posted by ts...@apache.org.
deployRunner to run when no format is given
format option was deprecated. But the testrunner wouldn't run without
it specified. Fixed this by removing traces of format.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e140556e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e140556e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e140556e
Branch: refs/heads/bvt
Commit: e140556eb3cbe8eb7b5b2632dd21800e0e5d714d
Parents: cf9c78b
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Mar 22 19:38:41 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Mar 22 19:38:41 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/TestCaseExecuteEngine.py | 4 +--
.../sandbox/demo/simulator/simulator_setup.py | 2 +-
tools/marvin/marvin/testSetupSuccess.py | 4 --
tools/marvin/pom.xml | 29 +++++++++++++--
4 files changed, 27 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e140556e/tools/marvin/marvin/TestCaseExecuteEngine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/TestCaseExecuteEngine.py b/tools/marvin/marvin/TestCaseExecuteEngine.py
index 144c5db..5743868 100644
--- a/tools/marvin/marvin/TestCaseExecuteEngine.py
+++ b/tools/marvin/marvin/TestCaseExecuteEngine.py
@@ -37,7 +37,6 @@ class TestCaseExecuteEngine(object):
self.logformat = logging.Formatter("%(asctime)s - %(levelname)s - %(name)s - %(message)s")
self.loader = unittest.loader.TestLoader()
self.suite = None
- self.format = format
if testcaseLogFile is not None:
self.logfile = testcaseLogFile
@@ -89,5 +88,4 @@ class TestCaseExecuteEngine(object):
def run(self):
if self.suite:
- if self.format == "text":
- unittest.TextTestRunner(stream=self.testResultLogFile, verbosity=2).run(self.suite)
+ unittest.TextTestRunner(stream=self.testResultLogFile, verbosity=2).run(self.suite)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e140556e/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 0d34140..e4ec9b7 100644
--- a/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py
+++ b/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py
@@ -41,7 +41,6 @@ def describeResources(config):
z.name = 'Sandbox-%s'%(config.get('environment', 'hypervisor'))
z.networktype = 'Advanced'
z.guestcidraddress = '10.1.1.0/24'
- z.vlan = config.get('cloudstack', 'zone.vlan')
vpcprovider = provider()
vpcprovider.name = 'VpcVirtualRouter'
@@ -50,6 +49,7 @@ def describeResources(config):
pn.name = "Sandbox-pnet"
pn.traffictypes = [traffictype("Guest"), traffictype("Management"), traffictype("Public")]
pn.providers.append(vpcprovider)
+ pn.vlan = config.get('cloudstack', 'zone.vlan')
z.physical_networks.append(pn)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e140556e/tools/marvin/marvin/testSetupSuccess.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/testSetupSuccess.py b/tools/marvin/marvin/testSetupSuccess.py
index 90717dc..d1de9be 100644
--- a/tools/marvin/marvin/testSetupSuccess.py
+++ b/tools/marvin/marvin/testSetupSuccess.py
@@ -76,10 +76,6 @@ class TestSetupSuccess(cloudstackTestCase):
delay(60) #wait a minute for retry
self.assertNotEqual(retry, 0, "builtIn templates not ready in zone %s"%z.name)
- def test_deployVmWithBuiltIn(self):
- """
- Deploys a VM with the built-in CentOS template
- """
@classmethod
def tearDownClass(cls):
pass
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e140556e/tools/marvin/pom.xml
----------------------------------------------------------------------
diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml
index 7262580..5a8a1c5 100644
--- a/tools/marvin/pom.xml
+++ b/tools/marvin/pom.xml
@@ -65,8 +65,8 @@
</configuration>
</execution>
<execution>
- <id>package</id>
- <phase>package</phase>
+ <id>install</id>
+ <phase>install</phase>
<goals>
<goal>exec</goal>
</goals>
@@ -128,9 +128,8 @@
</goals>
<configuration>
<workingDirectory>${basedir}/marvin</workingDirectory>
- <executable>python</executable>
+ <executable>/usr/local/bin/nosetests</executable>
<arguments>
- <argument>/usr/local/bin/nosetests</argument>
<argument>--with-marvin</argument>
<argument>--marvin-config</argument>
<argument>${user.dir}/${marvin.config}</argument>
@@ -141,6 +140,28 @@
</arguments>
</configuration>
</execution>
+ <!--execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <workingDirectory>${basedir}/marvin</workingDirectory>
+ <executable>python</executable>
+ <arguments>
+ <argument>deployAndRun.py</argument>
+ <argument>-c</argument>
+ <argument>${user.dir}/${marvin.config}</argument>
+ <argument>-t</argument>
+ <argument>/tmp/t.log</argument>
+ <argument>-r</argument>
+ <argument>/tmp/r.log</argument>
+ <argument>-f</argument>
+ <argument>${basedir}/marvin/testSetupSuccess.py</argument>
+ </arguments>
+ </configuration>
+ </execution-->
</executions>
</plugin>
</plugins>