Brian Federle
8784f58ff2
CLOUDSTACK-5762: VM wizard, custom compute offering: Fix error label
...
(cherry picked from commit 71767cfe81 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
ui/css/cloudstack3.css
2014-11-26 22:23:21 +05:30
Rajesh Battala
3622471099
CLOUDSTACK-5821 systemvmiso is locked by systevmvm in hyperv
...
(cherry picked from commit 7ac48934f7 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 22:15:35 +05:30
Alena Prokharchyk
4d24452334
CLOUDSTACK-5839: fixed xml serializer to process collection field when its elements are of String type
...
(cherry picked from commit c3680cc111 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/api/response/ApiResponseSerializer.java
2014-11-26 22:13:28 +05:30
Alena Prokharchyk
4fdfd8f913
CLOUDSTACK-5839 : return canEnableIndividualService in listNetworkServiceProvidersResponse
...
(cherry picked from commit 07557eb570 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 22:11:23 +05:30
Likitha Shetty
6609191133
CLOUDSTACK-5865. Unable to use login API if domainId parameter is id and not uuid
...
(cherry picked from commit e5512960af )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 22:07:51 +05:30
Alena Prokharchyk
1e63d0b134
CLOUDSTACK-5870: API support for retrieving user data
...
(cherry picked from commit bd79fb33a6 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2014-11-26 22:06:44 +05:30
Gabor Apati-Nagy
17c3e83cae
CLOUDSTACK-5962: Value of Global parameter "custom.diskoffering.size.min" is not reflected in UI during new instance creation.
...
Added fields to /api and /server classes for CustomDiskOfferingMinSize
to be available in CapabilitiesResponse. Fixed UI code in Instance
Wizard to have this config value as the minimum selectable option when
we are in custom disk size mode.
(cherry picked from commit 883d7f17f7 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
server/src/com/cloud/server/ManagementServerImpl.java
2014-11-26 21:59:16 +05:30
Daan Hoogland
2b264e6b57
CLOUDSTACK-6020 ipv4 address can be a larger number then
...
Interger.MAX_VALUE
(cherry picked from commit b3829e54d6 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:37:18 +05:30
sanjeev
11eab3d285
CLOUDSTACK-6172: Adding new test case to verify this fix
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
test/integration/component/test_volumes.py
Signed-off-by: sanjeev <sanjeev@apache.org>
CLOUDSTACK-6172: Fixed review comments provided in RR 25771
(cherry picked from commit 2d19bcb46a )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:23:19 +05:30
Sanjay Tripathi
77446d2716
CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one storage to another.
...
(cherry picked from commit 624139d8ef )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:23:04 +05:30
Marcus Sorensen
a88c3dd8a4
CLOUDSTACK-6192: Return failure on StartCommand and PrepareForMigrationCommand
...
when connectPhysicalDisk fails, rather than continuing on
(cherry picked from commit fb0b2eb267 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:21:20 +05:30
Rajani Karuturi
c2c6ecf828
CLOUDSTACK-6210: LDAP:listLdapUsers api throws exception when we click on "Add LDAP Account" This occurs when ldap basedn is not configured. Throwing an IAE and a proper message is returned from the api call
...
Signed-off-by: Ian Duffy <ian@ianduffy.ie>
(cherry picked from commit 4552ec6322 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
2014-11-26 18:19:54 +05:30
Min Chen
2534b54853
CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in
...
VolumeDataStoreVO.
(cherry picked from commit 672bb353be )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:15:05 +05:30
Min Chen
88ec08439d
CLOUDSTACK-6236:Negative ref_cnt of template(snapshot/volume)_store_ref results in out-of-range error in Mysql
...
(cherry picked from commit cd8af6a3e2 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:14:53 +05:30
Santhosh Edukulla
7332ea8a1c
CLOUDSTACK-6269: [Simulator] Exception "Unable to send command"
...
Added fix for CLOUDSTACK-6269.More details inside the bug
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
(cherry picked from commit 3060f884ab )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
2014-11-26 18:13:36 +05:30
Rohit Yadav
67df5b9dad
CHANGES: updates changes files, fix cherry-picked commits that break semantics
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 00:34:14 +05:30
Sachchidanand Vaidya
df6172f938
CLOUDSTACK-6322 - Don't allow service instance creation with empty or null service-instance "name".
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 085911f0a6 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
2014-11-25 23:42:28 +05:30
Jayapal
192c706164
CLOUDSTACK-6328: added license header and removed white space
...
(cherry picked from commit d093a8a7b4 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:37:28 +05:30
Saurav Lahiri
650464eda0
CLOUDSTACK-6328: run.sh check if an existing java process is running, before spawining new ones
...
Signed-off-by: Jayapal <jayapal@apache.org>
(cherry picked from commit 96b1c6bf3c )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:37:13 +05:30
Murali Reddy
62ae768540
CLOUDSTACK-6365: support virtual host and ssl in rabbitMQ event bus
...
with this fix, virtual host on the AMQP server can be specified. Also
SSL can be used for connection between management server and AMQP
servers.
(cherry picked from commit bc17f17776 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:21:23 +05:30
Kishan Kavala
473cd6f09a
CLOUDSTACK-6374: Remove entries from lb vm map when lb rule apply fails
...
(cherry picked from commit 16ab5ce76c )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2014-11-25 23:19:14 +05:30
Kishan Kavala
7b7eb48281
CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated.
...
(cherry picked from commit 26746feb39 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:17:58 +05:30
Tanner Danzey
5ac44896c8
CLOUDSTACK-5907, CLOUDSTACK-6396: KVM/RBD & KVM/CLVM volumes mistakenly shown as OVM, disables snapshotting
...
modified: server/src/com/cloud/api/ApiDBUtils.java
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 601827e6b3 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:17:09 +05:30
jeff
af79d6aaf7
CLOUDSTACK-6467: Add pre/post-state transition status to messages published on
...
... event bus by UserVmStateListener. Allow system VM resource state
post-transitions to be published.
(cherry picked from commit 9c4de764f7 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/vm/UserVmStateListener.java
2014-11-25 23:16:01 +05:30
Amogh Vasekar
7e5c7d488a
CLOUDSTACK-6516: In 4.3, SSL was turned off by default.
...
However, for SSVM, the value from configuration server overrides the default in Config.java. Work around is to change in global properties.
Local testing, checking a fresh install has the above property false by default.
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
(cherry picked from commit 05802004e2 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:12:59 +05:30
Jayapal
fac57a0a83
CLOUDSTACK-6577: Disable service monitoring in RVR
...
(cherry picked from commit b9b623bccc )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-11-25 23:10:27 +05:30
Jayapal
dddc6488d4
CLOUDSTACK-6578: Fixed issue in delete remote access vpn command
...
(cherry picked from commit 40836344de )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
2014-11-25 23:08:44 +05:30
Marcus Sorensen
6ad3ae78e4
add conntrackd logrotate for systemvms, dont start conntrackd on logrotate if it isnt running
...
(cherry picked from commit df4a21ae3d )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:02:52 +05:30
Jayapal
cd77e702cf
CLOUDSTACK-6714: monitor script echo service command is added with quotes
...
(cherry picked from commit 6052a181dd )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 22:55:18 +05:30
Wido den Hollander
df7be28266
CLOUDSTACK-6783: Return a proper LibvirtStoragePool object after creating the pool
...
In situations where libvirt lost the storage pool the KVM Agent will re-create the
storage pool in libvirt.
This could be then libvirt is restarted for example.
The object returned internally was missing essential information like the sourceDir
aka the Ceph pool, the monitor IPs, cephx information and such.
In this case the first operation on this newly created pool would fail. All operations
afterwards would succeed.
(cherry picked from commit 48899e4c81 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 22:53:53 +05:30
Harikrishna Patnala
8992e18836
CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance
...
(cherry picked from commit 522208dec2 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/template/TemplateManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2014-11-25 22:50:03 +05:30
Sheng Yang
bad40a7481
CLOUDSTACK-6908: Enable IPv6 in sysctl when only necessary
...
This new way would only enable IPv6 when VR is created in IPv6 shared network.
Otherwise IPv6 sysctl options remain disable.
(cherry picked from commit c181485ae5 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 22:45:58 +05:30
Sheng Yang
7f1dd86443
CLOUDSTACK-6989: Add 3 strikes rule for RvR freezing detection
...
Sometime in VR ntpd would move time backward to keep sync with NTP server, which
can result in false alarm of keepalived monitering process.
This patch adds 3 strikes for keepalived process dead detection to avoid falsely
shutdown keepalived process due to time adjustment for only once.
(cherry picked from commit 75c9a20c77 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 22:42:55 +05:30
Sateesh Chodapuneedi
96e14f309e
CLOUDSTACK-6996 Adding cluster to legacy zone failed
...
Lookup zone_id field in legacy_zones table to search the table for legacy zone.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
(cherry picked from commit 71f76edf71 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
2014-11-25 22:42:13 +05:30
Murali Reddy
30dd76fc65
CLOUDSTACK-7129: Non-admin user can use deleteNetwork with shared
...
networks
fix ensures only admin users can delete shared network
(cherry picked from commit 2f293f42d5 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 22:36:55 +05:30
Rohit Yadav
f72eb94554
CHANGES: update list of backported bugfixes
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 20:34:11 +05:30
Murali Reddy
b8a28dfae3
CLOUDSTACK-7144: No GSLB provider is available during assigning load
...
balancing rule
this fix ensures any bean implementing GslbProvider interface are injected
into GlobalLoadBalancingRulesServiceImpl.
(cherry picked from commit 9dc322d46f )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
2014-11-25 19:50:37 +05:30
Murali Reddy
816eb63e97
CLOUDSTACK-7191:On restartNetwork destroy the VR immediatley, instead of
...
cleanup the rules then destroy
fix adds a provision to specify if cleanup is needed on network on
shutdown. VR is marked as to not to require network rules clean up on
network shutdown as the VR is destroyed and recreated.
ran the simulator tests that test network life cycle
(cherry picked from commit 67876b215e )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:46:40 +05:30
Mihaela Stoica
eb6987c393
CLOUDSTACK-7293: UI: Fixed localization issues on the login page
...
- Reverted the validator.messages to the original values (jquery.validator.js).
- Added a function to localize validator.messages which is called before login.
Signed-off-by: Brian Federle <brian.federle@citrix.com>
(cherry picked from commit f212aa57c3 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
ui/scripts/cloudStack.js
2014-11-25 19:36:08 +05:30
Mihaela Stoica
fa300f9f5e
CLOUDSTACK-7302: UI: Remove Hover Interaction from breadcrumbs at top page
...
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
(cherry picked from commit af37743045 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:34:39 +05:30
Joris van Lieshout
7dbafba52f
CLOUDSTACK-7319: dd with direct io is less impacting on Dom0 kernel resources
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit c4b78c3aaa )
(cherry picked from commit 37baddd721 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:33:34 +05:30
Gabor Apati-Nagy
898b2e700e
CLOUDSTACK-7463: UI: Domain Admin UI shows 'Add LDAP Users' button (should not be shown)
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit c200ada863 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
ui/scripts/accounts.js
2014-11-25 19:29:47 +05:30
Rohit Yadav
dc80b25361
CLOUDSTACK-7581: Empty 'ID' parameters allowed in API calls
...
Fix is to fail API calls with empty 'id' parameter value upfront rather than
going ahead and failing with NPE later on.
Backported using fix 4e07dd1dc4 by
Koushik Das <koushik@apache.org>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:24:29 +05:30
Min Chen
0610bf670c
CLOUDSTACK-7589: VM not Starting and always stuck in Stopped state after
...
management server restarts.
(cherry picked from commit 7cdb67dcf1 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:22:33 +05:30
Rohit Yadav
33761a311b
CLOUDSTACK-7679: Bump rabbitmq client library to latest 3.4.1
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6ad2f38426 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:18:45 +05:30
Min Chen
1cc58b1a6f
CLOUDSTACK-7700: Volume Snapshot Async Job returns Success for a failed
...
operation.
(cherry picked from commit 1e20600eca )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:13:50 +05:30
Gabor Apati-Nagy
ca8ecc0470
CLOUDSTACK-7766: Field Validations Missing for Ingress and Egress Rules
...
(cherry picked from commit 94b16b3bd5 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 18:42:56 +05:30
Mihaela Stoica
0b317ea06d
CLOUDSTACK-7837: [UI] Make the Source CIDR column wide enough to fit the CIDR value without ellipsizing
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit 6490694231 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 18:34:18 +05:30
Daniel Vega
c6e2166876
CLOUDSTACK-7849: Sorting projects alphabetically in drop down menu
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit e03a7e6fea )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 18:33:32 +05:30
Koushik Das
f0a81edb5b
CLOUDSTACK-7869: Add simulator support for findHostsForMigration API
...
(cherry picked from commit 8378485e56 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2014-11-25 18:31:37 +05:30