Min Chen
b259bccee7
CLOUDSTACK-6742: listVolumes - As regularuser , able to list Vms and
...
volumes of other users.
2014-05-22 18:28:00 -07:00
Min Chen
ba848087f8
Disable IAM feature from 4.4 release.
2014-05-22 18:27:08 -07:00
Anthony Xu
df6ce24f43
if networkID is not specified, get one network with free ips.
2014-05-21 14:33:52 -07:00
Min Chen
7f595778ad
Fix compilation error due to cherry-pick CLOUDSTACK-6569.
2014-05-02 16:01:13 -07:00
Min Chen
3314e11b70
CLOUDSTACK-6569: IAM - Regular user is able to listNetworks of another
...
user in the same domain , by passing account and domainId.
2014-05-02 14:58:11 -07:00
Laszlo Hornyak
178240a7da
test for HighAvailabilityManagerImpl
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-05-02 21:22:43 +02:00
Laszlo Hornyak
726d8fc3fc
test for escapeHTML
...
- test added
- StringBuffer replaced with StringBuilder
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-05-02 21:19:49 +02:00
Min Chen
a9072a6612
CLOUDSTACK-6513: Optimize code by removing deprecated utility to
...
QueryManagerImpl as private method just used for listTemplates and
listAffinityGroups to avoid misuse by new list APIs.
2014-05-01 15:57:28 -07:00
Laszlo Hornyak
94ab870d42
null pointer dereference fix
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-04-29 21:46:16 +02:00
Rajani Karuturi
f4779b4d0c
Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account
...
Conflicts:
api/src/com/cloud/user/AccountService.java
plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
Signed-off-by: Koushik Das <koushik@apache.org>
2014-04-29 14:49:06 +05:30
Nitin Mehta
dd55095fd5
CLOUDSTACK-6530: Populate the first class entities in the context to be available for publishing more information for the event bus, checking the displayable property etc.
...
(cherry picked from commit 3e7ea4e8d9 )
2014-04-28 18:21:48 -07:00
Laszlo Hornyak
fc68922286
Static resource compression
...
- added compile time maven plugin to compress css and js files
- Added new StaticResourceServlet to serve the requests to static files, this replaces the tomcat DefaultServlet
- Tests
- mapping of the static resource servlet to css and js files
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-04-28 21:10:18 +02:00
Laszlo Hornyak
ecec8d368d
autounboxing fix in ConfigurationManager
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-04-28 20:56:45 +02:00
Min Chen
44ff7fea5f
CLOUDSTACK-6513: IAM - Templates - When templates are listed with
...
templatefilter="shared" is used , we see public templates also being
included in the list. This commit reverts listTemplates behavior to 4.3
old logic without using consistent interpretation of list parameters
adopted in new IAM model.
2014-04-28 11:11:53 -07:00
Prachi Damle
9514c9e045
CLOUDSTACK-6349: IAM - No error message presented to the user , when
...
invalid password is provided.
- AccountManager now works using accountId instead of accountType in
following methods too:
- isResourceDomainAdmin()
- isAdmin()
2014-04-28 11:10:50 -07:00
Laszlo Hornyak
e24bf73a96
new testcase for AccountManagerImpl.deleteUserAccount
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-04-22 22:47:05 +02:00
Laszlo Hornyak
be8c6fe626
test for AccountManagerImpl
...
- new test for disableUser
- unused code removed
- A redundant if branch removed - all branches are doing the same
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-04-21 10:25:16 +02:00
Min Chen
da13165743
Change AccountManagerImpl.checkAccess to invoke SecurityChecker
...
interface that takes multiple controlled entities.
2014-04-17 17:53:01 -07:00
Antonio Fornie
f5ba020633
Fix: ParamGenericValidationWorker shouldn't be case sensitive
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
2014-04-14 10:05:19 -07:00
Marcus Sorensen
11f5bdd78d
CLOUDSTACK-6191 Add support for specifying volume provisioning
...
type (thin, sparse, fat) in disk/compute offerings.
Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski
2014-04-10 09:23:04 -06:00
Sanjay Tripathi
a195205d11
CLOUDSTACK-6366: add vgpuTypes details in vgpu_types table.
2014-04-09 18:23:50 +05:30
Sanjay Tripathi
2ae9da8d47
CLOUDSTACK-6357: Not able to select GPU card in case of GPU-passthrough.
2014-04-08 22:10:09 +05:30
Sanjay Tripathi
2530bf9658
CLOUDSTACK-6345: Non gpu enabled VMs are getting deployed in gpu enabled Hosts.
2014-04-07 15:43:46 +05:30
Min Chen
94ebc90877
Remove usage of sameOwner checkAccess invocation, and convert to
...
OperateEntry IAM check.
2014-04-04 16:38:29 -07:00
Alena Prokharchyk
375c799a24
Added missing license header to the unittest
2014-04-03 16:02:49 -07:00
Alena Prokharchyk
3a889aa217
CLOUDSTACK-3886: Volume attach/detach implementation for ROOT disk
...
Implemented for Xen hypervisor only by now
Unittests are included
2014-04-03 11:39:56 -07:00
Laszlo Hornyak
c6d2549939
StringBuffer replaced with StringBuilder in ApiServerService
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-03-24 21:04:06 +01:00
Laszlo Hornyak
96d56b7525
Tests for ApiServlet
...
- tests for login
- loginSuccessResponse test for xml and json
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-03-24 19:05:47 +01:00
Jayapal
fb498a40ba
CLOUDSTACK-6250: updated review comments, added unit test case
2014-03-24 17:54:54 +05:30
Damodar Reddy
93c46c9be8
CLOUDSTACK-6105: Initial version Windowsfication of the management server
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-03-24 10:54:46 +05:30
Laszlo Hornyak
265208a261
Basic tests for ApiServlet
...
new tests for ApiServlet covering
- utf8Fixup
- some of processRequestInContext
minor cleanup done in StringBuffer handling and utf8Fixup got a bit shorter
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-03-22 18:34:46 +01:00
Laszlo Hornyak
dd225684f4
new unit test for ApiResponseHelper
...
- unit test for getDateStringInternal
- StringBuffer replaced with StringBuilder, string concatenation replaced with append
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-03-22 18:34:46 +01:00
Mike Tutkowski
7629d6f129
CLOUDSTACK-6170
2014-03-20 23:54:53 -06:00
Jayapal
d38cab879b
CLOUDSTACK-6250 Review comments fixes for CLOUDSTACK-2692
2014-03-20 17:22:28 +05:30
Murali Reddy
d2d54a9463
region level VPC support
...
introduce 'RegionLevelVpc' as capability of 'Connectivity' service. Add
support for CreateVPCOffering to take the 'regionlevelvpc' as capability
of service 'connectivity'.
introduces new capability 'StretchedL2Subnet' for 'Connectivity'
service. Also add support to createNetworkOffering api to allow
StretchedL2Subnet capablity for the connectivity service.
adds check to ensure 'Connectivity' service provider supports
'StretchedL2Subnet' and 'RegionLevelVpc' capabilities when specified in
createNetworkOffering and createVpcOffering respectivley
enable ovs plug-in to support both StretchedL2Subnet and RegionLevelVpc
capabilities
make zone id optional parameter in createVpc, zone id can be null only
if vpc offfering supports region level VPC
in region level vpc, let the network/tier to be created in any zone of
the region
keep zoneid as required param for createVpc
skip external guest network guru if 'Connectivy' service is present in
network offering
fix build break in contrail manager
permit VM's to be created in different zone that in which network is
created if the network support streched L2 subnet
add integration tests for region level VPC
rebase to master
Conflicts:
setup/db/db/schema-430to440.sql
Conflicts:
api/src/org/apache/cloudstack/api/ApiConstants.java
engine/schema/src/com/cloud/network/vpc/VpcVO.java
setup/db/db/schema-430to440.sql
2014-03-20 16:32:22 +05:30
Alena Prokharchyk
d9e1c9c502
CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately
...
Conflicts:
server/src/com/cloud/network/NetworkModelImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2014-03-14 11:57:58 -07:00
Murali Reddy
794b38a789
fix unit-test failure
2014-03-14 17:19:27 +05:30
Murali Reddy
3139b35518
mark VPC to be using distributed router if VPC offerign supports
...
distributedrouter capability.
2014-03-14 16:56:35 +05:30
Min Chen
84a528fad6
Merge branch 'master' into rbac
2014-03-13 14:52:37 -07:00
Prachi Damle
d9696b26e1
After merge, fix isRootAdmin() calls to use accountId instead of type
2014-03-13 13:28:40 -07:00
Min Chen
99bdc8d875
Merge branch 'master' into rbac.
2014-03-13 11:05:03 -07:00
Antonio Fornie
39e5b768e8
More generic parameters that are not unknown
...
Adding some more parameter names that should not be considered unknown since they belong to general use paramters
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
2014-03-13 10:40:14 -07:00
Sheng Yang
f45de30d1b
CLOUDSTACK-6047: Enable VR aggregation commands for VR start/reboot
2014-03-11 13:04:26 -07:00
Sanjay Tripathi
c7d31fe288
CLOUDSTACK-4760 : Enabling GPU support for XenServer.
...
CLOUDSTACK-4762 : Enabling VGPU support for XenServer.
This feature is to enable the GPU-passthrough and vGPU functionality,
with the help of this feature, admins/users will be able to leverage
the GPU graphics unit power by deploying a virtul machine with GPU or
vGPU support or by changing the service offering of an existing VM
at any later point of time. There GPU/vGPU enabled VMs are able to run
graphical applications.
For now, this feature is only supported with XenServer hypervisor but
can be extended to add the support of other hypervisors.
2014-03-11 15:44:51 +05:30
Alena Prokharchyk
bf9375b8b9
CLOUDSTACK-6214: apply network rules when plug new guest nic to router for the network in Setup state
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
Conflicts:
api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2014-03-10 11:42:24 -07:00
Daan Hoogland
0aca7cfab6
unneeded imports removed
2014-03-10 10:56:37 +01:00
Daan Hoogland
2386ad73da
rat
2014-03-10 10:54:31 +01:00
Daan Hoogland
1075bed06c
findbugs: String for Service type mismatch (plus test for dummy data)
2014-03-10 10:44:10 +01:00
Alena Prokharchyk
7b0c5cfcbe
Removed unused methods from BaseCmd class. Moved some helper methods to AccountManagerImpl class
2014-03-07 11:33:10 -08:00
Antonio Fornie
c211f0bbbe
Dispatcher corrections, refactoring and tests
...
Corrects problems from previous attempt. Fixes based on help comments from
the community and conflict resolution
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-03-07 19:12:07 +01:00
Min Chen
48e08fe676
Merge branch 'master' into rbac.
2014-03-06 14:02:20 -08:00
Alena Prokharchyk
5a8d165afa
CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic
...
Conflicts:
engine/api/src/com/cloud/vm/VirtualMachineManager.java
engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
2014-03-04 15:37:52 -08:00
Alena Prokharchyk
fd43cf1516
Revert "CLOUDSTACK-5872: Async response from addAccountToProject doesn't contain useful information"
...
This reverts commit ebcaec8632 .
Reverting as it breaks API compatibility
2014-03-03 12:44:08 -08:00
David Grizzanti
ebcaec8632
CLOUDSTACK-5872: Async response from addAccountToProject doesn't contain useful information
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2014-03-03 11:02:34 +01:00
Alena Prokharchyk
e2ec094722
Display flag support for VpnConnection/VpnGateway/RemoteAccessVpn
2014-02-21 14:51:22 -08:00
Alena Prokharchyk
83bef78390
Fixed unittest
2014-02-21 14:29:00 -08:00
Alena Prokharchyk
0f489732c8
Display flag support for LB/InternalLB/NetworkACL rules
2014-02-21 14:03:10 -08:00
Alena Prokharchyk
27a790bdc1
DisplayFlag update support for PF/Firewall/EgressFirewall rules
2014-02-21 11:06:52 -08:00
Alena Prokharchyk
2f7bfc0c73
Display flag support for publicIpAddress and VPC. Once set to false, the object is not listed to the regular user. Available to be set by Root admin only
2014-02-20 17:15:42 -08:00
Hugo Trippaers
97bad4f9b3
Fix checkstyle and license issues
2014-02-14 18:37:47 +01:00
Daan Hoogland
15fa2ef8df
findbugs: check for system template id == -> equals()
2014-02-14 18:37:47 +01:00
Alena Prokharchyk
e0de79b170
Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command
2014-02-10 12:05:59 -08:00
Min Chen
3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -08:00
Alena Prokharchyk
782c530685
Revert "CLOUDSTACK-6003 fixing plus refactoring dispatcher" as it breaks API dispatching for commands having Map<String,String> as a parameter type
...
This reverts commit 447430c3df .
Conflicts:
api/src/org/apache/cloudstack/api/BaseCmd.java
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/network/as/AutoScaleManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-02-06 14:46:58 -08:00
Alena Prokharchyk
4305d817ba
External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection
2014-02-05 15:56:40 -08:00
Alena Prokharchyk
aaa20947a9
ExternalUUID control support for Firewall and Egress Firewall rules
2014-02-04 17:06:04 -08:00
Alena Prokharchyk
8065ee445f
External UUID control support for VPC and NetworkACLItemp
2014-02-04 15:47:12 -08:00
Alena Prokharchyk
6af6ce7e9e
1) Added External UUID control support for network.
...
2) Moved UUIDManager interface to cloud-util package
2014-02-04 15:47:12 -08:00
Prachi Damle
f84375442e
Merge branch 'master' into rbac
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/template/TemplateAdapterBase.java
setup/db/db/schema-430to440.sql
tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
Antonio Fornie
447430c3df
CLOUDSTACK-6003 fixing plus refactoring dispatcher
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit a9bcc1ea3b7dfd3fcc5c795b0095c77851ebe618)
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-02-04 13:37:08 +01:00
Marcus Sorensen
0502d2f375
CLOUDSTACK-5697 This patchset fixes a bug with the recently merged
...
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
2014-01-27 12:11:18 -07:00
Prachi Damle
af14699c4c
fixing the build _ AffinityGroup command changes
2014-01-23 18:17:43 -08:00
Min Chen
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
Min Chen
6c1849f4bf
Fix Spring wiring issues in starting up MS.
2014-01-14 16:20:30 -08:00
Min Chen
bae498c89e
Handle search of those entities without db view created using new ACL
...
model.
2014-01-13 21:55:56 -08:00
Murali Reddy
af657b3d71
CLOUDSTACK-5861: networks that failed to implement can not be destroyed
...
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
Conflicts:
api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
server/src/com/cloud/user/DomainManagerImpl.java
2014-01-13 23:28:35 +05:30
Hugo Trippaers
7c8facf3c9
Change checkstyle to run on every sub project, so it will also run when you build an individual module
2014-01-09 17:00:11 +01:00
Alena Prokharchyk
b15431e574
CLOUDSTACK-5810: addSecondaryIp to vm's nic - derive the ip owner from the vm instance account, not from the caller
2014-01-06 17:09:14 -08:00
Alena Prokharchyk
647ea6e2d0
listNics API: added optional networkId parameter allowing to list nics by network id for the specific vm
2014-01-06 17:09:14 -08:00
Murali Reddy
8b151c98c2
CLOUDSTACK-5403: Shared network - None of PF, LB rules work after router
...
restart, firewall rules dropped from iptables post restart
on VR restart, not all public IP's associated with the network are sent
with IpAssocCmd to VR. This fix will ensure all the ip's associated with
the network irrespective of the account are sent as part of
IpAssocCommand
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2013-12-27 14:27:57 +05:30
Devdeep Singh
c75f8bcc06
CLOUDSTACK-5420: The agent manager wasn't transitioning the host to maintenance
...
mode if their are no vms running on the host. Made the change to do so.
2013-12-26 11:15:51 +05:30
Alena Prokharchyk
914bc46484
CLOUDSTACK-5390: when calculate index (page #) in NetworkManager, rely on fact that getStartIndex() returned by API, returns pageSize*(page-1). So to get index(page), you need to do the reverse calculation
2013-12-23 16:28:06 -08:00
Kishan Kavala
cca60cd86d
fix network ACL unit test
2013-12-23 17:27:16 +05:30
Nitin Mehta
83bbe682d9
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 17:42:45 -08:00
Nitin Mehta
1c0b8db01b
CLOUDSTACK-4941:
...
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 16:27:20 -08:00
Min Chen
afcf967d24
Revert "CLOUDSTACK-4941:"
...
This reverts commit 231e7c01f2 .
2013-12-18 16:01:37 -08:00
Nitin Mehta
231e7c01f2
CLOUDSTACK-4941:
...
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 14:58:37 -08:00
Kishan Kavala
cc27a740dc
CLOUDSTACK-5528 : When VR version is not known set requiresUpgrade flag to true
...
Conflicts:
server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
server/test/com/cloud/vpc/NetworkACLServiceTest.java
2013-12-18 18:29:08 +05:30
Min Chen
729a79e85c
Refactor db view based list apis to use new IAM acl search criteria.
2013-12-16 14:31:32 -08:00
Alex Huang
cf0a11e45a
pull merges
2013-12-12 13:00:26 -08:00
Alex Huang
be5e5cc641
All Checkstyle problems corrected
2013-12-12 12:26:07 -08:00
Antonio Fornie
7833dd592c
JUnit test for NetworkACLManagerImpl#applyNetworkACL
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-12 15:01:51 +01:00
Jayapal
b385cb4f7a
Fixed test case failures in network acl
2013-12-11 14:20:11 +05:30
Jayapal
5c12250dea
CLOUDSTACK-5278 Fixed cleaning up egress default rules on VR and SRX
...
1. Egress default policy rules is send to the firewall provider. It is up to the
provider to configure the rules.
2. The default policy rules are send for both allow and deny default policy.
3. On network shutdown rules for delete are send.
4. For VR and SRX, by default deny the traffic. So no default rule to deny traffic is required.
2013-12-10 14:19:03 +05:30
Kishan Kavala
587f587621
CLOUDSTACK-5145 : Added permission checks while listing network ACLs and acl Items. Users will be able to list items that they have access to.
...
Conflicts:
api/src/com/cloud/network/vpc/NetworkACLService.java
api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
server/test/com/cloud/vpc/NetworkACLServiceTest.java
2013-12-09 21:57:47 +05:30
Alena Prokharchyk
bd6f706b72
CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
...
Conflicts:
engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/alert/AlertManagerImpl.java
server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
server/src/com/cloud/alert/AlertManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/BaseCmd.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -08:00
Bharat Kumar
68406ba29d
CLOUDSTACK-5161 enable scaling of a vm using custom offering
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-29 17:53:33 +05:30
Nitin Mehta
414d415dba
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Adding functions to resourcelimitmanager and doing it for the volumes at the moment.
2013-11-26 16:21:45 -08:00
Min Chen
11c0c263f2
QueryChecker interface and ACL search criteria to be used for query api
...
for entities with db views created.
2013-11-22 16:36:38 -08:00
Alex Huang
170f32f171
Broke up some long strings
2013-11-21 07:25:01 -08:00