etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,372 Commits 325 Branches 325 Tags 885 MiB
Commit Graph

380 Commits

Author SHA1 Message Date
Murali Reddy 0f9f428ad1 Merge branch 'master' into events-framework 
Conflicts:
	api/src/com/cloud/event/EventTypes.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	tools/whisker/LICENSE
	tools/whisker/descriptor-for-packaging.xml
 2013-01-31 19:52:27 +05:30
Jayapal b6727e5646 CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
Rohit Yadav d7ad2da7e0 server: Fix network refactor regressions for CLOUDSTACK-297 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-30 17:33:53 -08:00
David Nalley 1b39b0e908 fixing licensing headers 2013-01-29 23:45:11 -05:00
frank 1f7eaf3d61 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

merge baremetal feature to master
 2013-01-29 17:19:57 -08:00
Min Chen 85de14f6a4 Increase sleep time to allow token expire to account for windows 
environment clock issue.
 2013-01-29 11:19:09 -08:00
Min Chen 1c20c80cb5 Fix unit test failure only on Windows environment. 2013-01-29 11:09:06 -08:00
Marcus Sorensen 482ce5fe07 Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
 2013-01-28 21:21:30 -07:00
Murali Reddy 053b6bd636 publish state change events on Network and VirtualMachine resource state 
changes
 2013-01-28 17:02:21 +05:30
Murali Reddy b03744ab0d added entity details corresponding to each event. Entity represents the 
resource for which event is generated.
 2013-01-27 22:42:00 +05:30
Murali Reddy 73e6efdecd - changes to publish UUID instead of id's in the event message 
- action, usage events will publish resource name, resource UUID in the
  message
 2013-01-27 03:07:26 +05:30
Murali Reddy ffd55c4ee1 Merge branch 'master' into events-framework 
Conflicts:
	client/tomcatconf/components.xml.in
 2013-01-25 14:26:41 +05:30
Murali Reddy 2dd40c2823 -Added recoonect logic using shutdown listner in RabbitMQEventBus 
-changed EventBus interface method signtures to return/take UUID for
subscriber management
 2013-01-25 14:18:49 +05:30
Rohit Yadav 34f3e1c9a1 ApiDiscoveryServiceImpl: Fix fields variable definition from array to set 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Hugo Trippaers 363182cf76 Merge remote-tracking branch 'origin/master' into cloud-agent-with-openvswitch 2013-01-23 08:09:33 +01:00
Rohit Yadav 6482e27081 ApiDiscovery: Add mockito, unit test for ApiDiscovery service impl 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 14:28:31 -08:00
Rohit Yadav 26d8113f99 plugins: Indentation fix for pom.xml, add build/test rules for api discovery 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 14:28:31 -08:00
Rohit Yadav 179db40e3a ApiDiscovery: Fix response and service impl to make them test-able 2013-01-22 14:28:30 -08:00
Hugo Trippaers a0373fe1ff Summary: Apply feedback from Wido 
Better checking on VlanID

Correct speling mistake
 2013-01-21 12:34:20 +01:00
Hugo Trippaers 04f82623f6 Merge branch 'master' into cloud-agent-with-openvswitch 
Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 2013-01-21 12:18:21 +01:00
Marcus Sorensen a65b584d18 Summary: Fix bridge parsing when bridge names are subsets of others 
Detail: There are several places in the code that do a
"brctl show | grep bridgeName" or similar, which causes all sorts
of problems when you have for example a cloudVirBr50 and a
cloudVirBr5000. This patch attempts to stop relying on the output
of brctl, instead favoring sysfs and /sys/devices/virtual/net.
It cuts a lot of bash out altogether by using java File. It was
tested in my devcloud-kvm against current 4.0, as well as by the
customer reporting initial bug.

BUG-ID: CLOUDSTACK-938
Fix-For: 4.0.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
 2013-01-18 18:28:08 -07:00
Min Chen 5a865462e9 Merge branch 'api_limit' 2013-01-18 09:43:54 -08:00
Koushik Das 070856affd CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version 
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-01-18 16:49:52 +05:30
Marcus Sorensen 55e8965bd0 Summary: Pass StoragePoolType that maps to libvirt in cleanupDisk 
Description: When selecting a storage adaptor, cleanupDisk assumes that
libvirt is being used. Therefore, we pass a StoragePoolType that maps to
libvirt. This is the only place in LibvirtComputingResource where the
StoragePoolType can't be pulled from somewhere else.

BUG-ID: CLOUDSTACK-1011
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
 2013-01-18 00:20:34 -07:00
Murali Reddy 28738e4e22 Merge branch 'master' into events-framework 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
 2013-01-18 12:07:19 +05:30
Min Chen 2fd1d476b4 Merge branch 'master' into api_limit 2013-01-17 21:23:50 -08:00
Min Chen 805261a93f Change a debug message to TRACE level. 2013-01-17 15:16:50 -08:00
Min Chen 86ada92ffa Fix some bugs and add java integration test for api rate limit plugin. 2013-01-17 15:13:51 -08:00
Chiradeep Vittal 56cd809600 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Re-merge with network-refactor
 2013-01-17 11:32:49 -08:00
Murali Reddy 053831b0aa Merge branch 'master' into events-framework 
Conflicts:
	api/src/com/cloud/network/Network.java
	plugins/pom.xml
	server/pom.xml
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
 2013-01-17 23:56:37 +05:30
Min Chen c1a540c6bb Merge branch 'master' into api_limit 
Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-16 22:48:22 -08:00
Min Chen 3dabd5fbf3 Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException 
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-16 22:36:34 -08:00
Min Chen 06fa338d42 Add some tests for api rate limit plugin. 2013-01-16 21:56:25 -08:00
Min Chen bdcfa1919b Clean up ApiServer, ApiServlet and ApiDispatcher in handling various 
exceptions, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.
 2013-01-16 21:52:48 -08:00
Chiradeep Vittal cadca5fc0c Merge branch 'master' into network-refactor-merge2 
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 2013-01-16 19:17:14 -08:00
Marcus Sorensen 975021dda1 Summary: adding resizeVolume api call 
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.

BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
 2013-01-16 17:43:35 -07:00
Min Chen e83fe471c7 Merge branch 'master' into api_limit 2013-01-16 10:49:25 -08:00
Murali Reddy 88a0b5ac48 Revert "Summary: partical check-in for L4-L7 network services in the shared" 
This reverts commit 6657246cd4.

Reverting due to IP clearance issued for the commit done as part of CLOUDSTACK-312
 2013-01-16 16:05:17 +05:30
Min Chen 97cb16944f Merge branch 'master' into api_limit 2013-01-15 18:18:34 -08:00
Min Chen 8608925216 Consolidate RuntimeCloudException and CloudRuntimeException into one 
class CloudRuntimeException, and removed RuntimeCloudException to avoid
confusion.
 2013-01-15 18:07:08 -08:00
Rohit Yadav f6a8b45de5 ApiDiscovery: Use UserContext getCallerUser, do a lazy eval to get account service 
Impl. and use UserContext to get User.
CloudStack's @Inject is horrible, it may sometimes fail to inject account service
during startup. Do a lazy injection using ComponentLocator when needed.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-15 16:11:51 -08:00
Min Chen 4355d06a86 Reuse APIChecker adapter interface for APi Rate limit checking and optimize ApiRateLimitService interface. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-15 15:53:19 -08:00
anthony a6b9027630 default Security rule doesn't apply to system VMs since nic.getIsolationUri is not set 
use to.setSecurityGroupEnabled to indicate if securitygroup is enabled on this NIC

CLOUDSTACK-983: default Security rule doesn't apply to system VMs
 2013-01-15 11:15:42 -08:00
Wido den Hollander 95222cdb6d Templates: Add Ubuntu 12.04 to the templates 
Although I still think the templates aren't well maintained, I just
added 12.04 since this is an LTS and people probably want it in the
list of templates.

This system should be more generic I think though.
 2013-01-15 13:25:48 +01:00
Hugo Trippaers 2d69a1855d Summary: Begone pesky tabs 2013-01-15 10:00:58 +01:00
Hugo Trippaers 9f00302ad3 Summary: Polish and shine 
Document the used options in agent.properties

Default the bridge driver to something sensible based on the
configuration of the bridge type.
 2013-01-15 09:18:24 +01:00
Hugo Trippaers 4267a3fc7c Summary: copy/paste error 2013-01-15 09:18:24 +01:00
Hugo Trippaers 87fe646953 Summary: small fix causing trouble when shutting down virtual machines 2013-01-15 09:18:24 +01:00
Hugo Trippaers e0ecf7b834 Summary: Add vlan configuration to the network inteface definition 
Add xml piece for defining vlans

Set vlan tag in the libvirt definition for the network inteface
 2013-01-15 09:18:24 +01:00
Hugo Trippaers 68523e641f Summary: Add initial support for OpenVswitch to the KVM hypervisor 
Create OvsVifDriver to deal with openvswitch specifics for plugging
intefaces

Create a parameter to set the bridge type to use in
LibvirtComputingResource. 
Create several functions to get bridge information from openvswitch

Add a check to detect the libvirt version and throw an exception when
the version is to low ( < 0.9.11 )

Fix classpath loading in Script.findScript to deal with missing path
separators at the end.

Add notification to the BridgeVifDriver that lswitch broadcast type is
not supported.
 2013-01-15 09:18:24 +01:00