2099 Commits

Author SHA1 Message Date
Min Chen
5147fb16ac CLOUDSTACK-1253: Remove @author tag. 2013-02-15 10:42:06 -08:00
Kishan Kavala
7d61ee6e99 CLOUDSTACK-1295 : Added usage unit tests
Fixed Component annontation for usage parsers
Fixed mvn target to run usage
removed UsageServerComponentConfig which is not required
Added region_id to account table in cloud_usage db

Conflicts:
	setup/db/db/schema-40to410.sql
2013-02-15 18:41:28 +05:30
Koushik Das
bc493bd39b CLOUDSTACK-672: Set VMware cluster max. limit based on HV version
Max. number of hosts in a Vmware clueter is specific to the version of the HV. This limit is read from the hypervisor_capabilities table
2013-02-15 16:19:40 +05:30
Sheng Yang
ca5c6d5d14 CLOUDSTACK-1219, CLOUDSTACK-1220: Fix IPv6 error messages 2013-02-14 16:28:29 -08:00
Rohit Yadav
afbc950652 CLOUDSTACK-1272: Fix incorrect annotation for service offering id
Fixes param annotation in:
   api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
   api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
   api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-14 16:30:23 +05:30
Sheng Yang
78ca6ceefe IPv6: Enable dual stack support 2013-02-13 15:09:39 -08:00
Mice Xia
9a12756ae4 CLOUDSTACK-684 support vm snapshot 2013-02-14 01:26:30 +08:00
Sanjay Tripathi
5828e526b3 CLOUDSTACK-713: Limit Resources(CPU and Memory) to domain/accounts
Addition of two new resource types i.e. CPU and Memory in the existing pool of
resource types.
Added some methods to set the limits on these resources using updateResourceLimit
API command and to get a count using updateResourceCount. Also added calls in the
Virtual machine life cycle to check these limits and to increment/decrement the new
resource types

Resource Name  :: Resource type number
    CPU               8
    Memory            9

Also added Unit Tests for the same.
2013-02-12 12:02:07 -08:00
Sheng Yang
0c5c08b78b IPv6: CLOUDSTACK-1107: Add support for createVlanIpRange to extend existed network 2013-02-08 14:48:08 -08:00
Min Chen
0b1e3a4af0 Move Api rate limit configurations from xml file to global
configuration, and also modify listCapabilitiesCmd to also return api
limit interval and max for UI consumption.
2013-02-08 00:02:25 -08:00
Sheng Yang
06acd9f0ea IPv6: One network can have more than one vlan 2013-02-06 20:07:07 -08:00
Marcus Sorensen
ec6fdc7471 Summary: Fix NPE when calling createFirewallRule
Detail: CreateFirewallRuleCmd.java was returning 'null' for getTrafficType().
Recently, getTrafficType started being used by createIngressFirewallRule.
Changing getTrafficType() to return ingress per Jayapal Reddy.

BUG-ID: CLOUDSTACK-1168
Bugfix-for: master,4.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360170916 -0700
2013-02-06 10:15:16 -07:00
Sheng Yang
f89dd9050c IPv6: CLOUDSTACK-1113: Fix the mechanism to find the usable IP in the IPv6
The new policy is:
1. Generate a random IP.
2. Find the next available IP, start from the generated IP.
3. If we cannot find an available IP after certain times(10000 by default,
network.ipv6.search.retry.max) retry, give up.
2013-02-05 14:31:12 -08:00
Prasanna Santhanam
7f885b65f9 CLOUDSTACK-1160: remove refs to invalid ACS release
@since tag in API cmd /responses has been given an invalid ACS release
version. This fix removes these references.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-05 20:56:41 +05:30
Kishan Kavala
fc0bf21a13 CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl 2013-02-05 16:49:34 +05:30
Hugo Trippaers
27e5d1fc04 NiciraNvp Provider should not be marked as external as this will prevent
creation of networks when there is no default CIDR in the zone.
2013-02-04 15:51:45 +01:00
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
77e3aade03 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 16:58:29 +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
Jayapal Uradi
6f89a843a8 CLOUDSTACK-1114: fixed listegressfirewallrule issue with networkid 2013-02-01 14:07:05 +05:30
Kanzhe Jiang
736b236eaf bigswitch controller support
Reviewed-by: Chiradeep Vittal <chiradeepv@gmail.com>

Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 12:42:04 +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
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
frank
8416d81b99 Merge branch 'ucs' into javelin
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	plugins/pom.xml
	utils/src/com/cloud/utils/exception/CloudRuntimeException.java
	utils/src/com/cloud/utils/exception/RuntimeCloudException.java
2013-01-31 14:44:07 -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
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
8b1a5b1de2 - Separated RegionServiceImpl and RegionManagerImpl
- Added comments
- Changed package name to org.apache.cloudstack.region
2013-01-31 18:08:20 +05:30
Jayapal
b6727e5646 CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
Jayapal
48fdc25daa CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 10:57:30 +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
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
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
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
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
Sheng Yang
b1972f6c11 IPv6: Update NetworkResponse and NicResponse 2013-01-29 22:01:31 -08:00
Sheng Yang
85d0546fe8 IPv6: Make the IPv6 input all lowercase
To make them consistent.
2013-01-29 22:01:25 -08:00
Kishan Kavala
e848a937df Add sync entry to region_sunc table on region api failure 2013-01-30 11:20:30 +05:30
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
Sheng Yang
2cbca372bf IPv6: Add support for IPv6 on DeployVMCmd 2013-01-28 18:54:34 -08:00
Rohit Yadav
5b92c57b2c DeployVMCmd: Remove @ACL on ipToNetwork map to avoid NPE
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-28 16:16:02 -08:00
Rohit Yadav
9a95495f87 DeployVMCmd: Remove entityType for ipToNetworkList, MAP is string->string
Remove entityType as it can confuse people, right now we process map to string
data type maps<string,string> This map should be handled in cmd class level by
an api writer to getObject by uuid or by long int id as in getIpToNetworkMap()
of DeployVMCmd

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-28 16:15:55 -08:00