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
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
Brian Spindler
469c4dd139
Removing ^M's from code.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-04 00:53:20 +05:30
Brian Federle
21f953ffa4
GSLB UI: Fix section select for regions->GSLB, to fix broken 'view all' button
2013-04-03 11:34:32 -07:00
Jessica Wang
8d21b4f47c
CLOUDSTACK-1910: cloudstack UI - Regions menu - add new section GSLB.
2013-04-03 10:22:15 -07:00
Isaac Chiang
7b0b2cdc84
CLOUDSTACK-1908:Specified event isn't removed from the list after deletion
2013-04-03 22:51:01 +05:30
Wido den Hollander
8ff24fcb18
debian: Copy the SystemVM ISO from a different location
2013-04-03 17:07:00 +02:00
Wido den Hollander
fa1e9a24a6
conf: Add a @ so @MSUSER@ is replaced by "cloud"
2013-04-03 16:54:00 +02:00
Wido den Hollander
28d5c959d6
debian: Update the cloudstack-management server's classpath
...
It should contain /etc/cloudstack/management so it can locate it's configuration
2013-04-03 15:57:40 +02:00
Alex Huang
d24a45abaa
Added fixes for CLOUDSTACK-1839. Missing lots of indexes due to a rollback to 4.0 by Rohit
2013-04-03 14:42:47 +01:00
Hugo Trippaers
4a7d392f18
Summary: Small changes to the maven phases.
...
Moved the copy of the systemvm to the package phase as the systemiso is
made during this phase. So in the original config the old systemvm.zip
would be copied to the server.
Add a cleanup to the console-proxy to clean the dist dir during the
clean phase.
2013-04-03 14:55:50 +02:00
Hugo Trippaers
44567453e0
Enable the midonet plugin
2013-04-03 12:04:58 +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
Dave Cahill
d392445f7e
Rename MidoNetElement and MidoNetGuestNetworkGuru
...
- Creating this as a separate commit so that it is marked as a rename
- Over 50% code changed, so would count as a delete and add otherwise
Signed-off-by: Dave Cahill <dcahill@midokura.com>
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-04-03 12:03:05 +02:00
Gavin Lee
213c163011
Convert tab to space chars
2013-04-03 17:26:37 +08:00
Gavin Lee
bca7f9df5f
CLOUDSTACK-1596: Choosing a hypervisor matrix to xml and add to Install
...
Guide
2013-04-03 16:57:42 +08:00
Hugo Trippaers
8bb28fd713
With commit 16216720c6 autoscanning is
...
removed so Nicira needs to be properly added to the componentContext
2013-04-03 09:20:21 +02:00
Marcus Sorensen
04a511a1a8
CLOUDSTACK-1900 : Save a default db.properties during upgrade, and make sure
...
we only pull the old configs once.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1364966964 -0600
2013-04-02 23:29:24 -06: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
Rohit Yadav
7e54f40a02
CLOUDSTACK-1897: Ignore appliance definitions for license checking
...
Regression caused due to 8e917b1ad3
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-03 01:30:38 +05:30
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
Alena Prokharchyk
2313676857
41-42 db upgrade - added `cloud` db reference to the upgrade statements for remote access vpn
2013-04-02 11:11:18 -07:00
Harikrishna Patnala
6110e00c54
CLOUDSTACK-1830: ZWPS: NPE while create volume from snapshot
2013-04-02 10:40:42 -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
82fd9382b7
marvin+sync: apidiscovery sync and regenerate for marvin
...
Use codegenerator to sync marvin cloudstackAPIs from a given cloudstack
endpoint. Sometimes you want to synchronize marvin with the new APIs
that you have introduced locally or any alterations you may have made
the API. In such cases you can sync marvin's libraries as follows.
$sudo mvn -Pdeveloper,marvin.sync -Dendpoint=localhost -pl :cloud-marvin
This needs sudo privileges since it will call on pip to upgrade the existing
marvin installation on your machine. The endpoint is where your management
server is running and is exposing the API discovery plugin. A listApis call is
made and the resulting json deserialized back into marvin's library entities.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 19:56:28 +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