Commit Graph

17189 Commits

Author SHA1 Message Date
Koushik Das 7ce45ea108 Fixed indentation and line ending 2013-04-15 18:36:33 +05:30
Koushik Das 0232048f90 Merge branch 'master' into cisco-vnmc-api-integration
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	setup/db/db/schema-410to420.sql
	tools/marvin/marvin/integration/lib/base.py
2013-04-15 17:05:59 +05:30
Pranav Saxena 97911e9fe6 CLOUDSTACK-779:Enabling Egress rules feature for SRX 2013-04-15 16:28:45 +05:30
Koushik Das 735c4c8955 Fixed unit tests based on recent changes in the Vnmc resource code 2013-04-15 15:20:37 +05:30
Koushik Das f166f2d0bf added tests to register vnmc and asa appliance in cloudstack 2013-04-15 14:50:25 +05:30
Pranav Saxena e05defc073 CLOUDSTACK-1984:Wrong mapping of resource names to the capacity function on the dashboard 2013-04-15 12:38:18 +05:30
Talluri 0abfe240c3 CLOUDSTACK-1995: Enhance resize volume tests to support xenserver hypervisor and fix few test flow errors
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-15 12:00:08 +05:30
Pranav Saxena 48c1c00891 Scale UP VM form functionality for choosing a service offering 2013-04-15 11:01:59 +05:30
Joe Brockmeier b0bbffb79e Adding issues fixed in 4.1.0 2013-04-14 23:08:08 -05:00
Murali Reddy bc3e184b72 CLOUDSTACK-312: enable L4-L7 network services in the shared network in
the advanced zone

Squashed commit of the following:

commit 3021cb917b2446f6a04f6cbb01bc56ebc5484bff
Merge: 77c6991 886fe01
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Sun Apr 14 17:22:05 2013 +0530

    Merge branch 'master' into sharednetworkservices

commit 77c69918be
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 9 17:16:57 2013 +0530

    Trying to fit both isolated and shared network life cycle with single state
    machine may need addtional work. So set network state for shared network explicitly now.

commit 365ed73a0c
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 2 17:14:11 2013 +0530

    - associateIpAddress API to associate a public IP with shared network
    - shared network with services to go through the implement and shutwdon
      phases
2013-04-14 17:50:15 +05:30
Joe Brockmeier 886fe0128e Removing DISCLAIMER as we're no longer in the Incubator. 2013-04-13 16:18:22 -05:00
Pascal Borreli 20614598bf Fixed typos
Signed-off-by: Milamber <milamber@apache.org>
2013-04-13 13:28:32 +00:00
Wido den Hollander ed2aa9f9da CLOUDSTACK-574: Add Ceph RBD documentation
This commit also add some extra information about NFS and iSCSI
Primary Storage on a KVM hypervisor.
2013-04-13 11:13:26 +02:00
Wido den Hollander c5b10a71df tools: Add option to specify publican configuration file for building the docs 2013-04-13 11:13:01 +02:00
Wido den Hollander 15c26195c5 debian: Package the AWSAPI bridge 2013-04-13 11:12:39 +02:00
Prachi Damle e354807e05 Added the AffinityGroupProcessor definition to nonossComponentContext.xml.in to avoid auto-wiring failure for non-oss build 2013-04-12 15:32:44 -07:00
Min Chen 4b1a9f146c Fix CLOUDSTACK-1987: Deleted service offering still shows for domain users. Also extend this fix for Disk offering as well. 2013-04-12 13:47:45 -07:00
Chiradeep Vittal 7b4e1953d8 QuickCloud: accidental commit, removing 2013-04-12 12:08:13 -07:00
Prasanna Santhanam 45f852bec2 nose won't discover the test if it is executable.
Changing test_public_ip_range.py to 644

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-12 23:27:43 +05:30
Prasanna Santhanam 0b17b624db Fixing the apidoc for the new api dedicatePublicIpRange
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-12 23:27:42 +05:30
Prasanna Santhanam fd84c56bf9 moving the integration test to the smoke folder
The smoke folder is for the bvts and that's where maven+marvin will pick
up the tests tagged for the simulator run.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-12 23:27:42 +05:30
Likitha Shetty 8f865c5a90 Dedicate Public IP address range to an account 2013-04-12 23:27:35 +05:30
Pascal Borreli 95cbb790f3 Fixed Primary typo 2013-04-12 16:20:11 +01:00
Joe Brockmeier 69b0c149d8 Revert "CLOUDSTACK-574: Add Ceph RBD documentation"
This reverts commit 7753275b37.
2013-04-12 09:32:17 -05:00
Chip Childers 3b35063adf Revert "Fixed Primary typo"
This reverts commit 4e5a8a0f8a.
2013-04-12 15:18:02 +01:00
Murali Reddy 85b1519fe5 GlobalLoadBalancerResponse should contain the service type details and
GSLB rule is defaulted to have source IP as sticky method
2013-04-12 19:27:46 +05:30
Pascal Borreli 4e5a8a0f8a Fixed Primary typo
Conflicts:

	client/WEB-INF/classes/resources/messages_de_DE.properties
2013-04-12 14:14:44 +01:00
Wido den Hollander 0f8a46c580 tools: Allow setting the output format for the docs 2013-04-12 15:07:54 +02:00
Wido den Hollander 7753275b37 CLOUDSTACK-574: Add Ceph RBD documentation
This commit also add some extra information about NFS and iSCSI
Primary Storage on a KVM hypervisor.
2013-04-12 15:07:53 +02:00
Wido den Hollander 6d4b035f2c tools: A small fix for the script to build the docs with 2013-04-12 15:07:53 +02:00
Ryan Dietrich 38df62865d CLOUDSTACK-1989: Without this fix you can't query service offerings
that don't have a domain id set (null).

Tested via: Called "listServiceOfferings" using a simple perl script,
once with an ID, and once without an ID specified.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-12 14:03:28 +01:00
Hugo Trippaers accfccd83e Summary: Add support for nested hypervisors to the VmWare resource.
Add a flag VmDetailConstants.NESTED_VIRTUALIZATION_FLAG
Add an advanced config uption VmwareEnableNestedVirtualization

Depending on the settings of the flags and the capabilities of the target hypervisor the nested virtualization option will be set on guest VMs. It's a global setting intended only for developers to support cloud-in-a-cloud deployments.
2013-04-12 13:49:42 +02:00
Murali Reddy c0419791ed CLOUDSTACK-1934: NPE with listSupportedNetworkServices
For 'connectivity' network service current set of providers (MidoNet,
NiciraNcp) not necessarily part of OSS builds. So handle the case where
there are no providers for a service
2013-04-12 16:47:50 +05:30
Prasanna Santhanam 4ae3e5de7f scalevm test: adjust the tags to suit the environment
scalevm works with the xenserver hypervisortype only.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-12 16:32:12 +05:30
Bharat Kumar 580731ccc0 CLOUDSTACK-1534 Disable/Enable-unmanaged/manage cluster is setting CPU overcommit and memory overcommit ratio to 1 (defalut value).
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-12 15:30:02 +05:30
Mice Xia cbcb83b086 fix CLOUDSTACK-1894 User is not able to deploy VMs in a project[permission denied to access the guest network) 2013-04-12 15:39:36 +08:00
Anshul Gangwar 7fb63be6e1 CLOUDSTACK-1993: fixed the issue of not sending syslog messages for alertType 0
Signed-off-by: Anshul Gangwar <anshul.gangwar@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-04-12 07:15:06 +05:30
Prachi Damle c1a85401ae Single AffinityGroupProcessor could process multiple groups of same type. 2013-04-11 17:29:42 -07:00
Kelven Yang 370a7fdfd6 CLOUDSTACK-1884: fix the unit test issue 2013-04-11 17:23:49 -07:00
Prachi Damle 4958070b90 Reopening CLOUDSTACK-1884. Adding back the unit test, but still excluded due to component loading issue. 2013-04-11 15:43:54 -07:00
Jessica Wang 4600bd4b99 CLOUDSTACK-1910: cloudstack UI - Regions menu - make Add/Delete/Edit Region action not available to regular-user/domain-admin. 2013-04-11 15:27:11 -07:00
Prachi Damle 69f49e76cf Excluding this unit test for a while, since it fails because ComponentContext.initComponentsLifeCycle(); is failing when DB is unavailable 2013-04-11 14:50:35 -07:00
Jessica Wang 5f8a278196 CLOUDSTACK-1065: cloudstack UI - AWS Style Regions - make loginCmdText local. 2013-04-11 13:39:04 -07:00
Jessica Wang b1f67a0881 CLOUDSTACK-1065: cloudstack UI - AWS Style Regions - set autocomplete off. 2013-04-11 13:39:03 -07:00
Prachi Damle bfed74c411 Fixing rat. Merge with master missed the header change 2013-04-11 13:37:03 -07:00
Prachi Damle 6137d327a8 Fixes to unit-test dues to changes in master 2013-04-11 13:23:48 -07:00
Prachi Damle eea0ed5c4e Fixes for issues found while testing after the merge 2013-04-11 13:23:46 -07:00
Prachi Damle bbf7900732 Adding pretty toString() to AffinityGroup 2013-04-11 13:23:43 -07:00
Prachi Damle fc248cb99c ACl on affinity group 2013-04-11 13:23:41 -07:00
Prasanna Santhanam 9de7a68e92 affinitygroup bvt: changes to the bvt for affinity groups
Added tags for the test, base.py extensions for list, craete, delete and
fixes to the test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-11 13:23:39 -07:00