etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,697 Commits 326 Branches 325 Tags 885 MiB
Commit Graph

17697 Commits

Author SHA1 Message Date
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
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
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
Kishan Kavala e2449cfcf0 CLOUDSTACK-763: Added replaceNetworkACLList API. Added support for ACL action allow/deny and also number 2013-05-13 12:03:38 +05:30
Kishan Kavala 20e3a24012 CLOUDSTACK-763: Moved schema changes to 41to42 upgrade script 2013-05-13 12:03:38 +05:30
Kishan Kavala ebf8a7fd1e CLOUDSTACK-763: Added APIs to create, delete and list NetworkACLlist. 2013-05-13 12:03:38 +05:30
Prasanna Santhanam df39196bf7 marvin: build fails when no setuptools/distribute found 
appropriately warn the user to install setuptools.

Also - fixed the jenkins url for builds.a.o

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-05-13 11:21:38 +05:30
unknown 6df3d83183 CLOUDSTACK-893 conceptual info around gslb 2013-05-13 10:05:54 +05:30
Pranav Saxena 225a46746a Correcting the text for alert types 2013-05-13 01:53:33 +05:30
Pranav Saxena 34a3fd6d02 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-05-13 00:00:29 +05:30
Pranav Saxena 0ed0e9a26e CLOUDSTACK-1828:NAT on private gateway UI support 2013-05-12 23:59:39 +05:30
Koushik Das 80720dc4ac CLOUDSTACK-2409: Cisco VNMC Access credentials validatation is not enabled with addCiscoVnmcResource 
Enabled credentials validation by doing a login to the VNMC appliance
 2013-05-12 17:00:48 +05:30
Nitin Mehta 941a9a5fb7 license check 2013-05-12 14:42:59 +05:30
Nitin Mehta 5f0f1001be remove unwanted files 2013-05-12 14:30:10 +05:30
Nitin Mehta fa1217576b db conflict resolve 2013-05-12 13:59:14 +05:30
Nitin Mehta e107776d75 build master 2013-05-12 13:14:33 +05:30
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Nitin Mehta 836a3f1252 add missing file 2013-05-11 15:02:12 +05:30
Nitin Mehta 5f9263b161 fix build 2013-05-11 14:27:19 +05:30
Nitin Mehta 1731a4a442 Add the new APIs along with tests 2013-05-11 14:13:38 +05:30
Chiradeep Vittal 074901365f CLOUDSTACK-2324 Since wheezy (temporarily) does not have haproxy, install from squeeze. We cannot install from sid since that version depends on libc6(>=2.15) while wheezy has libc6 at 2.13-38 2013-05-10 17:11:12 -07:00
Brian Federle df0919bef5 Add placeholder network ACL list view 2013-05-10 16:03:44 -07:00