gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-06 10:48:12 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity
16,978 Commits 371 Branches 328 Tags 895 MiB
90172c38f8
Commit Graph

16978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prachi Damle
90172c38f8 Merge branch 'master' into affinity_groups 2013-04-09 15:05:39 -07:00
Prachi Damle
f92e265721 ACl on affinity group 2013-04-09 15:04:56 -07:00
Prasanna Santhanam
8e9650d28e affinitygroup bvt: changes to the bvt for affinity groups 
Added tags for the test, base.py extensions for list, craete, delete and
fixes to the test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-09 16:31:18 +05:30
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
Prasanna Santhanam
953f906169 marvin bvt: getting rid of unused keys in the test 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-08 23:25:06 +05:30
Prasanna Santhanam
4b33493a4b bvt: marvin test for the affinity groups feature 
The test deploys two VMs in the simulator context and verifies that the
default host -antiaffinity processor placed the VMs on two distinct
hosts.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-08 23:18:00 +05:30
Prasanna Santhanam
eeb5d913c1 simulator context : finalize the simulator spring context 
This context is similar to the componentContext.xml.in but loads
simulator components for the marvin tests.
(cherry picked from commit 5610749e29)
 2013-04-08 22:24:50 +05:30
Prasanna Santhanam
0346fd8ab0 affinity group tests moved into the test folder 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-08 11:18:28 +05:30
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
Hugo Trippaers
265cf42ffe packaging: sync master and 4.1 for rpm packaging 2013-04-05 21:18:16 +02:00
Rohit Yadav
ff74cbbeea cli: Remove tabularize, fix display types, make code pep8 compliant 
- Remove tabularize field
- Now display types are: default, json and table
- Make requester pep8 compliant
- Remove unnecessary comments, if we want them we should put them on each method

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-04-05 23:06:44 +05:30
Rohit Yadav
9fbae85799 cli: Make cloudmonkey.py pep8 compliant 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-04-05 22:56:07 +05:30
Justin Grudzien
c75b11d13a CLOUDSTACK-1875: add JSON output to cloudmonkey 
Added
1. display = [default|json|tabularize] has been added in the config to replace tabularize = [true|false]
2. tabularize is deprecated but we will still set it as "false" once the user removes it out of their config to avoid throwing an error. This will be removed in the next major version.
3. display = "default" is added to the [ui] section of the config if it is not present.
4. You can now output JSON formatted text by setting the config display = json
5. You can now filter text in JSON output mode. (i.e. list users account=grudzien filter=account,id,email). Filtered output returns a properly formatted JSON document.

Removed
1. Removed the printing of attr keys in read_config().

Deprecated
1. tabularize = [true|false] is now messaged as deprecated.

Signed-off-by: Justin Grudzien <grudzien@gmail.com>
 2013-04-05 22:48:15 +05:30
Rohit Yadav
63fa086fcc cli: Handle URLError, variable refactor used passed variable 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-04-05 22:42:55 +05:30
Funs Kessen
6e22843acb Cloudmonkey requester.py change to return clearer errors and implement a logic change for async calls. 
Applied from review request:
https://reviews.apache.org/r/10151/

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-04-05 22:42:55 +05:30
Hugo Trippaers
1f206a4eb1 rpm: Install the LICENSE and NOTICE files 2013-04-05 18:49:44 +02:00
Wido den Hollander
aa23dcc956 debian: Install the LICENSE and NOTICE files 
These will be installed in /usr/share/doc/<package>/
 2013-04-05 18:52:48 +02:00
Joe Brockmeier
57611253dd CLOUDSTACK-1747: Adding this to known issues. 2013-04-05 11:34:04 -05:00
Chip Childers
348afc8aaf Removing waf legal docs 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-04-05 16:44:08 +01:00
Prasanna Santhanam
5610749e29 simulator context : finalize the simulator spring context 
This context is similar to the componentContext.xml.in but loads
simulator components for the marvin tests.
 2013-04-05 21:08:59 +05:30
Joe Brockmeier
b1c9a340a1 adding changes to release notes from work on 4.1. 2013-04-05 10:30:47 -05:00
Hugo Trippaers
171a967437 packaging: Three times is a charm 
Sorry about this, my packaging test system is out of order :-(
 2013-04-05 17:08:15 +02:00
Hugo Trippaers
09f278f909 packaging: spark404 should test his commits 2013-04-05 16:42:42 +02:00
Wido den Hollander
a773ed88b7 debian: Management server packaging fixes 
We should be carefull what we package since all configuration should
be in /etc/cloudstack/management

Signed-off-by: Wido den Hollander <wido@widodh.nl>
 2013-04-05 16:13:42 +02:00
Hugo Trippaers
89d3808a18 packaging: move jasypt jar to cloudstack-common 
Continuation of the work done in a35f7c7bd1
 2013-04-05 16:12:27 +02:00
Hugo Trippaers
085846af94 Cleanup: Found some waf remnants 2013-04-05 13:28:15 +02:00
Pranav Saxena
ae4befb0b9 Merge remote-tracking branch 'remotes/origin/scale-UP' 2013-04-05 15:06:36 +05:30
Hugo Trippaers
8d6bb9538a Packaging: db-enc.properties is gone 2013-04-05 10:50:57 +02:00
Kishan Kavala
7ea0d7bce4 CLOUDSTACK-1874: Removed region_id column from cloud_usage db account table 2013-04-05 13:57:27 +05:30
Hugo Trippaers
eacc0d7a89 CLOUDSTACK-1917: Both MidoNet and NiciraNvp have a network guru that must be loaded 2013-04-05 08:46:39 +02:00
Prachi Damle
1b60135fbc Added AffinityGroup View in order to include VM details while listing AffinityGroups. 2013-04-04 22:46:11 -07:00
Kelven Yang
1274d8f68a CLOUDSTACK-1917: Finalize componentContext.xml/nonComponentContext.xml content organization to be plugin friendly, merge the fix with latest master changes 2013-04-04 15:52:45 -07:00
Kelven Yang
c062808912 CLOUDSTACK-1917: Finalize componentContext.xml/nonComponentContext.xml content organization to be plugin friendly 2013-04-04 15:35:18 -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
Wido den Hollander
df48b6531d CLOUDSTACK-1589: Don't depend on chkconfig 
Although this package is semi-available under Ubuntu/Debian we don't use it.

It's not used by the packages, so no reason to depend on it.
 2013-04-04 21:10:33 +02:00
Chip Childers
94960cc722 CLOUDSTACK-1842: adding the missing os type in upgrade script 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-04-04 17:36:00 +01:00
David Nalley
542a339f96 CLOUDSTACK-1936 add cloudstack-agent as a service 2013-04-04 09:38:10 -04: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
Hugo Trippaers
dbf4cb7e92 Revert "maven: Do not copy the management server configuration to the webapp" 
This reverts commit a773ab16d6.

See devlist for reasoning
 2013-04-04 11:13:13 +02:00
Wido den Hollander
a773ab16d6 maven: Do not copy the management server configuration to the webapp 
All configuration should be in /etc/cloudstack/management
 2013-04-04 08:51:38 +02:00
Wido den Hollander
d80d8d8a67 Remove db-enc.properties 
This seemed to be used with Ant, but there is no other reference to this file.

It shouldn't be here and isn't used. It only confuses people.
 2013-04-04 08:51:38 +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
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
Pranav Saxena
bb841d6011 CLOUDSTACK-1669:UI for non-contiguous VLAN ranges 2013-04-04 02:56:34 +05:30
Chip Childers
4f9bdba281 Correcting missing license headers in two MidoNet plugin files 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-04-03 20:33:25 +01:00