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

8866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alena Prokharchyk
17cca192c7 Fixed deployDB broken with the merge 2011-11-10 16:47:41 -08:00
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
Alena Prokharchyk
c6dc572ebe Fixed deploydb 2011-11-10 16:00:54 -08:00
Alena Prokharchyk
5452705175 Fixed couple of merge db schema bugs 2011-11-10 15:57:19 -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
frank
991ac4835a Bug 11933 - Unable to add Primary Storage (OCFS2) to a OVM Cluster 
Bug 11948 - Cannot add a new OVM host to an existing OVM cluster
Bug 11699 - OVM - add host previously used in other OVM cluster > host went to alert state> host cleanup procedure needed

status 11933: resolve fixed
status 11948: resolve fixed
status 11699: resolve fixed

replace ovs-agent ocfs2 functions with our implementation.
ovs-agent's implementation doesn't check error condition, it can only run if everything is correct.
we also add check for used host without clean up, clean up procedure will print out as error message

reviewed-by: edison
 2011-11-10 14:53:07 -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
b53dc42d0a bug 10617: alter the sequence of add column 2011-11-10 15:37:02 +05:30
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
Jessica Wang
d324c5d9f2 cloudStack 3.0 new UI - NaaS - Guest page - Edit action - make zone's CIDR editable here and call updateZone to update CIDR from Guest page. 2011-11-09 20:02:54 -08:00
Jessica Wang
15082f0dfc cloudStack 3.0 new UI - NaaS - Guest page - Edit action. 2011-11-09 19:48:40 -08:00
Jessica Wang
24a5fe3924 cloudStack 3.0 new UI - NaaS - Public page - fix a bug that no data showed in details tab. 2011-11-09 19:34:42 -08:00
Brian Federle
cbf212844d Allow custom data to be passed to detail view actions, via dataProvider 2011-11-09 19:25:11 -08:00
Sheng Yang
4ea3aaeb18 NaaS: Add checking for gateway service in update network offering 2011-11-09 19:14:16 -08:00
Jessica Wang
d7edcd6957 cloudStack 3.0 new UI - NaaS 2011-11-09 19:12:11 -08:00
Sheng Yang
5c1773dd26 NaaS: Add response for VirtualRouterProvider 2011-11-09 18:52:34 -08:00
Brian Federle
e62ce165f5 Pass correct context 2011-11-09 18:46:51 -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
Brian Federle
2a13268fe3 Add system configuration forms for public, management, guest; add list view support for network providers 2011-11-09 16:12:30 -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
Jessica Wang
3937f5d5cc cloudStack 3.0 new UI - Disk offering page - add details tab, Edit action, Delete action. 2011-11-09 14:03:45 -08:00
Sheng Yang
b85744859f NaaS: Set new added virtual router element enabled by default 2011-11-09 13:56:35 -08:00
Kelven Yang
bf3664574a Revert the temporary build fix (don't expose ID unneccessarily to outside) 2011-11-09 13:51:10 -08:00
Kelven Yang
24a6c2f528 Revert the temporary build fix after the root cause in ApiDocWriter is addressed 2011-11-09 13:47:52 -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
Jessica Wang
a6d90ca1fd cloudStack 3.0 new UI - system service offering page - add details tab, Edit action, Delete action. 2011-11-09 10:38:22 -08:00
Jessica Wang
dd3757af94 cloudStack 3.0 new UI - service offering page - implement Delete action. 2011-11-09 10:24:19 -08:00