Commit Graph

706 Commits

Author SHA1 Message Date
Alex Huang 5b616eaba3 Fixed the applicationcontext.xml 2013-08-12 21:09:26 -07:00
Alex Huang 3df5571d2e Resolved merge conflicts 2013-08-12 20:15:24 -07:00
Chiradeep Vittal 71af0db668 Fix simulator running
NOTE: need to use mvn -Dsimulator client jetty:run to run
2013-08-09 18:36:18 -07:00
Alex Huang 5495f10bce Revert "Reverting the range of commits that broke the build"
This reverts commit b59e3aaefc.
2013-08-08 15:02:40 -07:00
Prasanna Santhanam b59e3aaefc Reverting the range of commits that broke the build
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Alex Huang 5161ded69c Removed the configuration parameters from Config.java 2013-08-07 16:41:05 -07:00
Alex Huang e4f20c7ced config in place 2013-08-07 16:41:03 -07:00
Alex Huang 942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Edison Su e115ee4026 CLOUDSTACK-3535: still maintain stop agent wont trigger HA 2013-08-07 14:43:16 -07:00
Edison Su 5b0314fff9 CLOUDSTACK-3535: add kvminvestigator to investirage kvm host
Conflicts:

	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2013-08-07 11:44:19 -07:00
frank 578c4444d7 CLOUDSTACK-4093
UCS:API: Need delete UCS_manager API
2013-08-06 18:01:59 -07:00
Min Chen 151a7ee497 CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes. 2013-08-02 18:16:46 -07:00
Min Chen 3e5a84a8bb CLOUDSTACK-4053: Removal of AddSwiftCmd and ListSwiftsCmd APIs broke api
back compatibility.
2013-08-02 15:33:43 -07:00
Alex Huang c48553c36f Of course, I forgot changes in the xml configuration again 2013-08-02 11:07:56 -07:00
Alex Huang b940947764 Revert "Updating conversion pattern strings from 1. to 1"
The actual fix was already put in.

This reverts commit 4c729e758b.
2013-07-30 14:07:20 -07:00
Chip Childers 4c729e758b Updating conversion pattern strings from 1. to 1 2013-07-30 09:04:18 -04:00
Alex Huang 486e0d02f8 Fixed the applicationcontext.xml because I removed a class. oh kelven oh kelven, when can we get back our java based config for core components...this is so bad for refactoring 2013-07-29 19:13:33 -07:00
Min Chen 42da3efbc3 CLOUDSTACK-3862: Remove S3/Swift-backed Secondary Storage Code. 2013-07-29 14:31:33 -07:00
Alex Huang a4cea4ebf2 Removed schema from the dependency of many components 2013-07-29 10:55:19 -07:00
Alex Huang 3d2e49bcfc Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format 2013-07-26 20:35:49 -07:00
Min Chen c8cafb91a7 CLOUDSTACK-3818: NFS Cache Improperly Named. 2013-07-26 15:07:45 -07:00
frank 697b7c9471 make UCS api name better 2013-07-26 11:28:47 -07:00
Alex Huang 2dc3ede0a8 Remove a line to make it compile 2013-07-25 20:29:13 -07:00
Min Chen 45d38c4142 CLOUDSTACK-3709:[Object_Store_Refactor][UI] Can't delete NFS Cache
storage through UI.  Fixed at API side.

Conflicts:
	server/src/com/cloud/storage/StorageManagerImpl.java
2013-07-25 17:33:28 -07:00
frank 42738c2fda change associatesUcsProfileToBlade to async api 2013-07-25 15:26:51 -07:00
Alex Huang 861be3063c Simplify the components that VirtualMachineManager uses 2013-07-23 18:24:57 -07:00
Devdeep Singh 876a7b3361 Add VHDX image support, which is missing from DiskFormat class, revised ImageFormat interface, StorageManager implementation, and the application component spec. 2013-07-18 18:58:05 +05:30
ahuang 11971b5a58 Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master 2013-07-17 18:29:42 -07:00
Edison Su c618caf102 fix localendpoint npe 2013-07-17 16:29:52 -07:00
Prachi Damle ee664a1cac CLOUDSTACK-2159 Anti-Affinity - When "HostAntiAffinityProcessor" plugin is not included in the deployment , deployVirtualMachine() command does not error out when passing the affiitygroupnames parameter.
Changes:
- Added a check during vm deployment to see if a processor for the affinity group type is available
2013-07-16 15:48:07 -07:00
ahuang 11e1e585b1 UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
Prachi Damle fa9ca72f36 CLOUDSTACK-2155: Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes:
- Locking the group and save reservation mechanism done by DPM
- Added admin operation to cleanup VM reservations
- DPM will also cleanup VM reservations on startup
2013-07-16 10:53:06 -07:00
Edison Su 8f4575e877 CLOUDSTACK-3400: add swift support 2013-07-13 02:07:15 -07:00
Sateesh Chodapuneedi d0958d0be0 CLOUDSTACK-3494 listvmwareDcs API doesn't exist for admin
Added the API to commands.properties.in with admin access.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-12 19:23:59 +05:30
Murali Reddy 3c1b3c71fe CLOUDSTACK-3440: action events are not published due to conflict of
Eventutils and ActionEventUtils files

removing the 'EventUtils' file which got merged back during the Spring
changes to master at 4.1. 'EventUtils' file was replaced by
'ActionEventUtils', and the original file was removed for events
frameworks. This file conflict was resulting in action events not to be
published on to event bus
2013-07-10 16:44:08 +05:30
Edison Su 5db3057b05 move simulator classes into simulatorcomponent.xm 2013-07-09 15:36:45 -07:00
Edison Su 94aa67eae0 fix simulator 2013-07-09 10:42:03 -07:00
Marcus Sorensen 97f1e88314 Summary: usage db connection missing url parameters property
Detail: users should be able to add url parameters to the usage database
connection string, just like with the cloud database

BUG-ID: CLOUDSTACK-3410
Bugfix-for: 4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1373350596 -0600
2013-07-09 00:16:36 -06:00
Sheng Yang 2fc6054a9d Baremetal: Move list APIs to the correct location 2013-07-01 15:19:39 -07:00
Prasanna Santhanam 9f12a25191 Fix injection of datastoreproviders in nonoss context
the datastore provider references are not in application context anymore
and have been moved to respective componentCOntexts. Plug them in by
default for nonoss server to startup successfully.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 01debd59d3)
2013-07-01 13:52:53 +05:30
Prasanna Santhanam a24b8d8def Include the solidfire plugin into componentContext
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 16:51:27 +05:30
Prasanna Santhanam 1e0f833772 Add UCS daos for simulator context
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 15:09:57 +05:30
Prasanna Santhanam 57641d85f7 Set all templates/volumes to Ready in the simulator
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:53:41 +05:30
Prasanna Santhanam f1134da8df Group storage subsystem components for spring
Breaking down storage components among oss, nonoss and simulator
contexts. The default components are loaded by

OSS - applicationContext + componentContext
NonOSS - applicationContext + nonossComponentContext
Simulator - applicationContext + simulatorComponentContext

provider beans are are selectively overridden for simpler configuration.
Where possible beans are loaded by local reference.

<list merge=true> does not unfortunately work perfectly for bean merging
the providers causing a bit of bloat. Explore for later.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:53:41 +05:30
Prasanna Santhanam fd867d5afa DataStore - provider, lifecycle, driver implementations for simulator
mock implementation to manage secondary storage related operations for
the simulator.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:52:16 +05:30
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Hiroaki KAWAI 2091852175 CLOUDSTACK-212: migrate the namespace (network-ssp-plugin)
migrate the ssp plugin namespace from com.cloud to org.apache.cloudstack

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-06-28 18:10:28 +09:00
Kishan Kavala 6da29c4cde CLOUDSTACK-650: Rename ExternalLBUsageMgr to more generic ExternalDeviceUsageManager since it contains firewall usage also. Most of the functionality is already fixed in CLOUDSTACK-1289 2013-06-28 12:08:33 +05:30
Sheng Yang 7e44f81273 UCS: Add missing beans
Also move the API to the right place
2013-06-27 14:54:45 -07:00
Donal Lafferty 4361418e41 Removed Dead Code from Management Server Hyper-V 2012 Support
Update ImageFormat enum to include VHDX format introduced with Hyper-V
Server 2012.
Remove existing Hyper-V plugin, because it does not work and is dead
code.
Remove references to existing Hyper-V plugin from config files.
Remove Hypervisor.HypervisorType.Hyperv special cases from manager code
that are unused or unsupported.
Specifically, there is no CIFS secondary storage class
"CifsSecondaryStorageResource".  Also, the Hyper-V plugin's
ServerResource is contacted by the management server and not the other
way around.
Add Hyperv-V support to ListHypervisorsCmd API call

Signed-off-by: Edison Su <sudison@gmail.com>
2013-06-27 11:46:02 -07:00