Commit Graph

628 Commits

Author SHA1 Message Date
David Nalley e87558256c Patch from Chip Childers
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
Wido den Hollander 1a2f354f4d Remove message about contacting Cloud support.
CloudStack has gone Apache now.
2012-07-01 15:12:43 +02:00
Alena Prokharchyk 634cd78baa Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
2012-06-28 17:41:40 -07:00
U-CITRITE\\koushikd 817595daf8 Fix bug CS-15261 In case IP address is passed to deployVirtualMachine API, the default property on NIC was not getting set and as a result there was a failure down the line and VM creation was failing.
Signed-off-by: U-CITRITE\koushikd <koushikd@banlkoushikd01.citrite.net>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-06-19 06:53:43 +01:00
Alena Prokharchyk 31b8f07bb5 Added NicTO to setupGuestNetworkCommand constructor - we need this info for guest network configuraiton 2012-06-15 14:22:40 -07:00
Alena Prokharchyk 0a7faa9838 Support for adding private network
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-15 14:20:34 -07:00
Alena Prokharchyk d9fd7e02a5 Plug nic support
Conflicts:

	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
2012-06-15 14:07:46 -07:00
Alena Prokharchyk f4060c3c1d 1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support
2) Added services api support for plugging/unplugging the nics to VpcElement

Conflicts:

	api/src/com/cloud/network/NetworkService.java
	core/src/com/cloud/vm/VMInstanceVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:04:09 -07:00
Alena Prokharchyk 60b52f90dd Initial checkin for VPC feature:
1) Added API frameworks for the feature. New commands:
* CreateVPCCmd
* ListVPCsCmd
* DeleteVPCCmd
* UpdateVPCCmd
* CreateVPCOfferingCmd
* UpdateVPCOfferingCmd
* DeleteVPCOfferingCmd
* ListVPCOfferingsCmd

2) New db tables:

* `cloud`.`vpc`
* `cloud`.`vpc_offerings`
* `cloud`.`vpc_offering_service_map`

and corresponding VO/Dao objects.

Added vpc_id field to `cloud.`networks` table - not null when network belongs to VPC

3) New Manager and Service interfaces- VpcManager/VpcService

4) Automatically create new VpcOffering (if doesn't exist) on system start

5) New Action events:

* VPC.CREATE
* VPC.UPDATE
* VPC.DELETE

* VPC.OFFERING.CREATE
* VPC.OFFERING.UPDATE
* VPC.OFFERING.DELETE

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	setup/db/create-schema.sql
2012-06-15 13:53:59 -07:00
prachi f1fae9d57f CS-14753: When Vm is deployed with a Security Group , it also gets associated with the default security group.
Changes:
- StartVM needed to be changed to add default security group only when none is present.
- DeployVm: createAdvancedSecurityGroupVirtualMachine changed to follow the same rule - add default SG only if none is specified.
2012-05-25 14:40:31 -07:00
prachi 0c1c9141f4 DeployVMCmd: Do not place the instance in default security group if groupId is provided 2012-05-25 14:40:28 -07:00
Nitin Mehta 4bb4e98eae bug CS-14945: Throw an error message if the user is trying to attach the volume in local only storage zone.
Reviewed-by: Kishan
2012-05-25 18:46:44 +05:30
Edison Su 403addc59d bug CS-14833: if iso is xen/vmware tools, attach it to vm; status CS-14833: resolved fixed 2012-05-15 14:04:16 -07:00
Alena Prokharchyk d11dceaccc CS-14904
Fixed the bug where vm_instance.ha_enabled wasn't updated during service offering upgrade

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
2012-05-15 12:36:40 -07:00
Nitin Mehta 7e0863555b bug CS-14814: Do not allow attaching volume to a stopped vm for an uploaded volume. Make changes to accomodate volume attaching for a vm created in Stopped state. 2012-05-15 18:28:12 +05:30
Nitin Mehta acd55bac90 bug CS-14785: Allow attaching the volume for Uploaded volume. Also have transition fo delete volume. 2012-05-14 16:46:49 +05:30
Nitin Mehta 838d01754b bug CS-14785: Improvements to volumes sync so that it can recover from any error. Introduced new state UploadOp which signifies that the volume os on secondary and the status would be picked up from volume host ref table. 2012-05-11 11:42:42 +05:30
Nitin Mehta 189ac88a11 bug CS-14785: String equality should be through equals function....what was i thinking !!!. 2012-05-08 16:07:52 +05:30
Nitin Mehta 0d2422720b bug CS-14739: Check for the volume and vm hypervisor compatibility before attaching the volume to vm in case the volume is on secondary storage. 2012-05-04 17:29:22 +05:30
Salvatore Orlando 9f321ffeac Open vSwitch tunnel manager
Applying patch with new ovs-tunnel-manager on top of cloudstack oss-master
2012-04-23 22:32:16 +01:00
Nitin Mehta 54956280e6 Preliminary upload and attach changes work .. 2012-04-23 12:28:36 +05:30
Nitin Mehta 564cef8ddf More changes for uploadVolume. Create framework for upload volume progress communication between MS and SSVM. 2012-04-23 12:14:35 +05:30
Alena Prokharchyk 85b35978de Db upgrade path for 3.0.2 to 3.0.3 2012-04-09 15:50:10 -07:00
Alena Prokharchyk 6ff3dc3951 Return password as a result of startVm command if the vm was originally deployed with startVm=false parameter 2012-04-06 13:46:49 -07:00
Alena Prokharchyk 2d1a6b0b35 bug 14615: deployVm can work 2 diff ways now: 1) Default way - create and start the vm. 2) Create the vm without starting it. Note that vm's volumes stay in Allocated state -not created on the backend till the point where vm starts
status 14615: resolved fixed
2012-04-06 11:30:48 -07:00
Alena Prokharchyk c0130a5c41 Code cleanup for createVlanRange api 2012-04-04 15:03:04 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Alena Prokharchyk d6cf594ef7 bug 14292: don't try to reboot vm as part of resetVmPassword if the vm is in Stopped state
status 14292: resolved fixed
2012-03-28 13:51:14 -07:00
Vijayendra Bhamidipati 005ba5e2b5 Bug 13127: API error text refer to database ids instead of uuids
Description:

	Adding overloaded addProxyObject() function to CloudException
	and RuntimeCloudException classes and using this function
	to stuff exceptions with IDs, to reduce code footprint.
2012-03-15 16:27:52 -07:00
Vijayendra Bhamidipati b1bb0afad4 Bug 13127: API error text refer to database ids instead of uuids
Description:

	Modifying the API functions' exception handling to call
	addProxyObject() wherever applicable, and removing some
	wrong calls to addProxyObject() that were put in in an
	earlier commit for this bug.

	With this commit, we cover many API functions to use the
	new exception handling code, but some pieces may still be
	left out. These will be covered as work in progress, when
	making changes to the CS API code.
2012-03-12 18:05:45 -07:00
prachi 5148145d18 Bug 14028 - Add hostid parameter to StartVmCmd to enable admins to start VM on a particular host
Changes:
- Added hostid to StartVMCmd. Only root admin can use it.
2012-03-05 17:50:23 -08:00
Alena Prokharchyk c052d96428 bug 13966: cleanup the vm (stop it on the backend) when work step is Release. Also never retry when finalizeStart failed
status 13966: resolved fixed
reviewed-by: Alex Huang
2012-02-23 15:13:47 -08:00
Alena Prokharchyk 2e9511e2ae Changed isElastic to isSystem for the publicIpAddress assigned during the vm deployment in EIP enabled network
Reviewed-by: Chiradeep
2012-02-21 15:39:49 -08:00
Alena Prokharchyk cad392cd68 bug 13335: fixed listProjectInvitations by projectId
status 13335: resolved fixed
2012-02-07 13:16:27 -08:00
abhi ae609f6801 bug 13408: added more loggin to assignVM 2012-02-01 18:45:25 +05:30
abhi b6e5419370 bug 12899: checking if static nat rule is in place, throw error if there. Let the caller clear it first before assigning VM to another account 2012-02-01 18:08:32 +05:30
Kelven Yang c1fb754de7 VM display name can be NULL in schema, leave it as NULL instead of empty string when user does not provide a optional VM display name 2012-01-26 11:30:40 -08:00
Kelven Yang e751dad940 VM display name will stay empty if user does not provide, VM host name is default to UUID for now 2012-01-26 11:10:00 -08:00
Kelven Yang 8083b29235 bug 13306: remove sensive DB id info from VM display name 2012-01-25 17:16:21 -08:00
Alena Prokharchyk 4dec3c890a bug 13282: release elastic IP of the vm on vmStop
status 13282: resolved fixed
2012-01-25 15:03:46 -08:00
Alena Prokharchyk 5307d21210 DisableStaticNat: if elasticIP service is enabled for the network offering, always allocate new elastic ip and create static nat rule for it when disableStaticNat is called 2012-01-24 14:06:01 -08:00
Alena Prokharchyk 57ddf63676 Special permission check for networks 2012-01-20 11:01:38 -08:00
Alena Prokharchyk d4d345a587 Don't retry to re-create the vm when failed to allocate public ip 2012-01-19 14:00:07 -08:00
Alena Prokharchyk 4f46c3b160 Mark ip as not elastic when disable static nat is called on it 2012-01-19 13:58:36 -08:00
Alena Prokharchyk 212c22b256 Added isElastic flag to ip address 2012-01-19 13:58:35 -08:00
Alena Prokharchyk 6325d21c50 Get new elasticIp when releaseIpAddress is called for elasticIP of the vm 2012-01-19 13:58:35 -08:00
Alena Prokharchyk 0e8104cca1 Disassociate ip address - always allocate a new IP and enable static nat for it when elactic IP is enabled 2012-01-19 13:58:35 -08:00
Alena Prokharchyk 359185f567 System is the owner of the first elastic ip address for the vm 2012-01-19 13:58:35 -08:00
Alena Prokharchyk d5752eca61 Error deployVm when elasticIp/staticNat failed to assign to the vm 2012-01-19 13:58:34 -08:00
Alena Prokharchyk 0f6f231ee6 Elastic IP - when deployVm, get ip address and enable static nat on it. On vm destroy release the Ip 2012-01-19 13:58:34 -08:00
Kelven Yang 3612fc12c8 bug 11428: remove the constraint based on customer's feedback, we will allow creating volume from a snapshot that was originally taken from root volume. Customers should be aware that when the volume is attached as a data volume, some partitions that were originally created as a root volume may not be recognized by the guest OS 2012-01-17 16:10:20 -08:00
Alena Prokharchyk 83400cd15f bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account
status 12776: resolved fixed
2012-01-17 13:40:37 -08:00
Alena Prokharchyk bda032b874 bug 12760: generate vm.destroy event when vm goes from Stopped to Expuning state
status 12760: resolved fixed
2012-01-17 10:38:52 -08:00
Alena Prokharchyk f0c4980dff bug 13110: use Ternary data structure when build search criteria
status 13110: resolved fixed
2012-01-16 14:15:28 -08:00
Abhinandan Prateek 0374e42931 bug 13068: clearing sec grp has a dependency on nic's existing, move the call a bit 2012-01-16 13:50:15 +05:30
Abhinandan Prateek eb4cfe063a bug 12916: warning user if he tried to move the VM across zones 2012-01-10 10:49:18 +05:30
Abhinandan Prateek 3a2d0b1ec6 bug 12918: don't allow movement within same account 2012-01-10 10:39:03 +05:30
Alena Prokharchyk c581506103 bug 12306: list* command revamp 2012-01-09 10:07:42 -08:00
kishan 5dc4a70b90 Bug 12850: Allow accounts in child domains to create Vms in zones owned by parent domain
Status 12850: resolved fixed
Reviewed-By: Abhi
2012-01-09 19:32:26 +05:30
Edison Su 1648bd800c bug 12899: mgt server needs to pass down the storage pool uuid when creating template from volume
status 12899: resolved fixed
2012-01-05 16:42:45 -08:00
Abhinandan Prateek 2778deacb6 bug 8962: usage related changes 2012-01-04 16:41:18 +05:30
kishan 9b3f78254d Bug 12845: When moving Vm to another account, add volume create usage event with size and template/offering id
Status 12845: resolved fixed
Reviewed-By: Abhi
2012-01-04 16:34:52 +05:30
Abhinandan Prateek 8173474a42 bug 8962: done some testing on basic networks 2011-12-29 12:37:28 +05:30
Abhinandan Prateek b2079346d6 bug 8962: added params networkids and securitygroups in case the moved VM needs to be part for additional networks and sec grps respectively 2011-12-28 11:39:28 +05:30
Abhinandan Prateek df83487be9 bug 8962: adding code for basic networks 2011-12-21 17:18:31 +05:30
Edison Su 009fa8c079 bug 12158: only allow storage migration through migratevm api, iff no data disks attached to the vm. As data disks may have different service offering with the specified storage pool
status 12158: resolved fixed
2011-12-20 17:12:09 -08:00
kishan e2cb4f94d6 bug 12337: Encrypt only password in host_detail table. Removed unused and duplicate references of HostDetailDao
status 12337: resolved fixed
reviewed-by: Abhi
2011-12-20 19:28:41 +05:30
Abhinandan Prateek 462ad5cfc2 bug 8962: network related improvements 2011-12-20 18:31:37 +05:30
Alena Prokharchyk ceb0a918a1 createTemplate/createSnapshot for project - allow to execute for Projects in Active state only 2011-12-19 16:20:40 -08:00
Edison Su 49fb9049fb bug 12446: fix typo
status 12446: resolved fixed
2011-12-14 16:51:38 -08:00
Sheng Yang 3263fd596e bug 10904: add a global config to enable/disable automatically add the vm to the default security group
status 10904: resolved fixed
2011-12-13 14:48:44 -08:00
Nitin Mehta 353bc396e3 bug 11838: Create Private Template from Snapshot - Lift the restriction of creating duplicate names keeping it consistent with register template
Reviewed by : Kishan.
2011-12-13 14:42:08 +05:30
Alena Prokharchyk bde5e16a26 bug 12453: when networkId is specified, don't check if the network created from Required network offering is present
status 12453: resolved fixed
2011-12-08 14:38:21 -08:00
Alena Prokharchyk 2c2dfdc507 bug 12237: fixed listSnapshots to work correctly with projectId
status 12237: resolved fixed
2011-12-06 16:43:58 -08:00
Alena Prokharchyk 7b8287d323 bug 10804: Api and middle layer support for default route feature 2011-12-05 14:53:45 -08:00
Alena Prokharchyk a4773b7080 bug 12291: listVms - show non-project resources only if no projectId specified
status 12291: resolved fixed
2011-12-02 15:17:50 -08:00
Abhinandan Prateek 660891b405 bug 8962: adding a check for disabled accounts 2011-11-29 12:40:58 +05:30
Alena Prokharchyk afb56d2112 bug 11492: check volume resource limit when deployVm
status 11492: resolved fixed
2011-11-28 13:38:32 -08:00
Alena Prokharchyk 586febd4c1 bug 11965: check the user state on the Services layer, not in the VmManager as VmManager can be called not only from the API, but also by internal methods - HA for instance - and in this case we shouldn't care about the account state
11965 status: resolved fixed

Also fixed gson serialization error in account response
2011-11-28 10:05:19 -08:00
Abhinandan Prateek 88f9b1ab7c bug 8962: review changes incorporated 2011-11-25 15:03:45 +05:30
prachi 0dc7fb48a1 Bug 11962 - MigrateVirtualMachine fails with AgentUnavailableException when the targeted host for migration is under Maintenance
Bug 11964 - You are allowed to migrate a virtual machine on to the host that it already exists o

Changes:
Validations were missing in th MigrateVmCmd API, since from UI the validations are always done while listing hosts for migration as first step.
2011-11-21 17:12:36 -08:00
Nitin Mehta ec3a00a230 bug 10281: Template/ISO APIs should throw an exception in failure case for the events to be registered as failure.
Reviewed by : Kishan.

status 10281: resolved fixed
2011-11-21 18:58:06 +05:30
Alex Huang 84d5f0514e Changed network tags to network name as we no longer need to send the entire network tags down to the resource. 2011-11-18 14:28:16 -08:00
Alena Prokharchyk 5571afa471 Virtual router elements: prepare nics only when VirtualRouter is a provider for at least one service in the network 2011-11-17 14:33:22 -08:00
Alena Prokharchyk 790b33bdfc More validation to network and network offering creation/upgrade 2011-11-16 14:53:38 -08:00
Kelven Yang 277c60e4f6 bug 11814: Allow template to have details info in key/value pairs. 2011-11-15 15:01:46 -08:00
Alena Prokharchyk bb2a8cf7ea NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param 2011-11-14 18:13:47 -08:00
Alena Prokharchyk 039e09ce93 * Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account -
only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id
2011-11-10 18:34:56 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Nitin e2e7da3ff4 bug 11428: Under VMware with current version, for snapshot related related operations,
1) if snapshot is originally created from root volume, allow only CreateTemplateCommand from snapshot 2) if snapshot is originally created from data volume, allow only CreateVolumeCommand from snapshot Reviewed by - Kishan
status 11428: resolved fixed
2011-11-09 16:33:09 +05:30
alena 3a845d2d75 Keep Service/Provider map per network as well as per networkOffering (to handle the case when there are multiple providers defined for the same service in the network offering, and only one is picked when the network is created) 2011-11-07 16:16:03 -08:00
Abhinandan Prateek 267b12d015 bug 11709: saving encrypted password in db
status 11709: resolved fixed
2011-11-03 15:40:20 +05:30
alena 3e20c60d6d Fixed vm deployment in Basic zone 2011-11-02 17:02:44 -07:00
alena f42c9e434f Basic zone: the System Guest network offering can be created from any Shared Guest network offering.
Limitation:
* in order to make the networkOffering choice, only one Shared network has to be Enabled at the moment when Basic zone is being created
2011-11-02 15:44:53 -07:00
alena 2250dff349 1) Removed tags from the network object
2) Get hypervisor tags from the physical network instead.
2011-11-01 17:42:06 -07:00
alena 9560e92015 physicalNetworkId is optional in createNetwork api. Works as follows:
* can be specified for Shared network only
* if not specified for the Shared networks, try to locate it based on the zoneId and tags. If tags is not null, pick up first physicalNetwork from the zone that has matching tags. If tags is null, and there are none/more than 1 physical netwroks in the zone, error out.
2011-11-01 15:49:39 -07:00
alena be21a5e37c Don't allow enabling securityGroup service for Isolated networks 2011-11-01 13:09:14 -07:00
alena 80dc2c0b1a Don't send security group commands to the backend when 1) securtiy group service is disabled in the network offering and 2) security group service provider is supported on the physical network 2011-11-01 12:07:32 -07:00
anthony 46dac852fa Merge branch 'swift'
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2011-10-31 15:04:48 -07:00
Abhinandan Prateek abb37acbdd bug 8962: added usage related and resource count related code, changed the API name as suggested. Incorporated relevant review comments 2011-10-31 16:35:42 +05:30