apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,866 Commits 304 Branches 324 Tags
Commit Graph

4088 Commits

Author SHA1 Message Date
Sheng Yang
8b9b2d0f1a Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 
Conflicts:
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
 2011-11-10 16:40:54 -08:00
Sheng Yang
bde1f6d2de Merge branch 'networkasservice' 
Conflicts:
	api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java
	api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	setup/db/create-schema.sql
 2011-11-10 16:36:08 -08:00
Alena Prokharchyk
88cdd9f2cf removed unused fields from networkVO 2011-11-10 16:28:42 -08:00
Edison Su
6d5c27c1e3 bug 11981: upgrade snapshot version number from 2.1 to 2.2 if it's a root volume 
status 11981: resolved fixed
Reviewed-by: Anthony
 2011-11-10 16:22:37 -08:00
Alena Prokharchyk
a1e247ad03 Renamed the field in NetworkOfferingVO 2011-11-10 16:13:31 -08:00
Alex Huang
3ecceedf34 Changed to use resource manager 2011-11-10 15:50:08 -08:00
Alex Huang
d6c22c42fe Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-11-10 15:26:39 -08:00
Alex Huang
f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Murali Reddy
122b62066a bug 11817: NAAS: device allocation logic 
- adding a allocation state to device
 - change device allocation logic based on network offering  and device state
 2011-11-10 09:55:23 -08:00
Naredula Janardhana Reddy
02adbd4bd3 bug 10617: merging code from branch bug10617 2011-11-10 15:23:48 +05:30
Abhinandan Prateek
a2499c9e69 bug 11910: during full sync ignoring VMs which have been into starting state shortly 
reviewed-by: kishan
 2011-11-10 12:00:10 +05:30
Sheng Yang
4ea3aaeb18 NaaS: Add checking for gateway service in update network offering 2011-11-09 19:14:16 -08:00
Sheng Yang
5c1773dd26 NaaS: Add response for VirtualRouterProvider 2011-11-09 18:52:34 -08:00
Murali Reddy
53a636518f NAAS: changing sharedsourcenat capability to sourceNat service and changin serviceCapablityList parameter to one level map 2011-11-09 18:44:18 -08:00
Sheng Yang
47114af94b NaaS: Add redundant capability for Gateway service 2011-11-09 17:09:46 -08:00
Sheng Yang
bc86800d30 NaaS: Remove Redundant Virtual Router element 
Would use capability instead.
 2011-11-09 17:09:38 -08:00
Sheng Yang
d6d878c250 NaaS: Refactor capability map of network offering 2011-11-09 17:09:30 -08:00
Sheng Yang
c3c6e4f57a NaaS: Remove unused code 2011-11-09 17:09:23 -08:00
Sheng Yang
9b8f96c06d NaaS: Merge Role.DHCP_USERDATA and Role.DHCP_FIREWALL_LB_USERDATA to Role.VIRTUAL_ROUTER 2011-11-09 17:09:17 -08:00
Alena Prokharchyk
79e13ec3f7 Added support for listing networks based on the supported services information 2011-11-09 16:41:15 -08:00
Alena Prokharchyk
0228bca0c2 Use type instead of guestType in network API response (just the way it was done in 2.2.x) 2011-11-09 15:29:13 -08:00
Sheng Yang
29fbb8fa5a NaaS: Add check for domr start up command 
DomR may only responsible for a part of them, determined by the service DomR
provided.
 2011-11-09 15:24:43 -08:00
Sheng Yang
0876cbeda7 NaaS: Rename VirtualRouterProviderType 2011-11-09 15:24:28 -08:00
Sheng Yang
c09b2b94b3 NaaS: Add ElbVm to Virtual Router Provider 2011-11-09 15:23:33 -08:00
Sheng Yang
be72d81529 NaaS: Make element.prepare() contain only prepare, not DHCP or userdata apply 2011-11-09 15:23:25 -08:00
Sheng Yang
8616705293 NaaS: Add getPhysicalNetworkId() 2011-11-09 15:23:13 -08:00
Sheng Yang
b569a11e45 NaaS: Add DHCP and userdata service provider 2011-11-09 15:23:06 -08:00
Sheng Yang
58568db1d0 NaaS: Use provider() instead of explicit isRedundant flag 2011-11-09 15:23:01 -08:00
Sheng Yang
b85744859f NaaS: Set new added virtual router element enabled by default 2011-11-09 13:56:35 -08:00
Alena Prokharchyk
3c3cf26f64 Fixed API doc problem 2011-11-09 13:27:35 -08:00
Alena Prokharchyk
8d128fa737 bug 11573: made network wait timeout configurable 
status 11573: resolved fixed
reviewed-by: Alex Huang

Conflicts:

	setup/db/db/schema-2212to2213.sql
 2011-11-09 13:14:27 -08:00
Murali Reddy
aaf3b99228 NAAS: fixing NPE in createnetworkoffering with out service capabilities specified 2011-11-09 11:51:04 -08:00
Edison Su
44218ef07c bug 11919: if volume is dettached, instance id is null 
status 11919: resolved fixed
Reviewed-by: frank
 2011-11-09 10:43:32 -08:00
Alena Prokharchyk
9ae3dffee4 bug 11924: don't return ISO entries where removed != null 
status 11924: resolved fixed
reviewed by: Will Chan

Conflicts:

	server/src/com/cloud/storage/dao/VMTemplateDao.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
 2011-11-09 09:42:31 -08:00
Alex Huang
0353133369 Added ways to acquired ip to network guru 2011-11-09 09:37:22 -08:00
kishan
e331e1c80f bug 10285: Throw exception when loadbalancer API fails 
status 10285: resolved fixed
 2011-11-09 18:52:55 +05:30
Naredula Janardhana Reddy
00ea2a5995 bug 11590: 
reviewed-by: Abhi

Summary of Changes:
 while adding a primary address to the domR interface, previous primaray addresses(ip) are removed and added as with 32-bit netmask.
   This is to avoid two same ip's with different netmask attached to the interface.
 2011-11-09 16:44:47 +05:30
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
kishan
507bc20c03 bug 11938: Removed unique constraint on usage_network_offering table. 
status 11938: resolved fixed
reviewed-by: Abhi
 2011-11-09 16:28:22 +05:30
kishan
2a620fa5ed bug 10286: When router API fails, throw error instead of returning null 
status 10286: resolved fixed
 2011-11-09 15:02:43 +05:30
Alena Prokharchyk
50cf9cb8fb Removed unused code 2011-11-08 15:54:56 -08:00
Alena Prokharchyk
3aff7f00ff Re-create serviceProvider map when network is updated 2011-11-08 14:55:06 -08:00
Alena Prokharchyk
9c09c35fa5 Fixed incorrect exception method 2011-11-08 14:55:06 -08:00
Murali Reddy
db991dd8f6 NAAS : adding support for service capabilities to be specified as part of network offering 2011-11-08 13:01:44 -08:00
Alena Prokharchyk
eac54e3ad4 Don't allow to upgrade networkOfferingId and networkDomain for Shared network offerings 2011-11-08 12:33:28 -08:00
Alena Prokharchyk
5e6fedb7ff Removed unused code 2011-11-08 10:36:29 -08:00
kishan
606779b300 bug 11851: When Add VPN user fails, remove the user entry from db instead of leaving in Add state. 
status 11851: resolved fixed
reviewed-by: Abhi
 2011-11-08 15:56:16 +05:30
Alena
0785b64306 bug 11923: don't expose command name in the exception response when command is not available 
status 11923: resolved fixed
reviewed-by: Will Chan
 2011-11-07 18:00:33 -08:00
Kelven Yang
9489d6ffeb 1) Fix a serialization problem in command inherits AsyncCreateCommand. 
2) Deal with special IDs (i.e. -1) in UUID translation
 2011-11-07 18:00:14 -08:00
alena
76a3bb7581 Fixed unittest 2011-11-07 16:28:31 -08:00