Alena Prokharchyk
90c485e5d6
Fixed some problems reported by FindBugs
2014-03-13 13:45:30 -07:00
Min Chen
99bdc8d875
Merge branch 'master' into rbac.
2014-03-13 11:05:03 -07:00
Alena Prokharchyk
1b83698dac
deployVm/startVm APIs: ability to define deploymentPlanner for VmToStart in the api call (available to ROOT admin only)
2014-03-13 10:23:34 -07:00
amogh.vasekar
3ee1fc28de
CLOUDSTACK-6217:
...
Add APIs for ability to add new guest OS types, and their hypervisor specific mappings.
The table guest_os_hypervisor is currently maintained but not used, and the APIs reuse the same
Signed off by: Nitin Mehta <nitin.mehta@citrix.com>
2014-03-12 17:03:38 -07:00
Min Chen
cd8af6a3e2
CLOUDSTACK-6236:Negative ref_cnt of template(snapshot/volume)_store_ref results in out-of-range error in Mysql
2014-03-12 16:17:53 -07:00
Daan Hoogland
1dc2bbdc37
CLOUDSTACK-6231 allow for cidr list entry of more than 256 chars
2014-03-12 15:50:43 +01: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
Min Chen
48e08fe676
Merge branch 'master' into rbac.
2014-03-06 14:02:20 -08:00
miguelaferreira
ea0dec77d9
Refactor DbUpgradeUtils
...
- Move database access code to new class DatabaseAccessObject.
This was done to ease the effort of testing, since
DbUpgradeUtils has a static API and it is harder to mock
static things with Mockito.
- Log exceptions even if ignored
- Add unit tests for both DbUpgradeUtils and DatabaseAccessObject
- DbUpgradeUtils.dropTableColumnsIfExist(...) no longer throws
CloudRuntimeException to make it consistent with the other methods in
the class
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-03-06 14:48:35 +01:00
Nitin Mehta
830328b63d
CLOUDSTACK-6199: Hide action events for Vm/Volume commands when the resources have display flag=0.
...
Introduce generic BaseAsync(Vm/Volume)Cmd to make get the flag value for logging action events.
Rename the db field as display rather than display_event in keeping with the convention
2014-03-05 16:40:44 -08:00
Min Chen
d0ae4d9a9f
CLOUDSTACK-5920:Add interface to ControlledEntity to return IAM
...
entity type.
2014-03-05 09:40:55 -08:00
Nitin Mehta
339c4f4c3f
CLOUDSTACK-6199: Action Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature.
...
For root admin - s/he should be able to see all the events despite the value of the flag.
2014-03-04 14:59:30 -08:00
Alena Prokharchyk
bbf5a912c6
list* APIs - added parameter helping to filter by "display" flag (available to ROOT admin only)
2014-03-03 14:37:46 -08:00
Alena Prokharchyk
d9a4e038a0
Enhanced updateVirtualMachine API with optional parameter "name" - to allow update hostName for the virtual machine
2014-02-28 14:35:37 -08:00
Alena Prokharchyk
93d2c8c3ed
CLOUDSTACK-6184: set display=true by default for all resource details
2014-02-27 10:55:47 -08:00
Prachi Damle
bf479e75ca
Renaming acl to iam in the upgrade code
2014-02-26 17:56:38 -08:00
Sanjay Tripathi
624139d8ef
CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one storage to another.
2014-02-26 14:42:34 +05:30
Prachi Damle
f41604fc6c
Renaming AclEntityType --> IAMEntityType
2014-02-25 16:43:17 -08:00
Hugo Trippaers
d1efdca506
Findbugs: Fix Upgrade430to440.java:119, ES_COMPARING_STRINGS_WITH_EQ,
...
Priority: High
2014-02-24 17:01:04 +01:00
Alena Prokharchyk
e2ec094722
Display flag support for VpnConnection/VpnGateway/RemoteAccessVpn
2014-02-21 14:51:22 -08:00
Alena Prokharchyk
0f489732c8
Display flag support for LB/InternalLB/NetworkACL rules
2014-02-21 14:03:10 -08:00
Alena Prokharchyk
92064e347a
Display flag support for autoscale vmGroup and vmProfile
2014-02-21 11:52:50 -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
Jayapal
3136401d40
CLOUDSTACK-6083 corrected firewall rule cidr load issue
2014-02-13 14:42:38 +05:30
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
Devdeep Singh
306ffa0218
CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't
...
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
2014-02-10 10:29:09 +05:30
Min Chen
3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -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
9641e1dbee
External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer
2014-02-05 10:36:21 -08:00
Hugo Trippaers
adf6026d21
SnapshotDetailsVO doesn't have a display field even though it is required in the searchbuilder in ResourceDetailsDaoBase
...
java.lang.AssertionError: Searching for a field that's not there: display
at com.cloud.utils.db.SearchBase.set(SearchBase.java:219)
at com.cloud.utils.db.SearchBase$Interceptor.intercept(SearchBase.java:475)
2014-02-05 17:46:33 +01:00
Hugo Trippaers
8a9d9798d9
Fix camelcasing inconsistency causing an assertion error.
...
java.lang.AssertionError: Searching for a field that's not there: serviceName
at com.cloud.utils.db.SearchBase.set(SearchBase.java:219)
at com.cloud.utils.db.SearchBase$Interceptor.intercept(SearchBase.java:475)
at com.cloud.network.dao.MonitoringServiceVO$$EnhancerByCGLIB$$84195222.getServiceName(<generated>)
at com.cloud.network.dao.MonitoringServiceDaoImpl.<init>(MonitoringServiceDaoImpl.java:41)
2014-02-05 17:46:33 +01:00
Devdeep Singh
a24263fe81
CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
2014-02-05 15:44:09 +05:30
Alena Prokharchyk
8065ee445f
External UUID control support for VPC and NetworkACLItemp
2014-02-04 15:47:12 -08:00
Alena Prokharchyk
7cd0ad336b
External UUID control support for AutoscaleVmProfile and AutoscaleVmGroup
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
Nitin Mehta
0e2e6995b7
CLOUDSTACK-5997:
...
Template state changes side affects
2014-01-30 17:59:55 -08:00
Alena Prokharchyk
02bdb28d76
Resource metadata support for autoscale vm group object
2014-01-30 13:04:56 -08:00
Alena Prokharchyk
fdb25d6f5b
Resource metadata support for autoscaleVmProfile CS object
2014-01-29 14:57:00 -08:00
Jayapal
c53778c333
CLOUDSTACK-5810 updated null checks and preparestmt and resultset close
...
Closing the prepare statement and result set and assigning null to the object after close.
2014-01-23 18:27:03 +05:30
Damodar Reddy
4925b9f6a1
CLOUDSTACK-2031:support for number of ips per nic limit needs to be added for the multiple ip address per nic
2014-01-23 18:14:12 +05:30
Min Chen
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
Min Chen
c0da0a884a
CLOUDSTACK-5921:S3 security key is stored in DB unencrypted
2014-01-21 14:34:32 -08:00
Jayapal
569b558b92
CLOUDSTACK-5810 Added upgrade changes for updating accountid and domainid of nic secondary ip
2014-01-20 16:05:03 +05:30
Min Chen
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
Kishan Kavala
c8f6ec043d
CLOUDSTACK-5892: Disabled removal of old system Vm templates during upgrades. Updated hyperV template URL and checksum
2014-01-17 17:13:40 +05:30
Kishan Kavala
c0f60651b9
CLOUDSTACK-5690: Added upgarde template support for 4.3 64 bit templates. Changed min required version for VR to 4.3
2014-01-17 12:51:16 +05:30
Kelven Yang
7164fc6e73
CLOUDSTACK-5696: Fix sync issue with out-of-band changes
2014-01-15 13:11:02 -08:00
Hugo Trippaers
9aaea28d0d
Fix typo
2014-01-15 15:20:48 +01:00
Sateesh Chodapuneedi
ba96c8cadf
CLOUDSTACK-5408 [Automation] Failed to deploy vm in vmware environment with error "due to java.io.IOException: Cannot run program "mount": java.io.IOException: error=12, Cannot allocate memory"
...
Bump up RAM size of system offering for SSVM to 512MB
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-01-15 01:45:12 +05:30
Min Chen
43f0f901dd
Remove VO and DAO from cloud-engine-schema.
2014-01-10 15:57:39 -08:00
Kishan Kavala
9486a9652e
CLOUDSTACK-5852: router search in DomainDouterDao using AllFieldsSearch filters few routers due to router_network_ref join. Created a seperate search to list running routers with filters.
...
Conflicts:
engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
2014-01-10 19:58:59 +05:30
Alex Huang
ae8560b195
Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse.
2014-01-09 16:12:25 -08:00
Kelven Yang
1e2e1ea051
CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues
2014-01-09 14:29:13 -08:00
Mike Tutkowski
03118c2969
Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2014-01-09 14:44:35 -07:00
Wei Zhou
f012a2655d
CLOUDSTACK-5404: Fix timezone bug in network usage
...
(cherry picked from commit d5277a81e6 )
Conflicts:
engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java
2014-01-09 14:07:53 +01:00
Rajani Karuturi
f741d99c80
CLOUDSTACK-5790: decrypted ldap hostname and port during upgrade as they are not encrypted now.
...
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-01-09 15:50:53 +05:30
Min Chen
3223028fd6
CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be
...
used cross-zone.
2014-01-08 17:43:06 -08:00
Wei Zhou
cbe2560a78
CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage)
...
(cherry picked from commit 4bb85cd7f9 )
Conflicts:
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2014-01-08 15:38:06 +01:00
Sanjay Tripathi
c3d8e207c8
CLOUDSTACK-5314: Negative (-ve) values for primary storage and volumes are shown in the resource count table.
2014-01-07 15:07:02 +05:30
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
Harikrishna Patnala
95fa931ff2
CLOUDSTACK-5515: #cpu ,cpuspeed and ram is set to NULL in usage db(usage_vm_instance table) after vm stop and start Fixed populating usage event details in usage db on vm start/upgrade/dynamic_scale
2013-12-30 12:20:33 +05:30
Min Chen
5d262d7b59
CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
...
migration to S3.
2013-12-26 12:39:39 -08:00
Alena Prokharchyk
fbba17e68c
Resource metadata support for cloudStack user
2013-12-23 14:25:07 -08:00
Alena Prokharchyk
79e64aa535
Resource metadata support for Disk Offering
2013-12-23 12:36:13 -08:00
Nitin Mehta
edc1b78d84
Revert "Revert "CLOUDSTACK-5281:""
...
This reverts commit ab37009e90 .
2013-12-20 17:30:05 -08:00
Alex Huang
ab37009e90
Revert "CLOUDSTACK-5281:"
...
This reverts commit 6b62a04eaf .
2013-12-20 17:23:33 -08:00
Nitin Mehta
6b62a04eaf
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 16:58:43 -08:00
Nitin Mehta
f083f91b0b
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
2013-12-20 15:33:37 -08:00
Edison Su
8caf52c6bc
add xenserver 6.2.0 hotfix support, to optimize vdi copy
...
add xenserver hot fix
Conflicts:
api/src/com/cloud/vm/VirtualMachineName.java
core/src/com/cloud/host/HostInfo.java
core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
deps/XenServerJava/src/com/xensource/xenapi/VDI.java
engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
server/src/com/cloud/configuration/Config.java
2013-12-19 14:15:41 -08:00
edison su
a3fade86b2
Fix snapshot details dao
2013-12-19 13:35:08 -08:00
Kishan Kavala
29b90e7a5c
CLOUDSTACK-5208: upgrade from 3.0.6 to 4.3 is not throwing any exception if new System VM template is not registered with proper name Commit ae231444bc Commented the exception.
2013-12-19 16:17:37 +05:30
Koushik Das
f2fab9d5b1
CLOUDSTACK-5458: cpu speed is not getting updated in vm_instance table after service offeirngs change
...
Removed cpu, ram and cpu speed fields from the vm_instance table as these are not used
2013-12-19 14:15:39 +05:30
Prachi Damle
ce774e184e
Fixing the management server startup
2013-12-18 14:14:55 -08:00
Antonio Fornie
55a6df4501
Resources leaks, refactoring and testing
...
Removing resource leaks from UsageSanityChecker and
refactoring it (encapsulation, removal of copy and paste, constants...)
Modularize static method for closing Statments in TransactionLegacy
and reusing this new method from other classes (Upgrade2214to30)
Create Unit and Integration Tests for UsageSanityChecker
Add DBUnit cases and integration profile for nitegration tests as
a base for future DB tests
2013-12-18 10:55:04 +01:00
Min Chen
841dcb0e8e
Handle special scopeId = -1 case for current domain or current account
...
in AclPolicyPermission table.
2013-12-16 10:08:28 -08:00
Rajani Karuturi
b54ac9a635
CLOUDSTACK-5483 : Failed to start management server when db
...
encryption is enabled When db encryption is enabled, the server expects all
secure,hidden fields in encrypted form. moved the insert statements which has
dafault values to java and populated encrypted values if encryption is
enabled.
2013-12-13 17:44:24 +05:30
Jayapal
bd54ed8071
CLOUDSTACK-5417 Updating egress firewall rules CiDR on external network restart
2013-12-13 14:45:44 +05:30
Alena Prokharchyk
9df10718e4
Resource metadata support for S2SVpnConnection
...
Conflicts:
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
setup/db/db/schema-421to430.sql
2013-12-12 16:39:02 -08:00
Prachi Damle
7c6f1c14c2
ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and
2013-12-12 16:31:00 -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
Alena Prokharchyk
9a21afb50b
Resource metadata support for customer gateway
...
Conflicts:
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2013-12-12 10:16:30 -08:00
Alena Prokharchyk
cf84733f8b
Resource metadata support for Site2SiteVpnGateway
...
Conflicts:
setup/db/db/schema-421to430.sql
2013-12-12 10:15:36 -08:00
Antonio Fornie
e08f64e6ae
Fix several Resource Leak issues related to not closed PStmts and ResultSets
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-12 13:24:22 +01:00
Min Chen
010b007ee4
CLOUDSTACK-5414: With NFS Image Store migrated to S3 an error is thrown
...
in creation of Virtual Router.
2013-12-11 14:17:43 -08:00
tuna
5e23f00b1a
add Apache Licensed and add check native
2013-12-10 10:37:29 +07:00
tuna
f355359b23
fix issues
2013-12-10 10:37:28 +07:00
tuna
dc151115be
AutoScaling without NetScaler
2013-12-10 10:35:55 +07:00
tuna
4de09ee654
add Apache Licensed
2013-12-10 08:37:37 +07:00
Murali Reddy
be67f5d17a
CLOUDSTACK-5428: support NetScaler to be configured exclusively for GSLB
...
service and not used for LB
Fix adds a boolean flag to addNetscalerLoadBalancer api, which
will mark added NetScaler for exclusive GSLB service. A netscaler marked
as exclusive gslb service provider is not picked for any guest network's
lb provider.
2013-12-10 06:20:58 +05:30
Nitin Mehta
e79350d256
CLOUDSTACK-3664:
...
scaling up vms was not considering parameter cluster.(memory/cpu).allocated.capacity.disablethreshold. Fixed it
Also added overprovisioning factor retrieval at the cluster level for host capacity check
2013-12-09 15:40:17 -08:00
Min Chen
6730fa2b47
Fill in implementation of AclService.getGrantedDomains,
...
getGrantedAccounts and getGrantedResources.
2013-12-09 14:08:54 -08:00
Min Chen
288a81180c
Populate default group, policy, account mapping.
2013-12-09 11:29:39 -08:00
tuna
7efab20300
fix staticNat after rebase
2013-12-09 23:33:15 +07:00
tuna
d935d3865a
tuna
2013-12-09 23:33:14 +07:00
Min Chen
a416f6c3c3
Fix API build error based on new DB schema, now only
...
RoleBasedEntityAccessChecker needs to be fixed.
2013-12-06 15:09:00 -08:00
Syed Ahmed
ee7380ace2
CLOUDSTACK-5296: Add certificate chain support for netscaler
...
This patch adds support for trust chains in the netscaler.
I initially planned on using the 10.1 API's "bundle" feature but during
my testing I found that was not working. So I am doing the chain linking
myself. Also NS can have only one entity of a certificate ie lets say
two different users try to add the same certificate on the netscaler
only one of them will go through. The other one says resouce already
exists even though they have different files.
This can be a problem in trust chains where the chain can be shared
between multiple accounts/certificates. So, I am using the figerprint as
an identifier of a certificate and making sure that we delete it only
when no one references it.
2013-12-05 15:35:28 +05:30
Min Chen
c3f480e9b9
Updated db schema based on latest FS. Still need to fix old code in
...
AclServiceImpl, RoleBasedEntityAccessChecker and QueryManagerImpl to
make all build.
2013-12-04 18:44:30 -08:00
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
Alena Prokharchyk
426f564944
Resource metadata support for NetworkACLItem
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
2013-11-27 14:38:12 -08:00
Alena Prokharchyk
7af387c894
Resource metadata support for NetworkACLList
...
Conflicts:
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2013-11-26 17:12:12 -08:00
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
Alena Prokharchyk
5d974a234c
Resource metadata support for VPC Private Gateway
2013-11-26 12:48:15 -08:00
Nitin Mehta
6bea532efa
CLOUDSTACK-5206: Ability to control the external id of first
...
class objects. Putting in the generic methods and trying it
for objects like vm, volume. This is the first cut
2013-11-26 09:52:17 -08:00
Harikrishna Patnala
b2f0a0bce2
CLOUDSTACK-4737: handling usage events for dynamic compute offering
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-26 17:07:30 +05:30
Bharat Kumar
ef40e156ed
CLOUDSTACK-5162 Usage details are not getting populated when using dynamic offerings.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-26 14:32:30 +05:30
Prachi Damle
cf69731a52
Suring startup load the API permissions from commands.properties and @APICommand annotations
2013-11-25 17:01:56 -08:00
Alena Prokharchyk
c37e8b7e8c
Resource metadata - fixed the bug in removeResourceDetail API - when "key" parameter was passed in, used to remove the details matching the key, for all the resources, not just the one defined by resource_id
2013-11-25 15:32:52 -08:00
Prachi Damle
f231cec5b7
Loading api permissions from commands.properties during startup
2013-11-25 10:59:12 -08:00
Alena Prokharchyk
602d4ef0cf
Resource metadata - support for VPC
2013-11-21 14:29:39 -08:00
Alex Huang
433a631916
Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code.
2013-11-21 07:56:47 -08:00
Hugo Trippaers
3a414a850f
Add the upgrade path to all versions
2013-11-21 16:38:08 +01:00
Alex Huang
170f32f171
Broke up some long strings
2013-11-21 07:25:01 -08:00
Wido den Hollander
036fffcd7c
Add upgrade path from 4.3 to 4.4
2013-11-21 15:48:01 +01:00
Alex Huang
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
Alex Huang
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
Alex Huang
e4b22d0fca
Replace all tabs, particularly the ones in the comments
2013-11-21 03:39:58 -08:00
Min Chen
7ed030115e
Updated DB schema and DAO layer classes according to new FS.
2013-11-20 17:32:09 -08:00
Prachi Damle
e0d2423f06
Refactoring account_type for Domain_Admin and Normal_User types
2013-11-20 16:53:59 -08:00
Wido den Hollander
1edaa36cc6
CLOUDSTACK-1302: Allow a cache mode per disk offering
...
Per disk offering the setting none, writeback or writethrough can be set
This allows for both safety and performance for writes.
2013-11-20 17:11:10 +01:00
Alex Huang
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
Syed Ahmed
481af07fb1
Adding protocol parameter to loadbalancer response
2013-11-19 22:12:44 +05:30
Kishan Kavala
a9413707c9
Fix listRouter by clusterId and upgradeRouterTemplate by clusterId
2013-11-18 13:05:34 +05:30
Edison Su
1292b76c63
Add a new method on datastoredriver: getCapabilities, which will be called by liststoragepoolcmd. UI can make decision based on the capabilities of the storage.
...
And also add a new table: snapshotdetails
2013-11-14 15:55:39 -08:00
Alena Prokharchyk
4a8e9f8b8d
Resource Metadata: added implementation for Remote Access VPN
2013-11-13 14:26:16 -08:00
Min Chen
8b7b7a041d
Delay in displaying VM migrate dialog due to get vm snapshot size for a
...
storage pool.
2013-11-11 14:40:16 -08:00
Dave Brosius
3fd95fe231
set the state field, not unused local
...
Signed-off-by: Dave Brosius <dbrosius@mebigfatguy.com>
2013-11-09 14:00:19 +01:00
Laszlo Hornyak
b33a8371bc
license headers added
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-09 09:06:01 +01:00
Alena Prokharchyk
8bd1eaa210
ResourceMetaData: added support for userIpAddress (publicIp) metadata
2013-11-08 10:48:43 -08:00
Rajesh Battala
19e9849d86
Enabled the traffic lable support the hyperv hypervisor type. Modified the physical_network_traffic_types table to introduce hyperv_network lable column.
...
Modified associated VO's and impls classes. Modified the List/Update/Add TrafficType command api's and response classes.
Fixed the Unit tests
2013-11-08 20:21:18 +05:30
Syed
0076307863
Squashed merge of Ssl Termination feature
...
Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support
This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.
The following are the new API's that this patch adds
uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer
Unit tests are also included in the patch.
2013-11-08 16:49:16 +05:30
Chris Suich
aef633f203
Updated VMSnapshotDetails* to match *Details* pattern (e.g. UserVMDetails*)
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-11-07 14:28:19 -08:00
Alena Prokharchyk
99acb97854
CLOUDSTACK-5089: fixed VPCDao to set the accountId field correctly
2013-11-07 13:38:13 -08:00
Kishan Kavala
3f5b8f7063
CLOUDSTACK-4793 : Added UpgradeRouterTemplate API. Added filters to listRouters API. listRouters response includes verion and required upgrade flag. Min VR version is checked before sending commands to router
2013-11-07 19:49:05 +05:30
Hugo Trippaers
b736cbd27a
Fix CID 1127024 Various resource leaks
2013-11-07 14:57:40 +01:00
Jayapal
416206595e
CLOUDSTACK-4736 Fixed issue in default service selection
2013-11-07 17:11:03 +05:30
Bharat Kumar
7095ea2b5e
CLOUDSTACK-4738 Dynamic compute offering.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-07 12:41:20 +05:30
Mike Tutkowski
10c513a259
CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2013-11-06 21:02:39 -07:00
Kelven Yang
191dc80fa4
VM power state for job oritented sync processing
2013-11-05 19:00:37 -08:00
Nitin Mehta
7a042e2330
CLOUDSTACK-5038:
...
used cpu is getting bumped up when the over provisioning factor > 1. This was because we didnt record the overprovisioning factors of the vms which got deployed pre 4.2
Upgrade path will fix that by populating the cpu/mem overprovisioning factors for each of the vms in user_vm_details table using the global overprovisioning factor.
Reviewed by : bharat kumar <bharat.kumar@citrix.com>
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-11-05 16:35:52 -08:00
Jayapal
b464a20a52
CLOUDSTACK-4736: Monitoring services in VR
2013-11-05 23:39:33 +05:30
Harikrishna Patnala
a286dec098
CLOUDSTACK-4908: CPU socket count of host Adding cpu socket count of the host in hostresponse
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-05 16:12:36 +05:30
Likitha Shetty
2f45940493
CLOUDSTACK-5028. Vmware instance fails to start when the chain_info of any volume that belongs to the VM is longer than 255 characters.
...
If the VM has snapshots then the chain_info of a volume can be longer than 255 characters.
Increasing the column length of chain_info in VolumeVO to match the maximum length of type text(db schema type)
2013-11-05 13:24:37 +05:30
Min Chen
ce3638bb03
Merge branch 'master' into rbac.
2013-11-04 15:49:29 -08:00
Alena Prokharchyk
2ff791b0b8
CLOUDSTACK-5025: volumes.display_volume field should be set to 1 by default. DB used to handle this, but VO was missing the default field assignment. Fixed th
...
e VO and db upgrade to update all existing volumes with 1 value
2013-11-01 22:48:11 -07:00
Darren Shepherd
c1bae7984a
Revert "Commit 1460196496 changed db.properties"
...
This reverts commit a3cec3802c .
2013-11-01 22:25:53 -07:00
Min Chen
2ef4d5200c
Merge branch 'master' into rbac.
2013-10-31 17:16:33 -07:00
Edison Su
c5bec6b336
add quiescevm in createvmsnapshotcmd
2013-10-31 16:45:05 -07:00
Alena Prokharchyk
78b1ac4126
CLOUDSTACK-3868: fixed "count" param in listUsageRecords API to return the actual number of records matching the search criteria. Used to return the wrong value - the number of records per page
...
Conflicts:
server/src/com/cloud/usage/UsageServiceImpl.java
utils/src/com/cloud/utils/db/GenericDaoBase.java
2013-10-31 15:25:57 -07:00
Darren Shepherd
afaf6370dd
Fix change that broke db.properties.override
2013-10-31 09:21:34 -07:00
Hugo Trippaers
a3cec3802c
Commit 1460196496 changed db.properties
...
loading, this also affects the database creator. This make the database
creator use the new loading completely instead of partially.
2013-10-31 15:08:25 +01:00
Sheng Yang
3205cd42b5
CLOUDSTACK-730: Site-to-site VPN between VPC VR to VR
...
Now VPN connection can be created as "passive", which would enable the ability
of remote peer initiate the connection. So it's possible for VPC VR to
establish the connection to another VPC VR of CloudStack.
Test case also included.
The test case would create 2 vpcs and using VPN to connect them.
2013-10-30 19:30:22 -07:00
Darren Shepherd
1460196496
Centralize loading of db.properties to one place
...
There is now a method DbProperites.getDbProperties() that will load the
db.properties in one place and do the proper decryption of values if needed
2013-10-30 17:03:13 -07:00
Alena Prokharchyk
591dcd1d1c
ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user
2013-10-29 09:18:11 -07:00
Min Chen
6be228a438
CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary
...
storage to S3.
2013-10-28 21:01:31 -07:00
Alena Prokharchyk
2cac1aaa0f
Moved ResourceDao and ResourceDaoBase to cloud-engine-schema/org/apache/cloudstack (used to be mistakenly placed under com/cloud/cloud)
2013-10-28 15:03:57 -07:00
Alena Prokharchyk
5caeab782d
ResourceDetails -
...
1) added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2) added resource details support for firewall rules
2013-10-28 14:45:52 -07:00
Alena Prokharchyk
e86b612750
ResourceDetails - added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2013-10-28 12:53:53 -07:00
Alena Prokharchyk
d0090a0c24
Resource details (metadata) - added support for Storage pool details
2013-10-28 12:53:53 -07:00
Edison Su
51a8086cf6
Merge branch 'pluggable_vm_snapshot'
...
Conflicts:
client/tomcatconf/applicationContext.xml.in
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
engine/storage/integration-test/test/resources/storageContext.xml
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
2013-10-25 16:47:17 -07:00
Edison Su
a6ce66e55a
move a lot of code into vmsnapshot strategy
...
fix compile
fix compile
add vm_snapshot_details table in db
add vmsnapshot test cases
2013-10-25 15:09:04 -07:00
Alena Prokharchyk
300f626d42
Renamed ResourceDetailDaoImpl to ResourceDetailDaoBase
2013-10-25 14:21:20 -07:00
Alena Prokharchyk
0fb4d9d5a2
Made all resource details DAOs (nic_details, user_vm_details, template_details, volume_details, service_offering_details) extend from the same base class as although details are being stored in diff tables, those tables have the same structure and same accessors.
2013-10-25 10:56:19 -07:00
Bharat Kumar
e4a1ff818f
CLOUDSTACK-4947 VM creation fails if the global config apply.allocation.algorithm.to.pods is set to true."
2013-10-25 15:07:00 +05:30
Sheng Yang
1528725949
CLOUDSTACK-754: Enable Remote Access VPN for VPC
...
With integration smoke test case.
2013-10-24 17:34:41 -07:00
Alena Prokharchyk
24725f8e21
ResourceDetails:
...
1) Added support for Zone resource details
2) Renamed DcDetailsDao to DataCenterDetailsDao to follow the CS name convention for DataCenter related classes
2013-10-24 15:54:49 -07:00
Alena Prokharchyk
765832a5cf
CLOUDSTACK-4649: added support to removeResourceDetail to remove details for UserVm/Templates
...
Conflicts:
engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-24 10:34:21 -07:00
Alena Prokharchyk
2bb716efd8
ResourceMetaData (Resource details) fixes:
...
* changed name for TaggedResourceType enum to ResourceObjectType as this enum is used both by ResourceMetaData and ResourceTags code
* enhanced the enum with extra fields resourceTagsSupport (boolean) and metadataSupport identifying if the resource supports tags and/or metadata.
* cleanup unused @Inject objects from the ResourceMetaDataManager
2013-10-23 17:39:16 -07:00
Darren Shepherd
e3280bdba2
Merge remote-tracking branch 'origin/spring-modularization'
...
Conflicts:
client/tomcatconf/applicationContext.xml.in
client/tomcatconf/nonossComponentContext.xml.in
client/tomcatconf/simulatorComponentContext.xml.in
framework/db/src/com/cloud/utils/db/Transaction.java
plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
Darren Shepherd
205a77a5bb
Merge remote-tracking branch 'origin/txn-refactor'
...
Conflicts:
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -07:00
Anthony Xu
e33ae74067
CLOUDSTACK-4649:
...
xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
this patch tracks PV driver versions in vm details and template details.
Anthony
2013-10-22 17:54:51 -07:00
Alena Prokharchyk
d79135f4e6
CLOUDSTACK-4649: allow to update template details with addResourceDetails API
...
Conflicts:
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-22 14:01:54 -07:00
Alena Prokharchyk
3ec14c4baf
CLOUDSTACK-4649: addResourceDetail - added support for userVm resource. Now "hypervisortoolsversion" get stored in user_vm_details table, and being returned as a part of listVirtualMachines call ("details" parameter)
...
Conflicts:
api/src/org/apache/cloudstack/api/response/UserVmResponse.java
engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java
engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
server/src/com/cloud/api/query/vo/UserVmJoinVO.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-22 13:50:43 -07:00
dhoogland
c0c46268ac
CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled
2013-10-22 12:44:23 +02:00
Wei Zhou
db890bc71e
fix a bug in findAllChildren of domains
2013-10-21 14:02:53 +02:00
Min Chen
ec3302afd6
CLOUDSTACK-3472: [Object_Store_Refactor] System VMs are not coming up in
...
initial attempt, but they are coming up after multiple attempts.
2013-10-17 15:59:10 -07:00
Darren Shepherd
711ad386d1
Random cleanup
2013-10-16 16:18:49 -07:00
Nitin Mehta
fc6c1ec812
CLOUDSTACK-4882:
...
list Clusters/pods/zones API not accounting for reserved in the used capacity percentage.
Fix listCapacity cmd for reserved as well
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-16 15:02:18 -07:00
Darren Shepherd
f62e28c1ec
New Transaction API
...
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment. The existing Transaction class was renamed
to TransactionLegacy. All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
Kishan Kavala
81f1a0b831
CLOUDSTACK-4095 : Remove region_id from Transaction. Read from db.properties whenever required
...
Conflicts:
framework/db/src/com/cloud/utils/db/GenericDaoBase.java
2013-10-16 19:28:42 +05:30
Min Chen
ac02987db2
Add upgrade path from 4.2.1 to 4.3.0.
2013-10-14 21:56:34 -07:00
Nitin Mehta
fa0c685bcb
CLOUDSTACK-4854:
...
Add support for adding network details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-10 19:18:39 -07:00
Alena Prokharchyk
c4084a7c34
Fixes for resource details code: 1) Fixed the NPE happening when the resource detail couldn't be located by the key passed through API 2) Added ResourceDetails interface, made all resource details VO objects to implement it.
2013-10-10 11:13:47 -07:00
Prachi Damle
5c7db71bbb
Duplicate getter-setter after merge
2013-10-10 00:47:36 -07:00
Prachi Damle
ec4fa61ae3
Tested ACL for StartVmCmd using the new RoleBasedEntityAccessChecker
2013-10-10 00:46:06 -07:00
Prachi Damle
0b1aaf514f
More logic to Role based checker
2013-10-10 00:43:56 -07:00
Harikrishna Patnala
bb7493775c
CLOUDSTACK-4707: "sourcetemplateid" field is not getting set for derived templates Template created from a volume or snapshot did not have the sourcetemplateid field set in vm_template table.
2013-10-10 12:20:40 +05:30
Min Chen
2b4703b6e6
Change ListVMsCmd to use new role and entity permission information.
2013-10-09 21:56:52 -07:00
Min Chen
9cd1a95327
Fix search criteria to support searching both specific entityType and *.
2013-10-08 14:50:46 -07:00
Min Chen
11fe1f527a
Add role permission for normal user role.
2013-10-08 11:08:54 -07:00
Min Chen
b87b9e5c64
Add Scope to acl_role_permission, remove parent_role_id from acl_role
...
table, and create PermissionScope and AclEntityType enum types.
2013-10-07 16:09:26 -07:00
Nitin Mehta
6e80bb001c
CLOUDSTACK-4824:
...
Add support for adding zone details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-07 15:48:43 -07:00
Prachi Damle
579806440b
Add permission flag to acl_entity_permission
2013-10-07 14:30:15 -07:00
Prachi Damle
385dfc230f
Schema and VO/Dao for Role Permission
2013-10-07 12:33:28 -07:00
Darren Shepherd
d769a73cfc
Fix DatabaseUpgradeChecker in standalone context
...
When running DatabaseUpgradeChecker as a standalone program _dao will not
be injected. Still create an instance of VersionDaoImpl in constructor
and when DatabaseUpgradeChecker is ran in the mgmt server it will be
overwritten by the injected value.
2013-10-07 11:57:55 -07:00
Min Chen
ded2785bb1
Add interface method to remove account group association from
...
acl_group_account_map.
2013-10-07 11:46:40 -07:00
Laszlo Hornyak
bd8536739c
remove txn attribute from DB
...
txn attribute was never actually used
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 10:15:39 -07:00