Commit Graph

17882 Commits

Author SHA1 Message Date
Brian Federle e35f14439a Merge branch 'master' into ui-vpc-redesign 2013-05-21 12:30:01 -07:00
Jessica Wang 0eceb0da60 CLOUDSTACK-747: UI - create network offering - default sourceNat type as per account instead of per zone. 2013-05-21 11:59:03 -07:00
Jessica Wang a75cf9a79d CLOUDSTACK-747: internalLb in VPC - UI - create network offering - when Lb service is checked and LB provider is InternalLbVm, pass capability type as lbSchemes and capability value as internal. 2013-05-21 11:44:50 -07:00
Jessica Wang 263cc9a62c CLOUDSTACK-747: internalLb in VPC - UI - create network offering - when VPC checkbox is checked, enable provider InternalLbVm, VpcVirtualRouter, Netscaler. When VPC checkbox is unchecked, disable provider InternalLbVm, VpcVirtualRouter. 2013-05-21 11:44:20 -07:00
Jessica Wang e42ddb83c2 CLOUDSTACK-747: internalLb in VPC - UI - create network offering - add LB Type dropdodwn which is shown when VPC is checked and LB service is checked, hidden otherwise. LB Type (publicLb, internalLb) will determine the options in LB Provider dropdown. 2013-05-21 11:43:54 -07:00
Jessica Wang 75df90663f CLOUDSTACK-747: internalLb in VPC - UI - create network offering - when Lb service is checked and LB provider is InternalLbVm, pass capability type as lbSchemes and capability value as internal. 2013-05-21 11:37:12 -07:00
Jessica Wang ccf1ebc26b CLOUDSTACK-747: internalLb in VPC - UI - create network offering - when VPC checkbox is checked, enable provider InternalLbVm, VpcVirtualRouter, Netscaler. When VPC checkbox is unchecked, disable provider InternalLbVm, VpcVirtualRouter. 2013-05-21 11:08:40 -07:00
Pranav Saxena e6382b1896 Delete ACL list filter and css 2013-05-21 22:15:15 +05:30
Girish Shilamkar 2bc88ea277 CLOUDSTACK-778: Add tests for user provided hostname for vms
Automation tests to qualify User provides hostname feature.
1. Defines services class
2. Test to verify custom hostname for the instance with internal name
3. Test to verify custom hostname for the instance without internal name

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 20:27:26 +05:30
Girish Shilamkar b74d13f9b1 CLOUDSTACK-2472: Fix unresolved reference to max_value
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 19:31:52 +05:30
Girish Shilamkar 1736031fcb CLOUDSTACK-2473: Fix a typo in test_vpc_network.py
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 19:28:22 +05:30
Girish Shilamkar a8975f9522 CLOUDSTACK-2474: Remove garbage code which was added while resolving merge conflicts.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 19:25:58 +05:30
Wido den Hollander 37308ebff4 debian: Create the webapps7080 directory 2013-05-21 14:36:03 +02:00
Bharat Kumar 79dc83d1ac blocker bug in dnsmaq config
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-21 17:49:05 +05:30
Wido den Hollander 730e6571f6 debian: Packaging fixes for AWSAPI 2013-05-21 13:20:44 +02:00
Nitin Mehta a58ee74e1c CLOUDSTACK-2567 - Check whether DMC - dynamic memory control is enabled for the hyervisor before trying to scale the vm. If its not then dont scale and instead throw and exception. 2013-05-21 16:39:25 +05:30
Pranav Saxena e5e41b0f45 Remove ACL List action item 2013-05-21 16:35:14 +05:30
Prasanna Santhanam 2adc8e9a03 Adding docstrings for the portablip test
1. Test to create a portable public ip range
2. Test to acquire a provisioned public ip range

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 15:26:23 +05:30
Prasanna Santhanam 5fb1a16109 Fix apidocs build
Portable IP section added post portable IP merge

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 15:19:28 +05:30
Likitha Shetty eb92135d55 CLOUDSTACK-2603. EC2RunInstances return xen or ovm as the response value for attribute "hypervisor" 2013-05-21 15:15:35 +05:30
Devdeep Singh 904a2a87f7 CLOUDSTACK-2601 : xen.heartbeat.interval doesn't change the parameter passed to xenheartbeat.sh. Made changes to read the parameter from config and to pass it to the resource.
Signed-off-by: Devdeep Singh <devdeep@gmail.com>
2013-05-21 13:33:07 +05:30
Dave Brosius 9350441dd3 remove bogus self assign to parent
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-05-21 12:19:03 +05:30
Likitha Shetty 6217b0fb4c CLOUDSTACK-2600. Fix CS AWSAPI to add the below filters that are missing in DescribeImages API-
architecture
description
image-id
image-type
is-public
name
owner-id
state
tag-key
tag-value
tag:key
hypervisor
2013-05-21 12:10:52 +05:30
Prasanna Santhanam 218d26be60 Adding the 'advanced' attribute for test_public_ip_range
Fixing typo in class name.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 12:04:03 +05:30
Sanjay Tripathi 55c384651a CLOUDSTACK-2305: [Automation] NPE: not able to create volume from snapshot
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-05-21 12:00:49 +05:30
Dave Brosius 49faa002e2 code compares Long values with == which will work for Long cached values
Fixed by switch to use .equals

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 11:45:10 +05:30
Dave Brosius 45d2e60656 Nop assignment due to missing 'this.'
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 11:43:25 +05:30
Likitha Shetty 503392119d CLOUDSTACK-2599. Fix EC2 Rest to support tag related EC2 API's - CreateTags/DeleteTags/DescribeTags 2013-05-21 11:33:33 +05:30
Jessica Wang 933060dfeb CLOUDSTACK-747: internalLb in VPC - UI - create network offering - add LB Type dropdodwn which is shown when VPC is checked and LB service is checked, hidden otherwise. LB Type (publicLb, internalLb) will determine the options in LB Provider dropdown. 2013-05-20 19:18:56 -07:00
Sheng Yang eb7c321426 PVLAN: CLOUDSTACK-2401: VM Migration support 2013-05-20 16:43:24 -07:00
Hiroaki Kawai 7260e8d83f CLOUDSTACK-1638: Introduce NetworkMigrationResponder
The location of the virtual machine is provided by DeployDestination, which will
be passed in NetworkGuru#reserve and NetworkElement#prepare.

During the virtual machine migration, it actually changes DeployDestination and
it looks like that it will tell that event to network components as it has
NetworkManager#prepareNicForMigration. The problem is that althogh the interface
has that method, NetworkManagerImpl does not tell the DeployDestination changes
to network components.

So IMHO, we need to add calls of NetworkGuru#reserve and NetworkElement#prepare
in NetworkManagerImpl#prepareNicForMigration . And then, we also need to add
calls NetworkGuru#release and NetworkElement#release after the migration,
otherwise the network resources that plugin reserved will be kept even when the
vm leaves off.

(Sheng Yang: rebase code, add license header)

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-05-20 16:43:18 -07:00
Brian Federle 6b7098c990 Add network ACL item: Fix add action 2013-05-20 14:10:52 -07:00
Brian Federle bd764cc581 Pass dashboard data via dataProvider 2013-05-20 13:55:50 -07:00
Jessica Wang cf6045f1aa CLOUDSTACK-747: internalLb in VPC - UI - create network offering - system offering dropdown is for router only. Change its variable name to be more intuitive. 2013-05-20 13:41:02 -07:00
Jessica Wang 9e24af77b9 CLOUDSTACK-747: internalLb in VPC - UI - create network offering - system offering dropdown is for router only. Change its variable name to be more intuitive. 2013-05-20 13:37:52 -07:00
Brian Federle 034c21b6fc ACL multi-edit: add 'action' field to specify rule as allow/deny 2013-05-20 13:32:46 -07:00
Pranav Saxena a1614a5f8f ACL DENY RULES Network ACL List Detail View 2013-05-21 01:25:10 +05:30
Chip Childers 0365d555cf Adding a name to the framework/jobs/pom.xml file
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-20 19:17:33 +01:00
Pranav Saxena 981b5ddd1b ACL DENY RULES UI-API Integration 2013-05-20 23:42:55 +05:30
Dave Cahill cede6c11ab Adding package declaration to MidoNetElementTest 2013-05-20 18:57:42 +01:00
Prasanna Santhanam 54ac779b8f Fix all occurrences of account.account
Fixes the dereference of account objects with account.account. This is
to conform to recent library changes in Marvin

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-20 22:59:52 +05:30
Prasanna Santhanam 145a116c9b Fixing TestVMLifeCycle class
Missed the reference to zone listed in setUpClass()

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-20 22:05:53 +05:30
Sanjeev Neelarapu aa60105a84 CLOUDSTACK-2543: [Multiple_IP_Ranges] Failed to create IP alias on router vm
createipAlias.sh/deleteipAlias.sh won't be copied to XenServer host.
The directory of the scripts should be ".." rather "../../.." in all the xenserver patches file.
Corrected the path to ".." because the scripts are located at scripts/vm/hypervisor/xenserver/xenserver56/patch
2013-05-20 20:40:59 +05:30
Murali Reddy d6452be861 CLOUDSTACK-652: meging 'portable public ip' feature
Squashed commit of the following:

commit f244f9ce7982db16984dd87c31545f1c0240c704
Merge: 993cbb0 f5c8e38
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:54:05 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java

commit 993cbb0df9fa6e64b96b18ed775b73cdf4a8f5d7
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:49:54 2013 +0530

    introduce 'transferPortableIP' interface method in network manger. This
    method will transfer association of portable ip from one network to
    another network.

commit 0c1c2652c1b39e9a81ca35464360e11ed9ef23f1
Merge: a718d35 a29e393
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Fri May 17 02:48:54 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	utils/src/com/cloud/utils/net/NetUtils.java

commit a718d353f7
Merge: ecca117 c211818
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 21:22:19 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/src/com/cloud/network/addr/PublicIp.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/com/cloud/network/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit ecca117e34
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 20:05:29 2013 +0530

    added integration tests for testing portable ip ranges

commit 895a27c277
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 15:12:19 2013 +0530

    - establish model for transferring portable IP association from a network
      with which it is associated to another network.

    - enabling static nat api, extended to transfer potrtable IP across the
      networks if the VM/network is different from the current associate
      network of the portable ip

commit 51509751b2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 12:05:33 2013 +0530

    seperate out associate/disassociate with guest network operations from
    alloc and release of portable ip

commit bd058f58c2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 21:14:48 2013 +0530

    enhance disasociateIPAddr API to release protable IP associated with a
    guest network or VPC

commit 27504d9098
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 16:53:45 2013 +0530

    enhance asociateIPAddr API to acquire a protable IP and associate with a
    guest network or VPC

commit f82c6a8431
Merge: 3dbfb44 0749013
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 23:32:13 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/com/cloud/network/IpAddress.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	client/tomcatconf/commands.properties.in
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
    	setup/db/db/schema-410to420.sql

commit 3dbfb44eb5
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 20:33:19 2013 +0530

    - add 'portable' boolean as property of IpAddress, persist the property in
    IPAddressVO, return the property in IpAddressResponse

    - add ability to request portable IP in associateIpAddress api

commit bf3cb274cf
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 16:08:40 2013 +0530

    add the status of each portable IP (its state, details of associated data
    center/VPC/guest network etc) in the PortableIpRangeResponse returned by
    listPortableIpRanges API

commit e7b2fb2255
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 14:36:01 2013 +0530

    Introdcues notion of 'portable IP' pool at region level.

    Introduces root admin only API's to provision portable ip to a region
       - createPortableIpRange
       - deletePortableIpRange
       - listPortableIpRanges
2013-05-20 20:05:47 +05:30
Devdeep Singh f5c8e386e5 CLOUDSTACK-2379: Fix for issue destroy vm causing NPE. Made the following changes.
1. Made a fix to make sure a null object is added to the exception.
2. Also fixed the marvin test cases for the feature. Account cleanup will remove the vms deployed for the account. There is no need to explicitly delete the vms for the account.
3. Fixed the assertion checks for the vm created for an account. If there are multiple vms for an account, the test script needs to compare the ids with the correct instance.
2013-05-20 18:26:50 +05:30
Kishan Kavala 612afbd179 CLOUDSTACK-2553: Made ACL item action case-insensitive 2013-05-20 18:06:12 +05:30
Prasanna Santhanam 32e7ba23a3 LDAP moved to regression suite.
LDAP requires a Directory server which isn't available by default in
most environments. Moving this to the regression suite so it can be run
on demand.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-20 17:59:19 +05:30
Prasanna Santhanam e1ad36bccb migrate only when hosts are available
Identify the hosts that are suitable for migration before proceeding
with migrateVM

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-20 17:51:50 +05:30
Prasanna Santhanam 92e6352287 Detect the second zone for copyImage operation
When copying templates and ISOs detect that a second zone is available.
Else skip the test.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-20 17:51:49 +05:30
Prasanna Santhanam 8da7ec05f1 CLOUDSTACK-2085: DMC enable guest scaling
When dmc is enabled allow cloudstack to scale the VM between dynamic
ranges. This requires a further commit where there is enough memory
available between dynamic-max and static-max for the VM to scale under
memory pressure. See the TODO in Xenserver56FP1Resource.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-20 17:51:49 +05:30