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

1239 Commits

Author SHA1 Message Date
Alena Prokharchyk
0e0b75a041 Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
 2012-08-02 18:45:37 -07:00
Chip Childers
9ed5d3840a License header updates for the core folder 2012-08-02 09:22:36 -04: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
anthony
d49776938b CS-15713 : remove listen section, when ld is removed 2012-08-01 17:22:34 -07:00
Koushik Das
3f571684aa CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above 
Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.

Signed-off-by: Koushik Das <Koushik.Das@citrix.com>
 2012-08-01 19:39:30 +05:30
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
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
anthony
f44ce52b87 CS-15555 : typo 2012-07-27 16:56:40 -07:00
anthony
1261f0c821 KVM : fix, can boot user VM 2012-07-27 16:56:39 -07:00
anthony
0021192b05 KVM fix 2012-07-27 16:54:05 -07:00
Sheng Yang
8eee8f342e S2S VPN: CS-15650: Add connection status update to s2s vpn 2012-07-27 16:28:06 -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
chip.childers@gmail.com
ad9cf9dc28 Corrected license that was inappropriately changed to ASF. 
This file is licensed from F5, and needs to be reviewed.
 2012-07-26 22:58:47 -04:00
Wido den Hollander
406fd95d87 Add RBD support for primary storage 
This patch adds RBD (RADOS Block Device) support for primary storage in combination with KVM.

To get this patch working you need:
- libvirt-java 0.4.8
- libvirt with RBD storage pool support (>0.9.13)
- Qemu with RBD support (>0.14)

The primary storage does not support all the functions of CloudStack yet, for example snapshotting is disabled
due to the fact that backupping up a RBD snapshot is not possible in the way CloudStack wants to do it.

Creating templates from RBD volumes goes well, creating a VM from a template however is still a hit-and-miss.

NFS primary storage is also still required, you are not able to run your System VM's from RBD, they will need
to run on NFS.

Other then these points you can run instances with RBD backed disks.
 2012-07-26 22:22:26 +02: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
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
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
David Nalley
1581d65c99 License header updates for the core folder from Chip Childers 
https://reviews.apache.org/r/5705/
 2012-07-02 09:54:47 -04:00
Alena Prokharchyk
1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Alena Prokharchyk
634cd78baa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
 2012-06-28 17:41:40 -07:00
Alena Prokharchyk
1a232171eb VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done 2012-06-28 10:11:41 -07:00
Murali reddy
8197f1f07c moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware 2012-06-26 19:48:55 -07:00
Murali reddy
550b22576f Moving out XenServer support code into plugins/hypervisors/xen 2012-06-26 16:42:31 -07:00
David Nalley
5f0ece8014 fixing line encoding 2012-06-26 10:45:51 -04:00
Murali reddy
392ae5cb13 moving out Srx code into Plugins/network-elements 2012-06-25 16:55:53 -07:00
Murali reddy
422c4ce513 moving out F5 code from server into plugins/network-elements/f5/ 2012-06-23 14:16:59 -07:00
Murali reddy
49b88472a5 moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler 2012-06-21 18:57:18 -07:00
Edison Su
e7995d09dc CS-15281: Removal of third party dependencies in Citrix code base. 
[Problem]
CloudStack uses a significant amount of third party software.  As part of the move to ASF there is a certain set of licenses that are compatible with ASF policy.  We need to make sure that every dependency we have is in that set. If it's not we have to remove it.

[Solution]
First set: Removing JnetPcap.

[Reviewers]
Edison Su, David Nalley

[Testing]
    [Test Cases]
     Executed ANT build-all sucessfully after removing JnetPcap and its respective dependencies.

    [Platform]
     Fedora release

Signed-off-by: Pradeep <pradeep.soundararajan@citrix.com>
 2012-06-21 10:03:37 -07:00
Alena Prokharchyk
374a600746 VPC: initial checkin for network ACLs 
Conflicts:

	client/tomcatconf/commands.properties.in
 2012-06-20 17:19:49 -07:00
Alena Prokharchyk
982562b9fb VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip) 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-15 14:31:58 -07:00
anthony
95faedc09f VPC : bug fix 2012-06-15 14:29:47 -07:00
anthony
edbf4a0ba7 VPC : many debug fix 2012-06-15 14:26:41 -07:00
anthony
fb72b7e31b VPC : get correct guest gateway 2012-06-15 14:26:31 -07:00
anthony
a4d0f91cfe VPC : use routerProxy to call l2tpVpn 
Conflicts:

	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
 2012-06-15 14:26:20 -07:00
anthony
c75fe80125 VPC : use routerProxy to call networkUsage.sh 
Conflicts:

	core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
 2012-06-15 14:25:21 -07:00
anthony
251a91f5b3 VCP : use routerProxy to call checkrouter script 2012-06-15 14:24:18 -07:00
anthony
f5056d4898 VPC : implement SetupGuestNetworkCommand 2012-06-15 14:23:00 -07:00
anthony
8c1700a3a4 VPC : introduce router_proxy.sh, resource should use this as a proxy to call scripts inside domr 
already did this for ipassoc and getDomRVersion
 2012-06-15 14:22:49 -07:00
anthony
daf1aa4b92 VPC, implement plug/unplug nic 2012-06-15 14:22:29 -07:00
Alena Prokharchyk
72974831a0 Modified virtual router startup procedure - initial start happens with control nic only; then we plug Public and then Guest nic to it 2012-06-15 14:22:19 -07:00
Alena Prokharchyk
0a7faa9838 Support for adding private network 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
 2012-06-15 14:20:34 -07:00
Alena Prokharchyk
d9fd7e02a5 Plug nic support 
Conflicts:

	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/storage/secondary/SecondaryStorageManagerImpl.java
 2012-06-15 14:07:46 -07:00
Alena Prokharchyk
f4060c3c1d 1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support 
2) Added services api support for plugging/unplugging the nics to VpcElement

Conflicts:

	api/src/com/cloud/network/NetworkService.java
	core/src/com/cloud/vm/VMInstanceVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-06-15 14:04:09 -07:00
Alena Prokharchyk
9debd3a5df 1) Added start logic to the VPC 
2) VirtualRouterManagerImpl - refactored deployVirtualRouter method
3) Added vpcId to domain_router/user_ip_address tables and corresponding vo objects

Conflicts:

	server/src/com/cloud/network/IPAddressVO.java
 2012-06-15 13:56:05 -07:00
Alena Prokharchyk
998cf66e6c Removed network_id reference from domain_router table as now VirtualRouter can be associated with multiple networks (VPC case). Code modifications were done accordingly to the places where this field was used. 
Router->Networks (one to many) are held in router_network_ref table now
 2012-06-15 13:54:48 -07:00
anthony
5f3e0c5783 CS-15155 : after system VMs boot up, destroy CD virtual device for System VM 
when reconnect XenServer host, try to destroy CD virtual device for System VM, this is for upgrade
 2012-06-15 11:27:53 -07:00
anthony
2af6789020 CS-12972 : cap is per VM , weight is per VCPU 2012-06-14 18:28:33 -07:00
Edison Su
3a89d33e92 CS-14826 
fix typo
Reviewed-by: sheng
 2012-06-14 14:27:49 -07:00
Kelven Yang
8b6936bde6 CS-15080: VMware control network is CloudStack management network, correct the way to send down a correct traffic label to VMware resource 
Reviewed-by: Anthony
 2012-06-06 16:57:27 -07:00
Kelven Yang
874544fd64 bug CS-15119: check previously named datastore before we mount new one to support backwards compatibility 
Reviewed-by:Anthony
 2012-06-06 16:56:41 -07:00