17701 Commits

Author SHA1 Message Date
Anthony Xu
1518e7ee43 CLOUDSTACK-2115: remove the trailing '\n' to get correct XS network mode 2013-05-14 17:52:10 -07:00
Alena Prokharchyk
26cefdcfac When UUID field is null for existing records, set it to id
Conflicts:
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
2013-05-14 15:11:41 -07:00
Pranav Saxena
edb2f3da26 CLOUDSTACK-768:ACLs on Private GATEWAY :Acl id on Private Gateway ListView 2013-05-15 00:22:26 +05:30
Alena Prokharchyk
eff7587d51 InternalLB: allow domain admin to stop/start internal lb vms 2013-05-14 10:38:17 -07:00
Pranav Saxena
10380cea41 CLOUDSTACK-768:ACLs on Private GATEWAY 2013-05-14 22:47:53 +05:30
Wido den Hollander
b5bb9f251c debian: Change the version in the changelog 2013-05-14 15:56:36 +02:00
Srikanteswararao Talluri
237397df3c CLOUDSTACK-2382: fix the validation part in the test_global_settings 2013-05-14 17:31:21 +05:30
Jayapal
46f8b6f34a CLOUDSTACK-2400 updated the error message and replacenetworkacl on private gateway 2013-05-14 16:11:33 +05:30
Jayapal
c94c71b4ce CLOUDSTACK-2441: Fix deleting private gateways while deleting vpc in case multiple private gateways 2013-05-14 16:10:38 +05:30
sanjeevneelarapu
7d380423b5 CLOUDSTACK-702: Tests for Multiple IP Ranges
1. Add ip range super set to existing CIDR
2. Add ip range subset to existing CIDR

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 15:52:54 +05:30
Hugo Trippaers
37ca43684b CLOUDSTACK-2440 Print a warning if the rpm can't determine the previous configuration for server.xml or tomcat.conf 2013-05-14 11:05:04 +02:00
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
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
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
Nitin Mehta
70e78db3c7 Fix gslb documentation 2013-05-14 00:03:49 +05:30
Brian Federle
35164fde65 Merge branch 'ui-cisco-asa1000v-support' 2013-05-13 11:10:34 -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
Pranav Saxena
2a4184bbcc CLOUDSTACK-2394:Ability to delete Events and Alerts:UI: Make Category field visible on UI 2013-05-13 12:11:26 +05:30
Kishan Kavala
595f78f0f7 update APICmd imports 2013-05-13 12:03:39 +05:30
Kishan Kavala
5e009c4bcd CLOUDSTACK-763: Added comments and removed unused imports 2013-05-13 12:03:39 +05:30
Kishan Kavala
2cdb540e36 CLOUDSTACK-763: Added unit tests and integration test 2013-05-13 12:03:39 +05:30
Kishan Kavala
5e1d216197 CLOUDSTACK-763: Added unit tests and integration test 2013-05-13 12:03:39 +05:30
Kishan Kavala
257789dd54 CLOUDSTACK-763: Added API updateNetworkACLItem to update an existing ACL Item 2013-05-13 12:03:39 +05:30
Kishan Kavala
14e992e953 CLOUDSTACK-763: Removed unused methods 2013-05-13 12:03:39 +05:30
Kishan Kavala
49fbff21fa CLOUDSTACK-763: Added API updateNetworkACLItem to update an existing ACL Item 2013-05-13 12:03:39 +05:30
Kishan Kavala
a1023e4d04 CLOUDSTACK-763: Upgrade networkAcls from firewall_rules to network_acl_item table 2013-05-13 12:03:38 +05:30
Kishan Kavala
b30a01a705 CLOUDSTACK-763: Added acl_id param to createNetwork API. Backend changes for acl_deny. Support for all protocol and protocol number 2013-05-13 12:03:38 +05:30
Kishan Kavala
750bfe76ca CLOUDSTACK-763: Added filters to list APIs. Seperated service interface implementation to NetworkACLServiceImpl. Added default ACL to upgrade schema 2013-05-13 12:03:38 +05:30
Kishan Kavala
3322063067 CLOUDSTACK-763: Fixed source CIDR and apply ACL items 2013-05-13 12:03:38 +05:30