Commit Graph

6415 Commits

Author SHA1 Message Date
Prachi Damle
6ec7e25993 Adding pretty toString() to AffinityGroup 2013-04-10 14:18:36 -07:00
Prachi Damle
4a1eaf45bd Merge branch 'master' into affinity_groups
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-04-10 11:34:30 -07:00
Jayapal
a4a059c043 CLOUDSTACK-779 Egress firewall rules support for Juniper SRX 2013-04-10 10:54:04 -07:00
Prachi Damle
ee0a91d111 Fixed the issue - VM deployment for local service offering for Root and with data disk(shared), was deploying data disk to local disk too. Currently there is no way to let the planner know multiple pool information, hence letting the planner search for a pool always during VM deployment. 2013-04-10 10:47:50 -07:00
Jayapal
c8f2003138 CLOUDSTACK-1862 Added vm ip address info in the list PF rules response
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-10 14:26:36 +05:30
Mice Xia
b646e43a1a use hypervisor capabilities to control if vm snapshot is enabled for hypervisors 2013-04-10 12:36:42 +08:00
Mice Xia
bd7a38957a 1)use vmsnapshot.create.wait to control vmsnapshot timeout 2)remove global configuration vmsnapshot.expunge.interval and vmsnapshot.expunge.workers since vmsnapshot expunge is synchronous 2013-04-10 11:35:58 +08:00
Vijayendra Bhamidipati
d4e2aa32c6 CLOUDSTACK-1675: VMSnapshot: ListVMSnapshotsCmd should not display Domain ID in the Error Message
Description:
	Replace domain db id by uuid in exception message.

Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-04-10 11:35:58 +08:00
Kelven Yang
913f73ab6b Apply patch https://reviews.apache.org/r/10137/ 2013-04-09 17:29:21 -07:00
Prachi Damle
f92e265721 ACl on affinity group 2013-04-09 15:04:56 -07:00
Chiradeep Vittal
2e6c65fd34 QuickCloud: sanitize logs for normal running of agents outside systemvm 2013-04-09 14:45:27 -07:00
Chiradeep Vittal
271d232d62 QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package
QuickCloud: fix license issue
QuickCloud: use a different activation for deploying quickcloud
Otherwise marvin gets invoked during mvn install -Dquickcloud
2013-04-09 14:45:27 -07:00
Chiradeep Vittal
5ff8bcaa2e QuickCloud: when using SSVM, pass in the new name of the SS class (com.cloud -> org.apache.cloudstack)
QuickCloud : configuration moved to applicationContext.xml from componentContext.xml
QuickCloud: default to enabled state for devcloud zone
QuickCloud: environment.properties helps customize location of pid file
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
c5b11df6b7 QuickCloud: option to build with componentContext tailored for quickcloud
For now it replaces ConsoleProxyManagerImpl with StaticConsoleProxyManager
Usage: mvn install -Dquickcloud

QuickCloud: rename deploy profile

QuickCloud: remove cyclic dependency introduced in nonoss build by moving SecondaryStorageDiscoverer into services
However with this fix, developers will be unable to run 'PremiumSecondaryStorageResource' (for VMWare installations) using mvn exec:java.
Instead they will have to use the exploded archive from systemvm.zip
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
1d70b9ea77 QuickCloud: add a network offering without any services
This can be used to avoid starting up a virtual router simply for the purposes of offering dhcp and dns services
With the QuickCloudNoServices offering, no virtual router will be started up and the vm instance will not get a CloudStack-assigned IP address.
Instead, the VM will simply get whatever IP address is offered by an DHCP service that happens to be running in the same network
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
3d78019e57 QuickCloud: copy authorization code from ConsoleProxyManagerImpl
QuickCloud: refactor to avoid copy paste of authentication and startup code
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
790d2ce82e QuickCloud: Remove reference to unused code
QuickCloud: remove some dead code in ConsoleProxyManager
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
e7983b25cc QuickCloud: Enable secondary storage daemon to run outside the system vm 2013-04-09 14:45:25 -07:00
Hugo Trippaers
6c9fcb8c8f Make the VpcManager check a list of supported providers 2013-04-09 18:27:23 +02:00
Murali Reddy
9180bd5990 CLOUDSTACK-1834: Events are not generated for registerUserKeys() 2013-04-09 17:45:57 +05:30
Chiradeep Vittal
c6e226da74 CLOUDSTACK-524: in some cases (especially the built-in CentOS template), the template downloader does not use the configured http proxy
The DownloadProgress command is used to restart failed or stuck download jobs -- and it would not include the proxy information, unlike the DownloadCommand which always did

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-04-08 17:29:54 -07:00
Jessica Wang
98bc240d2a Revert "Dedicate Public IP range"
This reverts commit d6ed8d7cb5.

Conflicts:

	server/test/com/cloud/configuration/ConfigurationManagerTest.java
2013-04-08 17:15:51 -07:00
Chiradeep Vittal
67a99cbbc3 CLOUDSTACK-524: in some cases (especially the built-in CentOS template), the template downloader does not use the configured http proxy
The DownloadProgress command is used to restart failed or stuck download jobs --
It would not include the proxy information, unlike the DownloadCommand which always did

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-04-08 17:07:35 -07:00
Chiradeep Vittal
3cbbe2bb04 RAT check broken by d6ed8d7cb. Fix 2013-04-08 16:51:10 -07:00
Likitha Shetty
d6ed8d7cb5 Dedicate Public IP range 2013-04-08 14:46:21 -07:00
Prachi Damle
2a1163c673 CLOUDSTACK-1968: affinity_groups: Column 'deployment planner' cannot be null when creating a service offering
Added default value to all constructors..
2013-04-08 11:12:29 -07:00
Hugo Trippaers
d9f7bb2854 Changing the number of threads in the test from 1000 to 750. 1000 will more often than not result in build failures due to constraints on the build systems.
Most recent centos based systems have process limit of 1024. Running this test will result in an OutOfMemory exception with description unable to create native thread.
2013-04-07 12:17:53 +02:00
Mice Xia
a85b498afd 1) fix CLOUDSTACK-1946 2) remove redundant VMSnapshotVO.java 2013-04-07 17:41:26 +08:00
Prachi Damle
b54fbfb364 More log statements to debug 2013-04-05 17:59:50 -07:00
Prachi Damle
ec152bd5ea Fixes to de-couple the AffinityGroupResponse from UserVmResponse, since ApiDiscoveryService breaks, if we nest two response objects into each other. 2013-04-05 17:01:06 -07:00
Prachi Damle
ca1a7948f1 Merge branch 'master' into affinity_groups
Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-04-05 13:49:20 -07:00
Prachi Damle
1b60135fbc Added AffinityGroup View in order to include VM details while listing AffinityGroups. 2013-04-04 22:46:11 -07:00
Prachi Damle
68b74a1eaf Changes to return affinity groups information during listVMsCmd 2013-04-04 14:40:05 -07:00
Alena Prokharchyk
42ffac3ae8 CLOUDSTACK-1895: save placeholder nic with not null vmType='DomainRouter' when placeholder is used for the VR ip address 2013-04-04 13:29:17 -07:00
Hugo Trippaers
f1259d50bd Fix for _pingTimeout being 0 in AgentMonitor
With commit d79f1f6fdc the AgentMonitor
was replaced with a pluggable service. However the ping timeout in the
original constructor was not passed on anymore, leading to a default
pingTimout of 0. This would fail all agents constantly.

Modified the startMonitor command to take a pingtimeout as an argument
and instruct AgentManagerImpl to pass it along.
2013-04-04 14:23:42 +02:00
Edison Su
f18a1d6f14 fix bunch of bugs related to zone wide storage 2013-04-03 21:51:17 -07:00
Prachi Damle
d68856a2ff Added cleanup of affinitygroups when a VM is expunging and when the account is deleted. 2013-04-03 16:53:57 -07:00
Brian Spindler
469c4dd139 Removing ^M's from code.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-04 00:53:20 +05:30
Wido den Hollander
fa1e9a24a6 conf: Add a @ so @MSUSER@ is replaced by "cloud" 2013-04-03 16:54:00 +02:00
Dave Cahill
eddf7b9357 MidoNet Networking Plugin
- Supports DHCP, Source NAT, Static NAT, Firewall rules, Port Forwarding
- Renamed MidokuraMidonet to MidoNet
- Related Jira ticket is CLOUDSTACK-996

Signed-off-by: Dave Cahill <dcahill@midokura.com>
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-04-03 12:03:11 +02:00
Vijayendra Bhamidipati
2dbdc46337 CLOUDSTACK-1734: Make SHA1 default password encoding mechanism
Description:

	Making SHA256SALT the default encoding algorithm to encode
	passwords when creating/updating users.

	Introducing a new configurable list to allow admins to
	separately configure the order of preference for encoding
	and authentication schemes.

	Since passwords are now sent by clients as clear text,
	fixing the Plain text authenticator to check against the
	password passed in rather than its md5 digest.
2013-04-02 17:40:50 -07:00
Kelven Yang
58c962ef15 Retire unused files to avoid confusions 2013-04-02 15:55:41 -07:00
Min Chen
f52820f2fd CLOUDSTACK-1890: listProjects is not listing state in the response. 2013-04-02 20:24:31 +01:00
Kelven Yang
f2ad38aa0f CLOUDSTACK-1865: Change StatsCollector to be a manager so that it can initialize itself at proper run level 2013-04-02 11:22:56 -07:00
Prasanna Santhanam
b798c45114 maven+marvin+simulator: Changes to the lifecycle steps
integration test is now run as follows:

Build
$ mvn -Pdeveloper -Dsimulator clean install

DB:
$ mvn -Pdeveloper -pl developer -Ddeploydb
$ mvn -Pdeveloper -pl developer -Ddeploydb-simulator

Setup:
$ mvn -Pdeveloper,marvin.setup -Dmarvin.config=setup/dev/advanced.cfg -pl :cloud-marvin integration-test

Test:
$ mvn -Pdeveloper,marvin.test -Dmarvin.config=setup/dev/advanced.cfg -pl :cloud-marvin integration-test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 19:56:33 +05:30
Prasanna Santhanam
5d67c98e5b marvin+apidiscovery: Extend API discovery plugin
API discovery plugin will return embedded entities for marvin to
discovery and generate it's API classes.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:30 +05:30
Mice Xia
4edef1fd30 fix CLOUDSTACK-1700 2013-04-02 17:36:51 +08:00
Mice Xia
dedec164e8 fix CLOUDSTACK-1698 2013-04-02 17:36:51 +08:00
Hugo Trippaers
df6b97c194 Disabling broken test, see CLOUDSTACK-1884. Please revert this commit once the test itself is fixed. 2013-04-02 10:02:57 +02:00
Phong Nguyen
aa79ccf985 CLOUDSTACK-922: LXC Support in Cloudstack.
Signed-off-by: Edison Su <sudison@gmail.com>
2013-04-01 15:41:42 -07:00