285 Commits

Author SHA1 Message Date
Sheng Yang
2d2c0c48cd Merge branch 'pvlan'
Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2013-05-15 16:08:08 -07:00
Harikrishna Patnala
ffe90c0059 CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host
Fixed by updating the patch files that has
 entries to copy scipts on xenserver. Here we added
 Add-To-VCPUs-Params-Live.sh

Added a check on Host params whether host restricts Dynamic memory control(DMC) to able to allow scale up VM.
If DMC is not enabled then static max and min are set to SO.

Signed Off by - Nitin Mehta <nitin.mehta@citrix.com>
2013-05-15 16:17:21 +05:30
Anthony Xu
1518e7ee43 CLOUDSTACK-2115: remove the trailing '\n' to get correct XS network mode 2013-05-14 17:52:10 -07:00
Bharat Kumar
052c24c4d1 CLOUDSTACK-702: Multiple ip ranges in different subnets.
This feature enables adding of guest ip ranges (public ips)  form different subnets.

In order to provide the dhcp service to a different subnet we create an ipalias on the router. This allows the router to listen to the dhcp request from the guest vms and respond accordingly. Every time a vm is deployed in the new subnet we configure an ip alias on the router. Cloudstack uses dnsmasq to provide dhcp service. We need to configure the dnsmasq to issue ips on the new subnets. Added a new class dnsmasqconfigurator which generates the dnsmasq confg file, this file replaces the old config in the router.

The details of the alias ips are stored in db in the nic_ip_alias table. Every time a new subnet is added one of the ip from the subnet is used to configure the ip alias.

I have pushed the code to  https://github.com/bvbharatk/cloud-stack/tree/Cloudstack-702 , also rebased the code with master.
I need to test the code for advanced sg enabled network using kvm.

I have added the unit test
Marvin tests are at https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=53e4965

Also accomodated some of the changes suggested by koushik.
corrected the import statements. renamed the IpAlias command to createIpAlias command.

This feature supports only ipv4
2013-05-13 17:06:44 +05:30
Sheng Yang
3c3d67769b PVLAN: PvlanSetupCommand for KVM support 2013-05-01 13:23:09 -07:00
Sheng Yang
40386fc4cb PVLAN: Add network label parameter to PvlanSetupCommand
We need it to find the real bridge/switch to program on the OVS.
2013-05-01 13:23:09 -07:00
Sheng Yang
05885457ec PVLAN: Simplify OVS policy
We can resubmit the packet against the flow table to get simplier result.

Now we don't need to check if VM is in the same host as DHCP server or not.
2013-05-01 13:23:08 -07:00
Sheng Yang
b64039bafd Implement PVLAN on Xen
Start/stop vm/dhcp server are done. Not done with VM migration.

A new command(PvlanSetupCommand) is sent for setting up PVLAN for vms. Currently
it's focus on OVS implementation. Need to be more abstruct and add vSwitch part.
2013-05-01 13:23:08 -07:00
Nitin Mehta
3e4430d811 CLOUDSTACK-658 - Scaleup vm support for Xenserver
Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests.
2013-03-28 16:43:37 +05:30
Deepti Dohare
d5cb32f159 Multiple Secondary Storage Issue 2013-03-14 21:08:27 -04:00
Jayapal Uradi
a49261c3b1 CLOUDSTACK-24: mipn feature for basiczone
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-03-13 10:24:22 +05:30
Brenn Oosterbaan
e8b6f66582 Review 9647: In some storage failure scenario’s the NFS timeout can
cause writing the heartbeat to take longer than expected. By comparing
the last successful heartbeat epoch with the current epoch we check if
the timeout value has been met.
2013-03-05 15:38:54 +01:00
Nitin Mehta
b12aebefee Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes"
This reverts commit e0019eccd997d9b2b3ff9395bcd99f821f5121db.
2013-03-04 23:32:52 +05:30
Nitin Mehta
e0019eccd9 CLOUDSTACK-658 - Adding Scalevm command and XS related changes 2013-03-04 14:47:55 +05:30
Brenn Oosterbaan
c30da35811 Commit review 9586
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-02-25 14:40:15 +01:00
Mice Xia
9a12756ae4 CLOUDSTACK-684 support vm snapshot 2013-02-14 01:26:30 +08:00
anthony
db71d3da36 CLOUDSTACK-1167
remove arptables rules after VM is stopped
2013-02-05 15:07:29 -08:00
Kelven Yang
296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Devdeep Singh
e162876605 CS-16544: Create Snapshot (2nd time - reccuring) is failing on XenServer 6.1. The issue is that while backing up a snapshot when cloudstack tries to update the parent (of the backed up vhd), vhd-util isn't present at the desired location and setParent function in vmopsSnapshot fails. This issue is observed only on Xenserver 6.1. The reason for this is, when CloudStack connects to a Xenserver and executes the SetupCommand, it copies vhd-util tool to /opt/xensource/bin directory on the host. However, in vmopsSnapshot python file 'VHD_UTIL' is initialized to /usr/sbin/. The issue is not observed on 6.0.2 (and I guess previous versions) because vhd-util is present in /usr/sbin/ directory by default (after a clean install). Whereas, in Xenserver 6.1, vhd-util is present in '/usr/bin'. Fixed the issue by updating VHD_UTIL to point to /opt/xensource/bin/vhd-util in vmopsSnapshot file. 2013-02-01 15:25:26 +05:30
Alex Huang
10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Marcus Sorensen
8c5b82dfb4 Summary: several scripts are not mode executable
Detail: several scripts in the scripts directory weren't marked executable.
Normally this is handled/fixed in the packaging, but harder to deal with in
development environments, so marking them executable.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358446902 -0700
2013-01-17 11:21:42 -07:00
Alex Huang
30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Edison Su
4b2d9f4415 refactor test cases: use testNG instead of junit, as testNG can group test cases and pass parameter to test case 2012-12-22 22:10:39 -08:00
Edison Su
ac88c16be6 finaly, finish download template to primary storage 2012-12-20 19:06:02 -08:00
Edison Su
c216990e1c trying to add code to download url into devcloud 2012-12-19 18:43:04 -08:00
Edison Su
b70c1a5a84 Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
Edison Su
a9c81b6f08 fix devcloud: copy router_proxy.sh into correct place 2012-10-21 00:01:47 -07:00
Edison Su
3cd9ba46fb fix devcloud: add router_proxy.sh 2012-10-21 00:01:47 -07:00
Edison Su
c5ba6312e7 fix devcloud 2012-10-21 00:01:47 -07:00
Chip Childers
806d033fe3 CLOUDSTACK-330: Correct Citrix information to be Apache in several .py files
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 12:18:56 -04:00
Anthony Xu
acaa22003d CLOUDSTACK-184: add createFileInDomr plugin 2012-09-24 16:11:04 -07:00
Edison Su
e662790985 CLOUDSTACK-30: remove vhd-util binary, we need to build another rpm/deb for it. As it's only used by xenserver, so mgt server should not depend on it. We can document it, as an extra procedure when install mgt server 2012-09-18 17:47:22 -07:00
anthony
541fec8b46 Bug 13734 : after upgrade, dhcp traffic is allowed for all VMs
reviewed-by: kelven
2012-09-07 17:31:11 -07:00
Anthony Xu
b58123e075 CS-15921 : in 2.1 timeframe, -untagged string is appended to the end of instance name,
in cleanup_rules function, we need to convert chain name to vm name correclty
2012-09-07 17:25:41 -07:00
Anthony Xu
33fdcf1047 CS-16261:
egress_vmchain doesn't exist in 2.2.*, create it automatically after upgrade
2012-09-07 17:07:10 -07:00
anthony
2ea876dfd3 in basic zone, allow dhcp traffic by default 2012-08-15 13:11:58 -07: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
Hugo Trippaers
10e4a5ae48 Disable IPv6 in XenServer if it is enabled. The cloud support pack apparently enables IPv6 support at the moment, but wihtout proper security. 2012-07-30 17:36:29 +02: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
Sheng Yang
7349842c42 CS-15116: Add missing scripts for XCP server
Thank for the help from Wilhem Putz(wp@typoheads.at) to identify the issue.
2012-07-06 11:34:36 -07:00
Edison Su
27e9cdbece add console proxy support for devcloud 2012-07-03 23:38:39 -07: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
Edison Su
80e2a6faa0 add ASF license 2012-06-28 13:28:38 -07:00
Edison Su
5f6387e113 add clouddev 2012-06-27 23:28:34 -07:00
David Nalley
d630fa8697 license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -04:00
anthony
418cbe2e17 VPC : fixed get_domr_version 2012-06-15 14:33:43 -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