gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-30 17:01:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
20,860 Commits 394 Branches 330 Tags 895 MiB
hyperv
Commit Graph

573 Commits

Author SHA1 Message Date
Min Chen
9c584b5500 Use EndPoint to send local/remote command, and hide agentMgr message 
passing.
 2013-04-22 13:21:28 -07:00
Alena Prokharchyk
2ca7584994 Fixed VPC api unittests 2013-04-19 11:26:32 -07:00
Devdeep Singh
21ce3befc8 Storage motion for Xenserver changes: 1. Implemented Api findStoragePoolsForMigration. Added a new response objects to list storage pools available for migration. 2. Updated migrateVolume api for allowing migrating volumes of running vms. These changes are integrated into the latest storage refactoring changes. 3. Added the implementation for findHostsForMigration api. It lists the hosts to which an instance can be migrated, including hosts from within and across clusters to which an instance may be migrated with storage motion. The work of migrating a volume of a running vm is also done in copyAsync. 4. Updated the listHosts api for backward compatibility. 5. Added the implementation for migrateVirtualMachineWithVolume api. It migrates an instance with its volumes within a cluster and also across clusters. Also introduced a new XenServerStorageMotionStrategy for migrating volumes of a vm. When a vm is being migrated with its volumes, the vm is put in migrating state and a request is send to the volume manager to migrate the vm and its volumes. Volume manager calls into the volume service which forwards the request to data motion service after moving all the volumes to migrating state. Data motion service enumerates the strategies and the request reaches the XenServerStorageMotionStrategy. It calls in to the resource to complete the operation. 6. Resolved an issue where storage xenmotion of 2nd VM created from the same template to a host was failing with duplicate_vm exception. Made changes to remove the mac_seed key value pair from other_config when vms are created. This is was storage motion to fail. 7. Updated the db upgrade schema script. 8. Added the right permissions in commands.properties 9. Marvin tests for testing storage motion. Following scenarios are tested. 9.1. A virtual machine is migrated to another host. Its volumes are also migrated to another storage pool. 9.2. Just the volumes of a vm are migrated to another storage pool while the vm continues to run on the same host. 10. Unit tests for testing migration of a vm with its volumes. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-19 11:36:42 +05:30
Harikrishna Patnala
eae22d2ffa CLOUDSTACK-741: Granular Global Parameters 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-19 10:36:52 +05:30
Bharat Kumar
8b40e393b8 Cloudstack-701 Support for non contiguous vlan ranges. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-17 10:14:42 +05:30
Min Chen
1b3994e180 Fix copyTemplateCmd. 2013-04-16 16:38:14 -07:00
Prachi Damle
77ccc22723 Pulling back the changes to ServiceOffering to add a planner - these changes will be part of a separate feature branch 2013-04-16 15:17:01 -07:00
Likitha Shetty
9ad50272c1 Create Public IP address - If system account is specified do nothing 
Dedicate Public IP address - If system account is specified fail the request
 2013-04-17 02:16:07 +05:30
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
Likitha Shetty
8f865c5a90 Dedicate Public IP address range to an account 2013-04-12 23:27:35 +05:30
Prachi Damle
c8ae2a9d25 API to list planners and set the planner in Service offering 
Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql
 2013-04-11 13:22:56 -07:00
Prachi Damle
fe2a86871f Changes to add AffinityGroupprocessor, deployVM changes 2013-04-11 13:22:42 -07:00
Mice Xia
b646e43a1a use hypervisor capabilities to control if vm snapshot is enabled for hypervisors 2013-04-10 12:36:42 +08:00
Jessica Wang
98bc240d2a Revert "Dedicate Public IP range" 
This reverts commit d6ed8d7cb5.

Conflicts:

	server/test/com/cloud/configuration/ConfigurationManagerTest.java
 2013-04-08 17:15:51 -07:00
Chiradeep Vittal
3cbbe2bb04 RAT check broken by d6ed8d7cb. Fix 2013-04-08 16:51:10 -07:00
Likitha Shetty
d6ed8d7cb5 Dedicate Public IP range 2013-04-08 14:46:21 -07:00
Min Chen
7f64b61cbd Move some image store related interface methods from ResourceService to 
StorageService.
 2013-04-08 14:16:51 -07:00
Hugo Trippaers
d9f7bb2854 Changing the number of threads in the test from 1000 to 750. 1000 will more often than not result in build failures due to constraints on the build systems. 
Most recent centos based systems have process limit of 1024. Running this test will result in an OutOfMemory exception with description unable to create native thread.
 2013-04-07 12:17:53 +02:00
Min Chen
a872d6d306 Renamed internal classes to use "imageStorexxx" instead of previous 
"imageDataStorexxx". Add new addImageStoreCmd to use 3 image store
provider plugins.
 2013-04-05 17:33:35 -07:00
Min Chen
86a3840412 Fix AddSecondaryStorageCmd to use CloudStack default secondary storage 
store plugin.
 2013-04-05 11:18:33 -07:00
Alena Prokharchyk
42ffac3ae8 CLOUDSTACK-1895: save placeholder nic with not null vmType='DomainRouter' when placeholder is used for the VR ip address 2013-04-04 13:29:17 -07:00
Brian Spindler
469c4dd139 Removing ^M's from code. 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-04 00:53:20 +05:30
Alena Prokharchyk
cf72aa3274 Fixes/improvements for VPC feature: 
1) Added comments to VPC/VPCService/VPCManager interfaces
2) Moved VPC offering related methods from VpcService to the new interface - VpcProvisioningService
3) Fixed static nat creation in the VPC - used to result in NPE due to invalid method referencing while obtaining VPC VR information
 2013-03-29 16:56:01 -07:00
Sanjay Tripathi
18695276f7 CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts 
Addition of two new resource types i.e. Primary and Secondary storage space in the existing pool of
    resource types.
    Added methods to set the limits on these resources using updateResourceLimit
    API command and to get a count using updateResourceCount. Also added calls in the
    Templates, Volumes, Snapshots life cycle to check these limits and to increment/decrement the new
    resource types

    Resource Name          :: Resource type number
        Primary Storage               10
        Secondary Storage             11

    Also added jUnit Tests for the same.
Reviewed by : nitin mehta<nitin.mehta@citrix.com>
 2013-03-29 11:26:38 +05:30
Nitin Mehta
3e4430d811 CLOUDSTACK-658 - Scaleup vm support for Xenserver 
Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests.
 2013-03-28 16:43:37 +05:30
Alena Prokharchyk
26b892daf3 CLOUDSTACK-1771: fixed VirtualRouter nics assignment in the Shared networks. Before the fix VR could get a different IP address from the network upon recreation. With the fix the IP address assigned to the first VR in the network, will remain with the network till its entire lifecycle (stored in placeholder nic) and will be assigned to the VR every time it recreates in the network. 
Shared networks in both - Advance and Basic - zone types are covered by this checkin
 2013-03-26 13:29:57 -07:00
Sheng Yang
98291d043d CLOUDSTACK-1218: Use the first IP in the first vlan range for VR in shared network 2013-03-14 13:13:31 -07:00
Kishan Kavala
2dd31f331d CLOUDSTACK-1636: Removed the concept of owner region. 
Removed region_id from user/account and domain tables.
Removed forwarding of api calls to owner region.
Removed api_key and secret_key from region table.
Included related DB upgrade changes.
 2013-03-14 11:53:40 +05:30
Jayapal Uradi
a49261c3b1 CLOUDSTACK-24: mipn feature for basiczone 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-03-13 10:24:22 +05:30
Min Chen
c129c4e02e Add missing Apache license header. 2013-03-08 14:38:35 -08:00
Sanjay Tripathi
f539f40e35 CLOUDSTACK-874: Ability to delete Events and Alerts 
This feature will provide the functionality to delete or archive
the Alerts/Events.
Delete or archive alerts APIs are available only for root-admin,
delete or archive events are available for regular users.
 2013-03-08 11:59:53 -08:00
Kishan Kavala
a1fdb0c2d4 CLOUDSTACK-241: Remove API sync. Merge changes from 4.1 branch. Converted tabs to spaces. 2013-03-08 19:02:41 +05:30
Edison Su
409ec9c6b6 CLOUDSTACK-1426: We has strong implication that VO must implement an interface, otherwise EntityManagerImpl can't the vo 2013-03-07 18:25:57 -08:00
Kelven Yang
333dd810d2 CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory 2013-03-05 19:03:30 -05:00
Min Chen
613a061977 Merge branch 'master' into vim51_win8 
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
 2013-03-04 17:32:52 -08:00
Nitin Mehta
b12aebefee Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes" 
This reverts commit e0019eccd9.
 2013-03-04 23:32:52 +05:30
Nitin Mehta
e0019eccd9 CLOUDSTACK-658 - Adding Scalevm command and XS related changes 2013-03-04 14:47:55 +05:30
Jayapal Uradi
aedb8c478e CLOUDSTACK-24: mipn feature for isolated and vpc networks 
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC
 https://issues.apache.org/jira/browse/CLOUDSTACK-24
 2013-03-04 11:02:09 +05:30
Min Chen
8b9c45b96d Merge branch 'master' into vim51_win8 
Conflicts:
	setup/db/db/schema-40to410.sql
 2013-03-01 16:46:58 -08:00
Abhinandan Prateek
14791a9d8f Revert "CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes." 
This reverts commit f9d96c9169.
 2013-03-01 22:29:47 +05:30
Jayapal Uradi
f9d96c9169 CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes. 2013-03-01 16:40:26 +05:30
Prasanna Santhanam
993afdba6a ignore the tests looking for db 
These tests require DB to be present to do upgrade. Revisit later.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-03-01 12:04:06 +05:30
Min Chen
93f14e7c65 Merge branch 'master' into vim51_win8 
Conflicts:
	client/tomcatconf/componentContext.xml.in
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
	vmware-base/test/com/cloud/vmware/TestVMWare.java
 2013-02-27 17:47:10 -08:00
Min Chen
7d2ebc9fc3 Add some comments on some code source to give credit to vmware sample 
code.
 2013-02-27 13:46:43 -08:00
Edison Su
cc81413931 CLOUDSTACK-724: add zone wide storage, createstoragepoolcmd doesn't need cluster/pod any more 2013-02-26 23:16:17 -08:00
Kishan Kavala
e37fdce125 CLOUDSTACK-241: Removed API based account sync. Removed all the related API changes and RegionsAPIUtil. 
Converted tabs to spaces in the related files.
Verified account, user and domain APIs.
 2013-02-26 14:21:21 +05:30
Sheng Yang
1b408509d6 CLOUDSTACK-1332: Add IPv6 DNS for Zone 2013-02-25 16:08:10 -08:00
frank
cd291f6b4b From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001 
From: Vijayendra <vijayendra.bhamidipati@citrix.com>
Date: Mon, 25 Feb 2013 14:37:27 -0800
Subject: [PATCH] CS-670: Configurable setting to use linked clones or not on
 VMware

Description:

  Providing support for creation of user VMs as full clones on ESX.
  Putting in unit tests for VO and Dao classes introduced in this commit.

Signed-off-by: Vijayendra <vijayendra.bhamidipati@citrix.com>
---
 core/src/com/cloud/vm/UserVmCloneSettingVO.java    |  50 ++++++
 .../hypervisor/vmware/manager/VmwareManager.java   |   3 +
 .../vmware/manager/VmwareManagerImpl.java          |  18 +-
 .../hypervisor/vmware/resource/VmwareResource.java | 117 +++++++++----
 server/conf/migration-components.xml               |   1 +
 server/src/com/cloud/configuration/Config.java     |   1 +
 server/src/com/cloud/vm/UserVmManagerImpl.java     | 184 ++++++++++-----------
 .../com/cloud/vm/dao/UserVmCloneSettingDao.java    |  37 +++++
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java    |  74 +++++++++
 .../vm/dao/UserVmCloneSettingDaoImplTest.java      |  62 +++++++
 .../UserVmCloneSettingDaoTestConfiguration.java    |  52 ++++++
 .../test/resources/CloneSettingDaoTestContext.xml  |  42 +++++
 setup/db/db/schema-410to420.sql                    |   9 +
 13 files changed, 527 insertions(+), 123 deletions(-)
 create mode 100755 core/src/com/cloud/vm/UserVmCloneSettingVO.java
 create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDao.java
 create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
 create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java
 create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java
 create mode 100644 server/test/resources/CloneSettingDaoTestContext.xml
 2013-02-25 14:57:57 -08:00
Kishan Kavala
15201d908f CLOUDSTACK-749: updated mockvpcdao mockvpcmanagerimpl with external device related changes 2013-02-25 18:54:30 +05:30
Chip Childers
4b161e5410 Correcting the license header problem that was introduced with commit 
23e54bb0f4

Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-02-22 11:06:47 -05:00
Bharat Kumar
667aa17512 CLOUDSTACK 711: CPU and RAM overcommit update cluster part 2013-02-22 20:09:50 +05:30
Bharat Kumar
23e54bb0f4 Cloudstack-711: Cpu and Ram Overcommit Ratio. 2013-02-22 17:31:06 +05:30
Saksham Srivastava
ea3db2f073 CLOUDSTACK-705 IP Address reservation for Isolated Guest Networks 
CloudStack uses Guest CIDR for dhcp-range for the Guest VMs. The entire
CIDR is used by CloudStack for assigning IPs to Guest VMs. IP Address
Reservation will allow part of address space to be used fornon CloudStack
hosts/physical servers also, by restricting the address space of CloudStack
Guest VMs. Reservation can be configured using update Network API by specifying
guestvmCidr as an additional parameter. Reservation will be applicable for
Isolated Guest Networks including VPC. reservediprange in the response
will return the IP range that can be used for non Cloudstack hosts.

Tested manually the following scenarios:
Applying reservation when there are running VMs inside the
guest_vm_cidr.
Applying reservation when there are running VMs outside the
guest_vm_cidr.(not allowed)
Applying reservation when external device like Netscaler is configured
in the guest_cidr.
Applying reservation in VPC tiers.
Applying reservation outside the range of guest_cidr.(not allowed)
 2013-02-22 15:50:33 +05:30
Edison Su
18e496b057 rebase to master 2013-02-21 11:22:50 -08:00
Edison Su
a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Harikrishna Patnala
6c01b62cdc CLOUDSTACK-667: VM's base image update facility 2013-02-21 15:04:29 +05:30
Harikrishna Patnala
7a3f072a50 CLOUDSTACK-745: Reset a VM on reboot. On every reboot of VM, the root disk state is reset. This is for the VMs created using service offering where an optional parameter isvolatile is set true. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-02-21 14:59:35 +05:30
Abhinandan Prateek
f2b97db0f9 CLOUDSTACK-1172: LDAP enhancements 2013-02-19 15:36:39 +05:30
Min Chen
5147fb16ac CLOUDSTACK-1253: Remove @author tag. 2013-02-15 10:42:06 -08:00
Sheng Yang
ca5c6d5d14 CLOUDSTACK-1219, CLOUDSTACK-1220: Fix IPv6 error messages 2013-02-14 16:28:29 -08:00
Mice Xia
9a12756ae4 CLOUDSTACK-684 support vm snapshot 2013-02-14 01:26:30 +08:00
Rohit Yadav
0a9af54c9f rat: Fix license for ResourceLimitManagerImplTest.java 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-13 14:32:33 +05:30
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
Sheng Yang
06acd9f0ea IPv6: One network can have more than one vlan 2013-02-06 20:07:07 -08: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
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
Likitha Shetty
13ee8d1865 Persistent Networks support 
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
 2013-02-01 15:10:06 +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 894cb8f7d9 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
Kelven Yang
1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
Kishan Kavala
c607e03f0e Merge branch 'master' into regions 2013-01-31 22:31:25 +05:30
Jayapal
b6727e5646 CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
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
Kelven Yang
176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -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
Sheng Yang
2cbca372bf IPv6: Add support for IPv6 on DeployVMCmd 2013-01-28 18:54:34 -08:00
Kishan Kavala
ea660cd06d removed MockAPI server 2013-01-28 17:50:38 +05:30
Kishan Kavala
def9fd1f2e remove finduser, findaccount, finddomain APIs 2013-01-28 17:04:25 +05:30
Sheng Yang
bd4bc025d1 IPv6: Accept IPv6 parameter for createNetworkCmd 
Also ass public_ipv6_address for ipv6 address management.

Extend nics and vlans for ipv6 address.

Add dependency to com.googlecode.ipv6(java-ipv6).

Modify dhcpcommand for ipv6.
 2013-01-26 23:14:15 -08:00
Kishan Kavala
c6ae19d12f Merge branch 'master' into regions 2013-01-25 18:49:47 +05:30
Kishan Kavala
1f57d925eb Apply API refactoring changes. Make changes to Regions API to work with new code 2013-01-25 18:41:59 +05:30
Prachi Damle
df5c4c3048 Fixing VPC unit test to use Spring 2013-01-24 23:05:31 -08:00
Rohit Yadav
356866c72b Merge branch 'master' into javelin 
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 19:18:53 -08:00
Min Chen
b6f780fa33 Fix StoragePool unit testcase. 2013-01-24 16:11:35 -08:00
Min Chen
f85ac65645 Fix Snapshot unit testcase. 2013-01-24 16:05:03 -08:00
Alex Huang
1567a112fa unit test works again 2013-01-24 14:36:44 -08:00
Min Chen
c3f1a9d324 CLOUDSTACK-355: fix count for listSwiftsCmd. 2013-01-22 17:14:44 -08:00
Prachi Damle
e6cd47ddc0 More changes for deployVM flow. 2013-01-22 12:54:07 -08:00
Alex Huang
ee39ec82d3 Making unit tests work 2013-01-22 11:18:51 -08:00
Edison Su
4fbecf15ec add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00
Alex Huang
fe6f0457d5 fixed unit tests from merge 2013-01-18 15:58:55 -08:00
Alex Huang
10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Min Chen
5a865462e9 Merge branch 'api_limit' 2013-01-18 09:43:54 -08:00
Chiradeep Vittal
ce4b49d30b network-refactor merge: fix nonoss build 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-18 09:38:49 -08:00
Min Chen
2fd1d476b4 Merge branch 'master' into api_limit 2013-01-17 21:23:50 -08:00
Rohit Yadav
8d016d035b MockConfigurationDaoImpl: Fix build issue, add base class method 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 16:15:15 -08:00
Min Chen
86ada92ffa Fix some bugs and add java integration test for api rate limit plugin. 2013-01-17 15:13:51 -08:00
Alex Huang
cbb7ff1c32 added missing files 2013-01-17 06:50:59 -08:00
Alex Huang
9759ad57f2 Commit the current changes to unit tests 2013-01-17 06:50:11 -08:00
Min Chen
06fa338d42 Add some tests for api rate limit plugin. 2013-01-16 21:56:25 -08:00
Chiradeep Vittal
d9e36ac37b network-refactor: fix license issues 
Fix build after merge of network-refactor
 2013-01-16 19:25:23 -08:00
Chiradeep Vittal
cadca5fc0c Merge branch 'master' into network-refactor-merge2 
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 2013-01-16 19:17:14 -08:00
Min Chen
e83fe471c7 Merge branch 'master' into api_limit 2013-01-16 10:49:25 -08:00
Murali Reddy
4b67340d8c Revert "Summary: partical check-in for L4-L7 network services in the 
shared"

This reverts commits 0de5a145e4,
28bbf6c527

Reverting due to IP clearance issues for the commits done as part of CLOUDSTACK-312
 2013-01-16 16:43:37 +05:30
Min Chen
4355d06a86 Reuse APIChecker adapter interface for APi Rate limit checking and optimize ApiRateLimitService interface. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-15 15:53:19 -08:00
Chiradeep Vittal
7fad27b846 network-refactor: unfortunately have to ignore tests during build since the tests involve verification of injection. This causes the database to get invoked during component initialization. The database is not available on the build server 2013-01-15 11:43:53 -08:00
Min Chen
4d0c850dc8 Fix plugin component configuration. 2013-01-14 17:13:18 -08:00
Rohit Yadav
38eaa04b98 Pull changes from master into javelin 
- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts

Conflicts:
	docs/en-US/external-firewalls-and-load-balancers.xml
	plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 06:02:54 -08:00
Rohit Yadav
8cdb40a416 NetworkManagerImpl: Add method to getNetwork by uuid 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:19 -08:00
Rohit Yadav
31dd412626 DomainService: Fix getDomain by uuid string 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:19 -08:00
Kelven Yang
6fb1a1e6f1 Fix issues after another round of merge 2013-01-11 16:54:32 -08:00
Alex Huang
1294cdc701 pulled from master 2013-01-10 16:01:01 -08:00
Rohit Yadav
1425736c19 AccountManager: Add method to translate account type to role type 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-10 15:55:01 -08:00
Alex Huang
fac2270240 more files changed 2013-01-10 15:29:14 -08:00
Alex Huang
56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Alex Huang
f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -08:00
Chiradeep Vittal
1776659fe7 Network-refactor: move validateRule to LB manager since it now has access to LB elements. 
NetworkServiceImpl does not need a cache of system network offerings
Ensure mocks build to new APIs.

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 18:36:29 -08:00
Chiradeep Vittal
05a85c7cd6 Network-refactor: reduce verbosity of test logs. 
Icky way to do it, but unable to get maven to pick up log4j properties from test/resources

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:02 -08:00
Chiradeep Vittal
dbe3fe2d34 Network-refactor: interaction between firewall manager and network manager changed, verify this works as expected 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:02 -08:00
Chiradeep Vittal
728db6c8ca Network-refactor: fix bugs in components.xml discovered by unit tests 
Provide injection tests for NetworkManager and FirewallManager

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:02 -08:00
Chiradeep Vittal
e0578180c5 Network-refactor: verify injection is correct. Verify that dhcp service providers and ip deployers get injected independently in addition to the list of network elements 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:02 -08:00
Chiradeep Vittal
88df984ff3 Network-refactor: add a method for plugins to get the source nat ip 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:02 -08:00
Chiradeep Vittal
a34ce77b77 Network-refactor: verify that s2s provider gets injected as expected 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:01 -08:00
Chiradeep Vittal
504264236c Network-refactor: In preparation for moving the read-only interface NetworkModel 
to the api project, ensure that all methods use interfaces from the api project.
By moving it to the api project, it lessens the dependency of plugins on the server components.

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:01 -08:00
Chiradeep Vittal
6b6d8c5710 Network-refactor: Move code from NetworkManager to NetworkModel. 
NetworkModel is intended as a read-only view on the network model.
This includes Networks, Nics, Ip address, PhysicalNetwork, NetworkOfferings, etc
The code in configure() and start() is used to support queries on the network model which is now the responsibility of the NetworkModel service

Network-refactor: Fix tests so that they get injected with the required NetworkModel mock

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:01 -08:00
Chiradeep Vittal
5a830c4db0 Network-refactor: Refactor NetworkManager into NetworkModel and NetworkManager. 
NetworkManager's exclusive focus is now
 - handling plugins during orchestration, and
 - to deal with ip address allocation.
Those classes that used to refer to NetworkManager to get access to the datamodel now refer to NetworkModel

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-09 15:49:01 -08:00
Alex Huang
b6c56736e5 merge from master 2013-01-09 05:20:36 -08:00
Alex Huang
30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Min Chen
74c15a22a0 Create DB view for ListStoragePools API performance optimization. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-08 12:33:18 -08:00
Chiradeep Vittal
e262eef296 Fix mocks 2013-01-07 15:21:49 -08:00
Rohit Yadav
ed0637b8c2 api: Refactor move acl to org.apache.cloudstack 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-06 15:30:58 -08:00
Rohit Yadav
b720675bfe Merge branch 'master' into api_refactoring 
Getting ready for merge request for master, sync changes

Conflicts:
	client/tomcatconf/commands.properties.in

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-06 01:11:16 -08:00
Sheng Yang
aa9701a10c CLOUDSTACK-799: Redundant router: Speed up RvR status update 
The basic idea behind this is, deploy a fix sized threadpool for updating RvR
status, then using producer/consumer model. There is a global configuration
router.check.poolsize(10 by default) to control the pool size.

Using pool size 100 for 1000 RvR is tested with simulator and works well.

Also we can adjust the global configuration option router.check.interval to e.g.
60s from default 30s to mitigate the issue.
 2013-01-05 21:02:37 -08:00
Rohit Yadav
5119785cf7 Get latest changes, merge branch 'master' into api_refactoring 
Conflicts:
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-04 22:21:20 -08:00
Sheng Yang
42c8c73ab6 CLOUDSTACK-306: Introducing IpDeployingRequester and implement inline mode 
For LB device in inline mode, the ip deployer(the owner of public ip) is the
firewall in front of it, not itself. So check if it's inline or not, if it's
inline, return the firewall as ip deployer
 2013-01-04 19:18:03 -08:00
Sheng Yang
177e157cbf CLOUDSTACK-306: Move inline mode parameter from device to network offering 
One F5 device can be used as inline and side-by-side at the same time(for
different networks). So we can define inline or not on network base.
 2013-01-04 19:17:58 -08:00
Kelven Yang
25d14418b9 Replace Adapters<T> with standard List<T> to work with Spring injection 2013-01-03 13:33:52 -08:00
Min Chen
ebfb90e217 Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-02 17:38:58 -08:00
Min Chen
21c1623a03 Create DB view for Volume to speed up ListVolumesCmd. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2012-12-25 17:08:50 -08:00
Rohit Yadav
296b49c2f8 Merge branch 'master' into test-merge-api 
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 13:54:46 -08:00
Min Chen
e7fa1a86fb Create DB views to improve ListHostsCmd performance. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2012-12-22 21:47:05 -08:00
Min Chen
e017dc2c00 commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44 
Author: Min Chen <min.chen@citrix.com>
Date:   Mon Dec 17 17:42:30 2012 -0800

    Remove IdentityProxy from AlertResponse and AsyncJobResponse.

Signed-off-by: Min Chen <min.chen@citrix.com>
 2012-12-17 17:44:39 -08:00
Min Chen
c167ad45e3 Move view based VO and Dao classes to cloud-server module to hide the 
details from API client, also extract query related methods into
QueryService interface.
 2012-12-14 10:47:58 -08:00
Rohit Yadav
88b7af18e6 api: Revert "Move all the DB view DAOs from cloud-server to cloud-api for future api-server package." 
Reverting commit as we don't want the daos to move to cloud-api.
We'll eventually breakout cloud-server and create cloud-api-server for the standalone
api server.

This reverts commit 7597a38f7a.
 2012-12-13 09:42:28 -08:00
Min Chen
7597a38f7a Move all the DB view DAOs from cloud-server to cloud-api for future api-server package. 
BUG-ID: CLOUDSTACK-527

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-13 09:28:42 -08:00
Min Chen
472f4f91b9 Refactor ListProjectInvitationsCmd and ProjectInvitationResponse. 2012-12-12 09:04:43 -08:00
Min Chen
9c93fee0dc Refactor ListProjectAccountCmd and ProjectAccountResponse. 2012-12-11 15:49:15 -08:00
Min Chen
8735716ba0 Refactor ListProjectsCmd and ProjectResponse. 2012-12-11 12:51:08 -08:00
Min Chen
c83323fea7 api: Refactoring ListUsersCmd and UserResponse. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-10 17:45:40 -08:00
Koushik Das
238c55fb6e CLOUDSTACK-596 : DeployVM command takes a lot of time to return job id Issue happens while deploying VM in advanced zone and 'networkids' parameter is not passed to deployVM command. In this case CS tries to identify a default guest network to be used for deploying VM. This logic is not optimized and latency increases with increase in user accounts and guest networks. Optimized logic for getting default network. 
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2012-12-10 15:02:53 +05:30
Rohit Yadav
e398b1e47a api: Refactor command and response classes to org.apache.cloudstack.api.* 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-07 19:23:24 -08:00
Rohit Yadav
af28c06998 api: move and group all under command, org.apache.cloudstack.command.* 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-07 18:30:54 -08:00
Rohit Yadav
41268d1237 api: Fix test failure in cloud-server 
Added newly added dao class as part of list api optimizations to be picked up
by the locator.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-07 15:06:51 -08:00
Rohit Yadav
780eb95830 api_refactor: swift, ldap and vlan apis to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 11:13:46 -08:00
Rohit Yadav
6c2ed5cb66 api_refactor: move pod apis to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 11:02:57 -08:00
Rohit Yadav
e763fd7d36 api_refactor: move userkeys api to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:59:26 -08:00
Rohit Yadav
1f1ac79a6c api_refactor: move disk and service offering to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:53:42 -08:00
Rohit Yadav
ecc8249365 api_refactor: move cfg admin apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:50:26 -08:00
Rohit Yadav
ab4fac54e5 api_refactor: move admin level domain apis to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:44:40 -08:00
Rohit Yadav
c3853677c5 api_refactor: move zone apis to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:41:10 -08:00
Rohit Yadav
1b1d91dc4f api_refactor: move admin level account apis to admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-06 10:25:20 -08:00
Murali Reddy
28bbf6c527 Summary: partical check-in for L4-L7 network services in the shared network in the advanced zone 
Details:

- changed associateIPAddr API to accept shared network Id and account Id. Ip will be owned by tuple (account Id, network Id)
- chaged createNetwork API to accpet CIDR when network offering has external networking device providers

Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared
network in the advanced zone
 2012-12-06 11:55:19 +05:30
Min Chen
b0ce8fd4ff api: Optimize and improve api, db call perfomance 
This is part 1 of list API refactoring. Commands covered:
listVmsCmd, listRoutersCmd Response covered:
UserVmResponse, DomainRouterResponse. DB views created:
user_vm_view, domain_router_view.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 20:06:20 -08:00
Rohit Yadav
ceddaf122c api_refactor: refactor user apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 14:55:58 -08:00
Rohit Yadav
e07106db0b api_refactor: usage apis to admin.usage pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-05 14:31:31 -08:00
Rohit Yadav
2121fbd469 api_refactor: refactor network apis for admin pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 11:38:40 -08:00
Rohit Yadav
8773fc2a55 api_refactor: refactor volume apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 11:20:48 -08:00
Rohit Yadav
9a0df30766 api_refactor: refactor account apis 
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:42:13 -08:00
Rohit Yadav
46353e0916 api_refactor: refactor vmgroup apis 
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:35:30 -08:00
Rohit Yadav
3e0b2164be api_refactor: refactor template apis 
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:05:44 -08:00
Rohit Yadav
47ae62e44a api_refactor: refactor network apis 
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
- Fix trailing whitespaces for all *.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 22:47:07 -08:00
Rohit Yadav
ac1ea7616a api_refactor: refactor vpc apis 
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 21:44:40 -08:00
Rohit Yadav
6fc3bc3760 api_refactor: refactor vpn and vm apis 
- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 21:27:02 -08:00
Rohit Yadav
5edfc2760a refactor: remove redundant imports, fix trailing chars 2012-12-03 13:54:37 -08:00
Rohit Yadav
4c86b1545d CLOUDSTACK-424: Update userdata should propagate to VR 
The code that would propage userdata to router, when updateVirtualMachine api
is called, was missing. As per the docs [0], userdata should be a base64 encoded
string upto 2KB which is put on domr's html directory adn using HTTP GET the
userdata information can be obtained from the domr.

The updateVirtualMachine api [0] would accept a base64 encoded string
and decoded and put into the domr's /var/www/html/userdata/<uservm ip>/user-data
file. The operation does not require the VM to be in stopped state, though it is
advised to stop and call this api in case the user vm has a script which gets
the userdata information from domr while starting.

For example, this script can be used to fetch the data:
server_ip=$(grep dhcp-server-identifier /var/lib/dhclient-eth0.leases | tail -1 | awk '{print $NF}' | tr '\;' ' ')
wget http://${server_ip}/latest/user-data

This feature can be useful, for example to use into puppet facts [1], or to do
automation and horizontal scaling etc. based on userdata.

[0] http://incubator.apache.org/cloudstack/docs/api/apidocs-4.0.0/domain_admin/updateVirtualMachine.html
[1] http://geek.jasonhancock.com/2011/11/09/cloudstack-userdata-into-puppet-facts/

BUG-ID : CLOUDSTACK-424
Reviewed-by: Rohit Yadav <bhaisaab@apache.org>
Reported-by: Nick Wales

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-11-15 18:43:51 +05:30
Kelven Yang
453b31f3f4 Refactor ComponentLocator to be based on Spring so that legacy way of loading component can coexist with Spring 2012-11-07 15:03:23 -08:00
Kelven Yang
cea8f3bf37 Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation 2012-11-07 15:03:22 -08:00
Alena Prokharchyk
214bbf3ebd CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup 
Conflicts:

	api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
	server/src/com/cloud/network/element/CiscoNexusVSMElement.java
	server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
	server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/element/NetscalerElement.java
	server/src/com/cloud/network/element/OvsElement.java
	server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/storage/StorageManager.java
 2012-10-17 17:26:19 -07:00
Kishan Kavala
c40aac0add Add Mock managers for Regio API server 2012-10-17 17:02:13 +05:30
Kishan Kavala
f0f33bf4da Added Mock ApiServer, Regions API calls with api keys 2012-10-17 14:16:36 +05:30
Alena Prokharchyk
3f5733cea7 CS-16412: fixed count for following commands: 
listVlanIpRanges
listOsCategories
listOsTypes
listSystemVms
listPhysicalNetworks
listCounters
listConditions
listAutoScalePolicies
listAutoScaleVmProfiles
listAutoScaleVmGroups
listConfigurations
listStoragePools
listClusters
listPods
listInstanceGroups
listSSHKeyPairs
listHypervisorCapabilities
listNetworkServiceProviders
listVpnCustomerGateways
listVpnGateways
listVpnConnections
listProjects
listProjectAccounts
listProjectInvitations
listTrafficTypes

Conflicts:

	api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java
	api/src/com/cloud/api/commands/ListConditionsCmd.java
	api/src/com/cloud/api/commands/ListCountersCmd.java
	api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
	api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
	api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
	api/src/com/cloud/network/as/AutoScaleService.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/as/dao/CounterDao.java
	server/src/com/cloud/network/as/dao/CounterDaoImpl.java
	server/src/com/cloud/projects/ProjectManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-10-15 18:16:59 -07:00
Alena Prokharchyk
8f2d9a09e5 CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 
Fixes the count in commands:

listVolumes
listVirtualMachines
listSnapshots
listRouters
listFirewallRules
listPortForwardingRules
listLoadBalancerRules
listIpForwardingRules
listAccounts
listUsers
listDomains
listDomainChildren
listPublicIpAddresses
listAlerts
listAsyncJobs
listRemoteAccessVpns
listVpnUsers
listTags
listPrivateGateways
listNetworkACLs
listStaticRoutes

Conflicts:

	api/src/com/cloud/api/commands/ListVMsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 2012-10-12 13:58:59 -07:00
Alena Prokharchyk
339aa41442 CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host. 
Conflicts:

	core/src/com/cloud/async/AsyncJobVO.java
	core/src/com/cloud/async/SyncQueueVO.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/async/AsyncJobManagerImpl.java
	server/src/com/cloud/async/SyncQueueManager.java
	server/src/com/cloud/async/SyncQueueManagerImpl.java
	server/src/com/cloud/async/dao/SyncQueueDao.java
	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
	server/test/com/cloud/async/TestSyncQueueManager.java
	setup/db/create-schema.sql
 2012-10-10 13:40:00 -07:00
Alena Prokharchyk
436960d2aa Fixed unittest 2012-10-05 15:38:20 -07:00
Alena Prokharchyk
c876a66b3f Fixed unittest 2012-09-11 17:26:20 -07:00
Alena Prokharchyk
51cc301fef CS-16222: send password reset command only to the element responsible for the userdata service in network 
Reviewed-by: Sheng Yang
 2012-09-04 13:41:10 -07:00
Gavin Lee
d3921139ed Patch from Gavin Lee: Change license to ASL2.0 in server and tools 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-08-30 10:36:29 -04:00
Alena Prokharchyk
93ac01db0b Fixed unittest 2012-08-27 09:46:56 -07:00
Edison Su
481aae1ebc add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -07:00
Chiradeep Vittal
48521e74e6 ElbVmMapDaoTest requires active DB backend for tests, hence jenkins test fails. 
Also, ELB feature using virtual router does not work and is deprecated currently.
 2012-08-16 12:59:00 -07:00
Chiradeep Vittal
ae5d22b4ab bug CS-16036 ResourceManagerTest does not test what is says it tests 
also fixes unit test failures
 2012-08-16 12:11:41 -07:00