etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,618 Commits 349 Branches 328 Tags 873 MiB
Commit Graph

498 Commits

Author SHA1 Message Date
Alena Prokharchyk 353423acec Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-06 12:04:10 -07:00
Alena Prokharchyk 7acf8585b1 Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed 
2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)

Conflicts:

	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
	api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
	api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
	api/src/com/cloud/api/commands/ListSnapshotsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	api/src/com/cloud/api/response/VolumeResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/vm/dao/UserVmDaoImpl.java
 2012-07-06 11:43:31 -07:00
Alena Prokharchyk 540ea34f57 VPC: removed NetworkACL interface; added getTrafficType() to Firewall 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-07-06 11:08:00 -07:00
Alena Prokharchyk 31f9d718fb Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
 2012-07-03 17:32:50 -07:00
Alena Prokharchyk f2078afbd8 VPC: added zoneName to the VPC api response 2012-07-03 17:28:20 -07:00
Alena Prokharchyk 21d87f3fa5 VPC: fixed response tag for VpcRespnse 2012-07-03 17:23:50 -07:00
Alena Prokharchyk da6d876cd4 VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java
 2012-07-03 17:23:40 -07:00
Alena Prokharchyk b565f63e42 VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation) 
Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-07-02 17:44:28 -07:00
Sheng Yang 8d16d7f94f Fix build after merge site to site vpn 2012-07-02 16:39:41 -07:00
Sheng Yang 24c480f9e6 CS-6840: Add commands for site-to-site vpn 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	utils/test/com/cloud/utils/net/NetUtilsTest.java
 2012-07-02 16:26:34 -07:00
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
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
Alena Prokharchyk 1a232171eb VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done 2012-06-28 10:11:41 -07:00
Alena Prokharchyk d35eb73c9b VPC: initial checkin for Static Routes 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-25 20:59:33 -07:00
Alena Prokharchyk 030458a37b VPC: implemented add/delete Private gateway 
Conflicts:

	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/dc/DataCenterVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-06-25 20:54:14 -07:00
Alena Prokharchyk 374a600746 VPC: initial checkin for network ACLs 
Conflicts:

	client/tomcatconf/commands.properties.in
 2012-06-20 17:19:49 -07:00
Alena Prokharchyk 55a12582b4 Completed API / Management server code for Resource tags feature. UI is yet to be done 2012-06-20 15:45:08 -07:00
Alena Prokharchyk 62d45b9670 Initial checkin for resource tags feature 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
	setup/db/create-schema.sql
 2012-06-20 15:45:08 -07:00
Alena Prokharchyk 810151586b 1) Allow having multiple shared networks with the same vlan 
2) Added new parameter to listNetworks command - canUseForDeploy(boolean). When true, list only networks that can be used for vm deployment (networks have enough ip addresses to allocate from for the vm)

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
 2012-06-15 16:47:13 -07:00
Alena Prokharchyk c56998e876 Support for IPAssoc inside VPC 2012-06-15 14:10:33 -07:00
Alena Prokharchyk 9ec8526281 1) Added VPC restart support - new api command RestartVPC. The purpose of the call is to shutdown and start VPC including VPCVirtualRouter restart, rules re-implement, etc 
2) Only networks created from offerings with conserveMode=false, can participate in VPC
 2012-06-15 14:10:09 -07:00
Alena Prokharchyk b9a4e79277 1) Added search by vpcId to listRouters/listNetworks Apis 
2) Don't allow to add new networks/implement existing ones for VPC in Disabled state. Disabled state indicates that there was unsuccessful attempt to remove the VPC, and the further cleanup will be taken care of by cleanup thread.

Conflicts:

	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-06-15 14:09:37 -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 3fd17ae029 Merge awsapi related changes to CloudStack 2012-05-25 14:40:53 -07:00
Alena Prokharchyk 51eeb62f9f CS-14894: listTemplates - return hypervisor type to everybody 2012-05-18 12:47:06 -07:00
Nitin Mehta 07cbec95fa bug CS-14957: Return hypervisor type for uploaded volume 2012-05-17 19:22:19 +05:30
Nitin Mehta 2153ce96f7 bug CS-14321: Correcting listVolumes API call to return valid value for isExtractable for ISO derived disk and DATA disk. 2012-05-16 21:47:45 +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 9097b53eab bug CS-10789: Put zone id in the volumehost ref table. make list volume to show the percent uploaded. 2012-05-03 10:46:02 +05:30
Alena Prokharchyk c7cbae4c48 Set ha host to false when no ha tag is enabled 2012-04-25 11:04:35 -07:00
Salvatore Orlando 8ccb4b6680 CS-14270: return VLAN id only if the broadcast URI starts with 'vlan' 2012-04-24 21:27:26 +01:00
Salvatore Orlando 2340ebced3 Now using vnets instead of network id for creating networks 
Fixed issues with vif scripts on 5.6FP1
Fixed ipv6 issue on 5.6FP1
Plus other various fixes and improvements

Starting to remove debug code
NOTE: Network is configured correctly but instances do not start. Possibly indefinite wait occuring on some commands
 2012-04-23 22:33:18 +01:00
Alena Prokharchyk 03ccb7f313 CS-14512: fixed deployVm with ipToNetworkList when uuid is used for networkIds 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-04-16 15:43:56 -07:00
Alena Prokharchyk 676a28177b Added one more parameter - haHost(boolean) - to listHosts api command. The parameter identifies if the host is dedicated for ha only 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-04-12 11:50:36 -07:00
David Nalley 59436be4ee fixing line endings in server 2012-04-07 20:13:10 -04:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Alena Prokharchyk 5599713268 bug 14401: return juniper srx as a firewall provider along with the Virtual router 
status 14401: resolved fixed
 2012-03-20 11:51:48 -07:00
Alena Prokharchyk ad1192e264 bug 14239: limit number of Isolated account specific networks per account 
status 14239: resolved fixed

Conflicts:

	api/src/com/cloud/api/commands/CreateNetworkCmd.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-03-12 15:53:30 -07:00
Alena Prokharchyk f3935d667f bug 14156: return instancename parameter in userVm response to ROOT admin only 2012-03-06 13:39:13 -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 12b79da6c2 bug 13903: return vm's hostName as a displayName when displayName is null in bunch of api responses 
status 13903: resolved fixed
Reviewed-by: Kelven Yang
 2012-02-21 10:46:00 -08:00
frank a1fa313902 Bug 13568 - secondary storage VM's static route for nfs server breaks things! 
status 13568: resolved fixed
reviewed-by: Sheng Yang
 2012-02-17 16:24:32 -08:00
Alena Prokharchyk 31a3b878a3 bug 13864: for elastic IP address return the purpose (staticNat or Lb) in listPublicIpAddresses api response 
Reviewed-by: Frank
 2012-02-17 15:42:21 -08:00
Alena Prokharchyk 4d27f3c44b bug 13866: return publicIp info in listVms api response when vm is linked to public ip via static nat 
Reviewed-by: Frank
 2012-02-17 15:42:17 -08:00
Alena Prokharchyk 313659d730 Return hostName as displayName in the listvms api resonse, just the way it was before 41df47cc6873b4d8acd0503b16535051a3cbde14) 
Reviewed-by: Kelven Yang
 2012-02-17 14:51:25 -08:00
Nitin Mehta 680ab2f908 Bug 13059: Using Float instead of float for percentage. 
Reviewed-By: Kishan
 2012-02-10 11:11:47 +05:30
Sheng Yang 18ec438793 Revert zone guest cidr setting 2012-02-08 15:54:16 -08:00
Nitin Mehta e6beb08f1b Bug 13059: Keeping the param name more intuitive Also adding the ciode for listing used and total capacity as well. 
Reviewed-By: Kishan
 2012-02-08 18:03:22 +05:30
frank 02075c3a2d Bug 13476 - Public IP's are not shown in the UI for the System VMs 
status 13476: resolved fixed
 2012-02-07 10:58:11 -08:00
frank b59c3c595e return netmask in listStorageNetworkIpRangeCmd 2012-02-06 14:37:56 -08:00
Nitin Mehta 93b8178f19 Bug 13059: Introduce a new api to list top consumed resources in cloudstack. 
Reviewed-By: Kishan
 2012-02-06 20:32:40 +05:30
kishan b5d465f74a Bug 12649: Added ROOT to domain path and removed trailing slash 
Status 12649: resolved fixed
Reviewed-By: Abhi
 2012-02-06 14:27:55 +05:30
Alena Prokharchyk 1490e45a1c Fixed format style in a bunch of files (replaced tabs with spaces as a part of it) 2012-02-03 13:49:11 -08:00
frank e30ca89c7c Bug 13185 - CloudStack UI shows incorrect info for SSVM public IP 
status 13185: resolved fixed
 2012-02-02 10:52:18 -08:00
Alena Prokharchyk edd4c84ca1 Add domain name info for private zones in listZones api response 2012-02-01 11:26:00 -08:00
Kelven Yang 00ffe10b05 bug 12017: when owner host is not in UP state, mark VM state as UNKNOWN 2012-01-31 17:20:16 -08:00
Alena Prokharchyk c2f99796bb Return only VirtualRouter as a firewall provider in listSupportedNetworkServices api response 2012-01-31 14:37:44 -08:00
Kelven Yang 8f2b6dc791 do not default display name from null to other name like host name 2012-01-30 14:57:50 -08:00
kishan cdbf85e3e6 Bug 12649: Added new param path to listDomains respone 
Status 12649: resolved fixed
Reviewed-By: Nitin

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-01-27 17:58:48 +05:30
Alena Prokharchyk 8bcf30da85 bug 12869: more changes to NAAS feature 2012-01-20 14:16:30 -08:00
Alena Prokharchyk 212c22b256 Added isElastic flag to ip address 2012-01-19 13:58:35 -08:00
Alena Prokharchyk 630cbb2243 Added elb and eip capabilities to network offering response 2012-01-19 13:57:37 -08:00
Alena Prokharchyk 56b3561033 bug 12856: network offerings with services w/o providers support 
status 12856: resolved fixed
 2012-01-17 16:17:09 -08:00
Abhinandan Prateek be6642bf37 bug 13005: added response object name casuing this 2012-01-13 14:49:43 +05:30
Sheng Yang 8f2cd77c87 bug 12931: Add conserve mode in network offering response 2012-01-10 11:48:21 -08:00
Alena Prokharchyk adaea570e4 bug 12934: added name to physical network 
status 12934: resolved fixed
 2012-01-09 14:20:37 -08:00
frank 5ea56cdfeb Bug 12777 - Add storage network configuration into CloudStack 
polish API per Alena's review
 2012-01-09 11:06:21 -08:00
Alena Prokharchyk c581506103 bug 12306: list* command revamp 2012-01-09 10:07:42 -08:00
frank f72940e041 Bug 12777 - Add storage network configuration into CloudStack 
most finish
 2012-01-06 11:06:18 -08:00
frank 0b01c5dc1a Bug 12777 - Add storage network configuration into CloudStack 
create APIs
 2012-01-06 11:06:17 -08:00
Sheng Yang 89ca2fe48e bug 12656: Add restriction for network update and new rules 
status 12656: resolved fixed
 2012-01-05 21:08:41 -08:00
anthony 646d95a846 bug 12364: fixed export template with swift 
status 12364: resolved fixed
 2011-12-21 16:07:06 -08:00
Alena Prokharchyk 6049afa5fe Revert "bug 12426: return account information for Shared networks" 
This reverts commit 150f9c62ce381099a27bc084007c7b947117f47c.

Confirmed with Will - we shouldn't return accountId info for shared networks as these types of networks belong to system and available for everyone in the domain/zone
 2011-12-16 14:43:00 -08:00
anthony 79e0f1f39e SWIFT : refine api 2011-12-15 12:52:58 -08:00
anthony 235c5aa6eb SWIFT: api refine 2011-12-15 12:37:34 -08:00
anthony fb0f77711f SWIFT: fixed delete template/iso 2011-12-14 19:53:56 -08:00
Sheng Yang ab50f65ed8 bug 12483: Discard zone's cidr 
status 12483: resolved fixed
 2011-12-14 17:23:24 -08:00
anthony 1821019b7b SWIFT: fixed listtemplate/iso 2011-12-13 18:07:37 -08:00
kishan 6f9bc008f4 bug 12481: Added account ID to listusers response 
status 12481: resolved fixed
reviewed-by: Nitin
 2011-12-13 15:54:58 +05:30
Edison Su e02520a518 bug 10195: if vm's host is in alert state, return unknown state in listvmcmd 
status 10195: resolved fixed
 2011-12-12 16:21:02 -08:00
Alena Prokharchyk 28913c791b bug 11626: return same fields in queryAsyncJobResult and listAsyncJobs API commands 
status 11626: resolved fixed
 2011-12-09 16:50:08 -08:00
Alena Prokharchyk 7ff1417cbb bug 12229: added restartRequired field to the network object 
The value is set to true when shutdownResources or implementResources fail.
 2011-12-09 15:37:11 -08:00
Alena Prokharchyk 3a94a41baf bug 12305: drop max_connections from the network offering as this information is being set on network element level now 
status 12305: resolved fixed
 2011-12-09 09:00:08 -08:00
kishan e23f36b135 Check for null CIDR before converting to netmask 2011-12-08 19:51:40 +05:30
Alena Prokharchyk c83b1ddb05 bug 12380: return cidr in listNetworks response 
status 12380: resolved fixed
 2011-12-07 18:11:38 -08:00
Alena Prokharchyk 97a1276cec bug 12426: return account information for Shared networks 
status 12426: resolved fixed
 2011-12-07 17:03:29 -08:00
Sheng Yang 2902f3d8bd Update service offering id in the NetworkServiceOfferingResponse 2011-12-06 16:51:47 -08:00
Alena Prokharchyk cabb02f944 Removed unused values from the networkOffering response 2011-12-06 14:44:18 -08:00
Alena Prokharchyk 9092765183 1) In Advance zone allow ipAssoc only to the Isolated network with the source nat service enabled 
2) Added zoneName parameter to the listNetworks response
 2011-12-06 14:44:18 -08:00
Alena Prokharchyk edd25b93a1 bug 12336: pass correct service offering id to createNetworkOffering command 2011-12-06 10:10:28 -08:00
Murali Reddy bc88d2eee3 specify which network service capabilities can be choosed as part of network offering 2011-12-05 17:59:54 -08:00
Alena Prokharchyk 7b8287d323 bug 10804: Api and middle layer support for default route feature 2011-12-05 14:53:45 -08:00
Abhinandan Prateek c4f624e7c9 bug 8313: ldap authentication, still need to fix the MD5 encoded password, cuurent authenticator only works with plaintext password 2011-12-04 15:11:06 +05:30
frank d343af96e5 change allocationState of HostResponse to resourceState 2011-12-01 13:53:07 -08:00
Naredula Janardhana Reddy 09905b641b bug 10617: merge code from branch bug10617. 2011-12-01 14:17:52 +05:30
Naredula Janardhana Reddy e4b5a62402 bug 10796: merging code from branch 2011-11-30 15:03:43 +05:30
Alena Prokharchyk fc2b95d9c3 Fixed NPE in listIso API 2011-11-24 10:27:00 -08:00
Alena Prokharchyk 38b25f3466 bug 11289: return only Free ip addresses as available Ips as a part of listAccounts 
status 11289: resolved fixed
 2011-11-22 15:25:45 -08:00
Alena Prokharchyk f111d8377e bug 11702: removed obsolete ipaddress parameter from userVm response 
status 11792: resolved fixed
 2011-11-22 14:29:13 -08:00
Alena Prokharchyk 1ce1f520f1 bug 11406: don't return hypervisor type in API response 2011-11-22 14:13:07 -08:00