Commit Graph

16852 Commits

Author SHA1 Message Date
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
Prachi Damle f786535571 Correcting the rebase merge issues. 2013-04-03 16:23:57 -07:00
Prachi Damle 08d8257f50 Integration testcase and the config file needed, that runs with marvin. 2013-04-03 16:22:58 -07:00
Prachi Damle b266ad4612 Adding a unit test for the new affinity groups API 2013-04-01 11:08:16 -07:00
Prachi Damle f074f94588 Build failure fixes after rebase. 2013-03-29 13:10:29 -07:00
Prachi Damle 857ed166fc Adding the missing header! 2013-03-29 11:01:09 -07:00
Prachi Damle eea16cbf9e Fixes after functional tests
Conflicts:

	client/tomcatconf/commands.properties.in
2013-03-29 11:01:07 -07:00
Prachi Damle af5ed7379b Changes to make affinity group types configurable. 2013-03-29 10:52:46 -07:00
Prachi Damle dea9bf7dc6 API changes to expose the commands 2013-03-29 10:52:44 -07:00
Prachi Damle 051d3673d3 API to list planners and set the planner in Service offering
Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql
2013-03-29 10:41:46 -07:00
Prachi Damle c512f1319f Not using entity factory 2013-03-29 10:38:54 -07:00
Prachi Damle 98f5f23935 DAO constructor should be lightweight to make Spring DI faster. 2013-03-29 10:17:10 -07:00
Prachi Damle a0fbc21373 Schema changes to create affinity group tables 2013-03-29 10:17:08 -07:00
Prachi Damle e09d3a4cbb Added apache license header 2013-03-29 10:17:05 -07:00
Prachi Damle 0ce9debf8e Separated out host anti-affinity as a plugin. 2013-03-29 10:17:03 -07:00
Prachi Damle e967ef55b0 Changes to add AffinityGroupprocessor, deployVM changes 2013-03-29 10:17:01 -07:00
Prachi Damle 2ddac1f211 ListAffinityGroups API changes 2013-03-29 00:51:46 -07:00
Prachi Damle 2fcf7a531f DeleteAffinityGroup API changes 2013-03-29 00:50:33 -07:00
Prachi Damle 11cc64d989 More API changes 2013-03-29 00:48:53 -07:00
Prachi Damle 592301ce8f API changes for createAffinityGroup 2013-03-29 00:45:58 -07:00
Sanjay Tripathi 18695276f7 CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts
Addition of two new resource types i.e. Primary and Secondary storage space in the existing pool of
    resource types.
    Added methods to set the limits on these resources using updateResourceLimit
    API command and to get a count using updateResourceCount. Also added calls in the
    Templates, Volumes, Snapshots life cycle to check these limits and to increment/decrement the new
    resource types

    Resource Name          :: Resource type number
        Primary Storage               10
        Secondary Storage             11

    Also added jUnit Tests for the same.
Reviewed by : nitin mehta<nitin.mehta@citrix.com>
2013-03-29 11:26:38 +05:30
Marcus Sorensen d6e11f25ac CLOUDSTACK-1844 - fix typo in agent pre-script to allow copy of old configs
to new config location

Reported-by: Sangeetha Hariharan (JIRA)
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1364522608 -0600
2013-03-28 20:03:28 -06:00
Jessica Wang 4534dafba1 CLOUDSTACK-1840: cloudstack UI - VM Wizard - fix a bug that the first parameter in jQuery.grep() should not be null. 2013-03-28 16:23:34 -07:00
Sheng Yang e3f67d126d CLOUDSTACK-1827: Fix redundant router update mechanism
There is a bug that if the smaller number ID RvR stop running, that pair of
RvR's status won't be updated. This patch fixed it.
2013-03-28 15:54:07 -07:00
Jessica Wang 86a153c595 CLOUDSTACK-1838: cloudstack UI - volume page - listView, detailView - hide hypervisor field when log in as regular-user/domain-admin. 2013-03-28 14:38:52 -07:00
Alena Prokharchyk 34a59fc3a7 Fixed createNetworkOfferingUnittest 2013-03-28 12:16:05 -07:00
Jessica Wang 0f3b7ef225 CLOUDSTACK-1616: cloudstack UI - Infrastructure menu - zone detail - create network - correct IPv6 parameter names passed to API call. 2013-03-28 11:30:24 -07:00
Min Chen c52d04cd63 Correct a naming typo. 2013-03-28 10:23:55 -07:00
Hugo Trippaers c8fd16c03d Summary: Workaround for CLOUDSTACK-1831 and CLOUDSTACK-1672
Exclude the transient dependency on jaxb-impl 2.1.13 in cxf-bundle-jars.
VmWare code depends on the 2.0 version
2013-03-28 15:00:04 +01:00
Koushik Das c502b46703 CLOUDSTACK-1381
Fixed inconsistency in cluster limit check for Vmware clusters.
While adding a new Vmware cluster limit check done correctly but while adding a host to an existing cluster there was an issue with limit check.
2013-03-28 17:26:12 +05:30
Nitin Mehta 3e4430d811 CLOUDSTACK-658 - Scaleup vm support for Xenserver
Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests.
2013-03-28 16:43:37 +05:30
Murali Reddy f8b8f60977 Inject GslbServiceProvider using @Inject fails in oss build, as it requires an
implemenation by default to autowire but only implementation avaialable
is in nonoss plugin. So using autowired required=false for injecting
GslbServiceProvider that will work with both oss and non-oss builds.
2013-03-28 16:20:13 +05:30
Radhika PC d437cb6dac CLOUDSTACK-772 2013-03-28 10:53:52 +05:30
Murali Reddy e8a144a21d BLOCKER: oss jetty server fails to launch
temporarily disabling spring injection of GslbServiceProvider as only
implementing class is in non-oss, so oss build fails to launch with no
bean fpund exception
2013-03-28 08:49:35 +05:30
Kelven Yang 66b47ef6f8 Fix current blocking issue caused by the missing dependency of UCS plugin in master maven project 2013-03-27 16:28:26 -07:00
Brian Federle a6d7c9af7c CLOUDSTACK-1437: Fix detail view for newly-created storage pool 2013-03-27 14:07:36 -07:00
Marcus Sorensen a588efc0cc Summary: RPM - recover configs during upgrade
Detail: Uninstallation of old RPMs wipes out some of the configs, and makes it
difficult to reapply existing configs. This change moves the config directory
to cloud.rpmsave, and then pulls in necessary files from that location during
post install of agent and management server.

Test passed:
install 4.0 RPMs, set up advanced zone
build 4.1 RPMs via package.sh, with this patch
install 4.1 RPMs
restart cloudstack-management, cloudstack-agent
verify management, agent, and zone is operational

BUG-ID: CLOUDSTACK-1694
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1364409632 -0600
2013-03-27 12:40:32 -06:00
Murali Reddy f414b8a850 CLOUDSTACK-1804:Upgrade 4.0 -> 4.1 - DB upgrade fails.
remove the data migration functions that were accidently introduced by
commit b6727e5646
2013-03-27 18:06:22 +05:30
Murali Reddy c5fb8349bf CLOUDSTACK-653 : High Availability: implement GSLB (Global Server Load
Balancing) capability for ELB service

merging GSLB feature
2013-03-27 17:54:07 +05:30
Pranav Saxena c7be3b47cd CLOUDSTACK-1540:LDAP: Integrate ldapremove functionaly in the UI 2013-03-27 16:11:51 +05:30
Pranav Saxena f59ea14925 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-03-27 16:05:21 +05:30
Pranav Saxena 4d5f10585e CLOUDSTACK-1540:LDAP: Integrate ldapremove functionaly in the UI 2013-03-27 16:04:09 +05:30
Funs Kessen 99ea4011b1 Removing baremetal related references
Signed-off-by: Prasanna Santhanam <tsp@apache.org>

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-27 15:56:13 +05:30
Edison Su 359b931993 CLOUDSTACK-1788: remember, changing componentcontext.xml also needs to
change nooss, they are not in inheritance relationship any more.
2013-03-26 17:51:21 -07:00
Brian Spindler 99bcfd24c7 All slashes were being removed from the storage path which caused adding the pool to break.
Reviewed-by: Edison Su<sudison@gmail.com>
2013-03-26 17:36:29 -07:00
Jessica Wang 5df32e6d70 CLOUDSTACK-452: cloudstack UI - zone wizard - when Basic mode is selected, hide IPv6 DNS1, IPv6 DNS2 field. 2013-03-26 16:48:50 -07:00
Jessica Wang e806ff6743 CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - guest network - add guest network - validation - Either IPv4 fields or IPv6 fields need to be filled when adding a guest network. 2013-03-26 16:35:42 -07:00
Alena Prokharchyk 26b892daf3 CLOUDSTACK-1771: fixed VirtualRouter nics assignment in the Shared networks. Before the fix VR could get a different IP address from the network upon recreation. With the fix the IP address assigned to the first VR in the network, will remain with the network till its entire lifecycle (stored in placeholder nic) and will be assigned to the VR every time it recreates in the network.
Shared networks in both - Advance and Basic - zone types are covered by this checkin
2013-03-26 13:29:57 -07:00
Joe Brockmeier ba812535aa another incubating reference fix. 2013-03-26 15:27:29 -05:00
Joe Brockmeier 67034f0c38 Removed unnecessary -incubator reference from Castor docs. 2013-03-26 14:02:01 -05:00