Commit Graph

20355 Commits

Author SHA1 Message Date
Prasanna Santhanam 80c2ea769e Fixing merge markers introduced by conflict from 2660a6
test had conflict markers as a result of an improper merge

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 14:35:45 +05:30
Jayapal 55739f93b8 CLOUDSTACK-2403 Fixed configuring private gateway with sourcenatsupported=false 2013-05-14 12:22:08 +05:30
Prasanna Santhanam a92abaa916 multiple fixes to regression tests in test/component
- invalid variable references
- syntax/indentation errors
- self/cls reference errors
- some logic fixes in redundant router suite

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 11:42:34 +05:30
Min Chen bbdab9806d CLOUDSTACK-2470: listVolume throws db exception. 2013-05-13 22:09:06 -07:00
Prasanna Santhanam 8f57a851be account name dereferences as account.name
Fix to tests to conform to library changes.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 10:34:01 +05:30
Prasanna Santhanam 894413e362 Marvin IP cleared tests for various cloudstack components
One big blob of all the tests that were posted for IP clearance several
months ago. IP clearance VOTE has passed on general@

Ref: http://markmail.org/thread/xareczan2kx4hhom

RAT check passed.
2013-05-14 10:24:27 +05:30
Gavin Lee 1a31a3bb10 typo when yum install, ws-common-utils should be ws-commons-util 2013-05-14 10:21:14 +08:00
radhikap 9f9333b363 fix build error 2013-05-14 07:37:07 +05:30
radhikap e3ff2b33ae fix build error 2013-05-14 07:26:51 +05:30
Jessica Tomechak a8cebac30d Docs. Change step by step procedure from bullets to numbers in Adding a Host section. 2013-05-13 18:53:13 -07:00
Min Chen 3424ac86ad Fix size issue for template created from snapshot. 2013-05-13 17:45:22 -07:00
Brian Federle ce7802413a Remove refresh button 2013-05-13 17:33:14 -07:00
Brian Federle d6ceef2a29 Implement refresh VPC chart 2013-05-13 17:20:08 -07:00
Edison Su 0ce01e56db set template size when creating template from snapshot 2013-05-13 16:45:03 -07:00
Edison Su a7480530f7 fix RAT 2013-05-13 16:22:46 -07:00
Jessica Wang b082e23af3 CLOUDSTACK-2351: object store - UI - restore UI change that was overwriten by the sync from master branch. 2013-05-13 16:22:20 -07:00
Min Chen 9777e56e8e Update built-in template size in vm_template table. 2013-05-13 15:46:01 -07:00
Min Chen dafe2654b6 Fix default devcloud.cfg 2013-05-13 15:46:00 -07:00
Min Chen 5341f299ff We still need the hack of Ready to Ready transition for NFS. 2013-05-13 15:46:00 -07:00
Alena Prokharchyk dfdc089668 CLOUDSTACK-2465: fixed network creation in VPC - removed extra call to createGuestNetwork introduced by the NetworkACL feature merge 2013-05-13 15:28:08 -07:00
Jessica Wang eeb012308c CLOUDSTACK-2351: object store - UI - zone wizard - add secondary storage step - when provider is S3, add Create NFS Cache Storage option. 2013-05-13 15:10:34 -07:00
Brian Federle 3c24380f9d Fix typo 2013-05-13 14:54:35 -07:00
Edison Su 1694c1a502 fix download timeout 2013-05-13 14:40:49 -07:00
Brian Federle c819980338 Add place holder for internal LB 2013-05-13 14:06:43 -07:00
Brian Federle 40dc2211db Implement 'add tier' action handling 2013-05-13 14:03:58 -07:00
Sheng Yang 2bcf71638d PVLAN: Add integration test 2013-05-13 11:42:15 -07:00
Sheng Yang 065d2561b9 CLOUDSTACK-2392: Not allow create pvlan network with ipv6 2013-05-13 11:40:40 -07:00
Min Chen e6faa47a4b Remove unnecessary state machine entry after refactoring
sendMessageAsyncWithListener to use sendMessageAsync.
2013-05-13 11:36:44 -07:00
Nitin Mehta 70e78db3c7 Fix gslb documentation 2013-05-14 00:03:49 +05:30
Min Chen c13a691429 Fix some inaccurate logging message in template sync. 2013-05-13 11:27:34 -07:00
Brian Federle 57d21051bd Fix typo 2013-05-13 11:16:15 -07:00
Brian Federle 9ac67b8546 Merge branch 'master' into ui-vpc-redesign
Conflicts:
	ui/modules/modules.js
2013-05-13 11:12:32 -07:00
Brian Federle 35164fde65 Merge branch 'ui-cisco-asa1000v-support' 2013-05-13 11:10:34 -07:00
Min Chen ff735b4d81 Fix a bug in searching for eligible image store when we pass a ZoneScope
with scopeId = null.
2013-05-13 11:07:06 -07:00
Brian Federle 9be36609fd Merge branch 'master' into ui-vpc-redesign 2013-05-13 11:00:16 -07:00
Nitin Mehta 7b46599942 Fixing apidocs adding the new category meta data apis 2013-05-13 23:24:20 +05:30
Wei Zhou 2224ecb0dd CLOUDSTACK-528: Correct a bunch of mistakes in the 3.0.x to 4.0 db
script
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-13 16:52:45 +01:00
Chip Childers 207c288958 CLOUDSTACK-2218: Remove applicationContext.xml from the awsapi
installation logic for DEB

Signed-off-by: Chip Childers <chip.childers@gmail.com>

Conflicts:

	debian/rules
2013-05-13 16:29:50 +01:00
Hugo Trippaers abb049bc0b Remove some dead code 2013-05-13 17:05:40 +02:00
Hugo Trippaers dcc288c8be Make the classes that get started by jsvc implement Daemon.
Set the daemon version centrally in the pom
2013-05-13 16:53:27 +02:00
Hugo Trippaers c2118180d5 CLOUDSTACK-2440 RedHat (CentOS) expects a directory with the name of the service to store initd.log 2013-05-13 16:07:46 +02:00
Kishan Kavala c5a59ee0be fixed update query in vpc_gateway upgrade 2013-05-13 19:31:53 +05:30
Jayapal Reddy 2d950e2858 CLOUDSTACK-768: ACL on private gateway 2013-05-13 19:24:23 +05:30
Nitin Mehta bcc320f8b0 Scale vm test failing..commented for now to unblock all. Will open a bug for the same 2013-05-13 18:32:01 +05:30
Nitin Mehta 573f529ea0 mvn install didnt point me the compilation errors...fixing them 2013-05-13 18:18:56 +05:30
Nitin Mehta f84b6abde0 merge with master 2013-05-13 17:30:42 +05:30
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
Nitin Mehta 8d53b1ef05 merge with master 2013-05-13 16:36:41 +05:30
Rajesh Battala 756a4179e2 Fixed CLOUDSTACK-2189 Volume is stuck in resizing state
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-13 14:41:00 +05:30
Gavin Lee 78ffb7ae5e CLOUDSTACK-1597: Docbook xml for 'Storage Setup' section 2013-05-13 16:26:27 +08:00