Commit Graph

1932 Commits

Author SHA1 Message Date
Prasanna Santhanam
7288eca129 failonerror for some marvin targets 2012-07-31 12:17:33 +05:30
chip.childers@gmail.com
2b1feadb20 Additional puppet configuration updates for devcloud. 2012-07-30 15:30:25 -04:00
chip.childers@gmail.com
969b94e7db Adding license headers to puppet manifest files 2012-07-30 09:10:49 -04:00
chip.childers@gmail.com
90de18138d Added storage configuration to the devcloud puppet module. 2012-07-30 09:06:45 -04:00
Prasanna Santhanam
8a2135e3fa VpcVirtualRouter is not enabled always. 2012-07-30 15:32:38 +05:30
Prasanna Santhanam
046f2d786f License headers for the marvin plugin and the setup checker 2012-07-30 15:32:35 +05:30
Prasanna Santhanam
ed7f72b629 Enable VpcVirtualRouter when deploying advanced zone 2012-07-30 15:32:35 +05:30
Prasanna Santhanam
7662426769 All responsibilty for running through nose belongs to the marvin-nose plugin
Conflicts:

	tools/marvin/marvin/NoseTestExecuteEngine.py
2012-07-30 15:32:34 +05:30
Prasanna Santhanam
13857700d3 Plugin-izing the testcase runner
* setup.py is the installer for marvin-nose plugin
* marvin-nose drive all tests using nose with other plugins like xunit, coverage, multiprocess execution etc
* -n option deprecated. All tests driven by nosetests --with-marvin
2012-07-30 15:32:34 +05:30
Prasanna Santhanam
ed113ca844 Correcting the imports for HTTPException 2012-07-30 15:32:34 +05:30
Prasanna Santhanam
9af88ad44d Plugin support to pick test cases using marvin.
Using this plugin Nose will drive tests and this also allows using other
nose plugins. Cmd Line plugin support to be added

Conflicts:

	tools/marvin/marvin/NoseTestExecuteEngine.py
2012-07-30 15:32:34 +05:30
Prasanna Santhanam
0ab7a9289f Support added for attrib, multiprocess and Xunit coverage plugins
Conflicts:

	tools/marvin/marvin/NoseTestExecuteEngine.py
2012-07-30 15:32:34 +05:30
Prasanna Santhanam
84b69e6e0a injecting the testclient during Test Loader process
Without this the tests do not have access to the client APIs
2012-07-30 15:32:33 +05:30
Prasanna Santhanam
db5687d691 enhancement related to -x to take directory name/path to store xml reports
Conflicts:

	tools/marvin/marvin/TestCaseExecuteEngine.py
2012-07-30 15:32:24 +05:30
Prasanna Santhanam
91b6e09e6d The NoseTestLoader to pick cloudStackTestCase as tests 2012-07-30 15:27:55 +05:30
Prasanna Santhanam
9443734f1d setup.properties for basic zone environments 2012-07-30 15:27:55 +05:30
Prasanna Santhanam
aa4ff87812 Post configuration tests to check
- if system VMs are up and running
- if built-in template is downloaded and ready to launch
2012-07-30 15:27:55 +05:30
Prasanna Santhanam
326655d8c6 xml reports for TestCaseEngine
Conflicts:

	tools/marvin/marvin/TestCaseExecuteEngine.py
2012-07-30 15:27:55 +05:30
Prasanna Santhanam
85c5b5656d adding unittest-xml-reporting as a dependency to marvin 2012-07-30 15:27:55 +05:30
Prasanna Santhanam
ba33a25c57 Sandbox scripts for generating one host configuration
- marvin/sandbox/advanced
- marvin/sandbox/basic

* supports generating configurations for cloudstack deployment with
properties files. The format of the config, properties files and the
process is explained in the tutorial:

http://wiki.cloudstack.org/display/QA/Testing+with+python#Testingwithpython-DeploymentConfiguration
2012-07-30 15:27:55 +05:30
chip.childers@gmail.com
25e0cc9d75 Checkpoint commit - work in progress.
Attempting to provide devcloud base box build process via veewee and
puppet provisining via Vagrant.
2012-07-27 23:37:46 -04:00
chip.childers@gmail.com
7da5ab8aca First commit of the devcloud pre-configuration puppet module.
Using this via Vagrant assumes that Vagrant is patched with the changes
made by Edison. The pull request to upstream these changes into the
Vagrant project are here: https://github.com/mitchellh/vagrant/pull/1043 )
2012-07-26 21:25:56 -04:00
chip.childers@gmail.com
ff71dd0525 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-26 09:16:07 -04:00
Edison Su
4c6e547e70 create devcloud base image from veewee 2012-07-20 18:20:31 -07:00
chip.childers@gmail.com
827943a865 Initial commit converting the devcloud build
process to being based on puppet and vagrant.
2012-07-19 04:12:19 -04:00
Edison Su
b627f5a85b Simplifying the process of running the simulator.
* ant run-simulator - will seed the simulator jar and start CS
    * ant run-marvin -Dmarvin.config="/path/config/file" - will
    * configure a
    cloudstack as per the given configuration. marvin.config - defaults
to a
    two host simulator in an advanced zone

    You can then connect your debugger over localhost:8787 or use the CS
ui
    at localhost:8080/client for testing.

From: Prasanna Santhanam(Prasanna.Santhanam@citrix.com)
2012-07-16 10:34:49 -07:00
Edison Su
ed4b6a517b the default templates are put into download.cloud.com 2012-07-11 15:19:21 -07:00
Edison Su
fb59fc5c8a disable virtualbox dhcp server for Vms created by cloudstack 2012-07-10 16:20:20 -07:00
Edison Su
3bbb694413 For devcloudsetup.sh:
Added dom0 memory settings to grub config.
    Added root password reset.
    Install xen ia32 instead of amd64, to 32bit compability
Send-by: chip.childers@sungard.com
RB: https://reviews.apache.org/r/5877/
2012-07-10 11:18:32 -07:00
Pradeep Soundararajan
32fef61ac2 [Defect / Enhancement / New Feature] CS-15281 : Removal of third party dependencies in Citrix code base 2012-07-06 17:28:29 -04:00
Edison Su
57ab39937c add script to setup devcloud image 2012-07-05 20:36:43 -07:00
David Nalley
6fe595f3d3 committing some more changes to marvins license headers 2012-07-04 18:50:49 -04:00
David Nalley
54d7a10b99 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-04 18:45:34 -04:00
David Nalley
ecf2cd57f9 fixing license headers in marvin 2012-07-04 18:45:08 -04:00
Edison Su
217fdd2497 From: jason.bausewein@tier3.com
Fixed deployDataCenter.py to select the correct network offering based on if security groups are enabled.  Also added default value to configGenerator.py for basic setup.
2012-07-03 12:56:42 -07:00
David Nalley
91fd3b772e Applying patch from Prasanna Santhanam
Marvin sandbox example scripts for generating one host configurations
https://reviews.apache.org/r/5656
2012-07-02 09:08:51 -04:00
Edison Su
8dd4197cd8 From: Jason Bausewein [jason.bausewein@tier3.com]
I would like to add an command line option to choose between advanced or basic networking configuration.  This would allow me or others to choose advanced networking without having to edit the python code.
2012-06-22 13:19:04 -07:00
Edison Su
e38db69434 remove tools/testClient as they are moved to tools/marvin/marvin already 2012-06-22 10:57:53 -07:00
Edison Su
2f38e1c713 From:Jason Bausewein [jason.bausewein@tier3.com]
I needed to change the case in the sim url so the SimulatorDiscover will detect the simulator hosts
2012-06-22 10:23:03 -07:00
Edison Su
356ab7b013 From:Jason Bausewein [jason.bausewein@tier3.com]
I needed to change the case in the sim url so the SimulatorDiscover will detect the simulator hosts
2012-06-22 10:21:09 -07:00
Prasanna Santhanam
d4d0950d71 Adding support for file copy to marvin's remoteSSHClient
Signed-off-by: Prasanna Santhanam <Prasanna.Santhanam@citrix.com>
2012-06-10 15:01:50 -04:00
Prasanna Santhanam
09dd71d056 Adding support with xmlrunner for generating XML reports 2012-05-18 12:08:39 +05:30
Prasanna Santhanam
0e22eed41f Files from the demo are now available in the sandbox 2012-05-17 18:12:17 +05:30
Ewan Mellor
42018bab81 Added full URL to output. 2012-05-16 12:04:32 -07:00
Ewan Mellor
d39e4dc611 Added scripts for searching {bugs,wiki}.cloudstack.org. 2012-05-15 13:42:42 -07:00
Prasanna Santhanam
0c26f359ce Add additional retries to the SSH client by default 2012-05-15 18:12:41 +05:30
Prasanna Santhanam
b5ea18d822 MD5 Auth for accounts created on the API 2012-05-14 19:40:44 +05:30
Prasanna Santhanam
0f98f5fe52 Build if you have python 2.7 installed 2012-05-14 19:40:44 +05:30
Prasanna Santhanam
7eaa1cf6f8 Install paramiko as a dependency, don't complain about the requirement 2012-05-14 14:45:24 +05:30
Prasanna Santhanam
a0efa70958 support for running tests in a given script 2012-05-11 18:52:41 +05:30
Prasanna Santhanam
dba1c01cb5 rename the nose test executor 2012-05-11 18:52:36 +05:30
Prasanna Santhanam
dc02d50b17 rename the nose test executor 2012-05-11 18:52:30 +05:30
Prasanna Santhanam
ab57aeb7bc The setup_requires must not co-exists with install_requires 2012-05-11 15:47:46 +05:30
Edison Su
38dd04b759 quick fix to demo 2012-05-02 22:38:38 -07:00
Prasanna Santhanam
aee89701e9 CS-14596: check existence of config file before loading
Check whether the config file to load cloudstack config is avvailable
in the specified path.
2012-04-23 18:52:26 +05:30
Prasanna Santhanam
0bd43e7cf5 CS-14025: provide python eggs to easily install the python test framework
CS-14025: Status - Resolved Fixed

1. Packaging the marvin test client into an installable egg
2. There is a hudson job (marvin) that creates eggs for a specified
branch
3. Alternatively you can use the package-marvin ant target to get a
source tarball.
2012-04-23 17:46:00 +05:30
Prasanna Santhanam
7f470e8d2a Merge latest testClient fixes to marvin
reviewed-by: unittest
2012-04-12 18:10:32 +05:30
Prasanna Santhanam
d150576a48 missing tests directory causes warnings in distutils
reviewed-by: ant run
2012-04-11 18:24:20 +05:30
Prasanna Santhanam
5c37d144cc Package management for the python testclient christened Marvin
$ant package-marvin
will create a packaged source tarball of the testclient that is
redistributable and decoupled from the rest of the cloudstack build
reviewed-by: unittest
2012-04-11 18:24:20 +05:30
Chirag Jog
c07cca1af6 Bug 14612: Database client returns empty list after one successful query
Status 14612: resolved fixed
reviewed-by: Prasanna Santhanam <Prasanna.Santhanam@citrix.com>

Commit to refresh the transaction state
2012-04-06 05:28:55 -07:00
Prasanna Santhanam
38f43564e0 reveal the complete exception from the dbClient
reviewed-by: Edison Su
2012-04-04 16:40:44 +05:30
Prasanna Santhanam
9c9f510fdf bug 14608: Async timeout counter does not get reset across tests
status 14608: resolved fixed
reviewed-by: Chirag Jog (chirag@clogeny.com)

Set the timeout countdown to start from beginning of each pollAsync instead
of setting it once for the entire run.
2012-04-04 16:40:20 +05:30
frank
2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Prasanna Santhanam
c8fa379c55 README file for the tutorial on "Testing with Python" 2012-04-02 18:01:41 +05:30
Prasanna Santhanam
40d7e124a7 Test runs against 3.0 version 2012-04-02 18:00:02 +05:30
Prasanna Santhanam
9011f6297f testClient demo
reviewed-by: unittest

Added test case that demonstrates a backend verification
2012-04-02 17:58:45 +05:30
Prasanna Santhanam
38d6ce4ef2 Correcting the reported failure message
reviewed-by: Edison Su
2012-04-02 17:57:57 +05:30
Prasanna Santhanam
47213463ea bug 13234: run tests as a regular user on testClient
status 13234: resolved fixed
reviewed-by: unittest

When multiple tests in a user-decorator suite are run only the first
test runs successfully since the apiKey has been altered to that of a
regular user. Preventing failure of other tests by detecting user
context - user, admin, domain-admin.

@UserName decorator applies to a testSuite class not a testMethod
2012-03-29 19:18:55 +05:30
Prasanna Santhanam
4221c87c37 bug 13234: unit test to test the user decorator
status 13234: resolved fixed

Uncomment each decorator to test
- tests run as existing admin
- tests run as new user in new domain
- tests run as new user in existing domain
- tests run as old user in existing domain
- tests run as new domain admin in new domain
2012-03-29 19:11:06 +05:30
Edison Su
5a06ddb36a bug 13234: add UserName decorator on testcase, in the form of (username, domainName, accountType). status 13234: resolved fixed. Reviewed-by: prasanna 2012-03-29 01:07:01 -07:00
Prasanna Santhanam
47d01dbd3d reduce logging verbosity, set level to info
reviewed-by: Kishan
2012-03-24 08:46:51 +05:30
Prasanna Santhanam
52202839fb testCase level logger and testClient class attr
reviewed-by: Chirag Jog

Each testCase class will use its own logger to distinguish log
messages when multiple suites are run. This will aid debugging

Every cloudstackTestCase will also contiain a class level attr of the
testClient which was previously available only to setUp/tearDown. Now
even setUpClass/tearDownClass can use this attribute.
2012-03-24 08:46:50 +05:30
Prasanna Santhanam
99000f5d6e Demo files for the confluence tutorial on testing with python
http://confluence.cloudstack.org/display/QA/Testing+with+python

demo.cfg: sample configuration file containing the mgmt server location
testDeployVM.py : simple example demonstrated on confluence tutorial
testSshDeployVM.py : advanced example to demonstrate backend verification
2012-03-21 13:45:44 +05:30
Prasanna Santhanam
b9807e0fca can't append str to logger message 2012-03-21 11:05:37 +05:30
Prasanna Santhanam
3a6edb7643 adding logging with level and timestamp 2012-02-29 11:58:25 +05:30
Prasanna Santhanam
01fa6e3322 adding retry logic, error handling, and urllib2 used for managing connections 2012-02-29 11:58:25 +05:30
Prasanna Santhanam
1316fb7714 Wrong place to put a return 2012-02-29 11:58:25 +05:30
Prasanna Santhanam
94eac37d30 The HTTPConnection object times out too soon when status is being polled. This
depends on python's internal socket implementation. Added an explicit 3m
timeout. Test code MUST NOT induce sleeps longer than 3m, instead check status
periodically to keep the HTTPConnection alive.
reviewed-by: Chirag Jog <chirag@clogeny.com>
2012-02-23 18:35:15 +05:30
Prasanna Santhanam
2a8bdb0c4c Propagating fixes to testClient from 3.0.x. Resolving conflicts
reviewed-by: Prasanna
2012-02-20 19:00:22 +05:30
Prasanna Santhanam
1b8a23f5be Multiple fixes to the testClient to accomodate further changes to 3.0 APIs
reviewed-by: Kishan
* Revert back to old guestCidrAddress
* Add default traffic types
* fixed typo when creating physical network, specifid wrong zone
* correctly specifying the guest VLAN as part of updating physical network
2012-02-20 18:23:46 +05:30
Prasanna Santhanam
0b9a3ddb2e fixing the case when multiple zones are added. enable the right VR element
Reviewed-By: Kishan
(cherry picked from commit 23357f3b17ea87ae51b9be06a1c19ec782a661a6)
2012-02-20 18:21:57 +05:30
Prasanna Santhanam
a424429090 Enable security groups in basic zones only
(cherry picked from commit 7ea0ace472f863374c9a0b8559065a90190e6f61)
2012-02-20 18:21:45 +05:30
Prasanna Santhanam
75c780a0c9 fixing the case when multiple zones are added. enable the right VR element
Reviewed-By: Kishan
(cherry picked from commit 23357f3b17ea87ae51b9be06a1c19ec782a661a6)
2012-02-18 20:23:43 +05:30
Prasanna Santhanam
7f72de368d Enable security groups in basic zones only
(cherry picked from commit 7ea0ace472f863374c9a0b8559065a90190e6f61)
2012-02-18 20:23:43 +05:30
Prasanna Santhanam
573cab407e Enable the zone after successful add 2012-02-18 20:23:42 +05:30
Sam Robertson
0411aad813 use temp tomcat directory for automated testing 2012-02-08 16:35:01 -08:00
Sam Robertson
5ce1a0cba3 Updating CATALINA_HOME used for automated testing environment 2012-02-08 15:06:02 -08:00
Sam Robertson
dadf25cca4 use /usr/share/tomcat, not /usr/share/cloud 2012-02-07 09:30:03 -08:00
Sam Robertson
113a2f2fe8 Adding automated.sh, removed failed attempt at setting CATALINA_HOME in ant build configuration 2012-02-07 08:52:01 -08:00
Sam Robertson
4acfc2eb1d automated testing changes, in addition to an automated.xml 2012-02-03 16:59:20 -08:00
Alex Huang
c42f50c4b0 Used a different way to allocate guest ip address. not in used yet. 2012-01-30 16:10:10 -08:00
Prasanna Santhanam
d99e71bad4 update a Disabled Physical network 2012-01-20 18:33:49 +05:30
Murali reddy
d92c361efd bug 12826:enable NetScaler in basic zone for load balancing and static NAT
NetScaler element should not firewall service provider in basic zone
2012-01-19 14:05:12 -08:00
frank
566f101be1 remove files 2012-01-19 14:00:07 -08:00
Prasanna Santhanam
0b69a252de uniform quotes 2012-01-15 19:21:58 +05:30
Prasanna Santhanam
a2059cf1c1 when the API response has empty list 2012-01-15 19:21:08 +05:30
Prasanna Santhanam
d45e065941 Enable VirtualRouter provider by default in the zone 2012-01-15 19:19:35 +05:30
Prasanna Santhanam
05aa61432b Fixing the framework for 3.0 /Acton API
* changes for bug 12964 - physical network creation is separated from createZone
* removed redundant comments
* PEP8 Compliance
2012-01-14 19:29:46 +05:30
Prasanna Santhanam
659810d5a8 no more guestcidr in createZone 2012-01-14 19:29:46 +05:30
frank
0b38d62c8e addcopyright.py
better license keywords library
2012-01-12 16:51:30 -08:00
frank
191c92a5c3 add shell/python support in copyright header tool 2012-01-11 18:42:18 -08:00
frank
52610ffcb3 add copyright header to shell scripts 2012-01-11 18:41:53 -08:00
frank
c6b19615c2 a tool to add/modify copyright header of source file 2012-01-11 17:32:49 -08:00
Prasanna Santhanam
9c8f989d6b typos and other fixes 2011-12-29 17:28:58 +05:30
Prasanna Santhanam
e9b861432a typos and other fixes 2011-12-29 17:28:58 +05:30
Prasanna Santhanam
b82d88d1d2 basic zone setup template 2011-12-29 17:28:58 +05:30
Prasanna Santhanam
d842119dc4 Fixing the framework for 3.0 /Acton API
* zones now have to be configured with physical networks and providers
* enabling the virtual router and configuring it are sperate API action
* create networks of shared type with SG network offering is done implicitly
2011-12-29 17:28:58 +05:30
Prasanna Santhanam
eaf57eb847 providers are in a list iterable 2011-12-29 17:28:58 +05:30
Prasanna Santhanam
431b571908 property files for simulator and basic zone setup 2011-12-29 17:28:58 +05:30
Prasanna Santhanam
18f865fc3e Reviving the simulator
* SSVM to act as a direct connect agent
* Storage Resources handle SSVM commands
* create-schema.sql already has simulator_network_label. removing the label from create-schema-simulator.sql
2011-12-19 15:03:19 +05:30
Prasanna Santhanam
dc944cd4dd skip config files from repo 2011-12-15 19:12:21 +05:30
Prasanna Santhanam
206077aec2 kvm and xen are already part of sandbox/advanced 2011-12-05 21:51:38 +05:30
Prasanna Santhanam
d5424b0d31 kvm and xen are already part of sandbox/advanced 2011-12-05 21:51:38 +05:30
Prasanna Santhanam
0b1ca708bb - configure the virtual router element for advanced networks only
- enable all service providers created in  a zone
- TODO: basic networking and optionally selecting providers enabled
2011-11-30 17:42:41 +05:30
Prasanna Santhanam
06dda10f31 - when de-serializing back to python from json, python attribute must be built
from dicts only, lists and tuples which don't contain dicts will be directly
set to the attribute
- eg: listnetworkserviceproviderresponse : servicelist = ['vpn', 'dhcp',
  'firewall'] contains no name,value combination to make attributes. So we make
self.servicelist = ['vpn','dhcp','firewall']
2011-11-30 17:42:40 +05:30
Prasanna Santhanam
3db3b92e2b - some quick environment configuration files
- adding service providers for zone configuration
- getting the python framework working with providers
2011-11-29 23:30:38 +05:30
Sam Robertson
d684dd86e1 Added more reporting, Fixed bug with setting globals, Added info to README, minor tweaks 2011-11-20 18:04:55 -06:00
Sam Robertson
b4ddcfbe48 Cleaning up stuff, reorganizing parser into a class to make it more manageable 2011-11-08 17:11:44 -08:00
Sam Robertson
3bdb5af2e2 initial checkin translator script to convert xml to python 2011-11-06 20:59:07 -08:00
frank
cef30956e9 Merge branch 'newagentmgr'
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
Edison Su
92eaf49f29 Add storage migration 2011-10-24 15:59:47 -07:00
frank
4e595d04ab Bug 11522 - New agent manager
1.load hosts that in maintenance mode because maintenance is no longer an agent status now
2.don't disconnect agent when entering maintenance mode, again it's no longer an agent status now
2011-10-19 17:51:20 -07:00
frank
58fefd2891 Bug 11522 - New agent manager
initialize simulator test case
2011-10-18 17:58:15 -07:00
anthony
e231ea1ab2 eclipse classpath fix 2011-08-31 15:51:19 -07:00
frank
de27618c7f move cloud-selenium*.jar to tools 2011-08-30 10:44:58 -07:00
Prasanna Santhanam
dc7ac31dce 1. correcting the global property 2. handling the case if unittest2 is present
(cherry picked from commit d1b71859c0d6bb054d64f38b7bc6f11d37bd1725)
2011-08-29 18:44:57 +05:30
Edison Su
db8341bb35 testClient: add timestamp for sync job 2011-08-25 18:56:28 -07:00
Edison Su
c8dafa8628 add missing files 2011-08-25 18:56:24 -07:00
Edison Su
9777b7d193 testclient: fix fix asyn job query for sync command 2011-08-25 18:56:20 -07:00
Edison Su
f8aaf1a126 TestClient: use json instead of painful XML 2011-08-25 18:56:05 -07:00
Prasanna Santhanam
81366d35c1 a. Test Discovery is only found in python 2.7+. unittest2 makes it backwards compatible for python 2.4-2.6
b. Adding traceback from pymysql to debug problems in connecting with database
(cherry picked from commit 81218d718af0ec101f7ba424c62bb6e0b5642744)
2011-08-25 19:52:30 +05:30
Edison Su
9391938908 fix conflict 2011-08-24 18:47:09 -07:00
Edison Su
4393162ecd TestClient: fix npe 2011-08-24 10:48:26 -07:00
frank
86bcca210b move migration to tools directory 2011-08-24 10:46:55 -07:00
Edison Su
ac826a721e TESTClient: async job threads can exit after job pool is empty 2011-08-23 11:45:12 -07:00
alena
8a7feb8ec1 Merge branch '2.2.y'
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
2011-08-22 20:28:30 -07:00
Edison Su
3ccc790b1d add sample code to config advanced zone 2011-08-19 18:06:11 -07:00
Edison Su
49f283f364 add sample code to config advanced zone 2011-08-19 18:05:37 -07:00
Edison Su
2e48a9188d add new testcase class, make testcase pydev friendly 2011-08-19 16:22:02 -07:00
Edison Su
3466d3f637 add new testcase class, make testcase pydev friendly 2011-08-19 16:21:16 -07:00
Edison Su
c57ca25d2a need to update configuration 2011-08-18 10:51:50 -07:00
Edison Su
97e9a0171a change parameters 2011-08-18 10:51:44 -07:00
Edison Su
c707aeb5da add more test cases 2011-08-18 10:51:38 -07:00
Edison Su
8fc6e18f46 fix typo 2011-08-18 10:51:34 -07:00
Edison Su
1bc7631bf2 finally, test framework works now 2011-08-18 10:51:31 -07:00
Edison Su
48494c5f20 generate json configuration file for any kind of data center setup, and deploy it 2011-08-18 10:49:18 -07:00
Edison Su
1600d70ca3 fix code generator, some api response is empty 2011-08-18 10:49:18 -07:00
Edison Su
1a82fd46b2 need to update configuration 2011-08-17 18:21:54 -07:00
Edison Su
54e4e0011b change parameters 2011-08-17 10:50:30 -07:00
Edison Su
bb8265ded3 add more test cases 2011-08-16 15:07:49 -07:00
Edison Su
92131e9859 fix typo 2011-08-16 10:30:52 -07:00
Edison Su
449a12870b finally, test framework works now 2011-08-16 10:30:52 -07:00
Edison Su
f4a6c314c5 generate json configuration file for any kind of data center setup, and deploy it 2011-08-16 10:30:52 -07:00
Edison Su
25ce6242c7 fix code generator, some api response is empty 2011-08-16 10:30:52 -07:00
Chiradeep Vittal
e72dbbeeee how to generate api spec file 2011-08-15 17:44:56 -07:00
Edison Su
7372f4a375 add more doc 2011-08-11 13:28:33 -07:00
Edison Su
9151bff1b2 fix typo 2011-08-10 18:37:34 -07:00
Edison Su
1cb9773d1a fix typo 2011-08-10 18:36:42 -07:00
Edison Su
499bdff397 fix cloudkit setup, to use new image 2011-07-08 13:49:53 -07:00
Edison Su
7feaca1d60 fix cloudkit setup, to use new image 2011-06-27 16:06:52 -04:00
Edison Su
3cddd72c9b fix template sync issue 2011-06-02 22:38:13 -04:00
Chiradeep Vittal
303e2a7481 Start of zonesfeature / mycloud/cloudkit 2011-05-03 10:40:17 -07:00
Alex Huang
8b06aed43b added mockito for mocking 2011-03-19 11:46:18 -07:00
anthony
8e334107f0 remove timestamp check for vhd-util check 2011-03-07 19:47:29 -08:00
anthony
e01ca05208 copy_vhd_from_secondarystorage implement coalesce 2011-03-07 19:47:29 -08:00
anthony
79dacfacb5 Revert "make vhd-util cross build work"
This reverts commit c26de0b3e1.
2011-03-07 19:47:28 -08:00
anthony
95d39161cc vhd-util coalesce to a specified file 2011-03-01 19:58:47 -08:00
anthony
c26de0b3e1 make vhd-util cross build work 2011-03-01 17:48:11 -08:00
anthony
fecd83d2b4 import vhd-tools from xen-4.0.1 2011-02-28 19:41:14 -08:00
Kelven Yang
4a66441b93 Fix Eclipse project settings for separation of JUnit 2011-02-17 09:55:05 -08:00
Alex Huang
c6efb2b09d bug 8529: propagated to master. Added junit test support to ant 2011-02-16 17:40:59 -08:00
edison
e67e7d0e7b remove patches/systemv, and mv tools/systemvm into patches 2010-10-05 20:41:39 -07:00
edison
0e5469340c fix typo, should be "dev eth2" 2010-09-27 17:24:45 -07:00
edison
2d728d4044 set default gateway always on eth2, to fix the bug that system vm is not pingable, if public network and
private network both are in the same subnet.
2010-09-27 17:08:31 -07:00
kishan
9135553a45 Bug 6175: clear rules when pub interface is remove 2010-09-17 12:24:37 +05:30
Chiradeep Vittal
e7c280214b file util required by download manager 2010-09-09 18:14:03 -07:00
Alex Huang
7249f168d5 more file changes 2010-09-09 13:27:20 -07:00
Manuel Amador (Rudd-O)
b0acdbcf8b Split out build responsibility into per-project wscript_build files. Installation of generic directories like bindir, and creation of systemvms, remain in toplevel wscript_build. Make some waf code useful and reusable in the form of tools. 2010-08-31 20:40:17 -07:00
Chiradeep Vittal
2164d07b61 Make the vm smaller 2010-08-27 09:38:33 -07:00
Chiradeep Vittal
aa49f9f98b Initial checkin of systemvm builder for debian-based systemvm 2010-08-23 18:40:06 -07:00
Alex Huang
3318f6dcb4 Issue #: 5890 Changes to projects to work in git
Status 5890: resolved works for me
2010-08-11 09:41:15 -07:00
Manuel Amador (Rudd-O)
05c020e1f6 Source code committed 2010-08-11 09:13:29 -07:00