318 Commits

Author SHA1 Message Date
Edison Su
f7c1b711ad merge to master 2013-05-16 23:56:20 -07:00
Prachi Damle
a2eb7bab1e CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
- Changes merged from planner_reserve branch
- Exposing deploymentplanner as an optional parameter while creating a service offering
- changes to DeploymentPlanningManagerImpl to make sure host reserve-release happens between conflicting planner usages.
2013-05-16 15:02:17 -07:00
Edison Su
389d7c1fa0 if object is already stored in cache store, don't download again 2013-05-16 14:34:06 -07:00
Mice Xia
e7fef86c80 CLOUDSTACK-2456 usage:usage parser throws runtime exception while parsing networkoffering usage 2013-05-16 15:19:05 +08:00
Edison Su
c476d7866e CLOUDSTACK-2482: fix create volume from snapshot 2013-05-15 19:41:50 -07:00
Likitha Shetty
fd354dbd7c CLOUDSTACK-2116
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 19:41:49 -07:00
Jayapal
85789534f0 CLOUDSTACK-2369 fixed adding same private gw twice 2013-05-15 19:41:49 -07:00
Sanjay Tripathi
88422248cc CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts 2013-05-15 19:41:48 -07:00
Min Chen
b66c484905 Fix size issue in copying template from S3 to cache storage to make
system vm up.
2013-05-15 18:54:55 -07:00
Min Chen
7ffb6d8464 Fix DettachAnswer to have default result state for CLOUDSTACK-2526. 2013-05-15 16:52:28 -07:00
Min Chen
8de401caad Fix CLOUDSTACK-2520: Invoke parent constructor to set result state to
default true to avoid attachVolume error.
2013-05-15 14:08:09 -07:00
Alena Prokharchyk
9f59c618e2 CLOUDSTACK-2517: fixed private gateway creation. Following fixes went in:
1) Only PrivateNetworkGuru handles network creation for the private gateway. Exluded Guest Network Guru from this list (was mistakenly included as a part of merge for Nicira integration)
2) Pass vpc_id to createNetwork call when the network is created as a part of private gateway creation
3) Fixed VPC restart when there are multiple private gateways present (have to grab all the private gateways when creating nic profiles for the VPC router that is being re-created)
4) 41-42 db upgarde: set vpc_id for the private networks of the existing VPCs
2013-05-15 13:12:51 -07:00
Prachi Damle
73030f4372 CLOUDSTACK-2486: Deleting the host_details and inserting them back can lead to mysql deadlock
- Changing the correct details dao. Instead of using separate delete and insert, we will use ON DUPLICATE KEY UPDATE to avoid the MySQL deadlock
2013-05-15 11:58:13 -07:00
Prachi Damle
d31217f3be CLOUDSTACK-2486: Deleting the host_details and inserting them back can lead to mysql deadlock
- Added the index found missing after upgrade

Contained in branches: master
Contained in no tag
2013-05-15 11:16:43 -07:00
Prachi Damle
a13dd59d16 CLOUDSTACK-2486: Deleting the host_details and inserting them back can lead to mysql deadlock
- Instead of using separate delete and insert, we will use ON DUPLICATE KEY UPDATE to avoid the MySQL deadlock
2013-05-15 11:16:41 -07:00
Likitha Shetty
f893aa8a78 CLOUDSTACK-2116
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 18:05:01 +05:30
Jayapal
9b6513466f CLOUDSTACK-2369 fixed adding same private gw twice 2013-05-15 16:45:52 +05:30
Sanjay Tripathi
9542f10592 CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts 2013-05-15 15:28:37 +05:30
Edison Su
a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Edison Su
ed065418b6 add license header 2013-05-14 21:58:07 -07:00
Edison Su
879a954b98 delete snapshot at the backend 2013-05-14 21:58:07 -07:00
Edison Su
68ffe1c706 fix bug in create volume from snapshot 2013-05-14 16:38:02 -07:00
Min Chen
252f384e89 Fix CLOUDSTACK-2485: ClassCastException in extracting ISO. 2013-05-14 14:57:02 -07:00
Min Chen
87af4ddab0 Only download eligible system template for S3 image store. 2013-05-14 14:57:01 -07:00
Edison Su
12583bbffc snapshot path is accountId + volumeid 2013-05-14 13:20:10 -07:00
Min Chen
2102ede2e7 Fix CLOUDSTACK-2469: default template is not downloaded. 2013-05-14 11:42:24 -07:00
Jayapal
c94c71b4ce CLOUDSTACK-2441: Fix deleting private gateways while deleting vpc in case multiple private gateways 2013-05-14 16:10:38 +05:30
Min Chen
3424ac86ad Fix size issue for template created from snapshot. 2013-05-13 17:45:22 -07:00
Edison Su
0ce01e56db set template size when creating template from snapshot 2013-05-13 16:45:03 -07:00
Min Chen
9777e56e8e Update built-in template size in vm_template table. 2013-05-13 15:46:01 -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
Edison Su
1694c1a502 fix download timeout 2013-05-13 14:40:49 -07:00
Min Chen
e6faa47a4b Remove unnecessary state machine entry after refactoring
sendMessageAsyncWithListener to use sendMessageAsync.
2013-05-13 11:36:44 -07:00
Min Chen
c13a691429 Fix some inaccurate logging message in template sync. 2013-05-13 11:27: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
Jayapal Reddy
2d950e2858 CLOUDSTACK-768: ACL on private gateway 2013-05-13 19:24:23 +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
Kishan Kavala
5e009c4bcd CLOUDSTACK-763: Added comments and removed unused imports 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
e2449cfcf0 CLOUDSTACK-763: Added replaceNetworkACLList API. Added support for ACL action allow/deny and also number 2013-05-13 12:03:38 +05:30
Edison Su
492127c035 fix kvm 2013-05-12 18:27:37 -07:00
Min Chen
0b9e0c0f3a Override getRootDir in LocalNfsSecondaryStorageResource to make mount
successfully on MS side. Now S3 is working.
2013-05-12 17:41:44 -07:00
Edison Su
e8259e38c2 integration test is passed again 2013-05-12 14:41:06 -07:00
Min Chen
0d580ccb26 Fix NPE in adding host and also put back lost change in deployDataCenter
due to rebase with master.
2013-05-11 22:00:40 -07:00
Min Chen
1bd216fc48 Merge with latest code rebased from master 2013-05-11 21:05:54 -07:00
Min Chen
f8e51f70a1 Invoke reatetmplt.sh script after copying template from S3 to cache
storage.
2013-05-11 18:19:29 -07:00