Alex Huang
3ecc52a4f3
Re-absorb delta in master into vmsync
2013-07-03 17:58:38 -07:00
Alex Huang
8d21f49ec9
Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged
2013-07-03 15:01:23 -07:00
Milamber
0a241b8ea8
Update L10N strings from Transifex to repo
2013-07-03 20:52:32 +01:00
Brian Federle
bd1ddee557
UI: Localize app name and 'about' window
2013-07-02 11:59:20 -07:00
Sheng Yang
2fc6054a9d
Baremetal: Move list APIs to the correct location
2013-07-01 15:19:39 -07:00
Alex Huang
57bafc8fe9
Another merge from master. This is just getting laborious
2013-07-01 11:29:57 -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
Hugo Trippaers
7d0785e858
This one too, see 422d9b8daf
2013-06-27 18:54:11 -07:00
Hugo Trippaers
f0cae6de61
Small temporary fix on 422d9b8daf
2013-06-27 18:52:17 -07:00
Alex Huang
422d9b8daf
Disabled ssp plugin because I don't have the db
2013-06-27 15:43:02 -07:00
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
Alex Huang
262352a1c6
Another merge from master to bring over fixes to bugs that broke the bvt
2013-06-27 11:16:32 -07:00
Ian Duffy
c214b47764
Add jetty stop function to cloudstack client
2013-06-26 11:13:15 -04:00
Hiroaki KAWAI
39ef9240e8
CLOUDSTACK-3194 fix stratosphere ssp plugin packaging
...
stratosphere-ssp plugin maven pom.xml has some bad settings
and client pom.xml requred dependency for it.
2013-06-26 12:36:01 +09:00
Alex Huang
5bd65daa03
How did these things actually pass in master
2013-06-25 13:32:37 -07:00
Alex Huang
e6229656c1
Took out netapp support which hasn't worked for a long time
2013-06-25 13:31:25 -07:00
Kelven Yang
ef1ec1e3cd
Enable nonoss building
2013-06-25 11:49:41 -07:00
Pranav Saxena
c6d361184b
Updated japanse and chinese localization files
2013-06-25 23:25:38 +05:30
Hiroaki KAWAI
2d6369c826
CLOUDSTACK-2756: Stratosphere SSP plugin
...
Stratosphere SSP is an SDN solution which creates virtual L2
networks backed by vxlan and vlan. SSP will ask hypervisor to set a
specific vlan, then SSP will interact with openflow switches and
put vxlan/vlan translation flow rules.
This plugin provides SSP as "connctivity" service provider.
Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-06-25 15:31:40 +09:00
Alex Huang
049dd7242e
merge from head
2013-06-24 16:51:59 -07:00
Alex Huang
7b7db0560c
merge is complete
2013-06-24 16:50:31 -07:00
Kelven Yang
e7c34793fe
Fix unit test issue in non-oss build, temporarily disable dipendency of external network-elements like F5, NetScalar
2013-06-24 12:19:02 -07:00
Sheng Yang
759269fcd8
Baremetal: Fix API's packages and categories
2013-06-21 09:48:30 -07:00
Sheng Yang
a18513286a
Baremetal: Re-enable baremetal component
2013-06-21 09:47:02 -07:00
Sheng Yang
f37b089fce
Revert "Removing baremetal related references"
...
This reverts commit 99ea4011b1 .
Conflicts:
server/src/com/cloud/network/NetworkServiceImpl.java
2013-06-21 09:46:56 -07:00
Pranav Saxena
9b70828e28
Merge remote-tracking branch 'remotes/origin/cloudstack-globalization'
2013-06-21 17:31:45 +05:30
Pranav Saxena
0c5182da0a
spell error
2013-06-21 17:28:21 +05:30
Min Chen
2f9ba709a5
Add listCacheStoresCmd api for UI to list cache stores.
2013-06-20 18:06:30 -07:00
Edison Su
6b9ea1761a
CLOUDSTACK-2947: fix create template from snapshot, in case of mix zone-wide/cluster wide primary storage
2013-06-20 17:51:11 -07:00
Edison Su
9aec9c605c
merge to master
2013-06-19 18:16:47 -07:00
Wei Zhou
882220e802
CLOUDSTACK-1301: VM Disk I/O Throttling
2013-06-18 10:02:55 +02:00
Alex Huang
e2edae1711
Merge from master
2013-06-17 19:00:44 -07:00
Alex Huang
8f00c19192
Finally, we moved AsyncJobManagerImpl out of server package
2013-06-17 17:04:05 -07:00
Pranav Saxena
e009560927
Simplified Chinese file for CS globalization
2013-06-17 15:54:25 +05:30
Edison Su
f41c800d88
merge to master
2013-06-14 19:06:33 -07:00
Edison Su
c2da4eac89
fix NPE for cache ref cnt
2013-06-14 17:24:31 -07:00
Edison Su
a715eb8121
clean up storage related code, and add lru replacement algorithm for cache storage
2013-06-14 15:55:59 -07:00
Min Chen
bb85a564da
Remove state from vm_template table, we should use template_store_ref
...
state column to represent the state of a template in each zone.
2013-06-14 15:14:09 -07:00
Pranav Saxena
8675fe89c0
Japanese globalization properties file
2013-06-14 15:25:07 +05:30
Devdeep Singh
201c0651cc
CLOUDSTACK-2948, Explicit dedication processor wasn't added to nonoss components context xml. The processor was never picked up to evaluate which hosts to avoid during deployment. Adding the explicit processor to the list of available processors.
2013-06-14 13:16:21 +05:30
Kelven Yang
2892469cf4
Fix recent changes in DeploymentPlanner
2013-06-12 15:30:24 -07:00