6117 Commits

Author SHA1 Message Date
Kelven Yang
296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Kelven Yang
7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Koushik Das
777147ce8a CS-CLOUDSTACK-606:
The issue happens randomly when hosts in a cluster gets distributed across multiple MS. Host can get split in following scenarios:
    a. Add host – MS on which add host is executed takes ownership of the host. So if 2 hosts belonging to same cluster are added from 2 different MS then cluster gets split
    b. scanDirectAgentToLoad – This runs every 90 secs. and check if there are any hosts that needs to be reconnected. The current logic of host scan can also lead to a split

    The idea is to fix (b) to ensure that hosts in a cluster are managed by same MS. For (a) only the entry in the database is going to be created except in case if the host getting added is first in the cluster (in this case agent creation happens at the same time) and then (b) will take care of connection and agent creation part. Since currently addHost only creates an entry in the db there is a small window where the host state will be shown as 'Alert' till the time (b) is scheduled and picks up the host to make a connection. The MS doing add host will immediately schedule a scan task and also send notification to peers to start the scan task.
2013-02-01 15:34:41 +05:30
Likitha Shetty
13ee8d1865 Persistent Networks support
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 15:10:06 +05:30
Saksham Srivastava
482ea4a71e CLOUDSTACK-822: system.vm.password is not encrypted
Signed-off-by: Kishan Kavala <kishan@cloud.com>
2013-02-01 14:18:59 +05:30
Kishan Kavala
fc925022bd Upgrade changes for Region schema. Made region_id not null 2013-02-01 13:49:57 +05:30
Kishan Kavala
519ca619df Encode password using UserAuthenticator 2013-02-01 12:23:15 +05:30
Kishan Kavala
4f53eb11f0 Merge branch 'master' into regions 2013-02-01 11:59:12 +05:30
Murali Reddy
1a348c85fd adding apache license heders to the files that are faling RAT check 2013-02-01 11:41:30 +05:30
Kishan Kavala
9ea90c3359 Merge branch 'master' into regions
Conflicts:
	client/tomcatconf/components.xml.in
	server/src/com/cloud/api/ApiResponseHelper.java
2013-02-01 11:38:16 +05:30
Murali Reddy
96c24930ae Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2013-02-01 08:45:53 +05:30
Sheng Yang
c0b18c76f0 IPv6: Add missing license header 2013-01-31 17:26:46 -08:00
Kelven Yang
7bd8bec68a Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a 2013-01-31 17:20:19 -08:00
Sheng Yang
5cb9df91a1 Merge branch 'ipv6'
Conflicts:
	api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
joesan
44d1397d36 fix CS-1080 2013-01-31 13:04:36 -08:00
Murali Reddy
e7a554fc6a Merging events framework branch into master. This commit will bring
following changes

   - introduced notion of event bus with publish, subscribe, unsubscribe
     semantics

   - a plug-in can implement the EventBus abstraction to provide event
     bug to CloudStack

   - A rabbitMQ based plug-in that can interact with AMQP servers to
     provide message broker based event-bug

   - stream lines, action events, usage events, alerts publishing in to
     convineance classed which are also used to publish corresponding
     event on to event bus

   - introduced notion of state change event. On a state change, in the
     state machine corrsponding to the resource, a state change event is
     published on the event bug

   - associated a state machined with Snapshot and Network objects

   - Virtual Machine, Volume, Snaphost, Network object state changes wil
     result in a state change event
2013-02-01 01:37:24 +05:30
Min Chen
6a6d93c309 Fix a bug in listStoragePools api where SQL exception is thrown when a
parameter is passed.
2013-01-31 11:56:48 -08:00
Kelven Yang
1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
Kishan Kavala
a33d8f9601 Fixed listRegions serach by id, name 2013-01-31 23:25:29 +05:30
Kishan Kavala
c607e03f0e Merge branch 'master' into regions 2013-01-31 22:31:25 +05:30
Kishan Kavala
e7341313e9 Added unit tests 2013-01-31 22:28:09 +05:30
Kishan Kavala
c17c7007f4 Added RegionServiceImpl to DefaultComponentLibrary 2013-01-31 18:26:54 +05:30
Prasanna Santhanam
1b922e816c Revert "CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second"
Reverted as per discussion at http://s.apache.org/NOm

This reverts commit 5060f98268090be1c5fdde14055480c5d18a8a6b.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-31 18:15:41 +05:30
Kishan Kavala
8b1a5b1de2 - Separated RegionServiceImpl and RegionManagerImpl
- Added comments
- Changed package name to org.apache.cloudstack.region
2013-01-31 18:08:20 +05:30
Sheng Yang
ed777bb7f3 IPv6: Check startipv6, endipv6 and ip6Gateway with ip range 2013-01-30 22:13:46 -08:00
Jayapal
b6727e5646 CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
Sheng Yang
f57cbaacd6 IPv6: Fix VlanIpRangeResponse 2013-01-30 20:01:04 -08:00
Sheng Yang
f45576bce5 IPv6: Fix missed AddressFormat in nic table 2013-01-30 19:46:30 -08:00
Sheng Yang
4adc974ab7 IPv6: Disable untested features 2013-01-30 17:43:29 -08:00
Rohit Yadav
d7ad2da7e0 server: Fix network refactor regressions for CLOUDSTACK-297
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:33:53 -08:00
Harikrishna Patnala
b21595c10d CLOUDSTACK-297: Reset SSH key to access VM
This feature provides resetting a SSH key for an existing VM which means,
setting the old ssh key that is assigned to the VM previously with the new ssh
key.

Signed-off-by: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:33:44 -08:00
Sheng Yang
ed547d91f7 IPv6: Rename public_ipv6_address to user_ipv6_address 2013-01-30 17:05:47 -08:00
Marcus Sorensen
15906c03ca Summary: add/remove/update default nics feature
Description: Adds API calls updateDefaultNicForVirtualMachine,
addNicToVirtualMachine, and removeNicFromVirtualMachine. These are
intended to allow a user to modify a VM's configuration post
deployment, to adjust the networks to which the VM belongs.

BUG-ID: CLOUDSTACK-645
Submitted-by: Brian Angus <blangus@betterservers.com>
Submitted-by: Ryan Dietrich <ryan@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359494800 -0700
2013-01-30 17:43:21 -07:00
Likitha Shetty
99556a4f30 CLOUDSTACK-617: Unable to edit a sub-domain. Change UpdateDomain to be consistent with CreateDomain i.e. before this operation, while checking if the domain-name is unique, search under the parent domain instead of searching under the ROOT domain.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 16:40:48 -08:00
Rohit Yadav
85aa3a9977 Revert "api: Include cloudstack-version in both xml and json api response"
This reverts commit f8a483fc5a47cb66ac4788fcd7d53da0c9d6ea2b.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 16:12:21 -08:00
Kelven Yang
176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
Kelven Yang
da2e6461a6 Remove temporary hacking and use Official way to wire-up servlet with injection under Spring 2013-01-30 15:21:01 -08:00
Sheng Yang
25ae2e4f3f IPv6: Remove dualstack parameter from createNetworkCmd
We can tell if it's dual stack by looking into the startIp and startIpv6.
2013-01-30 13:35:47 -08:00
Min Chen
6b19086874 Fix a bug in listHosts that returns wrong zoneId for host. 2013-01-30 10:47:16 -08:00
Wido den Hollander
301c4413bc CLOUDSTACK-1054: When calling listDomains through the API do not restrict ADMIN users
When an admin calls this command without the ID parameter do not set the domain's ID
to the ID where the admin is in, this prevents him from doing lookups.
2013-01-30 15:48:01 +01:00
Sheng Yang
f9a68e7f15 IPv6: Add vlan overlap checking 2013-01-29 22:01:38 -08:00
Sheng Yang
b1972f6c11 IPv6: Update NetworkResponse and NicResponse 2013-01-29 22:01:31 -08:00
Kishan Kavala
60fd29dacd Add sync entry to region_sunc table on region api failure 2013-01-30 11:11:49 +05:30
Sheng Yang
0b62fc4c17 IPv6: Verify if requested IPv4/IPv6 addresses are valid
Also rename NetUtils.isValidIPv6() to NetUtils.isValidIpv6()
2013-01-29 19:08:09 -08:00
Sheng Yang
cb9f2d018d IPv6: move assignPublicIp6Address() from NetworkManager to new Ipv6AddressManager
Don't want to involve IP address management code in NetworkManager.
2013-01-29 19:08:03 -08:00
frank
1f7eaf3d61 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

merge baremetal feature to master
2013-01-29 17:19:57 -08:00
Kishan Kavala
d3089ba2a5 Merge branch 'master' into regions 2013-01-29 11:50:49 +05:30
Kishan Kavala
158ee8b2fa Add sync entry to region_sunc table on region api failure 2013-01-29 11:49:23 +05:30
Sheng Yang
2cbca372bf IPv6: Add support for IPv6 on DeployVMCmd 2013-01-28 18:54:34 -08:00
Kelven Yang
8887f01b37 CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name 2013-01-28 17:12:41 -08:00