Alena Prokharchyk
def0861d5a
Inernallb: added internalLbVm to the list of network elements for nonoss build
2013-05-09 10:53:09 -07:00
Prasanna Santhanam
9e74fa9406
marvin changes for internallbvm provider
...
- changed the simulator context to load the internallb bean
- fixed deployDataCenter to use the additional provider by default
- fixed the sandbox script and the setup script for simulator checkin
tests
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-09 00:11:40 +05:30
Alena Prokharchyk
43e1667f90
Moved all DAOs and VOs to the cloud-engine-schema project
2013-05-07 14:31:56 -07:00
Prasanna Santhanam
3a0dc67de0
adding ACL for dedicateGuestVlanRange set of APIs
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:44 -07:00
Prasanna Santhanam
a3f5f01c7e
dedicateGuestVlanRange is admin only API
...
Adding ACL for the dedicateGuestVlanRange API.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:44 -07:00
Hugo Trippaers
1c4c80fe91
Recent pom switcharoo caused the client to lose the dependecy on console-proxy, which it needs to include the systemvm
2013-05-07 13:16:43 -07:00
Alex Huang
6727571403
Fixed an incorrect unit test for affinity group. Removed some useless pom.xml.
2013-05-07 13:15:33 -07:00
Alena Prokharchyk
a153373c7e
CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack
2013-05-07 13:15:30 -07:00
Likitha Shetty
d5cd3f7e00
Dedicate guest vlan range to account
2013-05-07 13:13:54 -07:00
Alena Prokharchyk
1cff609347
Merge branch 'master' into internallb1
...
Conflicts:
server/src/com/cloud/network/NetworkModelImpl.java
server/src/com/cloud/network/NetworkServiceImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2013-05-03 12:50:59 -07:00
Mice Xia
d7cab21e9a
1) rename RevertToSnapshotCmd->RevertToVMSnapshotCmd 2) add marvin test for vm snapshot
2013-05-03 12:32:53 +08:00
Alena Prokharchyk
8c8845bf77
Merge branch 'master' into internallb1
2013-05-01 10:39:10 -07:00
Brian Federle
1a4a319d32
VM wizard: Show message if no affinity groups are available.
2013-04-30 13:30:40 -07:00
Brian Federle
eacbb4cb2d
Merge branch 'master' into ui-add-remove-nics
...
Conflicts:
client/WEB-INF/classes/resources/messages.properties
ui/dictionary.jsp
2013-04-30 11:57:38 -07:00
Kishan Kavala
34885f6356
CLOUDSTACK-2201: Use DatabaseUpgradeChecker instead of premiumin nonossComponents.xml. Premium checker should be removed altogether
2013-04-30 17:37:32 +05:30
Alena Prokharchyk
7b24a7640c
Merge branch 'master' into internallb1
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
setup/db/db/schema-410to420.sql
2013-04-29 16:12:10 -07:00
Kelven Yang
85e73d18f5
Refactor message bus facitlity to avoid confusing with event bus for external notification, planning to use it in VMSync
2013-04-29 14:36:03 -07:00
Milamber
8545e68aaf
Update l10n resource file Web-UI with latest version from transifex.
2013-04-29 16:24:21 +01:00
Sebastien Goasguen
137fd188cf
Adding latest arabic resource file
2013-04-29 10:09:47 -04:00
Sebastien Goasguen
9416cb14a9
Adding arabic key to resource file
2013-04-29 09:51:24 -04:00
Milamber
4ebe0469ea
remove a \n char
2013-04-29 12:06:25 +01:00
Sebastien Goasguen
77ae066c65
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
2013-04-29 06:56:51 -04:00
Sebastien Goasguen
134704bb10
[TRANSLATION] Adding arabic strings
2013-04-29 06:56:46 -04:00
Milamber
b633353fff
CLOUDSTACK-2138 - first automate sync with Transifex. 1/ Upload the lastest EN resource file on Transifex. 2/ Download the lastest L10N resource file for "ca de_DE es fr_FR it_IT ja ko_KR nb_NO pt_BR ru_RU zh_CN" form Transifex to CS repo.
2013-04-29 11:14:57 +01:00
Brian Federle
3b758d176e
Merge branch 'ui-add-remove-nics' of https://git-wip-us.apache.org/repos/asf/cloudstack into ui-add-remove-nics
2013-04-26 12:29:54 -07:00
Brian Federle
ae79d782ec
Add remove NIC API calls
2013-04-26 10:48:25 -07:00
Hugo Trippaers
1adec812fa
Please, please, pretty please try to stay away from the exec plugin whereever possible. It ussually ends up being non portable across developer operating systems. Most commands like cp have a perfectly usable equivalent in ant like the copy task.
2013-04-26 14:00:01 +02:00
Prachi Damle
232d44bf6e
CLOUDSTACK-2158: 'userconcentratedpod_firstfit failed to find alternate host to run VM
...
In the applicationContext .xml , the context of the 'UserConcentratedPodPlanner' needs to include the list of allocators.
This will ensure that when this component is loaded by Spring, the allocators gets initialized.
2013-04-25 14:48:34 -07:00
Alena Prokharchyk
408ee59d1f
Internallb: new set of Web services APIs for managing Internal LB VMs
2013-04-25 14:03:40 -07:00
Brian Federle
5ce289034d
Merge branch 'ui-vm-affinity'
2013-04-25 11:04:35 -07:00
Milamber
cfc0633ec7
Fix a issue with the russian Web UI (one key with a '\n' as value)
2013-04-25 12:27:21 +00:00
Milamber
0e2ffe72aa
add lang key for Catalan, German, Italian, Norwegian. (from 4.1 branch)
2013-04-25 10:01:29 +00:00
Milamber
08f6a24d19
Update the chinese (zh_CN) resource file for Web UI. 100% translate. Thanks to Gavin Lee.
2013-04-25 08:42:28 +00:00
Milamber
1fed7df0ba
CLOUDSTACK-2138: fix an issue on JA (japanese) resource file. Add ES (spanish) resource file
2013-04-25 00:53:28 +00:00
Milamber
9f5fc3833c
Revert "CLOUDSTACK-2138: fix an issue on JA (japanese) resource file"
...
This reverts commit 26029f0a26 .
2013-04-25 00:52:01 +00:00
Milamber
26029f0a26
CLOUDSTACK-2138: fix an issue on JA (japanese) resource file
2013-04-25 00:50:01 +00:00
Milamber
2db2e7b3af
CLOUDSTACK-2138 : add ca, de_DE, it_IT ja, koçKR,nb_NO pt_BR, ru_RU resource files for UI with ASCII with unicode encoding. (Merging for 4.1/Transifex, sync with transifex), add some languages in combo list on login page on UI
2013-04-25 00:18:21 +00:00
Brian Federle
25f2f0fcb7
Merge branch 'master' into ui-vm-affinity
...
Conflicts:
ui/scripts/instances.js
2013-04-24 16:02:56 -07:00
Milamber
2c271e0f1d
Convert zh_CH (chinese) resource file to ASCII with unicode, merge with 4.1 files, synchronize with transifex 4.2 resources file
2013-04-24 13:54:47 +00:00
Alena Prokharchyk
ca2fc30655
Merge branch 'master' into internallb1
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
setup/db/db/schema-410to420.sql
2013-04-23 16:58:28 -07:00
Brian Federle
7b011e7ef4
Merge branch 'master' into ui-vm-affinity
...
Conflicts:
client/WEB-INF/classes/resources/messages.properties
ui/scripts/cloudStack.js
ui/scripts/instanceWizard.js
2013-04-22 13:45:29 -07:00
Milamber
35306d42b3
Improvements for French translation for Admin Web UI (for better display or better meaning). Add some missing translations.
...
Signed-off-by: Milamber <milamber@apache.org>
2013-04-22 18:16:04 +00:00
Milamber
2a769cffc0
Alphebetical order for keys, remove one duplicate key
...
Signed-off-by: Milamber <milamber@apache.org>
2013-04-22 16:52:16 +00:00
Devdeep Singh
21ce3befc8
Storage motion for Xenserver changes: 1. Implemented Api findStoragePoolsForMigration. Added a new response objects to list storage pools available for migration. 2. Updated migrateVolume api for allowing migrating volumes of running vms. These changes are integrated into the latest storage refactoring changes. 3. Added the implementation for findHostsForMigration api. It lists the hosts to which an instance can be migrated, including hosts from within and across clusters to which an instance may be migrated with storage motion. The work of migrating a volume of a running vm is also done in copyAsync. 4. Updated the listHosts api for backward compatibility. 5. Added the implementation for migrateVirtualMachineWithVolume api. It migrates an instance with its volumes within a cluster and also across clusters. Also introduced a new XenServerStorageMotionStrategy for migrating volumes of a vm. When a vm is being migrated with its volumes, the vm is put in migrating state and a request is send to the volume manager to migrate the vm and its volumes. Volume manager calls into the volume service which forwards the request to data motion service after moving all the volumes to migrating state. Data motion service enumerates the strategies and the request reaches the XenServerStorageMotionStrategy. It calls in to the resource to complete the operation. 6. Resolved an issue where storage xenmotion of 2nd VM created from the same template to a host was failing with duplicate_vm exception. Made changes to remove the mac_seed key value pair from other_config when vms are created. This is was storage motion to fail. 7. Updated the db upgrade schema script. 8. Added the right permissions in commands.properties 9. Marvin tests for testing storage motion. Following scenarios are tested. 9.1. A virtual machine is migrated to another host. Its volumes are also migrated to another storage pool. 9.2. Just the volumes of a vm are migrated to another storage pool while the vm continues to run on the same host. 10. Unit tests for testing migration of a vm with its volumes.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-19 11:36:42 +05:30
Alena Prokharchyk
a3321ce617
Internal LB : renamed the classes responsible for managing internal lb elements. Now the names are InternalLoadBalancerVMManager, InternalLoadBalancerVMService and InternalLoadBalancerVMManagerImpl
2013-04-18 13:41:55 -07:00
Alena Prokharchyk
0cfe96bd00
Merge branch 'master' into internallb1
...
Conflicts:
api/src/com/cloud/network/IpAddress.java
server/src/com/cloud/network/NetworkServiceImpl.java
setup/db/db/schema-410to420.sql
2013-04-17 15:51:05 -07:00
Prachi Damle
b910c2b245
Removing unused bean property
2013-04-16 15:17:03 -07:00
Alena Prokharchyk
014689e45e
Merge branch 'master' into internallb1
...
Conflicts:
api/src/com/cloud/network/Network.java
plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/NetworkServiceImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
setup/db/db/schema-410to420.sql
2013-04-16 09:55:45 -07:00
Prasanna Santhanam
32c7e1d880
fix up the hostaffinity processors from loading
...
hostaffinity don't load by default anymore
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-16 13:54:53 +05:30
Prachi Damle
8d33353b40
Removing the auto-wiring of AffinityGroupProcessors since this is an optional component
2013-04-15 16:02:05 -07:00