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
12,898 Commits 304 Branches 324 Tags
Commit Graph

70 Commits

Author SHA1 Message Date
Alena Prokharchyk
95449da4be Merge branch 'master' into vpc 2012-08-07 11:37:45 -07:00
Chip Childers
81ff7a09fd CS-15875 resolved via patch from Andy Gross. 2012-08-07 14:10:11 -04:00
Wido den Hollander
5fa300cd9c kvm: Define CPU shares in domain XML 
Since libvirt 0.9.0 this can be specified in the XML.

This used to be set by invoking virsh after starting the instance, but this is cleaner.
 2012-08-07 17:49:58 +02:00
Wido den Hollander
9212995501 kvm: Fix two small typos 2012-08-07 17:19:38 +02:00
Sheng Yang
1b5103c501 S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime 2012-08-06 15:19:26 -07:00
Hugo Trippaers
dd6fd2b68d Remove XTrustProvider as this class is kept within the 
cloud-iControl.jar.
 2012-08-06 16:31:36 +02:00
Alena Prokharchyk
5a72044dc7 Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
Alena Prokharchyk
e7a1862867 VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java
 2012-08-03 14:23:45 -07:00
Chip Childers
3a882fa17c License header updates for the plugins folder. 2012-08-03 09:07:43 -04:00
anthony
9b43753399 VPC : handle Revoke rules for staticroute 2012-08-02 18:59:49 -07:00
Alena Prokharchyk
0e0b75a041 Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
 2012-08-02 18:45:37 -07:00
Wido den Hollander
1276aedd35 rbd: Remove debug line 
This is no longer needed. It was here for testing purposes, but it was actually a bug in libvirt which has been resolved.
 2012-08-02 23:05:00 +02:00
Alena Prokharchyk
ce9f1afa78 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-08-01 19:04:28 -07:00
Alena Prokharchyk
e0c85c0d41 VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands 2012-08-01 18:19:03 -07:00
Kelven Yang
1aa4ed84b9 Merge VPC support in VMware integration 2012-08-01 17:27:59 -07:00
Edison Su
05df0a1965 Another clean up for unnecessary parameter conn Clean up unused 
parameter conn. Add test for LibvirtVMDef Add support for ethernet type
RB: https://reviews.apache.org/r/6284/
Send-by: tomoe@midokura.com
 2012-08-01 13:59:11 -07:00
Wido den Hollander
2ffc9907f7 kvm: Use libvirt for polling storage pool capacity and allocation 
Since we are using libvirt for handling our storage pools we should rely on that information as well.

Before fetching the capacity we refresh the pool so libvirt has the most up-to-date information.

This is not needed with newly created pools since libvirt does a refresh on creation.
 2012-08-01 17:18:11 +02:00
Wido den Hollander
34ed15e44e kvm: Remove main methods in various classes 
This is dead code which seems to be in there from the VMOps time.

No reason for this to be here, so this can safely be removed
 2012-08-01 14:42:31 +02:00
Hugo Trippaers
65daade79a Add a "ping" function to the resource and allow commands to be retried. 2012-08-01 14:11:32 +02:00
Alena Prokharchyk
7706a9c32f Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-31 13:37:28 -07:00
Wido den Hollander
cc08eee215 plugin: Rename cloud-kvm.jar to cloud-plugin-hypervisor-kvm.jar 
This way we stay consistent with naming our plugins.
 2012-07-31 22:18:56 +02:00
Edison Su
7a0a9231c3 Move KVM related code into plugins/hypervisor/kvm, a new jar file is 
created: cloud-kvm.jar
 2012-07-30 14:55:47 -07:00
Hugo Trippaers
b4bcd7f3fe Use the name of the network (or uuid) as display text of the nicira logical switch. 2012-07-30 15:17:46 +02:00
Hugo Trippaers
236f63fd34 When cleaning up or setting ip associations the NiciraNvpElement should be ignored. 
Implemented a generic ConnectivyProvider interface work around the dependency from server to nicira-plugin.
 2012-07-30 15:17:35 +02:00
kishan
9611a017e9 bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:37:46 -04:00
olgasmola
12c7fb3625 Fix build script typo. 2012-07-27 23:37:45 -04:00
Sheng Yang
8eee8f342e S2S VPN: CS-15650: Add connection status update to s2s vpn 2012-07-27 16:28:06 -07:00
anthony
2fc1dc0df6 VPC : vpc integration code for XenServer hypervisor 2012-07-27 15:54:30 -07:00
Alena Prokharchyk
a39fd61249 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
 2012-07-27 13:47:46 -07:00
kishan
468f2720eb bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:13:18 +05:30
olgasmola
c1989a5e5f Fix build script typo. 2012-07-27 16:36:02 +03:00
Edison Su
764678f558 CS-15521 Xenserver based User VM failed to HA when vrouter runs on ESXi 
return false as an answer when executing PingTestCommand in
VMwareResource
RB:https://reviews.apache.org/r/5903/
Send-by: mice_xia@tcloudcomputing.com
 2012-07-26 10:43:33 -07:00
Alena Prokharchyk
6420ecbd6f Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-24 16:13:06 -07:00
Edison Su
576d093e9c fix CS-15432 Failed to detach VMware tools ISO after VMware tools 
installation
RB: https://reviews.apache.org/r/5738/
Send-by: mice_xia@tcloudcomputing.com
 2012-07-24 13:44:55 -07:00
David Nalley
4421cd9dee fixing a few more license headers 2012-07-24 10:47:03 -04:00
Sheng Yang
f1e2be7157 CS-15511: Fix parameter transfer in bash 
[Dropped Vmware support in this commit, due to lack of VMware support in VPC now]

Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
 2012-07-23 14:51:40 -07:00
bfederle
c8f72c9198 Merge branch 'master' into vpc 
Conflicts:
	ui/scripts/network.js
 2012-07-23 10:36:25 -07:00
David Nalley
67bc9c819a fixing some more license headers 2012-07-20 15:59:31 -04:00
Alena Prokharchyk
a1acfd3bfa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
 2012-07-13 13:52:58 -07:00
Hugo Trippaers
79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
Edison Su
8b7b838c8a CS-15544: recreate router if router filesystem is crashed 2012-07-11 16:14:28 -07:00
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
Edison Su
27e9cdbece add console proxy support for devcloud 2012-07-03 23:38:39 -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
Vijayendra Bhamidipati
b957933a0e Making nexus vsm password encryptable 2012-07-03 17:26:05 -07:00
Alena Prokharchyk
40a3482f13 VPC: multiple fixes: 
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
 2012-07-02 17:44:54 -07:00
Sheng Yang
8d4079d477 CS-6840: Add hypervisor commands for site-to-site vpn 
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 2012-07-02 16:28:44 -07:00
Murali reddy
9876d34ea4 moving out ELB network element to plugins/network-elements/elastic-loadbalancer 2012-07-02 15:05:58 -07:00
Murali reddy
8aa2b55dd6 moving out NetApp code to plugins/file-systems/netapp 2012-07-02 08:34:02 -07:00