Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							08160fa882 
							
						 
					 
					
						
						
							
							Fixed responsename for VirtualRouter element  
						
						
						
						
					 
					
						2011-11-11 11:03:01 -08:00 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							f1b99f4f07 
							
						 
					 
					
						
						
							
							Revert "bug 10617: merging code from branch bug10617"  
						
						... 
						
						
						
						This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2011-11-11 20:23:26 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7adedca8a3 
							
						 
					 
					
						
						
							
							NaaS: Update listVirtualRouterElements to accept nspid as parameter  
						
						... 
						
						
						
						Also fix VirtualRouterProviderResponse by adding objectName. 
						
						
					 
					
						2011-11-10 17:26:11 -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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							02adbd4bd3 
							
						 
					 
					
						
						
							
							bug 10617: merging code from branch bug10617  
						
						
						
						
					 
					
						2011-11-10 15:23:48 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							d6db4a686e 
							
						 
					 
					
						
						
							
							Bug 11313 - Add an account param/detail/map in the XXXAccount API calls  
						
						... 
						
						
						
						status 11313: resolved fixed 
						
						
					 
					
						2011-11-07 14:24:36 -08:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							6dcc1691a1 
							
						 
					 
					
						
						
							
							Added missing guest type to the network response  
						
						
						
						
					 
					
						2011-11-07 10:53:28 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7e9b210d5c 
							
						 
					 
					
						
						
							
							bug 6745: Fix problems in Async create commands  
						
						
						
						
					 
					
						2011-11-03 07:34:02 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							79e39c20fb 
							
						 
					 
					
						
						
							
							Fixes on merged result  
						
						
						
						
					 
					
						2011-11-03 07:34:01 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							924e556c95 
							
						 
					 
					
						
						
							
							bug 6745: Using UUID instead of integers - for all commands  
						
						
						
						
					 
					
						2011-11-03 07:34:00 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d8775b533 
							
						 
					 
					
						
						
							
							bug 6745: Using UUID instead of integers - for Async Jobs  
						
						
						
						
					 
					
						2011-11-03 07:33:58 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6f14bdc361 
							
						 
					 
					
						
						
							
							bug 6745: Using UUID instead of integers - for System VM s  
						
						
						
						
					 
					
						2011-11-03 07:33:57 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fa2dd8e93a 
							
						 
					 
					
						
						
							
							bug 6745: Using UUID instead of integers - for VM instances  
						
						
						
						
					 
					
						2011-11-03 07:33:56 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							6aa743165a 
							
						 
					 
					
						
						
							
							Changes  to support Enable/ Disable services of a service provider added to physical network:  
						
						... 
						
						
						
						- ListSupportedNetworkServiceProvidersCmd will now return Providers along with its element's services and boolean 'canEnableIndividualServices' that indicates if for this Provider services can be enabled/disabled
- add & update NetworkServiceProvider changed to take in the list of services to enable. While adding a provider, if list is null then all services supported by the element are enabled by default.
- ListNetworkServices enhanced to take in a provider name and returns services of that specific provider. 
						
						
					 
					
						2011-11-01 18:03:55 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							346a6fe80a 
							
						 
					 
					
						
						
							
							Fixed NPE.  
						
						
						
						
					 
					
						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 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9a668416f8 
							
						 
					 
					
						
						
							
							Swift: List ISO fix  
						
						
						
						
					 
					
						2011-10-31 11:10:28 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							818df189c5 
							
						 
					 
					
						
						
							
							changes to Create Vlan & Public IPs  
						
						
						
						
					 
					
						2011-10-31 09:53:25 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							bbbfdd52ec 
							
						 
					 
					
						
						
							
							bug 10848: Minor fixes.  
						
						
						
						
					 
					
						2011-10-31 17:00:11 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							07e44e3a23 
							
						 
					 
					
						
						
							
							bug 11311: change list vm call to provide less info  
						
						
						
						
					 
					
						2011-10-30 16:25:57 +05:30 
						 
				 
			
				
					
						
							
							
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							a572205e3c 
							
						 
					 
					
						
						
							
							Revert "bug 11311: vm summary command initial impl"  
						
						... 
						
						
						
						This reverts commit 0abc7e2ea8b9e222f1927aea72d46240bfe8c534. 
						
						
					 
					
						2011-10-30 15:13:58 +05:30 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2b039530c0 
							
						 
					 
					
						
						
							
							Swift : list Template  
						
						
						
						
					 
					
						2011-10-28 16:07:31 -07:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							f456462443 
							
						 
					 
					
						
						
							
							bug 11311: vm summary command initial impl  
						
						
						
						
					 
					
						2011-10-28 14:07:19 +05:30 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b413a625f4 
							
						 
					 
					
						
						
							
							1) replaced joinProject API with updateProjectInvitation api. You can accept/decline the invitataion with this command  
						
						... 
						
						
						
						2) Added deleteProjectInviation command. Can be executed by project admin only 
						
						
					 
					
						2011-10-27 18:32:00 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							6d5601a84d 
							
						 
					 
					
						
						
							
							Added commands and framework for PhysicalNetwork trafficTypes  
						
						
						
						
					 
					
						2011-10-27 17:32:15 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d315e57b0e 
							
						 
					 
					
						
						
							
							Renamed "type" to "guestType"  
						
						
						
						
					 
					
						2011-10-27 16:51:42 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							fe0b685e95 
							
						 
					 
					
						
						
							
							Security group is a service now  
						
						
						
						
					 
					
						2011-10-27 16:49:20 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d1141aff7d 
							
						 
					 
					
						
						
							
							Swift : add Swift api  
						
						
						
						
					 
					
						2011-10-27 11:48:48 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							cef30956e9 
							
						 
					 
					
						
						
							
							Merge branch 'newagentmgr'  
						
						... 
						
						
						
						Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java 
						
						
					 
					
						2011-10-27 11:09:56 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							f85d558b6e 
							
						 
					 
					
						
						
							
							bug 10774: Introduce percentage in list commands and cluster id in alert table  
						
						
						
						
					 
					
						2011-10-27 11:23:57 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							b336a8b813 
							
						 
					 
					
						
						
							
							bug 10774: On removing storage, local storage, cluster handle deletion of corresponding op_host_capacity rows.  
						
						
						
						
					 
					
						2011-10-27 11:23:43 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							9c20c1b1b6 
							
						 
					 
					
						
						
							
							bug 10848: ListCapacity - Full rework. This fixes the pagination logic and the capacities are visible till the cluster level.  
						
						
						
						
					 
					
						2011-10-27 11:18:56 +05:30 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							75c8e33226 
							
						 
					 
					
						
						
							
							Removed guestIpType from network/networkOffering  
						
						
						
						
					 
					
						2011-10-24 17:05:00 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							30f95e638a 
							
						 
					 
					
						
						
							
							Bug 11522 - New agent manager  
						
						... 
						
						
						
						1. get rid of host allocation state
2. remove Updating status from agent status 
						
						
					 
					
						2011-10-24 16:49:32 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							92eaf49f29 
							
						 
					 
					
						
						
							
							Add storage migration  
						
						
						
						
					 
					
						2011-10-24 15:59:47 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							219978a9be 
							
						 
					 
					
						
						
							
							Create network using physical network id  
						
						
						
						
					 
					
						2011-10-20 18:25:13 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							654eaec663 
							
						 
					 
					
						
						
							
							NAAS: Configuring Zone  
						
						... 
						
						
						
						- Create Zone changes and changes to data_center table to remove vlan, securityGroup fields
- Physical Network lifecycle APIs
- Physical Network Service Provider APIs
- DB schema changes 
						
						
					 
					
						2011-10-19 22:44:03 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							c5acad39d9 
							
						 
					 
					
						
						
							
							Make Guest Direct security group enabled network offering system by default - we'll make it non-system after getting rid of Basic/Advance zone concepts  
						
						
						
						
					 
					
						2011-10-19 17:34:21 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							ceda05298e 
							
						 
					 
					
						
						
							
							Deprecate guestIpType in networkOffering api. Use type (Shared/Isolated) instead  
						
						
						
						
					 
					
						2011-10-19 16:38:39 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							972caf1936 
							
						 
					 
					
						
						
							
							bug 11777: resolved NPE in listIsos - get domain id from the iso's account owner object  
						
						... 
						
						
						
						status 11777: resolved fixed 
						
						
					 
					
						2011-10-19 10:43:36 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							c00058adc2 
							
						 
					 
					
						
						
							
							Added type (Shared/Isolated) to the networkOffering/networks  
						
						
						
						
					 
					
						2011-10-13 17:33:41 -07:00