Commit Graph

16162 Commits

Author SHA1 Message Date
Joe Brockmeier 13ec069129 Merge branch '4.1' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into 4.1 2013-02-28 19:00:13 -06:00
Joe Brockmeier 8303dd1673 Working on CLOUDSTACK-427 (hardcoded steps) and CLOUDSTACK-313 (cross references) 2013-02-28 18:59:55 -06:00
Kelven Yang 15bcb0e0c7 CLOUDSTACK-1455: fix the wiring for dynamically created objects 2013-02-28 15:44:06 -08:00
frank 2093aefcb8 CloudStack CLOUDSTACK-723
Enhanced baremetal servers support on Cisco UCS

change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema  to db upgrade schemaOh
2013-02-28 15:34:57 -08:00
Hugo Trippaers ad90e208b0 Don't load from a fixed path, but load from the classpath so admins or packagers can overwrite the logging config
(cherry picked from commit 97ca7791b3)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-28 23:36:16 +01:00
Noa Resare 0518e456ce rpm packaging fix: Add symlink for log4j-cloud.xml in client webapp
web.xml now references a log4j-cloud.xml relative to the webapp root
to capture early logging from spring.  This change introduces a symlink
in the client webapp to the system wide log4j-cloud.xml which works around
a problem starting cloud-management described in CLOUDSTACK-1436

CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]

Signed-off-by: David Nalley <david@gnsa.us>
2013-02-28 19:36:33 +00:00
Noa Resare c40e971752 Revert classpath.conf.in to before .deb packaing merge
This change is apparently incompatible with the centos packaging,
temporarily reverting until we have discussed a proper fix

CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]

Signed-off-by: David Nalley <david@gnsa.us>
2013-02-28 19:31:02 +00:00
Jessica Wang 665822b1fe CLOUDSTACK-452: cloudstack UI - Zone Wizard - add IPv6 DNS1 field, IPv6 DNS2 field. 2013-02-28 11:04:22 -08:00
Sateesh Chodapuneedi f8e3f161f9 CLOUDSTACK-1403 Storage and console-proxy related error
Aborting lease over VM/template if uploading file fails.
Earlier the lease was completed successfully even if upload fails due to IOException or ConnectionException while uploading file to HTTP URL.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-02-28 20:33:47 +05:30
Sateesh Chodapuneedi f4c62a8596 Fixing build failure.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-02-28 20:02:10 +05:30
Radhika PC 743ba7da24 CLOUDSTACK-1221 2013-02-28 18:20:09 +05:30
Rohit Yadav 9419d906e6 orchestration: Fix VirtualMachineEntityFactory to process spring injections
The bug was found was Harikrishna P. when iso was used, in case of Isos, the
create vm from scratch which fails due to factory being used to get the object
which is not spring injected

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 54bfd7e04a)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 17:29:27 +05:30
Pranav Saxena ca41037058 CLOUDSTACK-1447:Persistent Status is not displayed for VPC Tiers 2013-02-28 13:28:44 +05:30
Kishan Kavala 79995bf629 CLOUDSTACK-241: Moved regions upgrade chnages to Upgrade40to41.jav from schema file. Sets the right regins_id from db.properties instead of using default 1. 2013-02-28 11:21:02 +05:30
Kishan Kavala 1a2173f4db CLOUDSTACK-241: Removed API based account sync. Removed all the related API changes. Converted tabs to spaces in the related files.
Verified account, user and domain APIs manually.
2013-02-28 11:21:02 +05:30
Kelven Yang ccc51147a5 CLOUDSTACK-1252: Fix the issue of locating systemvm patch ISO under VMware environment 2013-02-27 22:05:23 -05:00
Prachi Damle 336d133f94 CLOUDSTACK-1418- As regular user , we are not allowed to deploy VM on a shared network.
- Added the access type attribute to @acl
- Domainchecker needs the AccessType.UseNetwork value specified to check access to network
2013-02-27 17:19:55 -08:00
Jessica Wang 3e0e929604 CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - guest network - network detail - View IP Ranges (only available in Advanced zone) - add IPv6 Start IP, IPv6 End IP field to listView and Add IP Range dialog. 2013-02-27 16:33:58 -08:00
Jessica Wang 74ef848788 CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - physical network - create guest network - add IPv6 Gateway, IPv6 CIDR, IPv6 Start IP, IPv6 End IP field. 2013-02-27 16:15:55 -08:00
Min Chen 4198e65500 Fix CLOUDSTACK-1425 and CLOUDSTACK-1399: Failed to load UserVmDaoImpl in
new Spring framework and register it into internal dao map.
2013-02-27 15:28:32 -08:00
Sheng Yang 02a0439dba CLOUDSTACK-1170: Use a unified way to generate PublicIp
Tired of manually generate mac address everytime when create PublicIp object.
2013-02-27 14:06:09 -08:00
Brian Federle 798404e61a CLOUDSTACK-1419: Add trademark to logos 2013-02-27 13:44:55 -08:00
Jessica Wang 476687d931 Revert "CLOUDSTACK-452: cloudstack UI - network menu - guest network section - network detail - add IPv6 CIDR field, IPv6 Gateway field."
This reverts commit a565d0b699.
2013-02-27 12:06:46 -08:00
Jessica Wang cd888ddb5b Revert "CLOUDSTACK-452: cloudstack UI - network menu - create guest network dialog - add IPv6 Gateway field and rename original Guest Gateway to IPv4 Gateway."
This reverts commit ba0d8c67bc.
2013-02-27 12:04:18 -08:00
Jessica Wang 0cedb8b092 CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - physical network - guest network - add IPv6 CIDR, IPv6 Gateway to listView and detailView. 2013-02-27 12:03:05 -08:00
Marcus Sorensen e2a16a12f9 Summary: Fix RPM installation error for cloudstack-awsapi
Detail: getting "hard link not allowed for directory" due to line 321 in
cloud.spec. Changing to symlink.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361982798 -0700
2013-02-27 09:33:18 -07:00
Noa Resare 78e8d18428 CLOUDSTACK-1415: Debian & Ubuntu packaging work
Some concepts included:

* the replace.properties location used by maven is parameterized to allow
  for a build that does not modify the currently git tracked files
* package naming is updated along the lines of what was discussed on the
  -dev mailing list and between committers at the Build a Cloud Day in Belgium.
* package version pattern is updated (since we redo all package names,
  we might as well drop the epoch)
2013-02-27 15:38:55 +00:00
Radhika PC 8444572fe9 CLOUDSTACK-820-documentation for event framework 2013-02-27 18:42:34 +05:30
Rohit Yadav 35293edddd db: Give option to specify region id while setting up database
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit e2bd88b2a1)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-27 17:06:23 +05:30
Mice Xia 304858aa18 CLOUDSTACK-1350 Management server Stop and start causes previously downloaded ISOs to redownload 2013-02-27 17:23:44 +08:00
Murali Reddy d76211d5d0 CLOUDSTACK-1391: EventBus is not getting injected after javelin merge
added logic to inject event bus using ComponentContext.getComponent
2013-02-27 14:52:11 +05:30
Chiradeep Vittal 78d207ade6 Reduce RAT errors in developer environment due to generated python files
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-27 13:44:03 +05:30
David Grizzanti 2fc5a3ca5e CLOUDSTACK-420: listZones missing name parameter
When calling the listZones API command, you can now supply a name to pull a specific zone by name.

Updated two classes to include name paramater and query data centers/zones by name if suppled:
- server/src/com/cloud/api/query/QueryManagerImpl.java
- api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-27 13:39:59 +05:30
Rohit Yadav 48ce06b9ba rat: Fix license in file headers
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-27 12:10:57 +05:30
Min Chen 25efe05018 CLOUDSTACK-1387: fix incorrect commit
d37ed18c3aff4fe522adb803322ba912819c73da.(cherry picked from commit cf06861c9b)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-27 11:15:35 +05:30
Sheng Yang 6c37fccc0b CLOUDSTACK-1232: Only support cidr=64 in IPv6 2013-02-26 19:39:37 -08:00
frank 696b4ed8ea CloudStack CLOUDSTACK-723
Enhanced baremetal servers support on Cisco UCS

change API response in line with new API response convention
2013-02-26 16:31:26 -08:00
Jessica Wang ba0d8c67bc CLOUDSTACK-452: cloudstack UI - network menu - create guest network dialog - add IPv6 Gateway field and rename original Guest Gateway to IPv4 Gateway. 2013-02-26 16:22:30 -08:00
Jessica Wang a565d0b699 CLOUDSTACK-452: cloudstack UI - network menu - guest network section - network detail - add IPv6 CIDR field, IPv6 Gateway field. 2013-02-26 14:35:02 -08:00
Sheng Yang 7d370f2eb7 CLOUDSTACK-1414: Reduce arping time to nearly 0
In the previous version it would take at least 1 seconds for arping, and it
would be big if the VR has more than 30 IPs - our biglock default timeout is 30
seconds.

Fix it by send out two arping immediately, and then sleep 1 second for router to
update arp cache.
2013-02-26 12:25:30 -08:00
Kelven Yang df8c7506fc CLOUDSTACK-1173: fix the regression caused by life-cycle management changes 2013-02-26 11:51:31 -08:00
Hugo Trippaers 62d7dc9d37 Summary: Packaging fixes for usage
Make the usage server look in the /etc/cloudstack/usage server for the db.properties

Add the /etc/cloudstack/usage to the package as an empty dir
(cherry picked from commit d92725e846)

Separate stderr and stdout output from jsvc
(cherry picked from commit 0fa3ed9b74)

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-02-26 20:26:37 +01:00
Prasanna Santhanam 6977e7bd45 spring changes for simulator component
allow spring to do DI for simulator plugin. componentContext.xml will
have simulator components disabled by default.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>

Conflicts:
	client/tomcatconf/componentContext.xml.in

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-26 18:54:02 +05:30
Kishan Kavala 609c7da383 CLOUDSTACK-1289: Added missing usage command processing for External firewall device. ExternalLoadBalancerUsageManagerImpl should be renamed as ExternalDeviceUsageManagerImpl 2013-02-26 17:33:23 +05:30
Harikrishna Patnala c3a37dd7ff CLOUDSTACK-1293 resetpasswordforVm shows "passsd reset to undefined" 2013-02-26 17:18:30 +05:30
Rohit Yadav c47f685b1f usage: Fix regression build fail from 03fdbfb2, missing closing parenthesis
We've to test our commits, build 'em before committing :)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 16:37:08 +05:30
Wei Zhou 03fdbfb291 CLOUDSTACK-962:setAggBytesSent/setAggBytesReceived in NetworkUsageTask when not in case of dailyor hourly
Removed duplicate userstatsdao injection
2013-02-26 16:26:30 +05:30
Rohit Yadav c7935a9ab6 CLOUDSTACK-416: Add XCP 1.6.x in XcpServerDiscoverer.java processConnect
Thanks to Devdeep for pointing this out.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 15:34:55 +05:30
Rohit Yadav 6a76c96be1 spring: Remove annotations from interfaces and abstract classes
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit da7c0b1437)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 15:26:15 +05:30
Mice Xia 9d57d59e61 fix issue: failed to start vm from iso caused by ClassCastException and NPE 2013-02-26 17:00:05 +08:00