Commit Graph

1670 Commits

Author SHA1 Message Date
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
Alex Huang 68b8891c62 Removed all reminants of the IdentityService. Created the KeysManager to move the management
of keys out of management server
2014-01-14 13:11:35 -08:00
Prachi Damle fac9f2da0f Adding messageBus events for adding and removal of an account. 2014-01-13 22:12:39 -08:00
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 bc1eec9f70 Fixed a missing package name 2014-01-09 16:48:19 -08:00
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 d910b42339 fix bean error 2013-12-10 11:30:55 +07: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 4d0602175c refactor ovsProvider to new resource 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
Hugo Trippaers cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01: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 70b2c0150d rebase to spring changes 2013-10-25 18:15:36 -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 df728fcf41 Include new DAO added since spring-modularization branch 2013-10-23 11:23:52 -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
Darren Shepherd 67186429e1 Spring Modularization
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
2013-10-02 15:41:04 -07:00
Nitin Mehta 8466fad6ca CLOUDSTACK-4785:
Adding list details for UserVm.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:53:07 -07:00
Nitin Mehta 85b5c6e353 CLOUDSTACK-4785:
Add support for adding user vm details and removing them.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:16:45 -07:00
Alena Prokharchyk a2bf7f035e CLOUDSTACK-4784: 22x to 4.x upgrade - don't ignore redundant router network offering, when update ntwk_offering_serivce_map with PF/StaticNat/SourceNat services 2013-10-02 11:09:44 -07:00
Min Chen 5583506c0c Add entity permission grant and revoke API. 2013-09-30 17:03:34 -07:00
Alena Prokharchyk 43770e0cb2 CLOUDSTACK-4744: enhanced root admin API updateVolume with state/storageId parameters as a part of "Better control over first party objects" feature.
Also fixed existing bugs for the API:

* corrected action event to be VOLUME.UPDATE (was VOLUME.ATTACH)
* all parameters to update, should be optional - fixed that. If nothing is specified, the db object will remain with its original fields
2013-09-28 21:44:47 -07:00
Alex Huang b60eef3e82 Added comments and finished off the work 2013-09-28 07:53:28 -07:00
Alex Huang e8cac2c5d8 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:26 -07:00
Alex Huang e2988902c9 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:25 -07:00
Alex Huang a964cf549e Continue to merge SearchCriteria2 and GenericSearchBuilder 2013-09-28 07:53:24 -07:00
Alex Huang af8832f6bd Unified both the SearchBuilder and SearchCriteriaService 2013-09-28 07:53:24 -07:00
Min Chen 0be374a796 Add All Apis for ACL Group. 2013-09-27 18:16:18 -07:00
Min Chen 97fd99b09a Add all Apis for AclRole. 2013-09-26 17:48:29 -07:00
Min Chen fce2aad23d WIP For APIs related to ACL Roles. 2013-09-26 11:22:43 -07:00
Edison Su b3ac12e171 delete snapshot_store_ref if the snapshot is in error state 2013-09-25 15:51:55 -07:00
Darren Shepherd 9fb0a1a619 Don't check implementation version of Object for DatabaseUpgradeChecker 2013-09-25 14:34:14 +02:00
Prachi Damle 4294005142 Check if an Account belongs to RootAdmin group 2013-09-24 17:01:43 -07:00
Min Chen ddae23c168 Add parent_role_id to acl_role table. 2013-09-23 13:18:57 -07:00
Wei Zhou 62d49b3524 CLOUDSTACK-4716: upgrade resource count (cpu,memory,primary_storage,secondary_storage) in the upgrade to 4.2
(cherry picked from commit 38bbfdc89a)

Signed-off-by: Wei Zhou <w.zhou@leaseweb.com>
2013-09-23 14:19:03 +02:00
Alena Prokharchyk 2fa5a5ae97 CLOUDSTACK-4704: 41-42 db upgrade - populate vpc_service_map table with the services/providers supported by VPC
(cherry picked from commit 798f34a49c)

Signed-off-by: Wei Zhou <w.zhou@leaseweb.com>
2013-09-23 14:18:41 +02:00
Min Chen 12b6e700b6 The first version of all the ACL VOs and DAOs. 2013-09-19 17:50:33 -07:00
Min Chen 354588611a Add missing table acl_group_role_map, as well as adding columns. 2013-09-19 17:49:49 -07:00
Prachi Damle 3333a04c40 During Upgrade to 4.3, Populate the API Permissions per Out-Of-Box Role from commands.properties file 2013-09-19 12:32:54 -07:00
Min Chen ad6af49f03 Populate acl_group_account_map for existing accounts. 2013-09-19 10:26:59 -07:00
Prachi Damle f2ea699d12 CLOUDSTACK-4668: Upgrade to 4.2 fails with NullPointerException when hypervisor_type is null for a cluster entry
Changes:
- Care for null value during comparing the hypervisor_type
- Do not consider removed clusters
- Method rename according to coding conventions
2013-09-18 16:52:01 -07:00
Daan Hoogland 2614b00c51 sdn hosted vpc gateways (using lswitch) 2013-09-18 16:56:56 +02:00
Min Chen 1042136c23 CLOUDSTACK-4661:[DB Upgrade] SecondaryStorage entry in host table before
upgrade is not marked as removed after migrating them to image_store
table.
2013-09-12 18:55:41 -07:00
Alex Huang 435e74e914 Commit to try something on removing getZone 2013-09-06 15:40:33 -07:00
Alex Huang 2e5bb63f77 Moved NetworkManagerImpl to NetworkOrchestrator 2013-09-06 15:40:32 -07:00
Sanjay Tripathi 108aab7665 CLOUDSTACK-4495: systemVM template URL is pointing to old template location in upgrade file. 2013-09-05 13:05:16 +05:30
Nitin Mehta 654c90f4e5 CLOUDSTACK-4327:
Check for the all the transition states for Maintenance. Also corrected the isMaintenance function for StoragePoolVo
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-09-05 12:43:36 +05:30
Kelven Yang ae231444bc CLOUDSTACK-4585: make run-time datastore folder migration, VM snapshot, bug in root disk controller type carried from previous version work under upgrade situation 2013-09-04 14:49:46 -07:00
Kelven Yang 458de9321d More fixes found in test cases when JVM assertion check is turned on 2013-09-04 14:49:45 -07:00
Kelven Yang f383656b21 Fix problems found in local test when JVM assertion is turned on 2013-09-04 14:49:44 -07:00
Kelven Yang 249e2e8f59 Correct DAO usage in VmwareDatacenterVO, relax assertion conditions to work with stack calling frame that is not wrapped with @DB injection 2013-09-04 14:49:44 -07:00
Vijayendra Bhamidipati 57dc52bb6f CLOUDSTACK-4539: [VMWARE] vmware.create.full.clone is set to true in upgraded setup;default nature of vms are full clone
Description:

    Set the criterion for overriding/preserving the vmware.create.full.clone
    flag so that if past version deployments have any deployments (data centers),
    this flag will be set to false. Else, it will be set to true.
    The earlier criterion to set this flag was based on the CS version numbers,
    but that is not a good business logic to serve as a basis to set the flag.
2013-09-04 05:58:25 -07:00
Prachi Damle 0115db0819 CLOUDSTACK-4369 [UPGRADE]Upgrade failed from 307 to 4.2
Changes:
- Do not consider removed zones
- Create affinity group per domain
2013-09-03 20:03:08 -07:00
Prachi Damle 6a8043e040 CLOUDSTACK-4561: DeployVm failed after upgrading from earlier version having a private zone to 4.2
Changes:
- In the upgrade path, for a private zone, entry needs to be added in the affinity_group_domain_map to provide access to the private zone for the domains it belongs too.
2013-09-03 20:03:01 -07:00
Prachi Damle ef22b42b38 CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
Changes:
- Implict creation of the 'ExplicitDedication' Affinity group during resource dedication
- Only one group per account or per domain will be present
- ListDedicatedResources by affinityGroup
- Deployment should consider dedicated resources associated to the group only
- Deleting affinity group should release the dedicated resouces
- Releasing the dedicated resources should remove the group associated if there are no more resources.

Conflicts:

	plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
	plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2013-09-03 20:02:38 -07:00
Prachi Damle a06bd9fa2b CLOUDSTACK-4168 Root Admin should be able to create 'ExplicitDedication' affinity group at domain level and make it available for all accounts in the domain
Changes:
- 'ExcplicitDedication' type of group can be created/deleted by Root admin only
- Users can no longer create this type of affinity group
- RootAdmin can create this type of affinitygroup at domain level. Such a domain level group is available for all accounts in that domain for listing and for use during deployVM.
- The domain level affinitygroup should be visible to the users in that domain, domain admins and Root admin.

Conflicts:

	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
	server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
2013-09-03 20:02:34 -07:00
Wei Zhou 62b09c9253 CLOUDSTACK-2319: fix incorrect account_id in event table for Revoke SecurityGroupRule commands
(cherry picked from commit d9ba234d6c)
2013-09-02 16:53:55 +02:00
Wei Zhou 1a67750cb6 CLOUDSTACK-4538: set default value of cpu.overprovisioning.factor and mem.overprovisioning.factor to 1
On a fresh environment, some values in cloud.configuration table are persisted in com.cloud.server.ConfigurationServerImpl.persistDefaultValues()
A default value need to be set before com.cloud.upgrade.DatabaseUpgradeChecker
2013-08-29 12:41:18 +02:00
Wei Zhou 53ee2c905b CLOUDSTACK-4538: fix small typo
(cherry picked from commit 68b668ae8f)
2013-08-29 11:33:37 +02:00
bharat kumar da6f048dd2 CLOUDSTACK-4538 Should update the vmware clusters with the global overporvisioning factors after upgrade to 4.2.
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-08-29 12:26:54 +05:30
Min Chen 6a9caf7487 CLOUDSTACK-4430:[Automation][vmware] Failed to deploy vm, if one host is
down in a cluster.
2013-08-28 11:52:06 -07:00
Min Chen 543088a203 CLOUDSTACK-4520: [upgrade][vmware]ExtractVolumeCmd fails with NPE while
attempting to download a volume.
2013-08-27 13:59:27 -07:00
Alex Huang abbae2aa87 Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items. 2013-08-26 17:31:10 -07:00
frank b37e6c14c1 CloudStack CLOUDSTACK-1365
UI support for baremetal PXE server

CloudStack CLOUDSTACK-1364
UI support for baremetal DHCP server

Conflicts:

	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
2013-08-22 16:35:23 -07:00
Kishan Kavala ad0fba31a3 CLOUDSTACK-4115 : Encrypt password in cluster_details table. This fix is to handle upgrades from versions earlier than 3.0.5 and 4.0. Upgrade was not handled when the cluster_details password encryption was introduced. 2013-08-22 18:53:45 +05:30
Min Chen 3bd2bbf59d CLOUDSTACK-3950:Set cross-zone flag in registerTemplate/registerIso in
case of region-wide secondary is enabled.
2013-08-20 14:13:49 -07:00
Alena Prokharchyk f1c63df665 CLOUDSTACK-4403: vmInstanceDao - initialize the SearchBuilder in init() method instead of the search dao method which wasn't thread safe, and could cause NPEs during search builder initializing. 2013-08-19 10:28:23 -07:00
Sateesh Chodapuneedi 17b6f1c570 CLOUDSTACK-4294 After upgrade of CloudStack to 4.2, support old vswitch type in existing clusters if user changes the vswitch backend to another type of vSwitch
While upgrading to 4.2, the type of vswitch being used by each cluster is persisted to cluster_details table. This helps if user want to change the type of vswitch used in a zone or entire cloud later on but leave existing cluster continue to use old vswitches. Hence even after modifying the type of vswitch at cloud level (by modifying global configuration parameters) or modifying the type vswitch at zone level (by modifying the traffic label) would not disturb operation of existing clusters.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-08-19 16:32:14 +05:30
Edison Su 37d58313c9 CLOUDSTACK-4325: if userdispersing algorithm is used, then zone wide storages never been picked up 2013-08-14 15:52:55 -07:00
Mike Tutkowski 0f60b5d41c CLOUDSTACK-4331 - Enable more capacity from a managed storage device to be given to CloudStack 2013-08-14 15:02:57 -06:00
Wei Zhou 02d1757724 CLOUDSTACK-4316: updateSystemVms is not need in Upgrade304to305 as new templates are used in upgrade from 4.1 to 4.2 2013-08-14 11:03:52 +02:00
Alena Prokharchyk b2d2f2c050 Fixed deployDb - in setRAWformatForRBDVolumes use executeUpdate instead of executeQuery when perform an update with the prepared statement 2013-08-13 17:14:25 -07:00
Min Chen 5c35bd1b3e CLOUDSTACK-3860: S3 and Swift-backed Secondary Storage Migration 2013-08-13 11:55:03 -07:00
Wido den Hollander 04f378bcff CLOUDSTACK-4114: Use RAW disk images for RBD instead of QCOW2 2013-08-13 16:14:45 +02:00
Likitha Shetty b172eb21c4 CLOUDSTACK-4279. Usage manager - Parameter index out of range error 2013-08-13 15:58:17 +05:30
Alex Huang 0e19e82fac Split up the volume manager into two. One part is for self-service. One part belongs in the engine. Removed old 2.1 upgrade code. In order to upgrade from 2.1, you must upgrade to 2.2. first. So therefore these files are no necessary in the newer versions of CloudStack 2013-08-12 19:05:22 -07:00
Murali Reddy 5cff9bd2e6 CLOUDSTACK-4111: Prompt "Acquire New IP - Cross Zones - YES/NO" wizard
only when there is portable IP range added at region level.

region response will now have details if portable IP service is enabled
or not. Portable IP service for a region is turned off by default. when
adming adds a portable ip range portable ip service is enabled for the
region.
2013-08-12 18:12:13 +05:30
Harikrishna Patnala 5404bf6063 CLOUDSTACK-4123: 3.0.6 to ASF 4.2 Upgrade: On Adding VMWare Cluster to the Setup, 3.0.6 System VM Template for VMWare is downloaded instead of 4.2
Updating the new system template URLs for the existing templates during upgrade to 4.2.
If new 4.2 system template is registered before upgrade then marking the old templates as removed during upgrade.
2013-08-10 18:02:49 +05:30
Koushik Das 8cf48ed2ce CLOUDSTACK-4179: [Performance Testing] Time taken for Deploy VM async job to complete is considerably higher
The time increased due to the newly added dedicated resources feature. During regular VM deployment, all dedicated resources are put in avoid list so that they are not considered for deployment.
Now the way to compute the list of dedicated resources is not optimal and performance deteriorates in an environment having lot of pods, clusters and hosts as the logic is to query db. for each suc resource.

The fix is to optimize the logic not to loop through all resources but get the list of each resource type in a single query.

Conflicts:
	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
2013-08-09 16:57:21 +05:30
Kishan Kavala 0eb67bff12 CLOUDSTACK-4146, CLOUDSTACK-4147: Fix KVM snapshot upgrade.
when migrating KVM snapshot path, CONCAT is not required. back_snap_id is complete path for KVM snapshots
2013-08-09 14:50:26 +05:30
Alex Huang 5495f10bce Revert "Reverting the range of commits that broke the build"
This reverts commit b59e3aaefc.
2013-08-08 15:02:40 -07:00
Alena Prokharchyk 4976a67bfc CLOUDSTACK-4193: don't let privateGateway to be created with NULL networkId 2013-08-08 10:49:12 -07:00
Koushik Das 12ba37c8af CLOUDSTACK-4136: [upgraded ENV]Deleting Snapshot which was created before upgrade is throwing NPE.
Snapshot object is being accessed even when it is null. In case snapshot is not present in backup store the code should return after cleaning db entry.
Also noticed discrepancy in the upgraded db setup but couldn't fully verify it, so added logging in the upgrade logic for template/snapshots etc.
2013-08-08 15:13:08 +05:30
Prasanna Santhanam b59e3aaefc Reverting the range of commits that broke the build
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Sateesh Chodapuneedi 3e85f480c4 CLOUDSTACK-4165 3.0.6 to ASF 4.2 Upgrade: Data Migration step of the Upgrade Fails on "persistLegacyZones"
Track the Datacenter of previous cluster correctly while going through each cluster in the zone to see if 2 clusters are from different DC/vCenter.

Cherry picked from 4.2 commit a3450afff5

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-08-08 09:02:17 +05:30
Alex Huang 5287f4c9ec Got everything running through testing 2013-08-07 16:41:06 -07:00
Alex Huang 942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Bharat Kumar e55844c364 Cloudstack-4100 preserve data in iso_id column while upgrading from 3.0.7 to 4.2
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
2013-08-07 18:47:05 +05:30
Marcus Sorensen 789ac14c14 Summary: CLOUDSTACK-4121 fix local storage volume deployment
Detail: Fix hypervisor type lookup for local storage volumes by
adding in a statement for the 'HOST' storage scope.

Reviewed-by: Rajesh Battala
2013-08-06 21:37:11 -06:00
Min Chen 93814d1738 CLOUDSTACK-4002: We should use backup_snap_id in snapshots table to
construct snapshot install_path in snapshot_store_ref for pre-4.2.0
snapshot.
2013-08-06 15:04:57 -07:00
Min Chen 5908a3931c CLOUDSTACK-4002:Fix snapshot install path for upgraded snapshots. 2013-08-06 15:04:57 -07:00
Rajesh Battala 7bb0e2a4ca CLOUDSTACK-3781 Unable to resize disk with Zone wide storage 2013-08-06 12:59:06 -07:00
Bharat Kumar 1a89bc06c8 Cloudstack-4015 No error logged when deleteing all the valns when there are allocateed vnets. Alos not updating the vnet range in physicalnetworks table in the above case.
Signed-off-by: Jayapal <jayapal@apache.org>
2013-08-06 17:28:22 +05:30
Harikrishna Patnala c1e78809b2 CLOUDSTACK-4070: upgrade from 2.2.14 to 4.2 is failing with 4.0 VMware SystemVm template not found. Cannot upgrade system Vms
System template upgrade is not required during 4.0 upgrade since we handle the same during 4.2 upgrade. So removing the system template update during 4.0 upgrade.
2013-08-06 17:17:20 +05:30
Kishan Kavala 95e15833b9 Encrypt pre shared key in Site2Site customer gateway DB entries
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
2013-08-06 17:01:31 +05:30
Prasanna Santhanam 0eafc0c0d8 CLOUDSTACK-4064: Missed renaming the config for KVM snapshots
KVM.snapshot.enabled is lowercased by f025db95 to keep the configs
uniformly lower-case. But it missed the upgrade script and the
references in SnapshotManagerImpl. This commit will fix the issue in all
locations

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 0e216fa7e41bdfe0cc744006bb896c8b00138ca2)
2013-08-06 10:39:14 +05:30
Alena Prokharchyk beabf596ba CLOUDSTACK-4080: don't GC the network when it has vms in Starting state even when the nics are not allocated for them yet (can happen when vm is being created) 2013-08-05 14:15:04 -07:00
Alena Prokharchyk 19c7cecde4 CLOUDSTACK-4065: db upgrade - when insert placeHolder nic for Shared networks, always mark this nic as non-default explicitly
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
2013-08-05 09:21:08 -07:00
Harikrishna Patnala 506f2a4b94 CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm CLOUDSTACK-3631: Enhance System vm deployment retry mechanism
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-08-05 18:19:16 +05:30
Min Chen 151a7ee497 CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes. 2013-08-02 18:16:46 -07:00
Alex Huang 8930cfa983 Switched over to use the new jobs framework 2013-08-02 11:07:55 -07:00
Bharat Kumar 65370f31bc upgrade to ASF 4.2 "cloud" Database Schema Inconsistencies on the Upgraded Setup - Table "volumes"
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-02 17:07:22 +05:30
Wei Zhou 0529da136f upgrade: Add upgrade patch to 4.3.0 2013-08-02 11:50:19 +02:00
Min Chen 2e0f11f15f CLOUDSTACK-4002: [Upgrade][2.2.16 to 4.2] After upgrade creation of
volume from a snapshot which was existing before upgrade, fails with NPE
2013-08-01 17:08:49 -07:00
Bharat Kumar 21f1b137cb Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command
Reviewed-by: Alena Prokharchyk

Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2013-08-01 13:36:20 -07:00
Alena Prokharchyk f444ce7f65 CLOUDSTACK-4015: don't insert the fake template record when upgrade from 304 to 305 2013-08-01 09:58:43 -07:00
Chip Childers 8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
Bharat Kumar b9a2b07ceb Fix for incorect capacity displayed at the dashboard. 2013-08-01 12:31:07 +05:30
Mice Xia 51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-08-01 10:47:36 +08:00
Alena Prokharchyk 2cacbeac2c CLOUDSTACK-3974: 410-420 db upgrade - exclude is_inline field from the query when insert the entry for the F5 load balancer as this field was dropped as a part of 40-41 upgrade 2013-07-31 13:33:52 -07:00
Bharat Kumar c7a1dbb176 Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-31 15:31:42 +05:30
Harikrishna Patnala 9939d09455 CLOUDSTACK-3969: Upgrade failed from 3.0.3 to 4.2 in KVM host with error 4.2.0 KVM SystemVm template not found though systemvm-kvm-4.2 template is uploaded during 3.0.3 setup
This is due to mysql version conflict with '=' and 'LIKE'.
Changing to '=' while searching for new system template.
2013-07-31 15:12:10 +05:30
Alena Prokharchyk 95fde83815 CLOUDSTACK-3936: db upgrade - added upgrade path from CCP 2.2.15,2.2.16 to CS 4.2 2013-07-30 10:53:23 -07:00
Prachi Damle ccec275e09 CLOUDSTACK-3904 listHosts API fails in VMware setup when virtualmachineid parameter is passed
Changes:
- Pod and Cluster can be null, modified the query to append these only if non-null
2013-07-29 15:51:44 -07:00
Edison Su d64c318f57 CLOUDSTACK-3510
Persist the download url in the db for volume download.
Signed off by : nitin mehta<nitin.mehta@citrix.com>

Conflicts:

	server/src/com/cloud/storage/VolumeManagerImpl.java
2013-07-29 11:50:15 -07:00
Alex Huang a4cea4ebf2 Removed schema from the dependency of many components 2013-07-29 10:55:19 -07:00
Rajesh Battala 63fea5e94e CLOUDSTACK-3877 Unable to Resize Volume (kvm, vmware) 2013-07-29 18:50:41 +05:30
Harikrishna Patnala 2f369973e2 CLOUDSTACK-3779: Support System vm scaling on VMWare
Marked the system template new system template as dynamicallyScalable
   - handled upgrade case
   - moved "dynamicallyScalable" flag to vm_instance table from user_vm_details to support dynamic scaling of system vm
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-29 15:25:07 +05:30
Alena Prokharchyk 8cac1e0443 DB upgrade: upgraded the bunch of db upgrade files with Apache license header 2013-07-26 15:37:07 -07:00
Alex Huang f5e5b39c9b Moved the DB layer code into framework-db and change only the necessary projects to refer to it. Cut down on the dependencies introduced with all the code in utils. 2013-07-26 15:02:10 -07:00
Min Chen 199e861a51 CLOUDSTACK-3856:[ZWPS] Template downloaded from ROOT volume is not seen
in the UI because of failure to get hypervisor_type for the ROOT volume
for zone-wide primary storage.
2013-07-26 13:41:58 -07:00
Alex Huang 9aaa378b08 Moved ClusterManager into it's own package. Removed the agent load balancing code. 2013-07-25 19:00:26 -07:00
Alena Prokharchyk 6a916b9e82 DB upgrade: added db upgrade paths for CloudPlatform (Citrix) releases 303,304,305,306,307 to 4.2 2013-07-25 16:39:16 -07:00
Prachi Damle 08bbfbdc4a CLOUDSTACK-3491 delete host resulting NPE; Exception caught while handling disconnect: java.lang.NullPointerException
Changes:
- During host deletion, host entry in databse gets removed prior to the disconnect task getting processed.
- This causes the disconnect task to get NPE while trying to do the host state transition
2013-07-25 15:57:39 -07:00
Alex Huang 555211a080 Moved Configuration from api to utils and moved the package. This was done by eclipse so I only ran the unit test to verify everything is fine 2013-07-25 03:57:12 -07:00
Likitha Shetty b7a483608f CLOUDSTACK-3735. Domain deletion fails even when the networks within the domain have been destroyed.
When a network is destroyed remove the corresponding network entry from domain_network_ref and account_network_ref table
2013-07-24 20:03:51 +05:30
Saksham Srivastava 135a2e66c5 CLOUDSTACK-2508: Template usage should report both physical and virtual sizes 2013-07-24 18:17:09 +05:30
Anthony Xu eff27e1f83 don't update VM state if the state doesn't really change. updating VM state increases the update count, which might cause real VM update fail 2013-07-22 15:56:37 -07:00
Edison Su cd6853cc1a CLOUDSTACK-732 Add disk snapshot for KVM 6.3, add the flag in CS.
Signed-off-by: Edison Su <sudison@gmail.com>

Conflicts:

	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
2013-07-19 13:26:19 -07:00
Alena Prokharchyk 823c72552e InternalLb: fixed creation for default network offering with internal lb support - public lb support should be disbaled on it 2013-07-19 13:20:57 -07:00
Koushik Das c202142a1e CLOUDSTACK-3628: [Storage]Migration of data disk from Shared primary to shared/local primary storage is throwing NPE
'Long' value was getting passed to a parameter of type 'long' and in case of null was resulting in NPE
2013-07-19 19:08:03 +05:30
Sanjay Tripathi 539eb38908 CLOUDSTACK-3492: [Regression]Update Resource Count for an account is updating the primary storage incorretly.
The issue is that while calculating the used primary storage size, the updateResourceCount
API is also calculating the disk size of virtual router VM, created for that account and
because of this, the API is returning the incorrect result.
2013-07-19 16:04:10 +05:30
Harikrishna Patnala 499b78bf09 CLOUDSTACK-3601: Adding router.template.xen/vmware/kvm/lxc/hyperv parameters in upgrade setup
Signed-off-by: Jayapal <jayapal@apache.org>
2013-07-19 14:40:13 +05:30
Alena Prokharchyk ca1f8a6632 CLOUDSTACK-3612: fixed missing indexes in some cloud tables. In the bug those tables are addressed as table #4, table #5, and table #6
Conflicts:
	setup/db/db/schema-410to420.sql
2013-07-18 16:00:19 -07:00
Vijayendra Bhamidipati dfa612d1fe CLOUDSTACK-3598: [Automation] NullPointerException observed while connecting agent
Description:

    Fixing an NPE when setting resource count.
2013-07-18 08:55:57 -07:00
Nitin Mehta 551fdd7df4 CLOUDSTACK-3605
Make the display_offering = true by default in the code.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-18 15:12:29 +05:30
ahuang ee4d067c12 Fixed a bunch of asserts 2013-07-17 16:20:53 -07:00
Bharat Kumar f76bf5b053 Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 15:22:33 +05:30
Bharat Kumar d73bb22802 Incorportaed the review changes Now dhcpservice IPs are removed when last vm from the subnet is removed. Rebased with master.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 12:35:06 +05:30
Bharat Kumar dd33abffbe Cloudstack-2997 Make haproxy maxconn configurable
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
Sheng Yang 86bbe211f2 CLOUDSTACK-494: Loose the limition of same ip used by site-to-site vpn
Different account can have same remote side IP now. Of course the remote side need
to identify them and configured properly to handle it.
2013-07-16 17:26:51 -07:00
Prachi Damle fa9ca72f36 CLOUDSTACK-2155: Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes:
- Locking the group and save reservation mechanism done by DPM
- Added admin operation to cleanup VM reservations
- DPM will also cleanup VM reservations on startup
2013-07-16 10:53:06 -07:00
Prachi Damle 661088927d CLOUDSTACK-2155 Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes to check if the destination found does not conflict with any vm reservation
2013-07-16 10:53:02 -07:00
Min Chen 2d30f42d0f After upgrade to 4.2.0, restart of system vms and router vm fails with a
NPE.
2013-07-15 15:37:08 -07:00
Edison Su 8f4575e877 CLOUDSTACK-3400: add swift support 2013-07-13 02:07:15 -07:00
Edison Su 0c1ae20e77 add inital swift support
Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/test/com/cloud/resource/MockResourceManagerImpl.java
2013-07-13 02:07:03 -07:00
Likitha Shetty aaaf168f5a CLOUDSTACK-2757. When configs are added the value of the property 'category' is not persisted. 2013-07-12 16:50:30 +05:30
Harikrishna Patnala 5dd1a1dd8e CLOUDSTACK-2987: Fixing dynamicallyScalable flag in register and update template API Previuos commit: 7b6b8d7a07 This fix is due to some changes made by the merges after this commit.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-12 15:19:25 +05:30
Saksham Srivastava bdc7e4ce33 CLOUDSTACK-3094: Adding a shared network to already deployed VM is failing.
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-07-12 14:30:10 +08:00
Sanjay Tripathi 429e6bd4bb CLOUDSTACK-1768: Ability to delete Events and Alerts: Delete by a time period is required.
User should be able to delete/archive alerts and events by selecting a time period or by
choosing the alerts and events older than a date. Added the ability to choose a time period
too.
2013-07-11 14:12:17 +05:30
Koushik Das aed49572c7 CLOUDSTACK-2918: In a scaled up environment, hosts fail to come up after Management server restart in clustered set up
Summary of changes in the fix
- Optimized host scan logic, now instead of iterating over each cluster host scan is done for a batch of clusters
- Made host scan task interval configurable
2013-07-10 12:13:24 +05:30
Mike Tutkowski 06f73092fb Changes related to Review Board comments 2013-07-09 22:50:14 -06:00
Sheng Yang 7d8f6c7022 CLOUDSTACK-3417: Prevent conflict of existed foreign keys of baremetal when upgrade
Now we dropped the keys(if any) then re-add them.
2013-07-09 16:36:52 -07:00
Kishan Kavala acb4a19633 CLOUDSTACK-2429: Multiple private gateways are allowed within a VPC. Check for conflicting routes in all gateways when adding a new static route 2013-07-09 17:27:06 +05:30
Murali Reddy ea8b85af2a CLOUDSTACK-234: create/delete firewa/lb/pf rule: send ip assoc command
only on first rule is created on the IP and last rule is revoked on the
IP

Current suboptima logic of IP Assoc

 - On associate IP to GuestNetwork there is an IPAssoc command sent to
   corresponding network service providers of the network
 - On every rule apply on IP associated with the network send IP assoc
   to the network service providers
 - On every rule deletion on IP associated with a network sernd IP assoc
   command to the network service providers

With this fix logic of IP assoc is changed as below which eliminates
executio of unnessary and expensive IpAssocCommand resource command

 - On associate IP to GuestNetwork, associate IP only to the network,
   Untill any service is associated with the IP dont send IP Assoc
 - On creation of first rule on the IP send IPAssoc to corresponding
   network service provider. Since IP is used for a service, IPAssoc
   need to be sent to correpondign service provider
 - On deletion of last rule on the IP send IPAssoc to corresponding
   network service provider. When last rule is deleted, IP has no
   service associated with it, so send IP assoc to service provider to
   remove the IP association
2013-07-08 14:52:12 +05:30
Harikrishna Patnala e63ac5512e CLOUDSTACK-3324: Fix/Improve upgrade system vm template 41 to 42
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-03 17:18:25 +05:30
Murali Reddy 2f3764ef94 CLOUDSTACK-1959: GSLB: add capability to provide weights to the sites
involved in the GSLB

add weights to each site participating in the GSLB. Traffic will be load
balanced across the sites based on the weigths associated with each
site. If not specified weight of site is defaulted to 1.
2013-07-02 17:55:58 +05:30
Alena Prokharchyk 4f89c88985 41-42 DB upgrade: fixed physicalNetworkUpdate method - one of the preparedStatement elements wasn't set 2013-07-01 12:00:54 -07:00
Min Chen 87c401aaaf CLOUDSTACK-3144: [Automation] Deletion of templates failing. Fails to
find image store housing template.
2013-06-28 17:57:42 -07:00
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Prachi Damle 02ab2eb384 Revert "Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries"
This reverts commit 7f2f25d640.
2013-06-28 14:58:32 -07:00
Bharat Kumar 6b0df2566d Cloudstack-3106 Delete all ips except ipAlias. Cloudstack-3119 Shared network removal doesn't cleanup corresponding IP ranges
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
Bharat Kumar 7f2f25d640 Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:54 +05:30
Kishan Kavala 87a5dc582e encrypt vnc_password for removed Vms also. Snapshots of removed Vms still refer Vm VOs 2013-06-28 11:13:02 +05:30
Alena Prokharchyk 5437a0d058 CLOUDSTACK-3126: don't count system network (private gateway's network) when calculate networks count in the vpc 2013-06-27 17:10:14 -07:00
Kishan Kavala f96442a45b CLOUDSTACK-3231: Update service offering Id of allocated Vm usage whem service offering changes for a Vm 2013-06-27 16:01:39 +05:30
Murali Reddy ff167134e4 CLOUDSTACK-3214: transferring portable IP across zones with enableStatic
NAT does not work

making an exception for portabe IP, so that if the current datacenter with
portable IP is associated is different from destiantion data center

also on transfer on to new zone, transfer the portable ip association to
new data center, physical network id's
2013-06-26 19:29:55 +05:30
Nitin Mehta 1c102a0589 CLOUDSTACK-2835: Change function from execute to executeUpdate 2013-06-26 17:47:17 +05:30
Harikrishna Patnala c0591531d8 CLOUDSTACK-3187: cluster.(cpu/memory).allocated.capacity.disablethreshold in not considering overcommit factor. cluster is getting disable based on actual use
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 16:02:21 +05:30
Harikrishna Patnala 9385cf0453 CLOUDSTACK-2835: VR Deployement from admin registered template is failing because registered template type is user. Additional parameter "isrouter" in register/update template API for the root admin. True if registered template is of type ROUTING.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 16:00:12 +05:30
Kishan Kavala da0006618f CLOUDSTACK-3124: Deletion of ACL associated with a tier/ pvt gateway should not be allowed. Check for associated tiers/gateways before deletion 2013-06-24 17:58:29 +05:30
Jayapal 6a7ae637dd CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider 2013-06-24 13:37:00 +05:30
Alena Prokharchyk ae6e8b448f CLOUDSTACK-3085: network implement - deploy internal lb vm for the ip only when:
* the load balancer contains lb rule in state "Active"
* when lb rule has at least one vm assigned to it
2013-06-20 13:01:32 -07:00
Edison Su 205722aabf fix nonoss build 2013-06-20 10:47:19 -07:00
Edison Su 97f8c524b8 merge object_store 2013-06-20 00:18:00 -07:00
Harikrishna Patnala 7b6b8d7a07 CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm
CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:08:38 +05:30
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Wei Zhou 10e80afdeb remove duplicated VPC router in return value of functions in DomainRouterDaoImpl 2013-06-18 15:29:46 +02:00
Wei Zhou 882220e802 CLOUDSTACK-1301: VM Disk I/O Throttling 2013-06-18 10:02:55 +02:00
Alena Prokharchyk 5d0a1cee13 CLOUDSTACK-2883: create default network offering with internal lb support (if doesn't exist already) 2013-06-17 16:13:19 -07:00
Jessica Wang 880029844b CLOUDSTACK-3016: remove zonetype parameter from listTemplates, listIsos API. 2013-06-17 16:08:38 -07:00
Min Chen cf43344541 Fix build error 2013-06-17 13:48:02 -07:00
Likitha Shetty 770cf02ccf Global config to disable an account from acquiring public ips and guest vlans from the system if the account
has dedicated resources and the dedicated resources have all been consumed - use.system.public.ips and use.system.guest.vlans
Both configs are configurable at the account level too.
2013-06-17 17:54:36 +05:30
Edison Su f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Min Chen bb85a564da Remove state from vm_template table, we should use template_store_ref
state column to represent the state of a template in each zone.
2013-06-14 15:14:09 -07:00
Min Chen c5083a385f Migrate NFS secondary storage data from 4.1 to 4.2. 2013-06-14 10:54:41 -07:00
Min Chen 80ed9254b6 Fix db creation issue caused from merge conflict. 2013-06-12 15:37:21 -07:00
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3ce) into object_store.
2013-06-12 11:20:32 -07:00
Harikrishna Patnala a30f9fa64a Fix for CLOUDSTACK-1704 and CLOUDSTACK-1622
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 15:01:59 +05:30
Min Chen 40982ccef2 drop all alert indice on column last_sent created up to 4.1 version 2013-06-10 11:04:50 -07:00
Nitin Mehta 5b48ec24d8 CLOUDSTACK-2924
Recurring snapshot schedule not showing up in UI
For some of the volumes Recurring snapshot schedule was not showing up in UI because the active column was set to false. Since we dont use this column anymore I am removing the active=true check in the listSnapshotPolicies call.
2013-06-10 20:00:16 +05:30
Wei Zhou 76ce304411 CLOUDSTACK-2707: use executeBatch instead of persist in Usage Server 2013-06-10 15:00:08 +02:00
Jayapal c8d607eae5 CLOUDSTACK-2650 setting vm ip null in user_ip_address when static nat ip
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-10 12:14:34 +05:30
Jayapal c1ad3b7974 CLOUDSTACK-2604 Fixed deleting secondary ip when no PF rules set
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-10 12:13:08 +05:30
Murali Reddy c0d894346a CLOUDSTACK-2874: fix the upgrade for the deployment with F5/SRX
combination prior to 3.0 release

Fix does following:

- add F5 network service provider into a physical network if there if F5
  deployed in the zone

- add instance of F5 network service provider

- add SRX network service provider into a physical network if there if
  SRX deployed in the zone

- add instance of SRX network service provider

- upgrade all the guest networks to network offering '"Isolated with
      external providers"
2013-06-06 17:49:47 +05:30
Alena Prokharchyk 54481d0b7b listLoadBalancingRules: when list by networkId, no need to pass the dataCenterId to the call 2013-06-05 10:25:25 -07:00
Harikrishna Patnala 9fe7846d72 CLOUDSTACK-2728: 41-42 DB upgrade: add step to upgrade system templates 2013-06-05 15:14:04 +05:30
Sanjay Tripathi 52a901099c CLOUDSTACK-2824: API:MS:Ability to delete events and alerts-Auto Purge for Alerts doesn't work 2013-06-05 14:37:11 +05:30
Alena Prokharchyk 90df4e4df0 CLOUDSTACK-2840: get the latest information from the DB about the number of rules in non-revoked state for the ip address when figuring out if the internal lb vm needs to be destroyed. Instead of relying on the information passed down by the NetworkManager as the network manager might pass only rules in transition state omitting the Active rules 2013-06-04 14:41:23 -07:00
Wei Zhou f714d26039 Revert "CLOUDSTACK-1301: Add VM Disk I/O Throttling"
This reverts commit 6dad8adf8f.
2013-06-03 07:48:03 +02:00
Wei Zhou 6dad8adf8f CLOUDSTACK-1301: Add VM Disk I/O Throttling 2013-06-01 08:03:02 +02:00
Wei Zhou b9b0168da4 CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
Murali Reddy 9c0f9aceb8 CLOUDSTACK-2332:[GSLB] deleteAccount is not cleaning the gslb rules
created by the account

revoking GSLB rules of account on delete
2013-05-31 19:08:40 +05:30
Sateesh Chodapuneedi 2b0ca781d8 CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter
Upgrade handling.
Detect legacy zones during db upgrade and perform data migration.
If legacy zone is detected the table 'cloud'.'legacy_zones' is populated.
If an existing zone which has resources that belong to single VMware datacenter then such zone would not be marked as legacy zone. Such zone would be automatically associated with the specific Vmware datacenter of the clusters inside the zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 13:33:46 +05:30
Laszlo Hornyak bc98d8ab46 just an organize import
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-31 11:32:02 +05:30
Saksham Srivastava 17267794ad CLOUDSTACK-681: Dedicated Resources - Explicit Dedication, Private zone, pod, cluster or host. <Patch1>
This feature allows a user to deploy VMs only in the resources dedicated to his account or domain.

1. Resources(Zones, Pods, Clusters or hosts) can be dedicated to an account or domain.
   Implemented 12 new APIs to dedicate/list/release resources:
   - dedicateZone, listDedicatedZones, releaseDedicatedZone for a Zone.
   - dedicatePod, listDedicatedPods, releaseDedicatedPod for a Pod.
   - dedicateCluster, listDedicatedClusters, releaseDedicatedCluster for a Cluster
   - dedicateHost, listDedicatedHosts, releaseDedicatedHost for a Host.
2. Once a resource(eg. pod) is dedicated to an account, other resources(eg. clusters/hosts) inside that cannot be further dedicated.
3. Once a resource is dedicated to a domain, other resources inside that can be further dedicated to its sub-domain or account.
4. If any resource (eg.cluster) is dedicated to a account/domain, then resources(eg. Pod) above that cannot be dedicated to different accounts/domain (not belonging to the same domain)
5. To use Explicit dedication, user needs to create an Affinity Group of type 'ExplicitDedication'
6. A VM can be deployed with the above affinity group parameter as an input.
7. A new ExplicitDedicationProcessor has been added which will process the affinity group of type 'Explicit Dedication' for a deployment of a VM that demands dedicated resources.
   This processor implements the AffinityGroupProcessor adapter. This processor will update the avoid list.
8. A VM requesting dedication will be deployed on dedicatd resources if available with the user account.
9. A VM requesting dedication can also be deployed on the dedicated resources available with the parent domains iff no dedicated resources are available with the current user's account or
   domain.
10. A VM (without dedication) can be deployed on shared host but not on dedicated hosts.
11. To modify the dedication, the resource has to be released first.
12. Existing Private zone functionality has been redirected to Explicit dedication of zones.
13. Updated the db upgrade schema script. A new table "dedicated_resources" has been added.
14. Added the right permissions in commands.properties
15. Unit tests:  For the new APIs and Service, added unit tests under : plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/DedicatedApiUnitTest.java
16. Marvin Test: To dedicate host, create affinity group, deploy-vm, check if vm is deployed on the dedicated host.
2013-05-30 01:07:01 -07:00
Edison Su 0a5228922b clean up storage related coded 2013-05-29 18:04:37 -07:00
Wei Zhou 2e8d1264a2 CLOUDSTACK-2707: use executeBatch instead of persist when Usage Server createNetworkHelperEntry 2013-05-28 09:43:23 +02:00
Nitin Mehta 08ac8fb468 CLOUDSTACK-2688
Add DB index to Alert.last_sent column to speed up listAlertsCmd.
2013-05-27 14:02:17 +05:30
Kishan Kavala a23f151df5 KVM snapshots backUp path in 22 had entire path, instead of relative path. Fix modifies the path to make it relative during upgrade 2013-05-24 14:41:28 +05:30
Kishan Kavala 3b48299a03 CLOUDSTACK-2664: Fixed delete query. Added log message when CloudRuntimeException is thrown during upgrade 2013-05-24 12:37:18 +05:30
Kishan Kavala 3e02a76f00 CLOUDSTACK-528: Config value has to be encrypted for Hidden category configs 2013-05-24 12:37:18 +05:30
Edison Su 3ec52807f1 CLOUDSTACK-2593: fix migrate volume between pools through secondary storage 2013-05-23 18:26:16 -07:00
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Min Chen d1704a389a Exclude removed template from template sync. 2013-05-23 17:23:25 -07:00
Anthony Xu e8fbee0e18 firewall service is not supported in shared SG enabled network offering , remove it 2013-05-23 14:19:43 -07:00
Edison Su 4e4112fcec fix attach volume for kvm 2013-05-23 13:51:46 -07:00
Edison Su 5af888c67a add image format in volumevo 2013-05-22 13:38:11 -07:00
Edison Su 383be568b3 CLOUDSTACK-2527: enable attach/detach xs tool iso 2013-05-21 19:13:29 -07:00
Min Chen 2af36aa87b Clean up template_zone_ref entries in case of create template failure. 2013-05-21 12:00:59 -07:00
Dave Brosius 45d2e60656 Nop assignment due to missing 'this.'
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 11:43:25 +05:30
Murali Reddy d6452be861 CLOUDSTACK-652: meging 'portable public ip' feature
Squashed commit of the following:

commit f244f9ce7982db16984dd87c31545f1c0240c704
Merge: 993cbb0 f5c8e38
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:54:05 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java

commit 993cbb0df9fa6e64b96b18ed775b73cdf4a8f5d7
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:49:54 2013 +0530

    introduce 'transferPortableIP' interface method in network manger. This
    method will transfer association of portable ip from one network to
    another network.

commit 0c1c2652c1b39e9a81ca35464360e11ed9ef23f1
Merge: a718d35 a29e393
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Fri May 17 02:48:54 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	utils/src/com/cloud/utils/net/NetUtils.java

commit a718d353f7
Merge: ecca117 c211818
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 21:22:19 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/src/com/cloud/network/addr/PublicIp.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/com/cloud/network/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit ecca117e34
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 20:05:29 2013 +0530

    added integration tests for testing portable ip ranges

commit 895a27c277
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 15:12:19 2013 +0530

    - establish model for transferring portable IP association from a network
      with which it is associated to another network.

    - enabling static nat api, extended to transfer potrtable IP across the
      networks if the VM/network is different from the current associate
      network of the portable ip

commit 51509751b2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 12:05:33 2013 +0530

    seperate out associate/disassociate with guest network operations from
    alloc and release of portable ip

commit bd058f58c2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 21:14:48 2013 +0530

    enhance disasociateIPAddr API to release protable IP associated with a
    guest network or VPC

commit 27504d9098
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 16:53:45 2013 +0530

    enhance asociateIPAddr API to acquire a protable IP and associate with a
    guest network or VPC

commit f82c6a8431
Merge: 3dbfb44 0749013
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 23:32:13 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/com/cloud/network/IpAddress.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	client/tomcatconf/commands.properties.in
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
    	setup/db/db/schema-410to420.sql

commit 3dbfb44eb5
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 20:33:19 2013 +0530

    - add 'portable' boolean as property of IpAddress, persist the property in
    IPAddressVO, return the property in IpAddressResponse

    - add ability to request portable IP in associateIpAddress api

commit bf3cb274cf
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 16:08:40 2013 +0530

    add the status of each portable IP (its state, details of associated data
    center/VPC/guest network etc) in the PortableIpRangeResponse returned by
    listPortableIpRanges API

commit e7b2fb2255
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 14:36:01 2013 +0530

    Introdcues notion of 'portable IP' pool at region level.

    Introduces root admin only API's to provision portable ip to a region
       - createPortableIpRange
       - deletePortableIpRange
       - listPortableIpRanges
2013-05-20 20:05:47 +05:30
Sanjay Tripathi a2fea4d449 CLOUDSTACK-2297 : Delete Account/Domain is not updating the resources usage of the parent domain 2013-05-20 14:08:31 +05:30
Sanjay Tripathi e7332b7c04 CLOUDSTACK-1901 : API:MS: DeleteEvents deletes Archived events as well 2013-05-20 11:58:19 +05:30
Edison Su f7c1b711ad merge to master 2013-05-16 23:56:20 -07:00
Devdeep Singh adbebc1892 Changes for implicitly dedicating a resource. It includes a following:
1. A new implicit planner which extends the functionality provided by FirstFitPlanner.
2. Implicit planner can be used in either strict or preferred mode. In strict mode it tries to deploy a vm of a given account on a host on which vms of the account are already running. If no such host is found it'll search for an empty host to service the request. Otherwise the deploy vm request fails.
3. In preferred mode, if a host which is running vms of the account or an empty host isn't found, the planner then tries to deploy on any other host provided it isn't running implicitly dedicated strict vms of any other account.
4. Updated the createServiceOffering api to configure the details for the planner that the service offering is using.
5. Made db changes to store the service offering details for the planner.
6. Unit tests for testing the implicit planner functionality.
7. Marvin test for validating the functionality.
2013-05-17 11:40:31 +05:30
Prachi Damle a2eb7bab1e CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
- Changes merged from planner_reserve branch
- Exposing deploymentplanner as an optional parameter while creating a service offering
- changes to DeploymentPlanningManagerImpl to make sure host reserve-release happens between conflicting planner usages.
2013-05-16 15:02:17 -07:00
Mice Xia e7fef86c80 CLOUDSTACK-2456 usage:usage parser throws runtime exception while parsing networkoffering usage 2013-05-16 15:19:05 +08:00
Likitha Shetty fd354dbd7c CLOUDSTACK-2116
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 19:41:49 -07:00
Jayapal 85789534f0 CLOUDSTACK-2369 fixed adding same private gw twice 2013-05-15 19:41:49 -07:00
Sanjay Tripathi 88422248cc CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts 2013-05-15 19:41:48 -07:00
Alena Prokharchyk 9f59c618e2 CLOUDSTACK-2517: fixed private gateway creation. Following fixes went in:
1) Only PrivateNetworkGuru handles network creation for the private gateway. Exluded Guest Network Guru from this list (was mistakenly included as a part of merge for Nicira integration)
2) Pass vpc_id to createNetwork call when the network is created as a part of private gateway creation
3) Fixed VPC restart when there are multiple private gateways present (have to grab all the private gateways when creating nic profiles for the VPC router that is being re-created)
4) 41-42 db upgarde: set vpc_id for the private networks of the existing VPCs
2013-05-15 13:12:51 -07:00
Prachi Damle 73030f4372 CLOUDSTACK-2486: Deleting the host_details and inserting them back can lead to mysql deadlock
- Changing the correct details dao. Instead of using separate delete and insert, we will use ON DUPLICATE KEY UPDATE to avoid the MySQL deadlock
2013-05-15 11:58:13 -07:00
Prachi Damle d31217f3be CLOUDSTACK-2486: Deleting the host_details and inserting them back can lead to mysql deadlock
- Added the index found missing after upgrade

Contained in branches: master
Contained in no tag
2013-05-15 11:16:43 -07:00
Likitha Shetty f893aa8a78 CLOUDSTACK-2116
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 18:05:01 +05:30
Jayapal 9b6513466f CLOUDSTACK-2369 fixed adding same private gw twice 2013-05-15 16:45:52 +05:30
Sanjay Tripathi 9542f10592 CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts 2013-05-15 15:28:37 +05:30
Edison Su a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Jayapal c94c71b4ce CLOUDSTACK-2441: Fix deleting private gateways while deleting vpc in case multiple private gateways 2013-05-14 16:10:38 +05:30
Jayapal Reddy 2d950e2858 CLOUDSTACK-768: ACL on private gateway 2013-05-13 19:24:23 +05:30
Nitin Mehta f84b6abde0 merge with master 2013-05-13 17:30:42 +05:30
Bharat Kumar 052c24c4d1 CLOUDSTACK-702: Multiple ip ranges in different subnets.
This feature enables adding of guest ip ranges (public ips)  form different subnets.

In order to provide the dhcp service to a different subnet we create an ipalias on the router. This allows the router to listen to the dhcp request from the guest vms and respond accordingly. Every time a vm is deployed in the new subnet we configure an ip alias on the router. Cloudstack uses dnsmasq to provide dhcp service. We need to configure the dnsmasq to issue ips on the new subnets. Added a new class dnsmasqconfigurator which generates the dnsmasq confg file, this file replaces the old config in the router.

The details of the alias ips are stored in db in the nic_ip_alias table. Every time a new subnet is added one of the ip from the subnet is used to configure the ip alias.

I have pushed the code to  https://github.com/bvbharatk/cloud-stack/tree/Cloudstack-702 , also rebased the code with master.
I need to test the code for advanced sg enabled network using kvm.

I have added the unit test
Marvin tests are at https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=53e4965

Also accomodated some of the changes suggested by koushik.
corrected the import statements. renamed the IpAlias command to createIpAlias command.

This feature supports only ipv4
2013-05-13 17:06:44 +05:30
Nitin Mehta 8d53b1ef05 merge with master 2013-05-13 16:36:41 +05:30
Kishan Kavala 5e009c4bcd CLOUDSTACK-763: Added comments and removed unused imports 2013-05-13 12:03:39 +05:30
Kishan Kavala a1023e4d04 CLOUDSTACK-763: Upgrade networkAcls from firewall_rules to network_acl_item table 2013-05-13 12:03:38 +05:30
Kishan Kavala b30a01a705 CLOUDSTACK-763: Added acl_id param to createNetwork API. Backend changes for acl_deny. Support for all protocol and protocol number 2013-05-13 12:03:38 +05:30
Kishan Kavala e2449cfcf0 CLOUDSTACK-763: Added replaceNetworkACLList API. Added support for ACL action allow/deny and also number 2013-05-13 12:03:38 +05:30
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Alex Huang 3047929367 Merged 2013-05-10 16:21:43 -07:00
Kishan Kavala b4aff6190f CLOUDSTACK-2309: Add fix to handle Vmware 4.0 template upgrade 2013-05-10 17:27:10 +05:30
Alena Prokharchyk 2660a6b7a7 CLOUDSTACK-747: Internal LB between VPC tiers support
Squashed commit of the following:

commit def0861d5a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu May 9 10:53:09 2013 -0700

    Inernallb: added internalLbVm to the list of network elements for nonoss build

commit 56d94fc074
Merge: d828c15 8f9a42e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu May 9 09:51:36 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
    	server/src/com/cloud/network/vpc/VpcManagerImpl.java

commit d828c154fd
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 8 14:58:22 2013 -0700

    internallb: Fixed nonoss build

commit 1b8a6986a6
Merge: 9e74fa9 738d35a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 8 13:20:07 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/async/AsyncJob.java
    	api/src/com/cloud/network/NetworkModel.java
    	api/src/com/cloud/network/rules/LoadBalancerContainer.java
    	api/src/org/apache/cloudstack/api/BaseCmd.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
    	client/tomcatconf/commands.properties.in
    	engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/network/NetworkManagerImpl.java
    	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/MockNetworkModelImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkModelImpl.java
    	server/test/resources/appLoadBalancer.xml
    	setup/db/db/schema-410to420.sql
    	test/integration/component/test_multiple_ip_ranges.py
    	test/integration/smoke/test_guest_vlan_range.py
    	tools/marvin/marvin/integration/lib/base.py

commit 9e74fa9406
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Thu May 9 00:11:40 2013 +0530

    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>

commit 0a2d49301b
Author: Jessica Wang <jessicawang@apache.org>
Date:   Tue May 7 15:50:41 2013 -0700

    Internal LB - UI - zone wizard - advanced zone - enable internal LB element, enable internal LB provider.

commit 43e1667f90
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue May 7 13:26:53 2013 -0700

    Moved all DAOs and VOs to the cloud-engine-schema project

commit 2fd94c8bbe
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Date:   Tue May 7 18:26:08 2013 +0530

    CLOUDSTACK-893 api

commit 12b64d6c00
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 17:06:15 2013 +0530

    Fixing the gmaven configuration for marvin/pom.xml

    For the marvin checkin test custom properties had a typo when run for
    the *nix environment.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 1e4274dd9f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:28:43 2013 +0530

    Renaming TesDedicateVlanRange -> TestDedicateVlanRange

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 9264ac526f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:28:20 2013 +0530

    Adding isolation method to the zone creation of marvin

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 3a0dc67de0
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:27:26 2013 +0530

    adding ACL for dedicateGuestVlanRange set of APIs

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 79f6e11368
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:26:48 2013 +0530

    add debug logs when access checkers fail to find API

    When the access checkers fail for api discovery, we fail silently.
    instead record a debug message.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 92cb7d3e0f
Author: Hugo Trippaers <trippie@gmail.com>
Date:   Tue May 7 11:44:23 2013 +0200

    commit e0d8f01ecd enabled all tests. Fix
    AWSAPI build by removing broken tests and excluding failing tests.

commit 4a391464c7
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Tue May 7 10:57:23 2013 +0200

    commit e0d8f01ecd enabled all tests, but the tests in vmware-base are horribly broken and will not compile with the current CloudStack.

    Removing the tests to fix the nonoss build and they are so broken they should be rewritten from scratch anyway.

commit 2ca03a8513
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:51:34 2013 +0530

    moving test data to top level dictionary

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit ceaa4e1b0d
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:50:56 2013 +0530

    Adding tracelogs to the API discovery service

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit a3f5f01c7e
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:50:12 2013 +0530

    dedicateGuestVlanRange is admin only API

    Adding ACL for the dedicateGuestVlanRange API.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 1c4c80fe91
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Tue May 7 09:58:16 2013 +0200

    Recent pom switcharoo caused the client to lose the dependecy on console-proxy, which it needs to include the systemvm

commit 8103f3c386
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Date:   Tue May 7 11:30:17 2013 +0530

    CLOUDSTACK-893 first cut

commit 67d0411d73
Author: Dave Cahill <dcahill@midokura.com>
Date:   Fri Apr 19 17:31:44 2013 +0900

    Add docs for MidoNet networking plugin [CLOUDSTACK-996]

    Signed-off-by: Dave Cahill <dcahill@midokura.com>

commit c745e6d28e
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 16:34:03 2013 -0700

    Fixed up the simulator to run with windows paths in cygwin

commit be91c03702
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 10:34:22 2013 -0700

    Moved over the VLAN daos

commit dcc09f8472
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 06:31:47 2013 -0700

    Missing file and updated .gitignore

commit e9953cd1a8
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 06:29:59 2013 -0700

    Fixed up unit testing to use only an in class TestConfiguration

commit 6727571403
Author: Alex Huang <alex.huang@gmail.com>
Date:   Thu May 2 15:20:49 2013 -0700

    Fixed an incorrect unit test for affinity group.  Removed some useless pom.xml.

commit d015fb3520
Author: Alex Huang <alex.huang@gmail.com>
Date:   Thu May 2 06:50:38 2013 -0700

    Moved most of the VOs and DAOs from server package into engine-schema as well

commit 77547a58df
Author: Alex Huang <alex.huang@gmail.com>
Date:   Wed May 1 15:15:57 2013 -0700

    Removed files that are no longer used and further separated out the files in the core project

commit 345f3d3482
Author: Alex Huang <alex.huang@gmail.com>
Date:   Wed May 1 05:46:15 2013 -0700

    Moved agent commands to core and out of api

commit e91ca00571
Author: Alex Huang <alex.huang@gmail.com>
Date:   Tue Apr 30 19:06:20 2013 -0700

    Removed framework-api which is completely useless.  Changed framework-ipc to reference gson itself.  Move VOs into engine-schema.

commit f64564e490
Author: Dennis Lawler <dlawler@gmail.com>
Date:   Mon Apr 29 15:10:09 2013 -0700

    Removing filterwin2k option

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 944a7ea5d6
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Mon May 6 20:57:02 2013 +0100

    CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup

    Signed-off-by: Chip Childers <chip.childers@gmail.com>

commit ff7f8ba362
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Mon May 6 20:56:06 2013 +0100

    CLOUDSTACK-2322: update network.gateway to fix deployVm error on
    SharedNetwork after ipv6 support

    Signed-off-by: Chip Childers <chip.childers@gmail.com>

commit a153373c7e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon May 6 11:45:19 2013 -0700

    CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack

commit 46f59cd49e
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 20:39:36 2013 +0530

    Fixed the incorrect assertion in noncontiguous_vlan test

    The assertion fails if the VLAN is found in which case find returns a
    positive number. So here the assertion should infact assert < 0 result.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit bd1dcc10b3
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 19:53:42 2013 +0530

    Affinity Groups requires multiple storage pools

    Fixing the affinity group test which would fail to find the appropriate
    storage pool to satisfy the anti-affinity group of the second VM

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 7f853cdb8f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 19:16:15 2013 +0530

    fixing double calls to VM deploy

    This fixes regression introduced in commit 2f40a90c that made duplicate
    calls to deployVirtualMachine.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 646e810fcf
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 18:51:53 2013 +0530

    fixing wildcard imports

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit b29b6e8525
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Fri May 3 14:03:53 2013 +0200

    BigSwitch should only respond if it is the actual provider on the network.

    This fixes an NPE during the release call.

commit 6fcc9b009b
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Thu May 2 17:38:27 2013 +0200

    Prevent Nicira NVP tags from exceeding the 40 character limit.

commit d8e61a1c0a
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Date:   Thu May 2 13:45:39 2013 +0530

    CLOUDSTACK-2188 : Parsing error with Download Monitor while checking the health of downloaded templates

    Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

commit 5b6e1140f9
Author: Sebastien Goasguen <runseb@gmail.com>
Date:   Mon May 6 05:35:58 2013 -0400

    CLOUDSTACK-2339: Adding libcloud example

commit 7be62d2374
Author: Sebastien Goasguen <runseb@gmail.com>
Date:   Mon May 6 05:35:19 2013 -0400

    CLOUDSTACK-2338: Adding example of how to sign api requests in python

commit 156fd68902
Author: Talluri <Srikanteswararao.Talluri@citrix.com>
Date:   Fri May 3 23:11:56 2013 +0530

    CLOUDSTACK-2323: fix test scripts to conform with library changes

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 33ff5e9107
Author: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Date:   Tue Apr 30 20:09:46 2013 +0530

    CLOUDSTACK-702: Tests for Multiple IP Ranges

    1.Deleting IP Range from the existing CIDR
    2.Add non-contiguous guest IP range in new CIDR
    3.Add overlapped guest IP range in existing CIDR

    Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 33059d1f66
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Mon May 6 14:08:40 2013 +0530

    scaleUp VM response change corresponding UI changes

commit 92e18d8106
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Mon May 6 13:45:32 2013 +0530

    CLOUDSTACK-2337:Resize button available for root/domain admin and normal users

commit d5cd3f7e00
Author: Likitha Shetty <likitha.shetty@citrix.com>
Date:   Wed May 1 13:47:26 2013 +0530

    Dedicate guest vlan range to account

commit 12c79c8377
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Sun May 5 12:02:32 2013 +0530

    scale up virtual machine response change in the backend

commit 94bac27622
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Sun May 5 09:58:04 2013 +0530

    appliance: Upgrade systemvm appliance from rc1 to Debian7 GA

    Signed-off-by: Rohit Yadav <bhaisaab@apache.org>

commit c598bb0038
Author: Isaac Chiang <isaacchiang@gmail.com>
Date:   Sun May 5 01:57:35 2013 +0530

    CLOUDSTACK-2076:Listview widget infinte scrolling error

commit d0615ea9a1
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Sun May 5 01:15:14 2013 +0530

    CLOUDSTACK-2274:Detail view loading problem when deleting a zone

commit 733b513c3a
Author: Isaac Chiang <isaacchiang@gmail.com>
Date:   Sat May 4 13:41:02 2013 +0530

    CLOUDSTACK-2160:Refresh button functionality for security groups and statistics tab

commit 418d75d7a4
Author: Marcus Sorensen <marcus@betterservers.com>
Date:   Fri May 3 14:09:52 2013 -0600

    Summary: Release old DHCP entries

    Detail: Refresh dnsmasq with updated entries live, no outage

    BUG-ID: CLOUDSTACK-2299
    Submitted-by: Dennis Lawler <dlawler@gmail.com>
    Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1367611792 -0600

commit b3dce64577
Author: Kelven Yang <kelveny@gmail.com>
Date:   Tue May 7 10:57:19 2013 -0700

    fix unitest

commit b17885f0f6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue May 7 09:55:47 2013 -0700

    InternalLb: some fixes to the unittest

commit 1cff609347
Merge: 053e184 a3a5c13
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri May 3 11:23:08 2013 -0700

    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

commit 053e18454d
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri May 3 11:07:07 2013 -0700

    InternalLB: marvin integration test for internal lb feature

commit 2e8e2f98f5
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 13:53:20 2013 -0700

    InternalLB: don't allow to upgrade the network from the network offering with internal LB to the offering with public LB, and vice versa

commit c773d204c8
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed May 1 13:21:52 2013 -0700

    Internal LB: if we detect that we are inside an internal lb vm, call out to the ilb script to perform LB configuration

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 8c8845bf77
Merge: 7e95545 471ca30
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 10:14:06 2013 -0700

    Merge branch 'master' into internallb1

commit 7e9554596f
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 10:01:16 2013 -0700

    InternalLb: boot args parameters cleanup for the internal lb vm

commit b7cf870074
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 30 10:31:28 2013 -0700

    InternalLb: more unittests for internal lb element

commit 63bb98ebe2
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Mon Apr 29 18:29:25 2013 -0700

    allow ssh on eth1

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit ca1c313c29
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 17:58:45 2013 -0700

    InternalLb: DB upgrade - update existing physical networks with InternalLbVm provider

commit ed50caa01c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 17:48:36 2013 -0700

    InternalLbVM: handle the scenario when sourceIpAddress is not passed when create internal Lb rule

commit 4c22c911a9
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Mon Apr 29 15:56:00 2013 -0700

    backend support for Internal LB

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 7b24a7640c
Merge: 440e848 a0dbf89
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 15:49:48 2013 -0700

    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

commit 440e8484d6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 13:27:06 2013 -0700

    InternalLB: unittests for InternalLoadBalancerVMManager

commit 63babe4b7e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 26 13:44:01 2013 -0700

    InternalLb:

    1) Added unittests for InternalLoadBalancerVMService
    2) Added unittests for InternalLoadBalancerElementService

commit 4f9c47ce54
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 25 14:46:42 2013 -0700

    InternalLb: create internal lb vm specific service offering

commit 408ee59d1f
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 17:08:08 2013 -0700

    Internallb: new set of Web services APIs for managing Internal LB VMs

commit 7680e1cc10
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 17:08:08 2013 -0700

    Internallb:

    1) InternalLb and PublicLb can't be enabled on the same network offering
    2) Can have internalLb only on VPC tier

commit d73ca7ef73
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 13:02:32 2013 -0700

    InternalLb:
    1) fixed the bug when the guest nic on internal lb vm wasnt set to be default
    2) Don't send the rules to the internal lb vm if its in Stopped state

commit ca2fc30655
Merge: 8057567 04a2b2d
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 23 16:56:11 2013 -0700

    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

commit 8057567aaa
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 23 13:15:36 2013 -0700

    Internallb: more unittests for ApplicationLoadBalancerService

commit 35c0273b85
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 19 16:17:45 2013 -0700

    InternalLb: unittests for ApplicationLoadBalancerService

commit 69b23f7003
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 14:01:10 2013 -0700

    InternalLb: create/configure/listInternalLoadBalancerElement - fixes to the API response

commit a3321ce617
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 13:31:16 2013 -0700

    Internal LB : renamed the classes responsible for managing internal lb elements. Now the names are InternalLoadBalancerVMManager, InternalLoadBalancerVMService and InternalLoadBalancerVMManagerImpl

commit 2baf7c365c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 10:02:17 2013 -0700

    Internallb: verify requested IP for LB rule (if specified) against guest network cidr

commit 0cfe96bd00
Merge: 501f2ff 11162f5
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 17 15:41:51 2013 -0700

    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

commit 501f2ffa0b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 17:03:50 2013 -0700

    InternalLb: validate source ip network as a part of LB rule creation

commit 4d9a7dfd85
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 16:03:32 2013 -0700

    InternalLB: in VPC, restrict public LB to one tier only. Internal LB can be supported on multiple tiers

commit 8689bf9eb3
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 15:59:56 2013 -0700

    Internal LB: added internal lb vm to the list of supported providers in VPC default offering

commit b7709b89ff
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 11:04:22 2013 -0700

    Internal Lb: added 2 boolean fields - internal_lb and public_lb - to the network offering. Define if internal or public LB service is supported. In the current release it's either one or another; in the future releases we might support both on the same network

commit 014689e45e
Merge: b3b16ba 90e8158
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 09:55:45 2013 -0700

    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

commit b3b16bae48
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 17:00:31 2013 -0700

    InternalLB: allow to specify more than one provider for the LB service when create network offering as diff providers can support internal and public LB for the same network

commit a4fc1d7d65
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 13:45:25 2013 -0700

    Internal LB:

    1) Added network_offering_details DB table and corresponding VO/DAO objects. Change createNetworkOffering web services api to accept the map of key/value pairs as details.
    2) Allow to have multiple providers for the same service for the network to support the case when LB service can have separate providers for Internal LB and Public LB

commit 4530cebf2b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 10:06:10 2013 -0700

    InternalLbVm: support for start/stop Internal lb vm

commit ae69f0ae56
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 17:25:02 2013 -0700

    InternalLb: fixed prepare() in InternalLbElement - have to prepare nics of User vms only

commit 888a83c221
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:58:27 2013 -0700

    InternalLb: Start/deploy internal LB vms for the existing LB rules as a part of network implement

commit 3b41d5bee1
Merge: bb73531 4b1a9f1
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:32:40 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/network/NetworkModelImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java

commit bb73531fed
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:13:55 2013 -0700

    Internal Lb: list internal lb vms as a part of listRouters response. Introduced new parameter - role (can be virtual_router or internal_lb_vm)

commit c113ea184b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 12:00:09 2013 -0700

    Add Internal Lb Provider/Element as a part of adding a physical network

commit 78c9db79da
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 10:05:28 2013 -0700

    InternalLbVm: destroy the internal lb vm when the last rule for the ip is being revoked

commit af6201257b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 16:55:37 2013 -0700

    Internal LB: fixed some bugs in internal lb vm startup process

commit 1db240c2b6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 14:23:55 2013 -0700

    InternalLb: fixed searchCriteria constructor in ApplicationLoadBalancerDaoImpl

commit 3795048fcc
Merge: f4c2b53 5f8a278
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 14:09:31 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/async/AsyncJob.java
    	api/src/org/apache/cloudstack/api/ApiConstants.java
    	api/src/org/apache/cloudstack/api/BaseCmd.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	client/tomcatconf/commands.properties.in
    	server/src/com/cloud/api/ApiDBUtils.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	setup/db/db/schema-410to420.sql

commit f4c2b53c21
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 13:46:47 2013 -0700

    InternalLB: modified InternalLbElement to start the Internal Lb vm for each ip address (if not already started)

commit 76a4b1cf81
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 11:41:47 2013 -0700

    InternalLB: added logic for acquiring guest ip address for the Internal LB rule

commit 915e39fbaa
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 10:19:18 2013 -0700

    Removed unused methods doing ipAllocation from GuestNetworkGuru and NetworkServiceImpl. The correct method is located in NetworkModelImpl

commit 3f2a62c7f6
Merge: 20beb7a a0b5ebc
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 17:16:07 2013 -0700

    Merge branch 'master' into internallb1

commit 20beb7a16c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 15:28:12 2013 -0700

    Internal LB: applyLoadBalancerRules - put not null check for sourceIpAddressId (can be null when Schema is not Public)

commit 87e5f5b9a6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 15:17:58 2013 -0700

    Internal LB: intermediate checkin - added InternalLBAppliance manager and managerImpl

commit 53b9c0d142
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 17:55:10 2013 -0700

    Internal LB: added @Since to API docs for Internal LB related commands

commit 867b305ea8
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 17:51:19 2013 -0700

    Internal LB: Made InternalLbElement to extend the ip deployer as the LB service implements IPDeployerRequester

commit 7b9af28094
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 15:45:30 2013 -0700

    InternalLb: new set of Web Services APIs to add InternalLB as a network element to the cloudStack (the element is packaged as an independent plugin). New APIs:

    1) configureInternalLoadBalancerElement
    2) createInternalLoadBalancerElement
    3) listInternalLoadBalancerElements

commit 039e303d4a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 14:01:11 2013 -0700

    InternalLB: Modified pluggable service VirtualRouterElementService to accept only VirtualRouter and VpcVirtualRouter as a VirtualRouterProvider type when add/configure elements. Other VirtualRouterProviderTypes are are taken care by elb/internal lb plugins.

commit f0018b4512
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 12:56:42 2013 -0700

    Internal LB:

    1)Added InternalLoadBalancerManager and corresponding Impl
    2)Add InternalLbVm as a default CS provider. DB upgrade is covered as well

commit e344cf250a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 16:57:47 2013 -0700

    InternalLB - removed unused code from LoadBalancerDao

commit 3588f46848
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 16:23:03 2013 -0700

    Internal LB - added network-element plugin for internal lb service

commit 76325e6168
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 13:58:08 2013 -0700

    Internal Lb:

    1) When network has both kinds of LB rules - Public and Internal - never send them in the same set to the provider
    2) Added extra checks on the provider side to validate if the schema - Public or Internal - is supported.

commit 56c2fe1d37
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 12:34:59 2013 -0700

    InternalLB:

    1) Added new capability for the LB service - LbSchemes. Can take 2 values - Internal and Public.
    2) F5 and Netscaler LB providers - changes all LB related methods to accept LoadBalancingRule instead of ? extends FirewallRule.

commit 34bcb2d026
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 12:11:11 2013 -0700

    InternalLB: implemented list/delete/create web services API commands that will be used for Internal LB creation

commit 9ab31e11f7
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 5 15:59:55 2013 -0700

    InternalLB: change LoadBalancingRule - reference sourceIpAddress of th load balancer by its value, not DB id

commit 08f855d4e4
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 4 09:26:21 2013 -0700

    InternalLB:

    1) Added new set of Interfaces - including the new VO - for the internal load balancer
    2) DB change - added source_ip_address/source_ip_address_network_id/scheme (Internal/Public) fields to the load_balancer table
2013-05-09 11:54:41 -07:00
Alex Huang 2639b9f91e Moved over the VLAN daos 2013-05-06 16:34:41 -07:00
Alex Huang 3722d66aae Fixed up unit testing to use only an in class TestConfiguration 2013-05-06 16:34:27 -07:00
Alex Huang 572e71e57d Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
Alex Huang ad2777c547 Moved agent commands to core and out of api 2013-05-06 16:34:20 -07:00
Alex Huang e0d8f01ecd Removed framework-api which is completely useless. Changed framework-ipc to reference gson itself. Move VOs into engine-schema. 2013-05-06 16:34:16 -07:00
Rohit Yadav 80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Alex Huang a6df8a5b44 Added engine 2012-11-05 09:14:14 -08:00