Commit Graph

7437 Commits

Author SHA1 Message Date
Jayapal
d5c3f87903 CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-25 15:16:26 +05:30
Jayapal
1f97b528c5 CLOUDSTACK-1573 listNics response update for not showing vlan to normal user 2013-04-25 14:48:41 +05:30
Mice Xia
79cc241c64 fix CLOUDSTACK-2157 On VMWare ESXi host deployment: Expunged VMs are not getting cleaned up from the host 2013-04-25 14:25:03 +08:00
Min Chen
79151f5f5d Remove sendToSSVM reference from SnapshotManagerImpl and
TemplateManagerImpl.
2013-04-24 17:45:32 -07:00
Min Chen
4c174a6867 Fix DeleteSnapshotBackupCommand to pass dataStore information. 2013-04-24 17:30:38 -07:00
Jessica Wang
48b82a6f91 CLOUDSTACK-2120: mixed zone management - (1) extend listStoragePools API to to take in zonetype. (2) UI: populate Primary Storages list page with ones whose zonetype matches selected option in zone type dropdown on top menu. 2013-04-24 16:36:07 -07:00
Min Chen
5b76e4914c Remove sendToSecStorage methods from agentManager to use EndPoint
instead.
2013-04-24 16:21:41 -07:00
Min Chen
0a976d5fd5 Change Upload table to store dataStoreId instead of hostId. 2013-04-24 15:20:09 -07:00
Min Chen
f16f92dd1d Remove TemplateManager.getSecondaryStorageHost api. 2013-04-24 15:06:36 -07:00
Min Chen
8d29cdf804 Remove SnapshotVO.getSecHostId and SnapshotVO.setSecHostId references
from codebase to use SnapshotDataStoreVO.
2013-04-24 11:54:42 -07:00
Jessica Wang
d893ba881b CLOUDSTACK-2120: mixed zone management - (1) extend listVolumes API to to take in zonetype. (2) UI: populate Volumes list page with instances whose zonetype matches selected option in zone type dropdown on top menu. 2013-04-24 11:26:58 -07:00
Min Chen
792fc471a2 Remove VolumeHostDao references from codebase. 2013-04-24 11:11:58 -07:00
Jessica Wang
cdd459bb0b CLOUDSTACK-2120: mixed zone management - (1) extend listVirtualMachines API to to take in zonetype. (2) UI: populate Instances list page with instances whose zonetype matches selected option in zone type dropdown on top menu. 2013-04-24 10:38:28 -07:00
Murali Reddy
f65f3b9d50 CLOUDSTACK-1958: List GSLB response should have the GSLB site (zone load
balancer rule) details as well
2013-04-24 21:03:26 +05:30
Pranav Saxena
ff7112a074 Correcting the spelling errors in the Non contigous Vlan range code 2013-04-24 19:58:10 +05:30
Mice Xia
8ff442bbeb fix CLOUDSTACK-1944 Destruction of a VM with StaticNAT/FW throws a NullPointerException during VM Expunge 2013-04-24 20:11:18 +08:00
Vijayendra Bhamidipati
b0caae6b33 CLOUDSTACK-1086: DeployVirtualMachine userdata enhancements
Description:

	Currently, userdata sent over to the DeployVMCmd and
	updateVMCmd commands can be upto 2K in length, whether
	sent over GET or POST. We remove this limitation for
	POST to change this limit to 32K. Also enabling lazy
	load on userdata to improve performance during reads
	of large sized userdata from user VM records.

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-04-24 13:42:38 +05:30
Mice Xia
434525b836 fix CLOUDSTACK-2149 and related unit test 2013-04-24 11:12:34 +08:00
Min Chen
0cfef3aa4e Remove almost all VMTemplateHostDao references except S3Manager and
SwiftManager.
2013-04-23 17:51:54 -07:00
Min Chen
7543f314a7 Remove more VMTemplateHostDao references. 2013-04-23 17:12:21 -07:00
Jessica Wang
04a2b2d326 CLOUDSTACK-2120: mixed zone management - extend listPods, listClusters, listHosts, listStoragePools, listSystemVms, listRouters API to return zone type. 2013-04-23 16:32:19 -07:00
Min Chen
7ec0882dca Remove VMTemplateHostDao reference from BareMetalTemplateAdapter, also
make store_id in template_store_ref table nullable to accommodate
baremetal case.
2013-04-23 16:07:44 -07:00
Min Chen
246e58013d Remove VMTemplateHostDao reference from TemplateManagerImpl. 2013-04-23 15:09:37 -07:00
Jessica Wang
15e2bc463f CLOUDSTACK-2120: mixed zone management - extend listSnapshots API to return zone type. 2013-04-23 14:03:35 -07:00
Jessica Wang
6230e5b77b CLOUDSTACK-2120 - mixed zone management - extend listIsos API to return zone type. 2013-04-23 13:46:36 -07:00
Jessica Wang
f7f1279d81 CLOUDSTACK-2120: mixed zone management - extend listTemplates API to return zone type. 2013-04-23 13:01:55 -07:00
Jessica Wang
16ba999bf1 CLOUDSTACK-2120: mixed zone management - extend listNetworks API to return zone type. 2013-04-23 13:01:55 -07:00
Jessica Wang
35e2072660 CLOUDSTACK-2120: mixed zone management - extend listVolumes API to return zone type. 2013-04-23 13:01:55 -07:00
Alena Prokharchyk
ba4b8f1705 LOUDSTACK-751: changed the way the code retrieves the blacklisted.routes config. Now it always reads it from the DB while before we used to load it only on the management server start, and the update happened only after MS restart 2013-04-23 12:22:04 -07:00
Min Chen
06b3092083 Remove VMTemplateHostDao reference from VolumeManagerImpl,
StorageManagerImpl and SecondaryStorageManagerImpl.
2013-04-23 12:10:40 -07:00
Edison Su
4cd3903c9d change iszoneready, to use imagestore table 2013-04-23 10:41:30 -07:00
Mice Xia
7dd88fbbc6 fix CLOUDSTACK-2139 When VM is live migrated to a different host , stopped and started , It starts on the original host where it was before live migration. 2013-04-23 14:27:03 +08:00
Min Chen
e40a06deae Fix extractTemplateCmd. 2013-04-22 21:48:57 -07:00
Min Chen
29687663e8 Rename SnapshotStrategy to SnapshotService to have consistent naming
convention for Template, Snapshot, Volume. Also rename CopyCmd to
CopyCommand to follow internal command naming convention.
2013-04-22 16:15:57 -07:00
Alena Prokharchyk
c9c2c5902d CLOUDSTACK-751: added a support for blacklisting certain routes on a zone level so they can't be used when create Static Route for VPC Private Gateway 2013-04-22 13:35:15 -07:00
Edison Su
b30e39b0e3 CLOUDSTACK-1392: add create template from snapshot and volume 2013-04-22 13:24:10 -07:00
Min Chen
9c584b5500 Use EndPoint to send local/remote command, and hide agentMgr message
passing.
2013-04-22 13:21:28 -07:00
Jessica Wang
612e5fb672 LOUDSTACK-2120: mixed zone management - extend listVirtualMachines API to return zone type. 2013-04-22 10:08:19 -07:00
Murali Reddy
f1b9ef8581 CLOUDSTACK-2065: addNetscalerLoadBalancer is faling to persist
gslb_site_publicip and privateip in db table `external_load_balancer_devices`
2013-04-22 19:01:32 +05:30
Mice Xia
5118e9e29f 1) fix CLOUDSTACK-2129 and CLOUDSTACK-2128
2) include nicId in network.offerings.assign/remove event
3) use publishUsageEvent instead of saveUsageEvent to track usageEvent
2013-04-22 19:38:32 +08:00
Edison Su
abf40435f3 refactor downloadlistener, sync system vm templates when adding a new image store 2013-04-21 22:46:02 -07:00
Min Chen
0229c75b50 Use data motion service for PrepareTemplateCmd to move template from
secondary storage to primary.
2013-04-20 20:44:31 -07:00
Min Chen
86913ab4d3 Use data motion service to implement copy template. 2013-04-19 23:01:59 -07:00
Min Chen
6f70fe28e8 Trigger system vm template download while adding image store. Just a
code skeleton, waiting for some code in EndPoint.
2013-04-19 19:37:06 -07:00
Min Chen
539824797c Refactor listTemplatesCmd and listIsoCmd to use db view. 2013-04-19 16:10:09 -07:00
Alena Prokharchyk
39abaf6452 Temporarely disabing vpc test as some part of it requires connection to the real DB. Will re-enable after fixing the problem 2013-04-19 12:42:42 -07:00
Alena Prokharchyk
2ca7584994 Fixed VPC api unittests 2013-04-19 11:26:32 -07:00
Likitha Shetty
8d8a0ebe10 CLOUDSTACK-2105.
While releasing an IP range from an acount if any of the Public IPs in the range is a source nat ip then the IP is not disassociated.
During the check CS also checks if the network the IP is associted with is not null. This results in an NPE for an account that has VPC s
because the public IP of a VPC domain router is common to all VPC tiers and not associated with a network
Remove the check to find the network associted with a source nat IP for both ReleasePublicIpRange and DeleteVlanPublicIpRange
2013-04-19 23:31:52 +05:30
Prachi Damle
ff4a4876c7 Adding affinitygroupid search parameter to listVMsCmd 2013-04-19 10:49:37 -07:00
Saksham Srivastava
ea893eaf33 CLOUDSTACK-1786: While reserving IPs in guest network, if guestvmcidr is a subset of network cidr but not a subset of cidr, exception is thrown.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-04-19 14:08:37 +05:30
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
Mice Xia
ca6873a9d0 CLOUDSTACK-2086 UI shows added NIC even if Actual NIC addition has failed 2013-04-19 10:52:00 +08:00
Mice Xia
4fd921269b CLOUDSTACK-2083 router never comes to running state when addNicToVirtualMachine api is called with network id which is only allocated 2013-04-19 10:52:00 +08:00
Likitha Shetty
f8d4a23343 CLOUDSTACK-2088. Dedicated Public IP Addresses per tenant. Guest Network in a project acquires IPs at random even from the IP ranges which are dedicated to other accounts.
Modified search to return only IP's belonging to system pool
2013-04-19 07:02:46 +05:30
Min Chen
7ba1a8fa21 Populate hypervisor_type column in registering ISO by referring it from
guest os id to make listIsos and listTemplates implementation more
consistent.
2013-04-18 13:52:35 -07:00
Isaac Chiang
34899f9b99 CLOUDSTACK-2077:The updatePhysicalNetwork command fails to update the database 2013-04-18 21:19:00 +05:30
Mice Xia
dfbe11355c fix CLOUDSTACK-2061 Hitting java NPE in addNicToVirtualMachine api when trying to add a shared network to a VM 2013-04-18 14:57:37 +08:00
Min Chen
1a74dfaa27 Move UpdateTemplate and UpdateIso methods from ManagerServerImpl to
TemplateManagerImpl.
2013-04-17 17:39:33 -07:00
Min Chen
fe4f53bfcd Fix SecStorageSetupCommand for Nfs image store. 2013-04-17 17:16:01 -07:00
Sanjay Tripathi
985b2aa88d CLOUDSTACK-2046: Primary Storage & Secondary Storage is max limit is set 0 with listResourceLimits API response as ROOT admin
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-04-18 05:26:00 +05:30
Prachi Damle
e03176c4d4 Apart from the UUID, we need not log any other details for AffinityGroup in error messages. 2013-04-17 18:04:18 -07:00
Prachi Damle
6dccf63a32 set Objectname to CreateAffinityGroupResponse Object. Also the listAffinityGroups is missing the 'type' property 2013-04-17 18:04:13 -07:00
Alena Prokharchyk
11162f5917 Removed set() methods from IpAddress related interfaces 2013-04-17 15:11:38 -07:00
Prachi Damle
112446602d (CLOUDSTACK-2068) Anti-Affinity - When Vm deployment associated with anity-affinity group fails , it is still included in the vmlist of the anti-affiity group
Changes:
- Added removal of the groups association when VM reaches 'Error' state.
2013-04-17 15:00:56 -07:00
Alena Prokharchyk
11480c3af8 CLOUDSTACK-1941: added isDefault parameter to account/user response 2013-04-17 13:45:25 -07:00
Marcus Sorensen
8d0bea994d CLOUDSTACK-2071 - VirtualMachineManagerImpl.java start() method for instance
can fail to start a VM without notifying caller, if no exception is triggered.
The result is that VM start looks successful but was not. This fixes it by
throwing an exception at the very end if the object to be passed back is still
null.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1366225829 -0600
2013-04-17 13:13:05 -06:00
Alena Prokharchyk
9584815d4f CLOUDSTACK-1941: introduced "default" flag to account/user objects. Admin/System accounts that come with the CS install are default, and can never be removed. All accounts created by the CS admin, have default flag set to false, and can be removed at any time. 2013-04-17 12:04:18 -07:00
Min Chen
14b5f0da19 Rename ImageDataFactoryxxx to TemplateDataFactory to have consistent
naming conventions for Template data factory class.
2013-04-17 11:45:25 -07:00
Mice Xia
7cc82db345 Fix CLOUDSTACK-2062 NPE while deleting the primary storage[Added with scope=cluster] 2013-04-17 22:06:45 +08:00
Murali Reddy
73f8f46afd deletGlobalLoadbalancer rule was only markign the rule as revoked, but
never removing it from the DB after applying the configuration on GSLB
provider. This fix will delete the rule from the DB.
2013-04-17 19:07:31 +05:30
Murali Reddy
774fd505c7 include account name and domain id in the globalloadbalancerrule
response object
2013-04-17 18:45:58 +05:30
Phong Nguyen
d0a7eae5d9 Add LXC to hypervisor.list configuration value on fresh install
Signed-off-by: Edison Su <sudison@gmail.com>
2013-04-16 23:28:58 -07:00
Sanjay Tripathi
0ddeb65fdf CLOUDSTACK-1966: Primary Storage Limits are not validated while deploying the VM
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-17 11:54:18 +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
c74969fcb0 add deleteTemplate implementation into S3 and Swift driver
implementation.
2013-04-16 16:53:13 -07:00
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
Min Chen
0da2da852b Fix the flow of deleteTemplateCmd. 2013-04-16 12:03:12 -07:00
Murali Reddy
90e8158db5 re-merge optional public IP for EIP service feature
Squashed commit of the following:

commit 2dae394a42
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 16 17:35:28 2013 +0530

    CLOUDSTACK-265: provide option to turn-off automatic public IP association
    for each VM when using EIP service.

      - introduces Capability in the network offering, which decides when EIP
        service is used, by defualt public IP should be assigned to the VM or not

      - default network offering with EIP/ELB service will still work with old
        EIP semantics, i.e) assign a public IP to each VM on start
2013-04-16 17:45:27 +05:30
Mice Xia
cbe021b8d2 CLOUDSTACK-2040 VM with snapshot not getting destroyed during account delation 2013-04-16 13:18:44 +08:00
Kelven Yang
34f8f795e1 CLOUDSTACK-2039: Improve console access security with 128-bit AES encryption and securely-randomized key generation 2013-04-15 16:52:22 -07:00
Prachi Damle
8d33353b40 Removing the auto-wiring of AffinityGroupProcessors since this is an optional component 2013-04-15 16:02:05 -07:00
Min Chen
593337565e Add S3 code to handle DownloadCommand for registerTemplate. 2013-04-15 14:44:39 -07:00
Phong Nguyen
794e653c13 Fix command for executing injectkeys.sh
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-04-15 20:43:02 +02:00
Koushik Das
e94c70254b Squashed commit of the following:
commit 7ce45ea108
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 15 18:36:33 2013 +0530

    Fixed indentation and line ending

commit 0232048f90
Merge: 735c4c8 97911e9
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 15 17:05:59 2013 +0530

    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

commit 735c4c8955
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 15 15:20:37 2013 +0530

    Fixed unit tests based on recent changes in the Vnmc resource code

commit f166f2d0bf
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 15 14:50:25 2013 +0530

    added tests to register vnmc and asa appliance in cloudstack

commit f38be4810e
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 8 18:42:06 2013 +0530

    Removed unwanted files

commit 902ce426c1
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 8 17:59:30 2013 +0530

    Fixed auto-wiring of components for Cisco Vnmc

commit 08467ee307
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 8 16:04:54 2013 +0530

    Fixed compilation issues, incorrect merges from last commit

commit 67f11d46ad
Merge: 3422cee c9c68e1
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 8 15:11:10 2013 +0530

    Merge branch 'master' into cisco-vnmc-api-integration

commit 3422ceefb6
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 8 14:42:32 2013 +0530

    Correctly associating nat, acl policy sets to edge security profile in VNMC

commit 9c1e193fca
Author: Koushik Das <koushik.das@citrix.com>
Date:   Sun Apr 7 21:22:22 2013 +0530

    Passing correct subnet mask while creating edge firewall in VNMC

commit 05e3d04b55
Author: Koushik Das <koushik.das@citrix.com>
Date:   Tue Apr 2 17:50:57 2013 +0530

    Added changes related to icmp

commit bcecb589de
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Apr 1 13:57:21 2013 +0530

    Some xml file renames

commit 9c1ee93f2e
Author: Koushik Das <koushik.das@citrix.com>
Date:   Sat Mar 30 15:54:25 2013 +0530

    Fixed PF and static NAT rule creation in VNMC

commit 7e6159fa05
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 27 18:53:49 2013 +0530

    Added more unit tests for Cisco Vnmc element

commit fc0ed9adb6
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 27 16:48:28 2013 +0530

    Cleaning up VNMC config as part of network shutdown

commit 5a427d48e2
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 27 02:22:54 2013 +0530

    Added unit test for Vnmc network element implement() method

commit 48cbf34d3b
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 27 02:20:45 2013 +0530

    Passing correct gateway ip while creating vservice node and guest port profile in Nexus

commit 2c386c61ef
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 22 13:50:52 2013 +0530

    Nexus 1000v fix

commit 4d2168bfa9
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 22 00:30:01 2013 +0530

    Egress firewall rule

commit e81ab3a2f4
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Mar 21 10:50:29 2013 +0530

    More tests for VnmcResource class

commit 9e9c179212
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Mar 21 00:25:10 2013 +0530

    Fixed build issue from master merge

commit f0c1af2b5c
Merge: 4f305c2 873ec27
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 20 16:20:10 2013 +0530

    Merge branch 'master' into cisco-vnmc-api-integration

    Conflicts:
    	api/src/com/cloud/network/Network.java
    	api/src/org/apache/cloudstack/api/ApiConstants.java
    	client/tomcatconf/components-nonoss.xml.in
    	client/tomcatconf/nonossComponentContext.xml.in
    	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
    	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
    	setup/db/db/schema-410to420.sql
    	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java

commit 4f305c2beb
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 20 15:09:34 2013 +0530

    Initial set of tests, will add more in subsequent commits

commit 50bfcc1f75
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 20 15:02:14 2013 +0530

    Updated pom to copy xmls to target location during build

commit 45bc92b826
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 20 14:58:59 2013 +0530

    Fixed cpmpilation issue as missed out adding this file

commit 2ce7cdc756
Author: Koushik Das <koushik.das@citrix.com>
Date:   Sun Mar 17 17:02:25 2013 +0530

    Creating vservice node and associating it with port profile in nexus for guest VMs

commit 387545caff
Author: Koushik Das <koushik.das@citrix.com>
Date:   Sat Mar 16 11:14:43 2013 +0530

    Added license headers to XML files

commit 43e2997421
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Mar 13 11:51:59 2013 +0530

    Changes related to instantiating the dao components

commit 99e88ecbf9
Author: Koushik Das <koushik.das@citrix.com>
Date:   Tue Mar 12 23:40:35 2013 +0530

    Fix build errors after merge from master

commit 7c20b120c2
Author: Koushik Das <koushik.das@citrix.com>
Date:   Tue Mar 12 23:31:46 2013 +0530

    Fixing poms and other xmls

commit ee868759a8
Merge: 9c94b6d a1b33ca
Author: Koushik Das <koushik.das@citrix.com>
Date:   Tue Mar 12 14:44:59 2013 +0530

    Merge branch 'master' into cisco-vnmc-api-integration

    Conflicts:
    	api/src/com/cloud/network/Network.java
    	api/src/org/apache/cloudstack/api/ApiConstants.java
    	plugins/pom.xml
    	setup/db/create-schema.sql

commit 9c94b6d231
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 8 22:20:23 2013 +0530

    Fixed XML to create static route in VNMC correctly

commit ef069b3323
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 8 15:26:26 2013 +0530

    Added logic for revoking ACL, PF and Static NAT rules

commit 4c65b70668
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 8 13:51:37 2013 +0530

    Renamed delete-acl-rule -> delete-rule

commit aa94eca516
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 8 00:38:52 2013 +0530

    - Creating static routes in VNMC as part of edge firewall configuration
    - Passing order parameter while creating rules so that they are evaluated in a specific order
    - Added methods in VnmcResource for listing acl policies and rules belonging to variouos policies. This is used to compute order while creation of various rules in VNMC

commit cc824e8585
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Mar 7 12:16:29 2013 +0530

    Adding appropriate ACL rules for PF and static NAT

commit fb23c50365
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 1 17:21:45 2013 +0530

    Added logic for deleting various VNMC artifacts. Added/updated relevant xmls as well.

commit 970c21a9a3
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 1 01:54:10 2013 +0530

    Added implementation for delete of asa and vnmc apis

commit 22e1455142
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 1 01:19:43 2013 +0530

    List asa api to return guest network if associated. From this it can be inferred if asa is available or not

commit 32223736c9
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Mar 1 00:50:55 2013 +0530

    Added Vmware cluster info along with asa1kv appliance.
    This is used to select the correct n1kv vsm for configuring the guest network

commit deed3cc951
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 25 18:03:59 2013 +0530

    Added support for static NAT rules.
    - Xmls for creating static nat rules in VNMC
    - applyStaticNats implementation in VNMC network element
    - handler for static nat in resource class

commit 681f0b7b50
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 25 10:44:13 2013 +0530

    Added implementation for firewall and port forwarding rules in Cisco VNMC element class

commit 66b01a6589
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 22 19:19:44 2013 +0530

    VNMC xml for deleting NAT policy

commit 5d98686768
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 22 19:16:41 2013 +0530

    Added support for PF/DNAT rules.
    Created methods in VNMCConnection class to create PF rules. Also moved out common code for PF and source NAT in methods.
    Updated the corresponding VNMC resource class.

commit 8db2fbeb8f
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 22 18:21:45 2013 +0530

    Added xml for creating NAT policy set in VNMC

commit f2da0d50ca
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 22 18:17:53 2013 +0530

    Added VNMC XMLs for supporting PF/DNAT rules.
    Also moved out some XMLs related to source NAT to common files so that these can be used for both source NAT and DNAT

commit 124a48819d
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Feb 21 17:53:12 2013 +0530

    Separated out creation of ACL policy set and policy in VNMC

commit 1e38515f35
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Feb 21 11:54:44 2013 +0530

    Added changes to create ingress fw rules in VNMC

commit cb2fba9e7c
Author: Koushik Das <koushik.das@citrix.com>
Date:   Thu Feb 14 16:23:05 2013 +0530

    Source NAT in VNMC

commit 720fe2f908
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Feb 13 14:16:47 2013 +0530

    Fix Vnmc test file

commit d6dbe790c6
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Feb 13 12:07:03 2013 +0530

    Added db. tables for asa1kv devices and their mapping with guest network

commit 3fd7e30f6e
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Feb 13 11:52:12 2013 +0530

    Changes:
    - Added implementation for add/list asa1kv APIs
    - Added agent command for associating asa1kv appliance with logical edge firewall in VNMC
    - Added handler for the above agent command in VNMC resource class
    - Updated VNMC element class to support the above

commit d08e2a1faf
Author: Koushik Das <koushik.das@citrix.com>
Date:   Wed Feb 13 11:40:58 2013 +0530

    Added lifecycle APIs for Cisco Asa 1000v appliance.
    Added corresponding Dao and VO classes.
    Also added mapping Dao and VO for guest netwok and asa appliance

commit 6b999ec867
Author: Koushik Das <koushik.das@citrix.com>
Date:   Tue Feb 12 00:05:39 2013 +0530

    Changes:
    a. Added handlers for CreateLogicalEdgeFirewall and ConfigureNexusVSMForASA commands
    b. Logic for add/list vnmc device API
    c. Partial implementation for network element implement()

commit 0656250308
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 11 23:48:19 2013 +0530

    Moved VNMC provider creation to Network.java. The plugin code would have been the ideal place to keep it but current state of the code doesn't allow it.

commit dc402eaa7a
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 11 23:35:19 2013 +0530

    Added new commands for the following:
    a. Logical edge firewall creation in VNMC
    b. Asa1kv vservice node creation and updating asa1kv inside port profile with guest network vlan id in n1kv VSM

commit d6cdfe35f8
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 11 23:06:36 2013 +0530

    Added helper method to create port profile in n1kv VSM with additional parameters VDC tenant and edge security profile
    Added helper method to create a vservice node in n1kv VSM

commit db42da17e9
Author: Koushik Das <koushik.das@citrix.com>
Date:   Mon Feb 11 22:44:01 2013 +0530

    Added database table for storing VNMC devices

commit f991436335
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 8 16:00:15 2013 +0530

    Added support for network offering creation with VNMC as provider for firewall, port forwarding, source nat

commit 74de210359
Author: Koushik Das <koushik.das@citrix.com>
Date:   Fri Feb 8 15:06:11 2013 +0530

    Added name attribute for the VNMC lifecycle commands

commit 6ce25ef11d
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 16:44:28 2013 -0800

    Fix licensing

commit 392cd8ed63
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 16:38:19 2013 -0800

    cisco-vnmc: Fix api to use new conventions

commit 6b142bbaab
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:33:33 2013 -0800

    WIP: configure ASA port profile

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 1ae21ea49a
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:33:01 2013 -0800

    WIP rename device to resource to better reflect nature of VNMC

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 84d218f972
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:32:54 2013 -0800

    WIP: fixes for associating ASA1000v to tenant

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit d74c6a9ac2
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:32:45 2013 -0800

    WIP: fixes for associating ASA1000v to tenant

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 9350d10849
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:32:29 2013 -0800

    WIP: admin commands for adding / listing VNMC

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit a8031a0cfe
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:41 2013 -0800

    WIP ASA 1000v listing"

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit f9cc674b9c
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:36 2013 -0800

    WIP : edge firewall

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 6a0964af00
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:30 2013 -0800

    WIP : edge security policy

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit e32295e8cf
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:24 2013 -0800

    WIP : dhcp server policy

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 446a9b8491
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:18 2013 -0800

    WIP : dhcp server policy

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit e35e0eb59b
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:14 2013 -0800

    Move unit test

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 2b43a3e74e
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:30:08 2013 -0800

    Move unit test

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 11b804a894
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed Jan 16 15:29:54 2013 -0800

    WIP: XML control of VNMC

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-04-15 18:58:43 +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
Pascal Borreli
20614598bf Fixed typos
Signed-off-by: Milamber <milamber@apache.org>
2013-04-13 13:28:32 +00:00
Min Chen
2dd8e2cb97 add getStoreTO into each DataStoreDriver, and add implementation for 3
data store plugins.
2013-04-12 18:22:23 -07:00
Edison Su
b81fa6d9ea add copy template to cache store 2013-04-12 16:03:30 -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
Likitha Shetty
8f865c5a90 Dedicate Public IP address range to an account 2013-04-12 23:27:35 +05:30
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
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
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
Min Chen
bb64672715 Refactor DownloadMonitorImpl code, move some functionalities to
TemplateServiceImpl and VolumeServiceImpl.
2013-04-11 18:09:42 -07:00
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
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
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
Prachi Damle
7201eb9ee4 CLOUDSTACK-1968: affinity_groups: Column 'deployment planner' cannot be null when creating a service offering
Added default value to all constructors..
2013-04-11 13:23:37 -07:00
Prachi Damle
d38bf8a10c More log statements to debug 2013-04-11 13:23:27 -07:00
Prachi Damle
0f565f2167 Fixes to de-couple the AffinityGroupResponse from UserVmResponse, since ApiDiscoveryService breaks, if we nest two response objects into each other. 2013-04-11 13:23:25 -07:00
Prachi Damle
3403b54773 Added AffinityGroup View in order to include VM details while listing AffinityGroups. 2013-04-11 13:23:23 -07:00
Prachi Damle
09a6eb735d Changes to return affinity groups information during listVMsCmd 2013-04-11 13:23:20 -07:00
Prachi Damle
0b3850c14f Added cleanup of affinitygroups when a VM is expunging and when the account is deleted. 2013-04-11 13:23:18 -07:00
Prachi Damle
b633dde744 Adding a unit test for the new affinity groups API 2013-04-11 13:23:11 -07:00
Prachi Damle
ee45437036 Build failure fixes after rebase. 2013-04-11 13:23:08 -07:00
Prachi Damle
c7c899f62d Fixes after functional tests
Conflicts:

	client/tomcatconf/commands.properties.in
2013-04-11 13:23:04 -07:00
Prachi Damle
bb9bdf0173 Changes to make affinity group types configurable. 2013-04-11 13:23:01 -07:00
Prachi Damle
708157d33f API changes to expose the commands 2013-04-11 13:22:59 -07:00
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
e9300d2676 DAO constructor should be lightweight to make Spring DI faster. 2013-04-11 13:22:51 -07:00
Prachi Damle
bf9221a370 Separated out host anti-affinity as a plugin. 2013-04-11 13:22:45 -07:00
Prachi Damle
fe2a86871f Changes to add AffinityGroupprocessor, deployVM changes 2013-04-11 13:22:42 -07:00
Prachi Damle
1aed5bf9c2 ListAffinityGroups API changes 2013-04-11 13:22:38 -07:00
Prachi Damle
50f53c86f5 DeleteAffinityGroup API changes 2013-04-11 13:22:34 -07:00
Prachi Damle
1e205a3d0b More API changes 2013-04-11 13:22:30 -07:00
Min Chen
582a1f0539 Fix ImageStoreDaoImpl to return only image stores, not image cache
stores.
2013-04-11 11:54:30 -07:00
Min Chen
cd2d066fda Add new api to gen_toc.py to avoid api-doc build error. 2013-04-11 11:34:33 -07:00
Edison Su
e5bf38ed05 add cache storage 2013-04-11 10:52:53 -07:00
Min Chen
dcbeea057b Extract a common routine to associate template to zones in
template_zone_ref table.
2013-04-11 10:20:58 -07:00
Marcus Sorensen
ca8ac08cf3 CLOUDSTACK-2003: When accounts and domains are deleted, cleanup can fail,
leaving instances in eternal expunged state. This happens when a domain is
deleted while a deleted account is cleaning up. The cleanup looks for the domain
of the account and we hit a null pointer. Adding null pointer check.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1365695448 -0600
2013-04-11 09:50:48 -06:00
Hugo Trippaers
5cd3608529 Remove the chmod solution and replace with an explicit call to
/bin/bash. This way the file will only need read permissions.
2013-04-11 11:30:45 +02:00
Min Chen
02686583cf First draft of register template using image store. 2013-04-10 18:02:53 -07:00
Jayapal
a4a059c043 CLOUDSTACK-779 Egress firewall rules support for Juniper SRX 2013-04-10 10:54:04 -07:00
Prachi Damle
ee0a91d111 Fixed the issue - VM deployment for local service offering for Root and with data disk(shared), was deploying data disk to local disk too. Currently there is no way to let the planner know multiple pool information, hence letting the planner search for a pool always during VM deployment. 2013-04-10 10:47:50 -07:00
Jayapal
c8f2003138 CLOUDSTACK-1862 Added vm ip address info in the list PF rules response
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-10 14:26:36 +05:30
Mice Xia
b646e43a1a use hypervisor capabilities to control if vm snapshot is enabled for hypervisors 2013-04-10 12:36:42 +08:00
Mice Xia
bd7a38957a 1)use vmsnapshot.create.wait to control vmsnapshot timeout 2)remove global configuration vmsnapshot.expunge.interval and vmsnapshot.expunge.workers since vmsnapshot expunge is synchronous 2013-04-10 11:35:58 +08:00
Vijayendra Bhamidipati
d4e2aa32c6 CLOUDSTACK-1675: VMSnapshot: ListVMSnapshotsCmd should not display Domain ID in the Error Message
Description:
	Replace domain db id by uuid in exception message.

Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-04-10 11:35:58 +08:00
Kelven Yang
913f73ab6b Apply patch https://reviews.apache.org/r/10137/ 2013-04-09 17:29:21 -07:00
Min Chen
3897590bb1 Add check in addImageStoreCmd to guarantee our assumption of homogeneous
image stores.
2013-04-09 16:36:02 -07:00
Min Chen
b2d5535bba Remove State from image_store db table, and removed enableImageStore
api.
2013-04-09 15:38:33 -07:00
Min Chen
9be9902ed5 Fix applicationContext.xml to properly load all new refactored image
store related classes, also add enableImageStore api.
2013-04-09 14:49:09 -07:00
Chiradeep Vittal
2e6c65fd34 QuickCloud: sanitize logs for normal running of agents outside systemvm 2013-04-09 14:45:27 -07:00
Chiradeep Vittal
271d232d62 QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package
QuickCloud: fix license issue
QuickCloud: use a different activation for deploying quickcloud
Otherwise marvin gets invoked during mvn install -Dquickcloud
2013-04-09 14:45:27 -07:00
Chiradeep Vittal
5ff8bcaa2e QuickCloud: when using SSVM, pass in the new name of the SS class (com.cloud -> org.apache.cloudstack)
QuickCloud : configuration moved to applicationContext.xml from componentContext.xml
QuickCloud: default to enabled state for devcloud zone
QuickCloud: environment.properties helps customize location of pid file
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
c5b11df6b7 QuickCloud: option to build with componentContext tailored for quickcloud
For now it replaces ConsoleProxyManagerImpl with StaticConsoleProxyManager
Usage: mvn install -Dquickcloud

QuickCloud: rename deploy profile

QuickCloud: remove cyclic dependency introduced in nonoss build by moving SecondaryStorageDiscoverer into services
However with this fix, developers will be unable to run 'PremiumSecondaryStorageResource' (for VMWare installations) using mvn exec:java.
Instead they will have to use the exploded archive from systemvm.zip
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
1d70b9ea77 QuickCloud: add a network offering without any services
This can be used to avoid starting up a virtual router simply for the purposes of offering dhcp and dns services
With the QuickCloudNoServices offering, no virtual router will be started up and the vm instance will not get a CloudStack-assigned IP address.
Instead, the VM will simply get whatever IP address is offered by an DHCP service that happens to be running in the same network
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
3d78019e57 QuickCloud: copy authorization code from ConsoleProxyManagerImpl
QuickCloud: refactor to avoid copy paste of authentication and startup code
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
790d2ce82e QuickCloud: Remove reference to unused code
QuickCloud: remove some dead code in ConsoleProxyManager
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
e7983b25cc QuickCloud: Enable secondary storage daemon to run outside the system vm 2013-04-09 14:45:25 -07:00
Hugo Trippaers
6c9fcb8c8f Make the VpcManager check a list of supported providers 2013-04-09 18:27:23 +02:00
Murali Reddy
9180bd5990 CLOUDSTACK-1834: Events are not generated for registerUserKeys() 2013-04-09 17:45:57 +05:30
Chiradeep Vittal
c6e226da74 CLOUDSTACK-524: in some cases (especially the built-in CentOS template), the template downloader does not use the configured http proxy
The DownloadProgress command is used to restart failed or stuck download jobs -- and it would not include the proxy information, unlike the DownloadCommand which always did

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-04-08 17:29:54 -07: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
67a99cbbc3 CLOUDSTACK-524: in some cases (especially the built-in CentOS template), the template downloader does not use the configured http proxy
The DownloadProgress command is used to restart failed or stuck download jobs --
It would not include the proxy information, unlike the DownloadCommand which always did

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-04-08 17:07:35 -07:00
Chiradeep Vittal
3cbbe2bb04 RAT check broken by d6ed8d7cb. Fix 2013-04-08 16:51:10 -07:00
Min Chen
74880fa26f add DeleteImageStoreCmd Api. 2013-04-08 16:18:06 -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
Min Chen
848fea6069 Add ListImageStoresCmd api. 2013-04-08 11:36:53 -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
Mice Xia
a85b498afd 1) fix CLOUDSTACK-1946 2) remove redundant VMSnapshotVO.java 2013-04-07 17:41:26 +08: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
7699485b4f Create DB view for Image Data Store. 2013-04-05 11:18:33 -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
Hugo Trippaers
f1259d50bd Fix for _pingTimeout being 0 in AgentMonitor
With commit d79f1f6fdc the AgentMonitor
was replaced with a pluggable service. However the ping timeout in the
original constructor was not passed on anymore, leading to a default
pingTimout of 0. This would fail all agents constantly.

Modified the startMonitor command to take a pingtimeout as an argument
and instruct AgentManagerImpl to pass it along.
2013-04-04 14:23:42 +02:00
Edison Su
f18a1d6f14 fix bunch of bugs related to zone wide storage 2013-04-03 21:51: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
Wido den Hollander
fa1e9a24a6 conf: Add a @ so @MSUSER@ is replaced by "cloud" 2013-04-03 16:54:00 +02:00
Dave Cahill
eddf7b9357 MidoNet Networking Plugin
- Supports DHCP, Source NAT, Static NAT, Firewall rules, Port Forwarding
- Renamed MidokuraMidonet to MidoNet
- Related Jira ticket is CLOUDSTACK-996

Signed-off-by: Dave Cahill <dcahill@midokura.com>
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-04-03 12:03:11 +02:00
Vijayendra Bhamidipati
2dbdc46337 CLOUDSTACK-1734: Make SHA1 default password encoding mechanism
Description:

	Making SHA256SALT the default encoding algorithm to encode
	passwords when creating/updating users.

	Introducing a new configurable list to allow admins to
	separately configure the order of preference for encoding
	and authentication schemes.

	Since passwords are now sent by clients as clear text,
	fixing the Plain text authenticator to check against the
	password passed in rather than its md5 digest.
2013-04-02 17:40:50 -07:00
Kelven Yang
58c962ef15 Retire unused files to avoid confusions 2013-04-02 15:55:41 -07:00
Min Chen
f52820f2fd CLOUDSTACK-1890: listProjects is not listing state in the response. 2013-04-02 20:24:31 +01:00
Kelven Yang
f2ad38aa0f CLOUDSTACK-1865: Change StatsCollector to be a manager so that it can initialize itself at proper run level 2013-04-02 11:22:56 -07:00
Prasanna Santhanam
b798c45114 maven+marvin+simulator: Changes to the lifecycle steps
integration test is now run as follows:

Build
$ mvn -Pdeveloper -Dsimulator clean install

DB:
$ mvn -Pdeveloper -pl developer -Ddeploydb
$ mvn -Pdeveloper -pl developer -Ddeploydb-simulator

Setup:
$ mvn -Pdeveloper,marvin.setup -Dmarvin.config=setup/dev/advanced.cfg -pl :cloud-marvin integration-test

Test:
$ mvn -Pdeveloper,marvin.test -Dmarvin.config=setup/dev/advanced.cfg -pl :cloud-marvin integration-test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 19:56:33 +05:30
Prasanna Santhanam
5d67c98e5b marvin+apidiscovery: Extend API discovery plugin
API discovery plugin will return embedded entities for marvin to
discovery and generate it's API classes.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:30 +05:30
Mice Xia
4edef1fd30 fix CLOUDSTACK-1700 2013-04-02 17:36:51 +08:00
Mice Xia
dedec164e8 fix CLOUDSTACK-1698 2013-04-02 17:36:51 +08:00
Hugo Trippaers
df6b97c194 Disabling broken test, see CLOUDSTACK-1884. Please revert this commit once the test itself is fixed. 2013-04-02 10:02:57 +02:00
Phong Nguyen
aa79ccf985 CLOUDSTACK-922: LXC Support in Cloudstack.
Signed-off-by: Edison Su <sudison@gmail.com>
2013-04-01 15:41:42 -07:00
Jayapal Reddy
8dd0b7747b Mulitiple ip address per nic support for advacned shared networks
Description:
Changes added for supporting multiple ip address per nic for shared networks

Testing Done:
Tested adding and removing the ip for nic using the APIs
2013-04-01 16:24:48 +05:30
Bharat Kumar
355589c1f0 CLOUDSTACK-1395 Upgrade script for cpu and ram overcommit.
It sets the overcommit values of all the clusters to 1.
2013-04-01 10:43:16 +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
Kelven Yang
5782abf8f8 Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00
Kelven Yang
85971b5194 CLOUDSTACK-1818: make DababaseCreator ready to invoke DatabaseUpgradeChecker, adjust Component startup sequence for integrity checkers
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-29 11:12:36 -07:00
Kelven Yang
3ab744d100 CLOUDSTACK-1795: implement custom AOP to fully support legacy CloudStack AOP semantcis
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-29 11:12:36 -07:00
Kelven Yang
95011d6bf3 CLOUDSTACK-1818: add a missing file that is missed in previous patch 2013-03-29 11:12:36 -07:00
Kelven Yang
8bb0990144 CLOUDSTACK-1795: implement custom AOP to fully support legacy CloudStack AOP semantcis (rebase fixups) 2013-03-29 11:12:36 -07:00
Kelven Yang
16216720c6 CLOUDSTACK-1276, CLOUDSTACK-1729: Remove autoscanning, ensure adpater execution order in runtime 2013-03-29 11:11:20 -07:00
Alena Prokharchyk
e00f22df8a CLOUDSTACK-240: added id/uuid fields to remote_access_vpn table and corresponding VO/Dao objects. The DB upgrade is covered as well. Now tags can be created for the VPN object 2013-03-29 10:40:28 -07:00
Hugo Trippaers
9a5bf78c3e Better error handling for some corner cases
Make the exceptions more descriptive so admins can pinpoint the issue
easier.
2013-03-29 12:06:03 +01:00
Hugo Trippaers
95fce11215 CLOUDSTACK-1156 Fix small typo 2013-03-29 12:05:58 +01:00
Murali Reddy
48311363d6 CLOUDSTACK-1834: Events are not generated for registerUserKeys(),
Enabling account and Editing account.
2013-03-29 15:54:00 +05:30
Murali Reddy
b585fa11c1 removing @Autowired, which is not JSR complaint.
initializing the bean 'GlobalLoadBalancingRulesServiceImpl' through the componentContext.xml
2013-03-29 15:53:59 +05:30
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
Sheng Yang
e3f67d126d CLOUDSTACK-1827: Fix redundant router update mechanism
There is a bug that if the smaller number ID RvR stop running, that pair of
RvR's status won't be updated. This patch fixed it.
2013-03-28 15:54:07 -07:00
Alena Prokharchyk
34a59fc3a7 Fixed createNetworkOfferingUnittest 2013-03-28 12:16:05 -07:00
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
Murali Reddy
f8b8f60977 Inject GslbServiceProvider using @Inject fails in oss build, as it requires an
implemenation by default to autowire but only implementation avaialable
is in nonoss plugin. So using autowired required=false for injecting
GslbServiceProvider that will work with both oss and non-oss builds.
2013-03-28 16:20:13 +05:30
Murali Reddy
e8a144a21d BLOCKER: oss jetty server fails to launch
temporarily disabling spring injection of GslbServiceProvider as only
implementing class is in non-oss, so oss build fails to launch with no
bean fpund exception
2013-03-28 08:49:35 +05:30
Murali Reddy
f414b8a850 CLOUDSTACK-1804:Upgrade 4.0 -> 4.1 - DB upgrade fails.
remove the data migration functions that were accidently introduced by
commit b6727e5646
2013-03-27 18:06:22 +05:30
Murali Reddy
c5fb8349bf CLOUDSTACK-653 : High Availability: implement GSLB (Global Server Load
Balancing) capability for ELB service

merging GSLB feature
2013-03-27 17:54:07 +05:30
Funs Kessen
99ea4011b1 Removing baremetal related references
Signed-off-by: Prasanna Santhanam <tsp@apache.org>

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-27 15:56:13 +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
Brian Spindler
ae3a048350 CLOUDSTACK-1736: Changes required to get cloudstack-management service
working again.

The newly created package for cloudstack-management was not correctly
installing the service. This prevented cloud-setup-management from being
able to configure the service, and the init script didn't even believe
the service was installed. I also added sudo to the chmod command for
checking script permissions, as most scripts belong to root. It was
trying to configure the agent with cloudstack-setup-agent but the script
was still called cloud-setup-agent, so I renamed it to cloudstack-setup-agent.
2013-03-25 17:23:18 +00:00
Alena Prokharchyk
37cdb5d74b CLOUDSTACK-766 - allow Vlan assignment to Isolated network. The network with Vlan assigned, gets created with Setup state, and will never get picked up by the GC thread meaning its vlan will never get released 2013-03-21 16:05:48 -07:00
Vijay venkatachalam
61d8dde033 CLOUDSTACK-1537. Fixing Network Restart case for AutoScale 2013-03-21 16:59:15 +00:00
Edison Su
3ed6200ef8 move default primary storage plugin into its own pom 2013-03-20 17:21:40 -07:00
Sateesh Chodapuneedi
dbfd31663c CLOUDSTACK-664 Health monitoring for NetScaler load balanced instances
Fixing class names added to command list.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-20 13:52:00 +05:30
Nitin Mehta
3e68dd810e CLOUDSTACK-1738 :
Adding code for StatsCollector initialization using spring framework. This was not initialized and hence stats were not colleced on vm, host and storage in CS.
2013-03-20 16:44:44 +05:30
Min Chen
6bc12fa66d CLOUDSTACK-1511 and CLOUDSTACK-1446 2013-03-20 00:45:47 +00:00
Wei Zhou
86a2a75046 CLOUDSTACK-1668: Fix IP conflict in VPC tier
Currently, allPossibleIps return the Ip lists which include the gateway,
so we need to remove gateway ip from this list.

Now, for non-VPC network it works, because NetUtils.getAllIpsFromCidr
return the Ip lists which do not include the first IP of the network
(like 192.168.0.1).
We need too add the first IP into the returned Ip list, because it can
be used for VM if it is not the gateway IP (for example, VPC networks).

The corresponding patch for 4.0.1 has been posted on
https://reviews.apache.org/r/9923/

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-20 00:31:52 +00:00
Kelven Yang
2bebb124cc CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on and relying on the fix 2013-03-19 15:47:22 -07:00
Edison Su
1ea5d6c169 CLOUDSTACK-1641: fix NPE during migrate volume 2013-03-19 15:34:31 -07:00
Edison Su
ba249c0e66 CLOUDSTACK-1608: enable attach a volume created on zone wide storage to a vm created on cluster or host wide storage 2013-03-19 14:45:17 -07:00
Edison Su
c60ef79321 CLOUDSTACK-1608: don't support attach volume between different storage scopes 2013-03-19 14:36:37 -07:00
Kishan Kavala
90678c3d14 CLOUDSTACK-198: Included VpnUsers in Add state while listing. Added state to Vpn user response. 2013-03-19 18:17:09 +05:30
Rohit Yadav
beb15af0f2 CLOUDSTACK-1720: Add upgrade paths from 4.0.x to 4.2.0
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-19 12:21:19 +05:30
Kelven Yang
fb94b72213 CLOUDSTACK-1568,CLOUDSTACK-1664: Fix ActionEvent interception and optimize @DB lookup with caching 2013-03-18 18:07:52 -07:00
Prachi Damle
d9b85e397d CLOUDSTACK-1706 Failed to deploy VM with error "cannot find DeployPlannerSelector"
Changes:

- Regular plugin/adapter components should usually be loaded at run level RUNLEVEL_COMPONENT(5)
- HypervisorVmPlannerSelector was at level 0, while configurationServer at level 2  - causing config to be not loaded for the HypervisorVmPlannerSelector
2013-03-18 12:12:56 -07:00
Min Chen
2b05f546b7 CLOUDSTACK-1690: Remove region_id from sql insert statement for inserting "system" and "admin" account and user in MS startup due to recent region feature change. 2013-03-18 11:21:15 -07:00
Anshul Gangwar
61754cd987 CLOUDSTACK-680: Feature SNMP Alerts support in CloudStack
Signed-off-by: Anshul Gangwar <anshul.gangwar@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-18 11:36:19 +05:30
Rajesh Battala
183b989d30 CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful 2013-03-18 14:01:15 +05:30
Chip Childers
eee720ceaa CLOUDSTACK-1702: Changed getId to getUuid in an exception message
string.

This doesn't resolve the bug in question, but does fix the specific
message that was reported as the origin of the bug.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-16 15:22:51 -04:00
Min Chen
1dc1bf00c6 CLOUDSTACK-1684: api.throttling.enabled configuration setting should be set to "false" in Config.java. 2013-03-14 21:17:35 -04:00
Sanjay Tripathi
105618896b CLOUDSTACK-1645 : Resources limit is not validated with update compute offering [ Instances are updated to higher CPU/Memory resources though there are no resources available @ account/domain] 2013-03-14 13:44:34 -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
Prachi Damle
a7231015e8 CLOUDSTACK-1604: deploy VM failed when global setting "vm.allocation.algorithm" is set to "userdispersing"
Changes:
- DeployPlannerSelector was newly introduced for BareMetal feature. It had the planner name hardcoded.
- Change it to decide the planner by referring to the global config vm.allocation.algorithm value
2013-03-14 11:24:35 -07:00
Wido den Hollander
41e3db39c3 debian: Package ulimits and sudo rules
The old packages used to write this data to the configuration
in a postinst file.

That was horrible to track since system administrators had no
idea what was going on.
2013-03-14 15:55:32 +01: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
b4bab5a152 CLOUDSTACK-1595 removeIpFromNic using uuid and response changes
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-03-13 14:46:31 +05:30
Rohit Yadav
0f8c4d0ac0 baremetal: Remove old templateadapter in cloud-server, fix spring xmls
The BareMetalTemplateAdapter in cloud-server is old and was introduced by recent
branch merges, Frank had separated and moved code to the baremetal plugin so
we will use that.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-13 11:50:54 +05:30
Bharat Kumar
6715f98087 CLOUDSTACK-1551: Failed to list clusters due to NPE at createClusterResponse(ApiResponseHelper.java:837) when cluster is added automatically as a part of addHostCommand
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-03-13 11:07:28 +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
Kelven Yang
d55560a627 CLOUDSTACK-1624: Initialize configuration variables properly to avoid influence of any racing conditions 2013-03-12 15:02:31 -07:00
Likitha Shetty
da89946ca9 CLOUDSTACK-1625. NPE with updateResourceCount when && is passed thru API.
If any API contains '&' i.e. no key value pair or '&<paramter-name>' i.e. a parameter without a value, then we get an NPE as owasp.esapi.StringUtilities.stripControls deosn't handle NPE.
2013-03-12 12:00:46 +05:30
Min Chen
1af8710da8 updateTemplatePermissions should allow user to be able to see
templates granted permissions by another user.
2013-03-11 17:32:26 -07:00
Min Chen
bab6839f38 CLOUDSTACK-1621: listProjectInvitations fails with NPE for valid requests. 2013-03-11 13:07:12 -07:00
Saksham Srivastava
75261eb317 CLOUDSTACK-924 :
Volumes created from snapshots misses the source template information.Fixed the issue with volumes now getting the template id.
	Signed Off by : - Nitin Mehta <nitin.mehta@citrix.com>
2013-03-11 16:40:12 +05:30
Kishan Kavala
603b5ad985 CLOUDSTACK-1569: Only forward API to source region and check for succcess. Do not convert the response to user/account/domain object since it is not updated locaaly. 2013-03-11 12:18:52 +05:30
Sheng Yang
e35ce6587a CLOUDSTACK-1461: Don't set dns server for non-default ipv6 network
The non-default parameter can be used by ipv4 as well in the future.
2013-03-08 17:43:23 -08:00
Min Chen
e40ebcce8f CLOUDSTACK-1179: API searches for names should not be fuzzy. fuzzy
search should be done through keyword.
2013-03-08 16:43:03 -08:00
Alena Prokharchyk
860ea5c0dd CLOUDSTACK-1451 Pass randomly generated UUID instead of empty string when create internal account as a part of project creation. Otherwise entityexistsexception would happen when attempt to create more than 1 project in the system 2013-03-08 14:57:54 -08:00
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
Chip Childers
bd4508589b Revert "CLOUDSTACK-874 Ability to delete Events and Alerts"
This reverts commit 5e4c2c8a9e.
2013-03-08 14:28:23 -05:00
Sanjay Tripathi
5e4c2c8a9e CLOUDSTACK-874 Ability to delete Events and Alerts
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-03-08 10:52:40 -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
Likitha Shetty
ee9f97f92e CLOUDSTACK-1509. During CreateVLANIPRange while trying to assign Public IPs to a new network if the network offering is persistent we get an NPE.
Since associateIpRangeToAccount starts and commits a seaparte transaction, commit the transaction started for createVlanAndPublicIpRange before calling associateIpAddressListToAccount.
2013-03-08 13:59:02 +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
Sanjay Tripathi
9b288c758b CLOUDSTACK-1574: updateResourceCount API is failed saying to specify valida resource type even after parsing the valid resource type.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-07 11:43:39 +05:30
Kishan Kavala
99066060cd CLOUDSTACK-1572: Remove references to netscalar vpc provider. NetworkElement is not implemented yet 2013-03-07 16:42:39 +05:30
Harikrishna Patnala
d51e964d42 CLOUDSTACK-1013 : running cloudstack overwrites default public/private ssh keys
The default private/public keypairs in .ssh will not be overwritten.
Instead cloudstack will generate a new keypair id_rsa.cloud and
id_rsa.cloud.pub and use those in developer mode.

To use this insert the (name,value)=(develop,true) tuple into
`cloud`.`configuration`

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-07 15:11:05 +05:30
Sheng Yang
27ba0208f0 CLOUDSTACK-1315: Fix NPE when try to upgrade network from VR to SRX-F5
Still return a valid object when reverting non-existed rules.
2013-03-06 16:49:44 -08:00
Min Chen
e31cd2b3d2 CLOUDSTACK-1402: listRouters API response doesn't return linklocal IP and public IP details. 2013-03-06 11:31:52 -08:00
Rohit Yadav
a1ca7e09ca rat: Fix license header on DataCenterLinkLocalIpAddressDao.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-06 18:46:33 +05:30
Rohit Yadav
15b5b7e7a3 CLOUDSTACK-1417: cosmetics, print param name, value for uuid->id translate error
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-06 17:55:40 +05:30
Venkata Swamybabu Budumuru
cdae53a289 CLOUDSTACK-1514 : Unable to remove secondary ips though there are no PF rules associated with it
Fixed the search filter in PortForwardingRulesDaoImpl.java. Earlier we were
passing a wrong filter parameter "address" in listByDestIpAddr which doesn't
exist. Changed this to the right search criteria that uses dstIp as filter
parameter.

Signed-off-by: Venkata Swamybabu Budumuru <venkataswamybabu.budumuru@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-06 10:28:37 +05:30
Kelven Yang
f077fd9b29 Make RecreatableFencer's constructor public so that it can instantiated through reflection 2013-03-05 19:03:31 -05:00
Kelven Yang
3f2b771e07 CLOUDSTACK-1173: fix the regression caused by life-cycle management changes 2013-03-05 19:03:30 -05: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
Kelven Yang
72e6fd6e8d CLOUDSTACK-1362: Put a workaround fix to set excutable attribute of injectkys.sh at runtime 2013-03-05 19:03:30 -05:00
Min Chen
33757377c0 CLOUDSTACK-1465: We should pass array instead of a List for SearchCriteria.Op.IN as value. 2013-03-05 14:20:55 -08:00
Min Chen
9c5c4753e9 CLOUDSTACK-1484: provide api.throttling.enabled gloabl configuration settings to enable/disable api throttling feature. 2013-03-05 09:44:09 -08:00
Min Chen
5750fd9631 CLOUDSTACK-1190: make APIChecker throw one sensible exception. 2013-03-05 09:44:08 -08: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
Min Chen
48aa035a71 CLOUDSTACK-1449: listAccounts and listProjectAccounts API lists all the users not account-specific users for each account returned. 2013-03-04 14:42:32 -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
Roeland Kuipers
68b836d46d review 8701: createSetupGuestNetworkCommand in
VpcVirtualNetworkApplianceManagerImpl.java fails when the broadcast URI
is not a long

Fixed whitespace issues

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-03-01 09:38:56 +01:00
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
frank
bd0fc2f354 CloudStack CLOUDSTACK-723
Enhanced baremetal servers support on Cisco UCS

change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema  to db upgrade schemaOh

Conflicts:

	client/pom.xml
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
2013-02-28 15:42:48 -08:00
Min Chen
801e5269ea Merge branch 'master' into vim51_win8 2013-02-28 14:25:26 -08:00
Min Chen
6f19895191 Remove unused RandomlyIncreasingVMInstanceDaoImpl to avoid confusion.
Confirmed with Kishan about this.
2013-02-28 14:17:58 -08:00
Kishan Kavala
1d31c3ecaf CLOUDSTACK-241: Moved regions upgrade changes to Upgrade40to41.jav from schema file. Sets the right regins_id from db.properties instead of using default 1.
Conflicts:
	setup/db/db/schema-40to410.sql
2013-02-28 14:35:23 +05:30
Mice Xia
91417115ef CLOUDSTACK-1401 NPE: listCapacity 2013-02-28 11:46:10 +08:00
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
Prachi Damle
9afd33d206 CLOUDSTACK-1418- As regular user , we are not allowed to deploy VM on a shared network.
- Added the access type attribute to @acl
- Domainchecker needs the AccessType.UseNetwork value specified to check access to network
2013-02-27 17:16:49 -08:00
Sheng Yang
50f995f8b4 CLOUDSTACK-1170: Use a unified way to generate PublicIp
Tired of manually generate mac address everytime when create PublicIp object.
2013-02-27 14:20:26 -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
Noa Resare
2f135be15f CLOUDSTACK-1415: Debian & Ubuntu packaging work
Some concepts included:

* the replace.properties location used by maven is parameterized to allow
  for a build that does not modify the currently git tracked files
* package naming is updated along the lines of what was discussed on the
  -dev mailing list and between committers at the Build a Cloud Day in Belgi
* package version pattern is updated (since we redo all package names,
  we might as well drop the epoch)
2013-02-27 15:44:46 +00:00
Murali Reddy
3e0bdaac1e CLOUDSTACK-1391: EventBus is not getting injected after javelin merge
added logic to inject event bus using ComponentContext.getComponent

Conflicts:
	server/src/com/cloud/storage/listener/SnapshotStateListener.java
2013-02-27 18:55:22 +05:30
sateesh
82d00c5fd1 Re-basing with latest master.
CLOUDSTACK-657 VMware vNetwork Distributed Virtual Switch support in CloudStack

This is 2nd patch for feature 'Support for VMware dvSwitch in CloudStack'.

This patch introduces 2 new global configuration parameters
"vmware.use.dvswitch" - Enable dvswitch functionality.
"vmware.ports.per.dvportgroup" - Default number of ports per Vmware dvPortGroup.

This patch introduces 4 optional parameters to AddCluster API
guestvswitchtype - Type of vSwitch to use for guest traffic
guestvswitchname - Name of vSwitch to use for guest traffic
publicvswitchtype - Type of vSwitch to use for public traffic
publicvswitchname - Name of vSwitch to use for public traffic

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-02-27 18:37:15 +05:30
sateesh
3c00e7b8c5 Re-basing with latest master.
CLOUDSTACK-657 VMware vNetwork Distributed Virtual Switch support in CloudStack

This is 5th patch for feature 'Support for VMware dvSwitch in CloudStack'.

This patch contains
1)Changes to addCluster done in vmware discoverer to support vswitch type provided as parameters. Also performing validation of vswitch type parameter provided with addCluster api call. Checks for physical network configuration for vmware cluster is added.
2)Changes to vmware resource to use specified vswitch type while preparing network for guest and public traffic types.
3)Changes to vmware manager to introduce new global parameter vmware.ports.per.dvportgroup. Some cleanup.
Virtual switch type could be chosen at zone level or at cluster level for specific traffic type.
autoExpand of dvPortGroup is available in code but disabled as its breaking because vCenter 4.1 does not support autoExpand feature. Would be enable once vSphere 5.1 SDK support is added to CloudStack.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-02-27 18:37:15 +05:30
David Grizzanti
53b6ba3798 CLOUDSTACK-420: listZones missing name parameter
When calling the listZones API command, you can now supply a name to pull a specific zone by name.

Updated two classes to include name paramater and query data centers/zones by name if suppled:
- server/src/com/cloud/api/query/QueryManagerImpl.java
- api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-27 13:35:26 +05:30
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
Harikrishna Patnala
254275dc26 CLOUDSTACK-1293: resetpasswordforVm shows "passsd reset to undefined" 2013-02-27 12:35:04 +05:30
Sheng Yang
a76301bbbe CLOUDSTACK-1232: Only support cidr=64 in IPv6 2013-02-26 19:46:45 -08:00
Edison Su
8e360f342d CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support 2013-02-26 18:39:23 -08:00
Min Chen
8aba25f18d Merge branch 'master' into vim51_win8
Conflicts:
	setup/db/db/schema-410to420.sql
2013-02-26 14:12:36 -08:00
Kishan Kavala
0b35f7184d CLOUDSTACK-1289: Added missing usage command processing for External firewall device. ExternalLoadBalancerUsageManagerImpl should be renamed as ExternalDeviceUsageManagerImpl 2013-02-26 17:34:10 +05:30
Wei Zhou
fc3905fb57 CLOUDSTACK-962:setAggBytesSent/setAggBytesReceived in NetworkUsageTask when not in case of dailyor hourly
Removed duplicate userstatsdao injection
2013-02-26 16:27:59 +05:30
Rohit Yadav
da7c0b1437 spring: Remove annotations from interfaces and abstract classes
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 14:52:31 +05:30
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
Sanjay Tripathi
10236bee26 CLOUDSTACK-1374 - When user uploads a volume using uploadVolume API command, only volume_host_ref table is getting updated with corresponding size of volume and "volumes" table, the size of volume still remains zero even ager the volume gets completely downloaded.
Signed-off-by: Nitin Mehta <nitin.mehta@citrix.com>
2013-02-26 10:51:25 +05:30
Sheng Yang
cf90b6cd10 CLOUDSTACK-1332: Add ip6dns to zone and domainrouter response 2013-02-25 19:12:09 -08:00
Sheng Yang
596e940264 CLOUDSTACK-1332: Pass IPv6 DNS to VR 2013-02-25 16:08:15 -08:00
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
Min Chen
084b6f3e05 Merge branch 'master' into vim51_win8 2013-02-25 11:55:12 -08:00
Min Chen
fbfc5c6894 Merge from master and fix conflicts 2013-02-25 11:53:24 -08:00
Edison Su
310e99087f CLOUDSTACK-1380: add db upgrade for vm_template, in 4.1 to 4.2 upgrade procedure 2013-02-25 10:45:04 -08:00
Vijayendra Bhamidipati
6675d2c1a3 CLOUDSTACK-778: user provided hostname to be specified in vCenter instead of CloudStack generated name
Introducing flag to allow display name to be appended to internal instance name.
2013-02-25 18:57:18 +05:30
Kishan Kavala
15201d908f CLOUDSTACK-749: updated mockvpcdao mockvpcmanagerimpl with external device related changes 2013-02-25 18:54:30 +05:30
Kishan Kavala
836ce6c11a CLOUDSTACK-749: External device support for VPC. VPC offering can be created with providers other than VPCVirtualRouter 2013-02-25 18:32:23 +05:30
Deepti Dohare
4d573ddd1b CLOUDSTACK-357 ISOs can be deleted while still attached to a running VM, and they subsequently cannot be detached from a running VM
I made the changes to make sure that:
1. ISO will be deleted from the UI, but it is not deleted from the secondary storage as long as it is attached to a VM.
2. The storage cleanup thread will check whether the iso is attached to any vm, if not, it removes the ISO from the secondary storage.
3. Detach operation is now working which was failing before for the vms having attached iso(deleted).

Updated the patch for template sync during MS restart.

Manually tested the following:
setup: upload ISO1 and ISO 2
Attach ISO1 to VM1 and VM2
Attach ISO2 to VM3
set storage.cleanup.interval to 300

test cases:
1. delete ISO1 from UI, gets deleted
2. In VM Details of VM1 and VM2, can see detach ISO option
3. ISO1 exists in secondary storage
4. detach ISO1 from VM1, successful
5. ISO1 still exists in secondary storage.
6. Restart MS, template sync will not delete ISO1.
7. Detach ISO1 from VM2, successfull detached.
8. Wait for storage cleanup thread to execute, ISO1 gets deleted from Secondary storage.
9. Detach ISO2 from VM3
10.ISO2 exists in secondary storage, Delete ISO2 form UI, get deleted from secondary storage.
2013-02-25 16:02:25 +05:30
Alex Huang
ac1b529f78 Revert "Revert "Fix fresh db install problem. (still pending one part of finding db""
This reverts commit ebcf6b1b7c.
2013-02-23 19:16:13 -08:00
Min Chen
ebcf6b1b7c Revert "Fix fresh db install problem. (still pending one part of finding db"
This reverts commit 5b760f903f.
2013-02-22 21:38:15 -08:00
Min Chen
5b760f903f Fix fresh db install problem. (still pending one part of finding db
script file correctly).
2013-02-22 18:01:55 -08:00
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
Mice Xia
dae57c1ab2 add missing license header reported by rat 2013-02-22 13:22:14 +08:00
Sheng Yang
a0762bc4a7 CLOUDSTACK-1303: Fix NPE when extend vlan with ipv4 only 2013-02-21 18:02:50 -08:00
Prachi Damle
6823adb3ac CLOUDSTACK-1367 NPE noticed in logs while AgentMonitor is monitoring the host ping interval
Added null check. If the host is not found, we dont ping anymore.
2013-02-21 17:40:08 -08:00
frank
1689062334 remove BareMetalVmManagerImpl.java thiat is unused 2013-02-21 17:05:19 -08:00
Edison Su
3bb713c5ce fix adding nfs primary storage and build and load 2013-02-21 16:24:39 -08:00
frank
15ead099a1 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

able to start vm

Conflicts:

	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
	server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-21 15:48:08 -08:00
frank
55b77c7c8f CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

adding missing scripts back

Conflicts:

	client/pom.xml
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/server/ManagementServerImpl.java
2013-02-21 15:46:11 -08:00
frank
1f15c1e9e7 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

fixing bugs to align to new code base

Conflicts:

	client/tomcatconf/componentContext.xml.in
2013-02-21 15:42:38 -08:00
Sheng Yang
667a1d18a4 CLOUDSTACK-1288: Fix regression on remove LB rules
It's a regression caused by:

   commit 69d24545c4
   Author: Murali Reddy <murali.reddy@citrix.com>
   Date:   Fri Feb 8 18:50:18 2013 +0530

       CLOUDSTACK-1208: Failed to shutdown guest network

       Firewall manager was being used instead of LoadBalancingRules manager
       while applying the load balancer rules in shut down network. Changing it
       to LoadBalancingRules manager.

The parameter transferre to applyRules() should be lbRules, rather than the lbs
object.
2013-02-21 14:46:22 -08:00
Chip Childers
6cc1123a3e Correcting license headers that broke the build
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-21 16:29:05 -05:00
Edison Su
18e496b057 rebase to master 2013-02-21 11:22:50 -08:00
Edison Su
ae902590d3 fix snapshot 2013-02-21 11:22:50 -08:00
Edison Su
0f532c4b3a rebase to master 2013-02-21 11:22:49 -08:00
Edison Su
ff047e75d3 refactor snapshot, move existing snapshot code into its own snapshotstrategy 2013-02-21 11:22:49 -08:00
Edison Su
020be66f9d add copy volume and create volume from snapshot 2013-02-21 11:22:49 -08:00
Edison Su
0b86b33c56 rebase to master 2013-02-21 11:22:48 -08:00
Edison Su
ec09e34f86 fix downloading template 2013-02-21 11:22:48 -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
Prachi Damle
744c24ee68 CLOUDSTACK-1346: Check to see if external devices are used in the network, is hardcoded for specific devices
- Changes the check to list all providers of a network and check if it is an external provider
2013-02-20 15:37:27 -08:00
Prachi Damle
70ac773f69 CLOUDSTACK-1344 Typo in use.external.dns setting description
Fixed the typo.
2013-02-20 11:58:14 -08:00
Prachi Damle
ec1f48a4b2 CLOUDSTACK-1331: Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan
Changes:
-We need to update the physical_network_id for public vlans.
-Physical network ID should be retrieved from the network if present.
2013-02-20 11:23:32 -08:00
Rohit Yadav
80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Rohit Yadav
35b83b2adc CLOUDSTACK-1317: In DatabaseUpgradeChecker, add upgrade path to 4.2.0
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:27 +05:30
Sheng Yang
817548bac1 IPv6: Add ipv6 for user vm view 2013-02-19 15:50:55 -08:00
Sheng Yang
da75e4ac8a IPv6: Add IPv6 for domain router view 2013-02-19 15:50:23 -08:00
Abhinandan Prateek
f2b97db0f9 CLOUDSTACK-1172: LDAP enhancements 2013-02-19 15:36:39 +05:30
Kishan Kavala
c94a75c0a6 CLOUDSTACK-752: Removed 1 private gateway for VPC limitation.
Verified that more than 8 private gateways can be created.
2013-02-19 14:15:02 +05:30
Rohit Yadav
ca432fe6b7 db: Fix upgrade paths to 4.1.0
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-19 13:36:21 +05:30
Prasanna Santhanam
447b2d9c95 listroutercmd: response should be set to the name of router
host name of router returned instead of the name of the router.
correcting the setter.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-19 13:22:21 +05:30
Kishan Kavala
cc2a3c5498 CLOUDSTACK-651: Removed 7 nics limitation for VR on XenServer
# of nics can be configured using global param xen.nics.max. Param defaults to 7
Added new param to upgrade schema.
2013-02-18 20:30:03 +05:30
Rohit Yadav
8094e933b0 ApiServer: Get rid of finding system account and user at init() time
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 17:09:37 +05:30
Rohit Yadav
0e354473f7 db: Add stubs for Upgrade410to420, schema-410to420.sql and schema-410to420-cleanup.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 13:31:58 +05:30
Rohit Yadav
44c8a33cf2 db: Fix commas which should be dots in create-schema, fix debug msg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 13:31:46 +05:30
Rohit Yadav
46ab973143 db: Fix Upgrade40to41 and add cleaning path schema-40to410-cleanup.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 12:28:00 +05:30
Likitha Shetty
87b668b71b CLOUDSTACK-863: Fix Non-printable characters in api call
Non-printable characters results in empty pages for all users loading the
corrupted object in the web interface. It also results in the API call results
getting truncated with an error when it encounters the non-printable characters.
Every decoded parameter value is checked for control character using OWASP's
ESAPI library.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 11:54:12 +05:30
Prachi Damle
a621048869 CLOUDSTACK-1307 Noticed NPE when we put host in maintenance mode in clustered management setup
Changes:
   - Use of class variable of type GenericSearchBuilder causes issues when multiple threads invoke this method to findCapacity
   - Changing the scope of the variable to be local to these methods.
2013-02-15 20:38:19 -08:00
Min Chen
5147fb16ac CLOUDSTACK-1253: Remove @author tag. 2013-02-15 10:42:06 -08:00
Likitha Shetty
3c764c0be7 CLOUDSTACK-1207. UpdateNetwork API fails with NPE if the network offering is not being updated and is non-persistent. 2013-02-15 17:18:43 +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
Min Chen
bd4661e467 CLOUDSTACK-1137: force reconnect to a disconnected host throws error. 2013-02-14 17:57:41 -08:00
Sheng Yang
ca5c6d5d14 CLOUDSTACK-1219, CLOUDSTACK-1220: Fix IPv6 error messages 2013-02-14 16:28:29 -08:00
Min Chen
cf7ac9d6c4 CLOUDSTACK-1277: populating transit password field to UserVmJoinVO in
converting from UserVm to UserVmJoinVO.
2013-02-14 12:03:18 -08:00
Alex Huang
f542c320d3 Removed a bunch of missing files and useless imports 2013-02-13 15:41:27 -08:00
Edison Su
d346f632c3 add missing file, fix build 2013-02-13 15:27:03 -08:00
Marcus Sorensen
8652e5f87e Summary: Fix hanging references to /var/lib/cloud, changed to /var/cloudstack
BUG-ID: CLOUDSTACK-1201
BUG-ID: CLOUDSTACK-1196
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360786749 -0700
2013-02-13 13:22:28 -07:00
Mice Xia
9a12756ae4 CLOUDSTACK-684 support vm snapshot 2013-02-14 01:26:30 +08:00
Wei Zhou
2e2ee2f3ed CLOUDSTACK-1088: EnableStaticNat error will clear the data in database
The issue occur in two conditions

(1) If I use two sessions or browsers to EnableStaticNat on CloudStack
UI. one is successful, the other is failed. However, there is no ip in
database.

(2) If I use API call EnableStaticNat several times The first time
succeed, the second failed, the third succeed. the result is
success-fail-success-fail-success-fail, which it is not correct.

Reported-by: Wei Zhou <w.zhou@leaseweb.com>
Reviewed-by: https://reviews.apache.org/r/9254/
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-13 18:43:42 +05:30
Rohit Yadav
fcb4b7a6a7 CLOUDSTACK-1237: Fix an overriding method that would help find template adapter
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 15:19:30 +05:30
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
Marcus Sorensen
ae2b673e03 Summary: fix cloud-agent KVM calls to cloudstack-agent for centos6.3
BUG-ID: CLOUDSTACK-1234
Bugfix-for: 4.1, master
Reported-by: Rayees Namathponnan
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360736064 -0700
2013-02-12 23:16:22 -07:00
Sheng Yang
15e466c56d Add missing break to applyRules in FirewallManager
Otherwise it would falling through PortForwarding rule.

Seems like a typo after network refactor.
2013-02-12 20:27:31 -08:00
Sheng Yang
2776ad14c8 CLOUDSTACK-1242: Fix inline mode
Network refactor dropped many inline mode codes. I've added at least part of
them back. Now I can create LB rule for inline mode.
2013-02-12 20:27:26 -08:00
Min Chen
c0442e2556 Fix a bug in register template, cannot find template adapter. 2013-02-12 16:56:02 -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
Rohit Yadav
bd034e0b9f CLOUDSTACK-1243: Add @Inject to fix NPE in AccountManagerImpl
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-12 17:58:17 +05:30
Murali Reddy
c809d057ef CLOUDSTACK-1241: Network apply rules logic is broken
added logic to check if the network element is configured service
provider for the network before applying rules
2013-02-12 15:28:05 +05:30
Min Chen
6320cad9a1 Merge branch 'master' into vim51_win8 2013-02-11 15:47:08 -08:00
Sheng Yang
d9aa051953 Fix a typo
CanUseForDeploy() didn't return correct result due to this
2013-02-08 14:48:14 -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
1cf85aa87a CLOUDSTACK-1216: insert UUID when we create "admin" user in DB. 2013-02-08 14:18:31 -08:00
anthony
6df0ff2596 fix build issue after revert 2013-02-08 12:30:12 -08:00
anthony
c0f2cf1e06 Revert "Revert "CLOUDSTACK-737""
This reverts commit dd67cfc5d0.
2013-02-08 12:19:31 -08:00
anthony
b66f6c88f9 Revert "Revert "CLOUDSTACK-737""
This reverts commit 447d49ae91.
2013-02-08 12:19:03 -08:00
Anthony Xu
27d1f3fa07 Revert "CLOUDSTACK-737"
This reverts commit 8a86d08fe3.
2013-02-08 10:47:40 -08:00
Anthony Xu
a2fa167613 Revert " CLOUDSTACK-737"
This reverts commit 65210f4e7e.

Conflicts:
	server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-08 10:47:08 -08:00
Anthony Xu
447d49ae91 Revert "CLOUDSTACK-737"
This reverts commit d7201dfe1f.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
2013-02-08 10:46:20 -08:00
Anthony Xu
dd67cfc5d0 Revert "CLOUDSTACK-737"
This reverts commit d7201dfe1f.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
2013-02-08 10:45:40 -08:00
Anthony Xu
0a6c6bb254 Revert "CLOUDSTACK-737"
This reverts commit d7201dfe1f.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2013-02-08 10:42:36 -08:00
Anthony Xu
b4f3f92607 Revert " CLOUDSTACK-737,"
This reverts commit 95aef332cc.
2013-02-08 10:29:53 -08:00
Murali Reddy
68c110cb18 CLOUDSTACK-1208: Failed to shutdown guest network
Firewall manager was being used instead of LoadBalancingRules manager
while applying the load balancer rules in shut down network. Changing it
to LoadBalancingRules manager.
2013-02-08 18:54:15 +05:30
Rohit Yadav
b59a18d1a1 CLOUDSTACK-1210: Fix pluggable service, apiserver, mgmt server impl, api-discovery
- Mgmt server impl is a pluggable service, fix it's method
- Fix getCommands() to return all cmd api classes supported by this mgmt server
- For api-discovery, get commands from pluggable services only, don't use reflections
- Don't use reflections in ApiServer, iterate pluggableservices
- Fix api discovery unit test
- The fix was done automatically using following python program along with
  following step:

1. Get all apis provided by default mgmt server, all of them are in cloud-api now
   cd api/src/org/apache/cloudstack/api/command
   find . >> apis
2. For all apis, generate java code that adds the class to the cmdList arraylist:
   f = open('apis', 'r')
   data = f.read()
   f.close()
   output = ""
   for a in data.split('\n'):
     output += "cmdList.add(%s);" % a.split('/')[-1].replace('.java', '.class')
   # wrote output to a file, copied content to mgmt server impl's getCommands()
   # similarly, fixed import statements using same code, splitting on /

Testing:
Ran apiserver, put breakpoints in ApiServer's init() where classes are processed
Total cmd classes found by reflections (ReflectUtil) = 354
Total cmd classes found by getCommands for all pluggable services = 354

Next, copied the comma separated values for each set to a string in ipython, a & b
set(a).difference(set(b)) returned null.

The above test implies both set of cmd classes found by both methods, i.e. using
reflections and using getCommands() had same set of apis and all were unique.

Conclusion:
The changes are idempotent and don't break api server's cmd class api discovery
processing.

BUG-ID: CLOUDSTACK-1210

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-08 16:48:13 +05:30
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
Min Chen
14ef9151a5 Fix ClassCastException. 2013-02-07 16:23:56 -08:00
anthony
951cba92bb Merge branch 'sg-in-advanced-zone'
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-07 15:19:41 -08:00
Murali Reddy
a71fb83c77 CLOUDSTACK-1178:DB Commit warning logged for every Deploy VM request
removing the regression that introduced premature transaction commit
2013-02-07 13:12:37 +05:30
Mice Xia
13a4c0670e CLOUDSTACK-1176 1) remove 'final' modifier from id attribute in SnapshotVO 2) make state setter method comply with convention 2013-02-07 13:41:49 +08:00
Rohit Yadav
7c003611d0 CLOUDSTACK-1181: Fix NPE, ignore if default path is not readable, we're passing props file anyway
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-07 11:09:56 +05:30
Sheng Yang
06acd9f0ea IPv6: One network can have more than one vlan 2013-02-06 20:07:07 -08:00
Sheng Yang
3d1989c103 IPv6: CLOUDSTACK-1141: Fix reboot router with IPv6 assigned VM 2013-02-06 13:59:53 -08:00
Marcus Sorensen
c5185c09ef Summary: Add missing ResizeVolumeCommand in VmwareResource.java
Submitted-by: hongtu_zang <hongtu_zang@tcloudcomputing.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-02-06 07:52:37 -07:00
Rohit Yadav
dfcd9b05a0 ApiServer: Ask pluggable services to return list of apis to ApiServer
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-06 16:54:46 +05:30
Rohit Yadav
8c5cd42b56 ManagementServerImpl: Fix NPE, PluggableService should not return null list
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-06 16:54:46 +05:30
Sheng Yang
fda8ec3c59 IPv6: CLOUDSTACK-1153: Fix integer overflow on IPv6 address calcuation
Use BigInteger, which is 128 bits long.
2013-02-05 17:41:37 -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
Sheng Yang
2e236a8322 IPv6: Fix ip address in range check 2013-02-05 14:31:06 -08:00
Koushik Das
0ff6612f7f CLOUDSTACK-446 : Host going to alert state, if you are adding already added host
Adding an already added host fails with error but in the process incorrectly updates the status of the host to 'Alert'. Put a check to prevent this.
2013-02-05 19:11:22 +05:30
Kishan Kavala
0816a0bdea CLOUDSTACK-1154: Added @Component annotation to RegionServiceImpl and RegionManagerImpl 2013-02-05 17:18:23 +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
Rohit Yadav
2b267c1ceb CLOUDSTACK-1142: Refactor handleRequest definition, clean redundant code
- Get rid of boolean decode arg
- Method assumes that OTW params have been already decoded
- Remove redundant code that tries to decode again based on boolean arg

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-05 10:37:09 +05:30
Mice Xia
d8062e5633 CLOUDSTACK-1142 Testing LDAP Auth Failed - due to % being illegal character in queryfilter 2013-02-05 11:26:42 +08:00
Anthony Xu
8a86d08fe3 CLOUDSTACK-737
Security Group script assume there is only one nic per VM, it is a big task to support multiple NICs, may seperate that as another project
2013-02-04 17:09:06 -08:00
Hugo Trippaers
f8a22d7520 Fix the situation where only a gateway and a netmask is passed with the
createNetwork command.
2013-02-04 15:08:53 +01:00
Kishan Kavala
6b3da5fbdc CLOUDSTACK-1083: Include removed projects while listing usage records 2013-02-04 19:29:59 +05:30
Hugo Trippaers
0495f5309e Remove yet another test where the database was not properly mocked. FIXME 2013-02-02 12:18:51 +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
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 894cb8f7d9 2013-01-31 17:20:19 -08:00
Anthony Xu
65210f4e7e CLOUDSTACK-737
support multiple NICs in Security group in java side
2013-01-31 15:45:52 -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 5060f98268.
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 f8a483fc5a.

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
Andrew Bayer
71835018e5 CLOUDSTACK-249: Add hostId to failed VM deploy alerts
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-28 15:27:09 -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
fa00ddf07e IPv6: Fix getIp6FromRange() 2013-01-27 19:07:44 -08:00
Sheng Yang
74811fa8b4 IPv6: Disable password and userdata service for ipv6 for now
Would add support later.
2013-01-26 23:14:48 -08:00
Sheng Yang
6169c1d724 IPv6: Enable IPv6 address for router 2013-01-26 23:14:21 -08:00
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
Kelven Yang
1450547987 Put usage server under Spring 2013-01-25 23:00:55 -08:00
Kelven Yang
767f54cc9a Make nonoss build work under Spring 2013-01-25 17:18:36 -08:00
Min Chen
fc7d07305f Fix a bug in listHosts that returns wrong zoneId for host.(cherry picked from commit 17c419ceb4)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-25 14:21:41 -08:00
Min Chen
17c419ceb4 Fix a bug in listHosts that returns wrong zoneId for host. 2013-01-25 14:18:25 -08:00
Edison Su
e9bca76a32 set local storage as up 2013-01-25 13:07:36 -08:00
Kishan Kavala
c6ae19d12f Merge branch 'master' into regions 2013-01-25 18:49:47 +05:30
Kishan Kavala
de20cb6c1a Apply API refactoring changes. Make changes to Regions API to work with new code 2013-01-25 18:45:01 +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
f56b96ad19 merge: Fast forward merge branch 'javelin'
FF merge commit due to recent merge of master and then Edison's commit.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:30:28 -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
Edison Su
6f5655cb03 generalize storage orchestration: DataObjectManager will handle all the object life cycle management 2013-01-24 18:30:08 -08:00
Kelven Yang
f8e5740c31 A workaround to injection problems in servlets (ConsoleProxyServlet and RegisterCompletionServlet) classes 2013-01-24 18:04:48 -08:00
anthony
d7201dfe1f CLOUDSTACK-737
add xenserver support in UI
     only XenServer and KVM clusters are allowed in security enabled zone.
     only shared security enabled networks are allowed in security enabled zone.
2013-01-24 17:26:51 -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
Rohit Yadav
e5b23e387d AccountManagerImpl: Fix method to check and return systemuser, spring injection failsafe
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 15:41:04 -08:00
Rohit Yadav
753b884044 spring: Fix component annotation for VolumeDaoImpl and CfgServerImpl
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 15:40:40 -08:00
Alex Huang
1567a112fa unit test works again 2013-01-24 14:36:44 -08:00
Prachi Damle
057097d0e0 Planner should set the pool information in the destination for volumes that are not yet ready. 2013-01-23 17:31:00 -08:00
Kelven Yang
45a92ba369 Fix the initialization of management server 2013-01-23 15:29:41 -08:00
Rohit Yadav
a7fd74f94a ApiDispatcher: Fix uuid->id translation and throw better debug statement
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
Rohit Yadav
b335684ec5 EntityManager: Implement method to search by uuid including removed entities
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
Rohit Yadav
7a927e36f0 ReflectUtil: Use collections to grow list and not manual array memory management
Fix usage in ApiDispatcher. Add two kinds of helpers:
- One that gets list of exclude cmd whose fields are not be included
- One that loops till a base class is asssignable from superclass

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
Rohit Yadav
a8623bacd7 ApiXmlDocWriter: Fix multiple field occurence in apidocs by using set
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
anthony
95aef332cc CLOUDSTACK-737,
allow to add security group enabled networks in security group enabled zone
2013-01-23 11:08:24 -08:00
Min Chen
485761f0b4 Fix a bug for listZones and listServiceOfferings for normal user, caused
by a misuse of SearchCriteria class.
2013-01-23 10:17:08 -08:00
Hugo Trippaers
1e40551cd5 Disabled test 'com.cloud.network.vpn.RemoteAccessVpnTest' as it requires
a database connection which we don't have during unittest phase.
2013-01-23 08:46:53 +01:00
Min Chen
c3f1a9d324 CLOUDSTACK-355: fix count for listSwiftsCmd. 2013-01-22 17:14:44 -08:00
Prachi Damle
e5bf16b00f Fixing error with merge 2013-01-22 16:44:28 -08:00
Min Chen
26be5ce2df CLOUDSTACK-355: create DB view for ZoneResponse to fix count for
listZonesByCmd.
2013-01-22 16:39:45 -08:00
Prachi Damle
aa7b3e0f6d Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
Corresponding getter/setter is renamed too.

Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case.
2013-01-22 12:56:39 -08:00
Prachi Damle
434c21a149 Fixing Merge error 2013-01-22 12:54:18 -08:00
Prachi Damle
02185d4240 VO should not contain any DAO. Transient should be loaded by the caller using the Dao. 2013-01-22 12:54:16 -08:00
Prachi Damle
e6cd47ddc0 More changes for deployVM flow. 2013-01-22 12:54:07 -08:00
Prachi Damle
94e8090bf3 Deploy, Start, Stop, Destroy VM orchestration service changes 2013-01-22 12:54:04 -08:00
Alex Huang
ee39ec82d3 Making unit tests work 2013-01-22 11:18:51 -08:00
Marcus Sorensen
2e14cf5b57 Summary: Allow for same vlan num on different physical NICs
Detail: A previous bug in the database schema did not allow the same vlan num
to exist on separate physical networks, even though this is possible and should
be allowed. To fix this, the code was changed to also disallow the same vlan
num on different physical networks, to avoid hitting the database constraint.
The database constraint has now been changed to allow only one of a vlan num
per physical nic per data center, so different physical nics can reuse vlan
numbers. This fix adjusts the code to match by removing the old fix.

BUG-ID: CLOUDSTACK-686
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358881555 -0700
2013-01-22 12:05:55 -07:00
Edison Su
4fbecf15ec add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00
Min Chen
6e40c33628 CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count
for ListServiceOfferingsCmd.
2013-01-21 15:25:49 -08:00
Min Chen
6db719d58b CLOUDSTACK-355: Create DB view to fix count issue for
listDiskOfferingsCmd.
2013-01-21 10:50:10 -08:00
Alex Huang
f27692aa7a Removed a useless class? 2013-01-21 10:25:58 -08:00
Hugo Trippaers
04d93ef0aa Use the user.home property instead of a bash thing. See
http://docs.oracle.com/javase/tutorial/essential/environment/sysprop.html
2013-01-21 11:56:53 +01:00
Kelven Yang
2c5859dbd4 Bring javelin back to the status of being able to start System VMs after another round of master branch merge 2013-01-18 19:15:32 -08:00
Rohit Yadav
64f13e1cd8 DatabaseCreator: Fast forward merge due to recent pull in merge of master 2013-01-18 18:16:04 -08:00
Rohit Yadav
03a3837d92 DatabaseCreator: Make it reinit db, add flags, opts, run scripts and upgrade checkers
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:09:04 -08:00
Alex Huang
fe6f0457d5 fixed unit tests from merge 2013-01-18 15:58:55 -08:00
Min Chen
2955d58976 Fix "Count" for listSnapshotPoliciesCmd. 2013-01-18 13:55:11 -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
Koushik Das
e45a9f3aed CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host HA won't be triggered in case the host investigator is not able to determine the state
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 17:20:51 +05:30
Koushik Das
070856affd CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 16:49:52 +05:30
Kishan Kavala
51c1ca7cbe CLOUDSTACK-1010: Fix count issue for listHosts command 2013-01-18 16:13:25 +05:30
Min Chen
2fd1d476b4 Merge branch 'master' into api_limit 2013-01-17 21:23:50 -08:00
Kelven Yang
e5507c3892 Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption 2013-01-17 18:55:14 -08:00
Rohit Yadav
b45cdef5d9 DatabaseCreator: Process db props, sql and upgrade classes separately
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 18:25:27 -08:00
Kelven Yang
17a94b20ec Always use premium setting in ConsoleProxyManager 2013-01-17 18:23:06 -08:00
Rohit Yadav
b120e19280 ApiDispatcher: In case of incorrect long int value or uuid, throw error
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 17:59:53 -08:00
Koushik Das
cd37e22f9b CLOUDSTACK-810: Make DirectAgent thread pool size configurable Removed hard-coding of directagent thread pool size and now reading it from configuration
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-17 17:21:52 -08:00
Rohit Yadav
f264571e92 ApiServer: Fix default reponse type for apiserver on intergration port to xml
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 17:03:27 -08:00
Chiradeep Vittal
2d19f3b052 network-refactor: merge stomped on a logical not' 2013-01-17 16:59:48 -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
Rohit Yadav
ef07cde449 DBCreator: Fix ScriptRunner to strip comments, reformat code
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:10:07 -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
Kelven Yang
6d155416c2 System VM can start now with Spring bootstraped management server 2013-01-17 14:22:14 -08:00
Chiradeep Vittal
56cd809600 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Re-merge with network-refactor
2013-01-17 11:32:49 -08:00
Alex Huang
cbb7ff1c32 added missing files 2013-01-17 06:50:59 -08:00
Alex Huang
b751b69c55 Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin 2013-01-17 06:50:19 -08:00
Alex Huang
9759ad57f2 Commit the current changes to unit tests 2013-01-17 06:50:11 -08:00
Min Chen
c1a540c6bb Merge branch 'master' into api_limit
Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-16 22:48:22 -08:00
Min Chen
3dabd5fbf3 Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-16 22:36:34 -08:00
Min Chen
06fa338d42 Add some tests for api rate limit plugin. 2013-01-16 21:56:25 -08:00
Min Chen
bdcfa1919b Clean up ApiServer, ApiServlet and ApiDispatcher in handling various
exceptions, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.
2013-01-16 21:52:48 -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
Prachi Damle
4d4fb9c959 https://issues.apache.org/jira/browse/CLOUDSTACK-993
Changes:
- Introduction of maven skipped the java code that inserts the admin user. This causes the NPE in management server while trying to find the user and also, admin user cannot login as expected.
- Fixing the insertion of the admin user as part of startup.
2013-01-16 19:18:59 -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
Kelven Yang
497dcd5044 Get rid of PlugService annotation, replace it with Spring standard injection in command classes 2013-01-16 18:44:44 -08:00
Prachi Damle
c08d151e05 https://issues.apache.org/jira/browse/CLOUDSTACK-993
Changes:
- Introduction of maven skipped the java code that inserts the admin user. This causes the NPE in management server while trying to find the user and also, admin user cannot login as expected.
- Fixing the insertion of the admin user as part of startup.
2013-01-16 17:18:11 -08:00
Marcus Sorensen
975021dda1 Summary: adding resizeVolume api call
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.

BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
2013-01-16 17:43:35 -07:00
Kelven Yang
2be270de89 Separate loadable components like Gurus, Elements, Adapters to componentContext.xml 2013-01-16 16:33:59 -08:00
Kelven Yang
727fab71cb Disable StorageProvider, storageType introduced in Javelin new code, temporarily, to make existing code run 2013-01-16 14:16:01 -08:00
Kelven Yang
4c1257bf18 Handle proxy object situation in dispatching API command 2013-01-16 11:28:09 -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
Murali Reddy
316c5267cc Revert " Summary: check-in for L4-L7 network services in the shared network in"
This reverts commit 7fcfcdf91e.

Reverting due to IP clearance issued for the commit done as part of CLOUDSTACK-312
2013-01-16 16:04:14 +05:30
Murali Reddy
156ed7a336 Revert "Summary: partical check-in for L4-L7 network services in the shared"
Reverting due to IP clearance issued for the commit done as part of
CLOUDSTACK-312

This reverts commit d4c604cfd8.
2013-01-16 15:58:44 +05:30
Murali Reddy
c7840cf91f reverting the earlier commit 432ea9c7d4
done for bug CLOUDSTACK-265 due to IP clearence issues.
2013-01-16 15:10:27 +05:30
Min Chen
97cb16944f Merge branch 'master' into api_limit 2013-01-15 18:18:34 -08:00
Kelven Yang
df684261cf Put command classes under Spring injection framework 2013-01-15 18:07:19 -08:00
Min Chen
8608925216 Consolidate RuntimeCloudException and CloudRuntimeException into one
class CloudRuntimeException, and removed RuntimeCloudException to avoid
confusion.
2013-01-15 18:07:08 -08:00
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
Sheng Yang
4f889bd426 CLOUDSTACK-985: Make sure RvR would always have same MAC address
Even with newly created RvR using "restartNetwork&cleanup=false" API.
2013-01-15 15:22:41 -08:00
Sheng Yang
c32dbec468 CLOUDSTACK-985: Revert "Using different MAC for a pair of redundant routers"
The different MAC address for a pair of redundant router have issues when short
time network outrage happened. When this happened:

1. BACKUP(r-2) cannot receive the broadcast from MASTER(r-1).
2. Then r-2 would announce it's MASTER after 3 seconds, and send gratuitous ARP
to the gateway of public ip(usually a rack router).
3. The gateway of public ip would update it's ARP cache to associate the public
ip of the network to the MAC of r-2.
4. In the meantime, r-1 still sending out VRRP broadcast(due to network issue,
the broadcast never arrived at r-2), and acting as MASTER.
5. After network outrage, r-2 would receive the higher priority VRRP broadcast
from MASTER again, then receded as BACKUP.
6. But the public gateway would still associate public ip with MAC of r-2, thus
caused the issue. r-1 would no longer able to receive any packets from public
network.

And there is no way for r-1 to send gratuitous ARP again, because it's always
consider itself as MASTER, no state changed, and no hook existed for receiving
lower priority broadcast.

So I would revert this change, and introduce another commit to ensure the newly
create redundant router would share the same MAC as the first one.

This reverts commit 9f257aa60b.
2013-01-15 15:02:21 -08:00
Marcus Sorensen
47251b51a7 Summary: Allow ssh keypairs to be created if developer flag set and user ! cloud
Detail: Previously in the code we allowed the configuration to create ssh
keypairs and put them in the configuration table so that systemvms could have
ssh key auth and work properly if the user was 'cloud' or if the developer
configuration item was set to true. It got changed to requiring both the cloud
user and the developer flag (using an || on a negative) somwhere along the way.
This changes it back to && on a negative to allow us to run as non-cloud users
with the dev flag set, and for cloud to deploy properly without the developer
flag.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358285190 -0700
2013-01-15 14:53:28 -07:00
Kelven Yang
af67d87662 Fix issues with @DB support in Spring environment 2013-01-15 12:35:03 -08:00
Min Chen
7f1486e2dc We need to catch PermissionDeniedException in checking if command is
available to an user.
2013-01-15 11:43:59 -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
anthony
a6b9027630 default Security rule doesn't apply to system VMs since nic.getIsolationUri is not set
use to.setSecurityGroupEnabled to indicate if securitygroup is enabled on this NIC

CLOUDSTACK-983: default Security rule doesn't apply to system VMs
2013-01-15 11:15:42 -08:00
anthony
101f64410a Do not allow add multiple VLANs or subnets into shared network
CS allows to add multiple VLANs and subnets to a shared network, but it doesn't really work, for example , vm on second VLAN or subnet cannot get IP through DHCP
This patch will not allow to add mulitple VLANS or subnets into shared network

CLOUDSTACK-982:Do not allow add multiple VLANs or subnets into shared network
2013-01-15 09:17:12 -08:00
Wido den Hollander
510450b11b Remove duplicate systemUse clausule when fetching service offerings.
A couple of lines back there is:

        if (isSystem != null) {
            sc.addAnd("systemUse", SearchCriteria.Op.EQ, isSystem);
        }

So it was set redundantly, this can be removed.
2013-01-15 12:14:57 +01:00
Rohit Yadav
bca2c928e8 PluggableService: Fix interface definition
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
Rohit Yadav
8f27c711e5 ApiServer: Process through chain of api access checker, on failure it will throw exception
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
anthony
3aba867e16 only basic network is pod based.
it has nothing to do with shared SG enabled netwokr
2013-01-14 18:29:09 -08:00
Kelven Yang
f304df44df Add ActionEventIntercepter to implement origianl ActionEventCallback in Spring AOP 2013-01-14 17:44:31 -08:00
Min Chen
4d0c850dc8 Fix plugin component configuration. 2013-01-14 17:13:18 -08:00
Rohit Yadav
896e505da6 APIChecker: Make interface generic, pass user and not just role
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 15:08:45 -08:00
Kelven Yang
96bd1d4172 Forget to save changed file in last commit 2013-01-14 14:10:47 -08:00
Kelven Yang
6dfbcee63d Fix singleton initialization in ApiServer/ApiDispatcher to make it work under Spring bootstraped environment 2013-01-14 13:57:30 -08:00
Kelven Yang
64c947a9f8 Re-fix startup of management server 2013-01-14 10:52:37 -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
452e9c3efd maven: Remove duplicate cloud-core dependency in server
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 03:41:27 -08:00
Rohit Yadav
ad063ed610 StaticRoleBasedAPIAccessChecker: Throw exception on failed check
Plugin should not be responsible for existence of checking an API, this was wrong.
Throw exception boldly when checkAccess fails.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 19:24:11 -08:00
Rohit Yadav
0dca44efe8 ApiServer: Debug messages, don't spam with info, remove identity helper in ResponseGenerator
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
83e7214b02 ConsoleProxyManagerImpl: Get rid of IdentityDao
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
8eba0ee0bb ApiDispatcher: Remove helper method that proxies via ApiResponseHelper to get entity by IdentityDao
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -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
24687973a8 ApiServer: Get rid of IdentityDao, reuse domain manager to get domain id
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
Min Chen
57e67c57d7 Merge branch 'master' into api_limit
Conflicts:
	server/src/com/cloud/api/ApiServer.java

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-11 15:50:21 -08:00
Kelven Yang
f57dcaa820 Loadable components to be in separted Spring component bundling 2013-01-11 15:33:15 -08:00
Kelven Yang
53da542001 Another round of fixes after merge 2013-01-11 15:21:04 -08:00
Rohit Yadav
74bb043c37 APIChecker: Rename refactor and add interface checkExistence
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 18:51:30 -08:00
Alex Huang
757e1a931b cleanup warnings in utils 2013-01-10 17:19:30 -08:00
Rohit Yadav
e63e352508 ApiServer: Log a better message if api access fails and debug it
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 16:08:16 -08:00
Alex Huang
1294cdc701 pulled from master 2013-01-10 16:01:01 -08:00
Alex Huang
d6f44a4d6a merged from master 2013-01-10 15:55:42 -08:00
Rohit Yadav
8f26e171e6 ManagementServerImpl: Fix missing import of PropertiesUtil
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55:02 -08:00
Rohit Yadav
c4e890c55d PluggableService: Refactor method to return map of key value pairs
- Makes plugins self contained so they decide their properties file format
- PluggableService creates the contract that implementing entity will return a
  properties map which is apiname:rolemask (both are strings)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55:02 -08:00
Rohit Yadav
a56f355ceb ApiServer: get role type from account manager using account
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55: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
f922c6fc03 Keep removing 2013-01-10 14:46:52 -08:00
Rohit Yadav
62a42723f9 APIAccessChecker: Make it check based on role type and not user
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 11:49:15 -08:00
Alex Huang
56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Alex Huang
395de6f2b3 merge from latest pull 2013-01-10 11:07:11 -08:00
Alex Huang
f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -08:00
Min Chen
0b69d9449a Merge branch 'master' into api_limit 2013-01-10 09:51:41 -08:00
Kishan Kavala
cd7f771615 CLOUDSTACK-721: Fixed network usage. Send network usage command for isolated guest nic of non VPC VR. Send network usage command for public nic in VPC VR. 2013-01-10 14:56:11 +05:30
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
745fae93f6 Network-refactor: some clean up of the NetworkService interface
- remove unused public apis
- remove unused members
- change visibility of methods to protected if they do not implement a method in the interface

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 18:36:23 -08:00
Min Chen
7f8262d45e Remove IdentityProxy and IdentityTypeAdapter class.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-09 17:40:58 -08:00
Kelven Yang
0bcebd33b6 Fix problems after merge 2013-01-09 17:36:53 -08:00
Rohit Yadav
657fb6ac0b ApiServer: Don't depend on plugin for apiname:cmd class mapping
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 17:20:46 -08:00
Rohit Yadav
72693ea382 server: Fix ApiServer init method, we won't use cfg files and it's not used there
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 17:20:46 -08:00
Min Chen
8d98daa1be Add API throttling config items and APILimitChecker Adapter interface,
add api limit checking in APIServer flow.
2013-01-09 16:11:23 -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
1339650c2c Network-refactor: remove unused members. Makes testing of injection a PIA.
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
0c3001530f Network-refactor: move readonly interface NetworkModel into api project so that plugins can stop depending on the server project
Network-refactor: accidentally injected NetworkModel twice (revert one of them)

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
Kelven Yang
cf5d935d81 Seperate configurable components out and let them be loaded from Spring configuration file 2013-01-09 14:39:16 -08:00
Min Chen
9924b64830 commit 3a3cb60e85c0254ebceff55d0b210ca1ff5386a6
Author: Likitha Shetty <likitha.shetty@citrix.com>
Date:   Wed Jan 9 11:54:25 2013 +0530

    CLOUDSTACK-614: ListTemplates API is not returning "Enable SSH Key" attribute for any given template. Update the TemplateResponse by adding 'sshkeyenabled' attribute to it. This attribute is set to the value that the user passes as input for parameter 'sshkeyenabled' while registering the template.

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-09 10:42:44 -08:00
Alex Huang
b6c56736e5 merge from master 2013-01-09 05:20:36 -08:00
Alex Huang
0bcb64605f all built with the latest 2013-01-09 05:02:39 -08:00
Rohit Yadav
0b0752f047 CLOUDSTACK-932: Fix incorrect param that caused casting error while processing api
Reported-by: Kishan Kavala <kishan.kavala@citrix.com>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:47:53 -08:00
Alex Huang
14bd345f1f merge compiles 2013-01-09 04:41:27 -08:00
Rohit Yadav
fc92f04c6b ApiDispatcher: Remove unused methods which were for acl processing
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:18:35 -08:00
Rohit Yadav
765504c070 ApiServer: Fix apidiscovery fail case, fix comment
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:18:35 -08:00
Rohit Yadav
2c04dad529 ApiDiscovery: New plugin to help discover apis on mgmt server
- Introduces api/discovery plugin that helps discover apis on the mgmt server
- It's a pluggable service, therefore has it's own api-discovery_commands.properties
  where the discovery api, listApi can be blacklisted (by removing it), or it's
  role mask can be changed
- By default its response has all the apis
- Changes in other parts of the code to make it work, viz. components.xml, pom.xml,
  and in ApiServer where it is used as an adapter to get apiname, cmd mappings

The ApiDiscoveryService interface is a contract that the implementing class will
provide:

1. A means to get all the apis as a list of response, plugin is free to implement
   the response class, as long as it extends on the BaseResponse:

    ListResponse<? extends BaseResponse> listApis();

2. Provides a map of apiname as the key and cmd class as the value:

    Map<String, Class<?>> getApiNameCmdClassMapping();

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
Rohit Yadav
d760271945 ApiDispatcher: Get rid of reflections, reuse utils' ReflectUtil
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
Rohit Yadav
539d94b4a6 ApiXmlDocWriter: Reuse methods from ReflectUtil
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
Kelven Yang
cc23a23324 Fix startup sequence for classes that have due Manager/Adapter interfaces 2013-01-08 18:42:12 -08:00
Kelven Yang
b274c570f9 Cleanup places that use explicit wiring of the components 2013-01-08 17:45:33 -08:00
Min Chen
d22229eb9d Remove updateUuids code in ConfigurationServerImpl (which is not the
right approach to populate uuid column since it will impact upgrade as
well), and populate UUID column in seed data sql script.

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-08 17:12:14 -08:00
Alex Huang
7f3a748d6c Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin 2013-01-08 14:46:38 -08:00
Kelven Yang
32e67f60d4 Work with Spring proxy-ed object 2013-01-08 14:24:19 -08:00
Alex Huang
cf8de7ee17 Removed all the .project files 2013-01-08 14:11:00 -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
Prachi Damle
a4f4c98670 OrchestrationService: some changes for DeployVM 2013-01-08 11:53:54 -08:00
Kelven Yang
992fa473be convert existing singleton objects into Spring loadable bean components 2013-01-08 11:07:22 -08:00
Kelven Yang
b96bb8feb9 Hook log4j to Spring bootstrapped Javelin server 2013-01-07 18:21:58 -08:00
Min Chen
0894822651 DB view dao cleanup, and introduce global configuration parameter for
entity detail batch query size to remove hard-coded
VM_DETAILS_BATCH_SIZE.

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-07 16:40:31 -08:00
Kelven Yang
559933f062 First page of Javelin management server bootstraped by Spring is able to show now 2013-01-07 15:54:18 -08:00
Chiradeep Vittal
af1abe4056 Forgot some element adapters + dont add JuniperSRX by default 2013-01-07 15:21:57 -08:00
Chiradeep Vittal
e262eef296 Fix mocks 2013-01-07 15:21:49 -08:00
Chiradeep Vittal
c876f02c6f Clean up some unused imports 2013-01-07 15:21:36 -08:00
Chiradeep Vittal
cf90685985 Remove old applyRules implementation 2013-01-07 14:26:09 -08:00
Chiradeep Vittal
f4da21998c WIP : extract NetworkService
WIP : move stuff between network manager and network service.
      at this point there is about 700 lines of duplicated code
WIP: Leave creation of default offerings to NetworkManager init
WIP: clean up imports

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-07 14:25:03 -08:00
Rohit Yadav
a948a89378 Sync updates: Merge branch 'master' into api_refactoring
Conflicts:
	server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
	server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-07 10:38:43 -08:00
Min Chen
13de3ca253 Enable default sorting for listVirtualMachines and listRouters to keep
back compatible.
2013-01-07 10:26:33 -08:00
Koushik Das
3ffbc4320a CLOUDSTACK-595 : Recreate root volume scenarios doesn't work in vmware
Issue seen during system vm template upgrade and restoreVM command
scenarios for vmware. In these cases CS tries to recreate root disk with
same name as the existing one, in case of vmware this results in creation
of vmdk file with same name for both existing and new root volume.
This results in undesired behavior when storage cleanup thread tries to
cleanup old volume. Made the vmdk file name unique by adding the volume
id to it. This will ensure that during volume recreation in the scenarios
mentioned vmdk will get created with a new name and there will be
no undesired side effects of running the storage cleanup thread.
2013-01-07 16:18:05 +05:30
Kishan Kavala
5502f4b20c Corrected response object in Traffic Monitor APIs Implementation annontation as TrafficMonitorResponse 2013-01-07 12:32:24 +05:30
Rohit Yadav
39b829bffe api: ACL annotation and checkAccess removal refactor for StopVMCmd
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 17:19:49 -08:00
Rohit Yadav
96b9164e4b Fix ACL processor and methods in ApiDispatcher and their usages
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 17:18:45 -08:00
Rohit Yadav
19cf665094 ApiServer: Fix debug output for role based user access checking
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 16:51:14 -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
6f6ed85839 ApiXmlDocWriter: Fix apidocs generation based on new commands.properties syntax
Makes it backward compatible to old syntax as well

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 15:01:09 -08:00
Rohit Yadav
e17e68f0af server: Fix base template*cmd class imports and names
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 14:47:00 -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
21d6cd304b server: Reformat DomainChecker
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 17:00:13 -08:00
Rohit Yadav
6a112bd64c api: Rename Validator to Validate, cosmetic fixes
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:52:53 -08:00
Rohit Yadav
b00ed17f4b server: Cosmetic fix for methodname in ApiDispatcher
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:40:59 -08:00
Rohit Yadav
63481ecb34 CLOUDSTACK-212: Move api response classes to cloud-api under org.apache.cloudstack
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:27:36 -08:00
Rohit Yadav
73a0c3e07f api: Refactor move storagepool apis to storage pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 15:32:58 -08:00
Rohit Yadav
f07a98a740 api: Refactor and move s3 to api.command.admin.storage
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 15:30:38 -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
Chiradeep Vittal
a64b386714 Move applyRules to the rightful place(s). Not sure why applyIps is required during applyRules, so we still have a reference back into a (simplified) applyRules in NetworkManager 2013-01-04 19:22:53 -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
Sheng Yang
717f9dcd4d CLOUDSTACK-306: Implement SRX firewall
Use SRX firewall filter as SRX firewall. The old security policy mechanism
cannot be used as IP based. This would enable SRX's ability to control traffic
for F5 behind it.
2013-01-04 19:17:50 -08:00
Rohit Yadav
dea8227001 server: Exclude ListPerf test in as it requires real MS and DB
Excluded test as per test author's comment:
"Currently we commented out this test suite since it requires a real MS and Db running"

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 18:25:13 -08:00
Rohit Yadav
0659c21f2d Get latest changes, Merge branch 'master' into api_refactoring 2013-01-04 17:22:57 -08:00
Rohit Yadav
65a1284e83 srx: Annotate api classes, remove IdentityMapper
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 17:00:10 -08:00
Rohit Yadav
4dd5f14e76 f5: Annotate f5 cmd classes, remove IdentityMapper
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 16:49:27 -08:00
Chiradeep Vittal
e37f458a8d Rationalize the interface by injecting all service providers by the service provider interface instead of assuming everybody implements NetworkElement. This is step 2 and includes all the plugins
import cleanups - remove unneeded and add explicit classes

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 15:13:47 -08:00
Chiradeep Vittal
3529c47248 Rationalize the interface by injecting ipDeployers. This is step 1 and includes 2 service providers - Remote AccessVPN and S2S VPN
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 15:08:55 -08:00
Rohit Yadav
0428b30a5a Fix reflections cmd class loading in ApiServer
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 14:35:05 -08:00
Kelven Yang
2e9c55f8f6 More Spring issues to bootstrape javalin server 2013-01-04 14:25:12 -08:00
Chiradeep Vittal
b0a1a47d48 Not all network service providers need to be NetworkElements. NetworkElements are only those that are interested in L2 events. Since only NetworkElements were injected, and only in NetworkManagerImpl, this has led to all kinds of contortions. As a first step, enable individual service providers to be injected.
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 12:14:49 -08:00
Noa Resare
0055d80211 CLOUDSTACK-771: maven: add mysql version reference to enable non-snapshot builds
If you update your build to build a version with a name not ending in -SNAPSHOT,
you are required to declare versions on all your depdendencies. There is already
a cs.mysql.version property, this patch makes sure it is used where appropriate.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-04 12:20:06 -05:00
Wido den Hollander
7240204a50 Pass on the destination host in StartCommand
I added this in commit bc94948e06 to be able to bind
the VNC on KVM on the Private IP Address of the Hypervisor.

This got (accidentally) reverted in commit 110903a91a breaking
this behaviour with KVM.

By passing the destination host again in StartCommand we are able to bind the VNC to the private
IP address of the hypervisor.

This makes sure the VNC is not open for the world and users don't have to firewall these ports, nor
do they have to change "vnc_listen" in their qemu.conf libvirt settings.
2013-01-04 14:37:23 +01:00
Rohit Yadav
6929bd9473 server: Don't silently ignore uuid param translation for required param in case they fail
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-03 22:32:47 -08:00
Rohit Yadav
98d5719b57 server: Make ApiDispatcher backward compatible to not throw error on incorrect params
Incorrect params are silently ignored in 4.0 and before. The fix would log the error
in debug log, but will continue processing. In case of an issue with uuid or param
an empty response is sent, for ex. in case of deleted entities as well.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-03 22:32:46 -08:00
Min Chen
daeb4abcca Create DB views for AsyncJobResponse to speed up listAsyncJobsCmd.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-03 15:35:26 -08:00
Min Chen
ff8fdbd194 Add missing @Id annotation to id fields for all the join VOs to support
findById call.
2013-01-03 14:12:15 -08:00
Kelven Yang
01701b1d9c Missing two files in last check-in 2013-01-03 14:11:16 -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
Rohit Yadav
edb00bb613 Merge branch 'master' into api_refactoring 2013-01-03 08:32:56 -08:00
Hugo Trippaers
cc3d692ab8 Summary: Remove useless and commented code 2013-01-03 11:57:37 +01:00
Rohit Yadav
580bf857ff server: ApiServer inits with processing cmd classes to fill apiname:class mapping
- Add maven dependency reflections (wtfl license, apl compliant)
- Use reflections to recurse and get apiname:class mapping

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 18:43:59 -08:00
Rohit Yadav
65e4f00a10 Annotate api name on usage related apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 18:43:58 -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
Rohit Yadav
bc8e0af0a3 plugin: ACL Static Role Based api access checker
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 17:06:19 -08:00
Rohit Yadav
d235859168 Fix PluggableService to provide interface for ACL adapters etc. to get configs
- Fix interface to return array of strings, or filenames
- Fix StaticRoleBased ACL adapter to process config files by going through all pluggable services
- Refactor interface names

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 16:29:39 -08:00
Rohit Yadav
d8d87adc22 Merge branch 'master' into api_refactoring
Conflicts:
	api/src/com/cloud/api/commands/ListS3sCmd.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 13:57:55 -08:00
Kelven Yang
e2078ec6e4 Solve Spring loading issues with a few Dao and Manager components 2013-01-02 13:55:26 -08:00
John Burwell
e4583ced2e S3-backed Secondary Storage 2013-01-02 10:28:47 -08:00
Alex Huang
e936c32a04 Fixed problems with inject checkin 2012-12-28 16:24:54 -08:00
Kelven Yang
259e6d5f74 Fix a few Spring bootstrap issues 2012-12-27 17:46:52 -08:00
Rohit Yadav
623e7389ef api: Make APIServer backward compatible to accept both uuid and id for pre 3.x apis
- Allow both uuid and id in param for pre 3.x apis
- Enforce uuid as param for all >= 3.x apis
- Use regex to better match uuid param

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-27 15:24:17 -08:00
Prasanna Santhanam
840da55520 api: Entities will extend InternalIdentity and Identity
Entities correlated to the Identity and carry a uuid and those
correlated to InternalIdentity carry an id. Those entities that carry
both will correlated to Identity and InternalIdentity.

This refactors entities wherever possible to ensure the VO only
implements the first class entity.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-26 19:11:15 -08:00
Rohit Yadav
7a7fe583e0 Rename Implementation annotation to APICommand
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:55:34 -08:00
Rohit Yadav
a18464dbe5 Rename @Entity to @EntityReference used in Response classes
- Renames to @EntityReference as @Entity is too general and used in javax's pkg
- Remove redundant imports

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:34:35 -08:00
Rohit Yadav
057ac12d23 Enforce InternalIdentity interface on all VO classes that impls long getId()
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:09:44 -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
78d70d349b Merge branch 'master' into api_refactoring
- Applies Isaac Chian'gs fix (CLOUDSTACK-648) to allow user change their password
- TODO: Fix response, only partially applied

Conflicts:
	api/src/org/apache/cloudstack/api/response/UserResponse.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-25 09:51:17 -08:00
Isaac Chiang
5aefd77f77 Fix for CloudStack-648
Signed-off-by: Gavin Lee <gavin.lxh@gmail.com>
2012-12-26 00:00:58 +08:00
Rohit Yadav
beb2fccf1c api: Finally get rid of IdentityMapper annotation processing in ApiDispatcher
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:06:36 -08:00
Rohit Yadav
9d3ab8ded7 server: Get rid of db helpers that work with IdentityMapper
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:04:32 -08:00
Rohit Yadav
e849d70af1 api: Annotate some juniper-src apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:41:10 -08:00
Rohit Yadav
a4fed07a7e api: Annotate usage related apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:33:30 -08:00
Rohit Yadav
a5dddb4a83 api: Extend or Implement InternalIdentity's getId method on a lot of VOs and Interfaces
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 16:52:35 -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
503db14127 Add back Identity interface to most VO class to avoid cast error in
ApiDispatcher.setupParameter call.
2012-12-22 22:35:09 -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
Rohit Yadav
5d8e106602 api: Add method in ApiDispatcher to be reused for both UUID and List<Uuid>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 18:57:26 -08:00
Rohit Yadav
2140ff55ea api: Refactor and move VPN related api cmd classes to command.user.vpn
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:13:37 -08:00
Rohit Yadav
024f0d95dd api: Use Identity interface instead of java reflect to getId
- Add new interface method to getId
- Fix method definition in AsyncJob
- Get rid of mechanism to getId using reflect, use Identity interface

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 19:05:45 -08:00
Rohit Yadav
08892c51a3 api: Fix jobid and entitytype for BaseResponse and QueryAsyncJob*
- Fix jobid serialization issue that broke the UI
- Fix AsyncJob Result and Response
- Get rid of getUuid(), setUuid(), just use getId, setId for uuid...
- All uuids from over the wire are UUIDs

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 19:05:45 -08:00
Kelven Yang
877e16029c Fix a few Spring issues to Bootstrap javaline server 2012-12-21 16:49:27 -08:00
Sheng Yang
96c7bbeb86 Update the router status after start network
Start network can possible start the router as well. If it's already started by
start network, then we won't need to start it again.
2012-12-21 15:22:07 -08:00
Sheng Yang
9f257aa60b Using different MAC for a pair of redundant routers
In the past, we use same MAC address therefore once MASTER is down, the packet
to the same MAC would go to BACKUP ASAP.

But now we also have arping after BACKUP become MASTER, which should update the
ARP cache of public gateway router quickly. Though it would be a little
delay(likely less than 1 second), it's still fine for different MAC.

And it would solve some cache issue for same mac on vSwitch different ports.
2012-12-21 15:21:53 -08:00
Min Chen
f4a90a151f Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into api_refactoring 2012-12-21 15:11:54 -08:00
Kishan Kavala
3ae5986b87 Update DB version during DB deploy
1. Modified create-schema.sql to add version as 4.1.0 instead of 4.0.0
	2. Removed schema-40to41.sql amd moved the content to schema-40to410.sql
	3. Added to schema-40to410.sql Upgrade40to41.java

Conflicts:
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to41.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-21 15:11:05 -08:00
Rohit Yadav
03b47cb501 api: Temp. fix to be backward compatible to old way of id passing
For some apis, the param=-1 is used to evaluate conditionals. Allow -1 to be passed
for now. This is a APITODO/FIXME to fix stuff in service layer and then only get rid of it.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 14:41:14 -08:00
Kishan Kavala
8acc85ca53 Update DB version during DB deploy
1. Modified create-schema.sql to add version as 4.1.0 instead of 4.0.0
	2. Removed schema-40to41.sql amd moved the content to schema-40to410.sql
	3. Added to schema-40to410.sql Upgrade40to41.java
2012-12-21 15:27:00 +05:30
Sheng Yang
d72f8a695d Add new global configuration option to enable user specify guest OS DHCP policy
This is improvement of:

commit 1ca493e4fa
Author: Sheng Yang <sheng.yang@cloud.com>
Date:   Wed Feb 29 17:43:50 2012 -0800

    bug 14042: Don't set dhcp:router option on DHCP server for non-default
network on CentOS/RHEL

The old solution only works on CentOS/RHEL, this one would enable the ability to more
guest OS, and enable user to choose what policy should be for each guest os
type.
2012-12-20 19:21:02 -08:00
Sheng Yang
53e6825b74 CLOUDSTACK-689: Clean stop pending flags when VR start/stop 2012-12-20 18:51:01 -08:00
Min Chen
e4dbc2033f Add upgrade script from 4.0 to 4.1.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-20 18:18:06 -08:00
Min Chen
b14b39a69f Remove IdentityProxy from BaseResponse, ExtractResponse. Now
IdentityProxy is only referenced in CreateCmdResponse, which involves
some async job logic change. Since it is not impacting list performance,
will leave it there for now.

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-20 16:52:52 -08:00
Min Chen
a88ce6bb7f Remove IdentityProxy from CloudException and ExceptionResponse. 2012-12-19 23:49:44 -08:00
Min Chen
98b022a430 Remove IdentityProxy from plugin response classes.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-19 13:09:02 -08:00
Min Chen
e397f23f6b Revert "Guard null pointer exceptions."
This reverts commit fc56e29a3e.

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-19 11:23:09 -08:00
Min Chen
1d729578d4 Remove IdentityProxy from Response classes.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 23:16:38 -08:00
Min Chen
fc56e29a3e Guard null pointer exceptions. 2012-12-18 22:26:38 -08:00
Rohit Yadav
7b6132e8e2 api: Skip empty uuid processing in ApiDispatcher for received params
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 18:16:18 -08:00
Rohit Yadav
a9df2cb0f5 api: Fix NullPointerException for listProjects in ProjectJoinDaoImpl
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 17:44:18 -08:00
Rohit Yadav
434258080f api: Fix NullPointerException in ApiResponseHelper for DomainResponse
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 17:44:17 -08:00
Rohit Yadav
22ee4200c3 api: Fix findByXId to findByUuid in EntityManager and ApiDispatcher
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 17:44:17 -08:00
Min Chen
4b75132aa2 Remove IdentityProxy from Response classes.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 16:33:12 -08:00
Min Chen
16be94e9d7 Remove IdentityProxy from OfferingResponse, FirewallResponse,
FirewallRuleResponse, HypervisorCapabilitiesResponse, IPAddressResponse.

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 12:02:08 -08:00
Min Chen
1aa30f03e7 Remove IdentityProxy from AutoScale responses.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 11:19:36 -08:00
Min Chen
a390b273ae Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into api_refactoring 2012-12-18 10:07:51 -08:00
Rohit Yadav
5fdce84e81 api: Process UUID and Parameter annotations in ApiDispatcher
- Use @Parameter's entityType and type annotation fields
- Use @Entity annotation in Reponse class to get table info for Dao
- Use findByXId to process all entities and translate UUID to ID
- Handle error in reflection method invoking

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 04:16:33 -08:00
Rohit Yadav
837d21bb2d api: Implement findByXId in GenericDaoBase and EntityManagerImpl
Declare and define findByXId() in GenericDao and EntityManager.
This method would return a VO by UUID and EntityManager's interface would
take in the VO Interface.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 04:10:36 -08:00
Min Chen
3d344738b1 Fix ControlledEntityResponse interface to remove IdentityProxy for
projectId and domainId.

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 23:24:08 -08:00
Min Chen
57eda4e3f4 Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into api_refactoring 2012-12-17 23:03:55 -08:00
Rohit Yadav
d54d8cbcd7 api: Fix ApiServer's handle() which runs on integration.api.port
- Fix URI parsing using apache hc
- Remove bloated c-like parsing code
- Fix param processing
- TODO: To use Guava's multimap

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 20:51:51 -08:00
Rohit Yadav
5572707ec6 maven: Bump httpcore version, add guava and httpclient dependency
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 20:44:48 -08:00
Min Chen
79f8c104eb Remove IdentityProxy from GuestOSResponse and GuestOSCategoryResponse.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 18:01:31 -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
348d3ae448 Conflicts:
api/src/org/apache/cloudstack/api/response/AccountResponse.java

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 15:41:56 -08:00
Chip Childers
ba30500402 CLOUDSTACK-505: Added string cleaning to the start and end debug
log statements within the API servlet.
2012-12-17 15:13:59 -05:00
Chip Childers
44da7b1841 CLOUDSTACK-505: Reworked approach to cleaning request / response strings
As noted in the bug, several of the API command in question
are async calls.  I've added a simple regex-based string cleaning
function, and have the request and response strings running through
it prior to being appended to the audit log.

Unit tests added for the new cleaning function as well.

The call to skip logging the createSSHKeyPair response remains intact
for now, although it should probably be scrubbed similarly to the
password fields.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-12-17 14:11:09 -05:00
Marcus Sorensen
6ed1989133 Summary: Allow for custom storage adaptors based on pool type in KVM
Detail: Instead of using LibvirtStorageAdaptor for everything, you can create
your own storage adaptor and use it. We select storage adaptor based on storage
pool type, thus we needed to adjust LibvirtComputingResource to pass pool type
to everything in KVMStoragePoolManager. This in turn required that we pass the
info necessary to LibvirtComputingResource as well, so a few agent Commands were
modified.

Note this patch in and of itself shouldn't change any existing behavior, just
allow for new storage adaptors to be selected based on storage pool type.

Reviewed-by: Edison Su
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1355769696 -0700
2012-12-17 11:41:36 -07:00
Rohit Yadav
de8aa86542 api: Work in progress code in ApiDispatcher to process annotations
- All id params are now uuids, basically for documentation
- Use injections and not component locator
- Remove resourceType field checking, it's now called entityType
- Fix indents

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 10:00:27 -08:00
kishan
0be6e2e02b bug CS-14982: Make traffic sentinel metering zones configurable. Global config default will be used when no zones are listed while adding Traffic Sentinel Host
status CS-14982: resolved fixed
reviewed-by: Nitin

Conflicts:
	api/src/com/cloud/api/ApiConstants.java
2012-12-17 15:18:31 +05:30
Rohit Yadav
f8a483fc5a api: Include cloudstack-version in both xml and json api response
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 21:37:03 -08:00
Rohit Yadav
59fc89abe3 api: Fix ApiServer role base acl logic and response type value
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 18:13:29 -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
Hugo Trippaers
2235776aed Unittests for NiciraNvpGuestNetworkGuru
These unittests do not depend on the componentlocator but instead are
completely dependent on mock objects. This ensures that they can be run
standalone without any requirements on the environment.

Includes some fixes to NiciraNvpGuestNetworkGuru and GuestNetworkGuru
2012-12-14 10:41:36 +01:00
Edison Su
b70c1a5a84 Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
Simon Waterhouse
0ba355fbc2 CLOUDSTACK-284: listVirtualMachines when zoneid passed
When zoneid is passed an no state is specified listVIrtualMachines does
not return the destroyed vms. This patch fixes the issue.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-13 23:06:07 -08:00
Vijayendra Bhamidipati
8ced7da733 CLOUDSTACK-333: When Datacenter name in VCenter has spaces Primary Storage (VMFS) discovery will fail
Description:

    Missed encoding of URI when discovering ESX cluster in vCenter.

    Signed-off-by: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
2012-12-13 22:43:59 -08:00
Chip Childers
82a17a413b CLOUDSTACK-505: Removed logging of deployVirtualMachine and resetPasswordForVirtualMachine commands.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-12-13 16:00:30 -05: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
Rohit Yadav
7dbdf786cc api: FIXME for api access checker adapter
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-12 14:21:38 -08:00
Min Chen
472f4f91b9 Refactor ListProjectInvitationsCmd and ProjectInvitationResponse. 2012-12-12 09:04:43 -08:00
Min Chen
3661f7f992 Fix several bugs of new refactored list apis. 2012-12-11 17:37:16 -08:00
Min Chen
9c93fee0dc Refactor ListProjectAccountCmd and ProjectAccountResponse. 2012-12-11 15:49:15 -08:00
Rohit Yadav
c455cf9271 api: refactor common code to get classname for an api in ApiServer
- Refactor common code to get classname from apiname
- Fix search mechanism within api access checker adapter to:
  * check permissions
  * get class name for an apiname

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 14:17:47 -08:00
Rohit Yadav
79b54e6ac1 api: Fix obj injections in ApiServer
- Inject classes using Inject annotation
- Don't misuse component locator

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 14:16:25 -08:00
Rohit Yadav
6ce68b93cc api: Fix APIAccessChecker and StaticRoleBasedAPIAccessChecker
- Add getCmd api interface in APIAccessChecker adapter to get cmd properties
- Add mechanism in StaticRoleBasedAPIAccessChecker to get config properties
- Add public interface to get the cmd properties for the adapter impl

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 14:10:36 -08:00
Rohit Yadav
f4892fbb84 api: remove those evil extra newlines
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 13:38:32 -08:00
Min Chen
8735716ba0 Refactor ListProjectsCmd and ProjectResponse. 2012-12-11 12:51:08 -08:00
Murali Reddy
432ea9c7d4 CLOUDSTACK-265: provide option to turn-off automatic public IP association for each VM when using EIP service.
- introduces Capability in the network offering, which
    decides when EIP service is enabled, by defualt public IP
    should be assigned to the VM or not

  - default network offering with EIP/ELB service will still work with old EIP
    semantics, i.e) assign a public IP to each VM on start
2012-12-11 23:06:13 +05:30
Min Chen
c83323fea7 api: Refactoring ListUsersCmd and UserResponse.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:45:40 -08:00
Rohit Yadav
8c4096dc59 api: Have apiserver injected by component locator
- Instantiate apiserver by injection, so all its entities are also created and injected
- Make the constructor protected

Thanks to Alex for helping out on this one.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:38:44 -08:00
Rohit Yadav
2146687112 api: initialize vars in constructor of StaticRoleBasedAPIAccessChecker
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:28:06 -08:00
Rohit Yadav
151a7643ce api: Don't silently fail apiserver instance initialization
- ApiServer instance assumes cloudstartup servlet will initialize it
- Check and log if initialization fails

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 16:27:33 -08:00
Rohit Yadav
8fbbc76466 api: minor fixes in ApiServlet
- Reusing local variable for string splitting/processing
- Fix comments
- Fix indentations

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 16:19:40 -08:00
Rohit Yadav
293665fafb api: Add license headers for APIAccessChecker and StaticRoleBasedAPIAccessChecker
- Fix license headers
- Fix tabs, trailing whitespaces

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 15:29:33 -08:00
Min Chen
1cf8b86ce5 api: Load InstanceGroupJoinDao to component Library
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 15:17:07 -08:00
Min Chen
bba96254f5 Refactoring ListVMGroupsCmd and InstanceGroupResponse. 2012-12-10 13:59:20 -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
Min Chen
30941c2d31 api: Refactoring ListEventsCmd and EventResponse, and create Event db view.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 16:54:45 -08:00
Alex Huang
57c9b4c6b1 Figured out how to add annotations to jackson 2012-12-07 15:21:22 -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
Min Chen
acf7afd7f5 api: Refactor ResourceTagResponse and ListTagsCmd, add db view for ResourceTag.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 09:57:52 -08:00
Min Chen
8a313d7f84 api: SecurityGroupResponse and SecurityGroupRuleResponse refactoring
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 16:04:48 -08:00
Min Chen
eba353099e api_refactoring: Fix build issue with api_refactoring branch.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 15:00:48 -08:00
Rohit Yadav
da6e81aa21 api_refactoring: Fix build issues and incorrect imports
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 13:48:20 -08:00
Rohit Yadav
089db9c631 api_refactor: capacity, hypvsr, alert and cert apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:25:56 -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
28305904e8 api_refactor: move cluster apis to admin package
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:04:24 -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
7f61d29c37 api_refactor: move zone and hypervisor user level apis to appropriate pkg names
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:36:26 -08:00
Rohit Yadav
cc386b791b api_refactor: move storagepool api to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:32:58 -08:00
Rohit Yadav
163fe7b8c3 api_refactor: move systevm apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:28:37 -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
Rohit Yadav
2a7fa674c7 api_refactor: Move host apis to admin pkg
- Moved host related apis to admin pkg
- Change namespace to org.a.cs.api, fix mappings in commands-prop.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:21:10 -08:00
Murali Reddy
7fcfcdf91e Summary: check-in for L4-L7 network services in the shared network in
the advanced zone

  Details:

  1). Added validation to check the Vlan Id specified in the createNetwork()
  does not overlap with any of the vlan's used by isolated networks or
  shared networks in the zone.

  2). state change for shared network with services to go to 'Setup' state
  on network shutdown instead of 'Allocated'

  Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone
2012-12-06 13:06:18 +05:30
Murali Reddy
d4c604cfd8 Summary: partical check-in for L4-L7 network services in the shared
network in the advanced zone

Details : ensure that CIDR specified for shared network does not overlap with any
CloudStack generated CIDR's for isaolated guest networks when using
external networking devices

Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-12-06 12:29:38 +05:30
Murali Reddy
0de5a145e4 Summary: partical check-in for L4-L7 network services in the shared
network in the advanced zone

Summary: change 'shared network' in advanced zone with L4-L7 services to  go through network
implement phase. Add ACL checks to associate IP to shared network in the
advanced zone

   Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-12-06 11:55:19 +05:30
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
c59de6cbde api_refactor: router apis for admin pkg
- Fix missing api mapping in commands.prop
- Refactor package namespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 15:23:31 -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
ba8e61bfb5 api_refactoring: for network api refactoring move interfaces so it works
Move ExternalNetworkDeviceManager to cloud-api, as server depends on cloud-api
The api refactoring of one of the api required this interface

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:53:16 -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
55364478e5 api_refactor: move vpn related apis to user.vpn
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:24:26 -08:00
Rohit Yadav
c24118e7e8 api_refactor: move network api for admin pkg from cloud-server to cloud-api
- Remove a lot of junk
- Fix commands.prop.
- Move apis from cloud-server to cloud-api
- Rename with org.apache.cloudstack namespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:06:13 -08:00
Rohit Yadav
678181ac35 api_refactor: move network api for admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 13:59:54 -08:00
Rohit Yadav
dd5a36fcd2 api_refactor: refactor for autoscale apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:42:07 -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
feb342ad23 api_refactor: refactor autoscale apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:30:37 -08:00
Rohit Yadav
456b852c0c api_refactor: refactor loadbalancer apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:25:20 -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
25b5aadb4e api_refactor: refactor firewall apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:17:06 -08:00
Rohit Yadav
5cd1f4b6c2 api_refactor: ip address apis refactoring
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:14:06 -08:00
Rohit Yadav
46ed598894 api_refactor: resource (limit) apis, move capability and cloud identifier
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:11:16 -08:00
Rohit Yadav
7f9c490b5a api_refactor: move listzones and listcapabilities to dc
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:06:34 -08:00
Rohit Yadav
a34fc1f1a7 api_refactor: move listcapabilites to dc
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:44:17 -08:00
Rohit Yadav
658cf56120 api_refactor: move diskoffering to offering
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:38:53 -08:00
Rohit Yadav
6fe1b5f9b0 api_refactor: move diskoffering to offering
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:37:14 -08:00
Rohit Yadav
1b8dc65f3a api_refactor: refactor user (vpn) apis
- Fix refactored apis, mappings in commands*.in

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:27:47 -08:00
Rohit Yadav
cabbc7bd7d api_refactor: refactor disk api (only user)
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:31:03 -08:00
Rohit Yadav
ea79162615 api_refactor: refactor configuration api for normal user
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:29:17 -08:00
Rohit Yadav
28df57ec75 api_refactor: refactor serviceoffering apis
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:27:19 -08:00
Rohit Yadav
73d1099c76 api_refactor: rename sg to securitygroup
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:25:22 -08:00
Rohit Yadav
1e51d6c1ab api_refactor: refactor guest os (guest) apis
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:19:39 -08:00
Rohit Yadav
b673c21174 api_refactor: refactor job (async jobs) apis
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:12:17 -08:00
Rohit Yadav
7ac48798b4 api_refactor: refactor event apis
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:05:54 -08:00
Rohit Yadav
add1b9b055 api_refactor: refactor register apis
- Split register apis across template, iso and ssh pkgs
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:54:19 -08:00
Rohit Yadav
316e7f226a api_refactor: refactor tag apis
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:48:48 -08:00
Rohit Yadav
37cd76ee81 api_refactor: refactor ssh apis
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:44:14 -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
a033cf1bfc api_refactor: refactor snapshot apis
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:19:12 -08:00
Rohit Yadav
0df9538fb7 api_refactor: refactor security group (sg) apis
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:11:17 -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
e0b4430070 api_refactor: refactor iso apis
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
- Note: copyIso uses copyTemplate, refactor copyTemplate

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:01:29 -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
Alena Prokharchyk
7857b1f62a CLOUDSTACK-573: check if external provider enabled, only when finalize the service/provider list for the network 2012-11-30 13:07:01 -08:00
Alena Prokharchyk
1aa4ad6a3c CLOUDSTACK-572: Advance SG enabled zone - allow deploying vm in SG disabled Account specific networks
Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
2012-11-30 12:47:37 -08:00
Prachi Damle
a2306f4917 some more poc work 2012-11-29 16:10:09 -08:00
Prachi Damle
073863249a Some ACL POC work
Conflicts:

	server/src/com/cloud/api/ApiDispatcher.java
2012-11-29 16:09:47 -08:00
Alex Huang
6036f73725 Removed that darn exceptions when cloudstack is running in windows. It's a simple or check that was written as an and check 2012-11-29 13:35:23 -08:00
Hiroaki Kawai
a28f4cac3c HttpClient needs releaseConnection method call
reviewboard: https://reviews.apache.org/r/8186/

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-29 20:23:30 +01:00
Chip Childers
e4a5173199 CLOUDSTACK-505: Do not log the command response object for the createSSHKeyPair command.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-29 12:24:42 -05:00
Edison Su
5724f1ca96 fix build 2012-11-26 11:49:51 -08:00
Edison Su
e436d4327f create volume from template unit test is passed 2012-11-26 11:42:34 -08:00
Rohit Yadav
55447c2572 CLOUDSTACK-424: Fix NPE while updating user data
Replace newlines in userdata only when it's not null.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-21 18:27:11 +05:30
Edison Su
550f4fbcdc create template/primary data store is done 2012-11-20 18:57:19 -08:00
Edison Su
573d13dd7c starting unit test 2012-11-20 18:57:19 -08:00
adefanti
2a0d0104bd maven : declare mysql-connector-java dependency into dependencyManagement section of cloudstack pom and use the version 5.1.21 only
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-20 09:27:07 +01:00
Hiroaki Kawai
c8832cd4b6 Commit https://reviews.apache.org/r/8075/
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2012-11-19 12:02:26 +01:00
Marcus Sorensen
88180fc139 Summary: Direct template imaging for CLVM, bypass copy template to primary
Detail: Because of the way most other primary storage types work with cloudstack
   (i.e. backing stores) CLVM actually copies the template to a local logical
   volume on primary storage, then uses that. This causes all of your primary
   storage to be littered with a copy of every template used. Since we're not
   using these, dump the template direct to the newly created logical volume.
   This is faster as well since the template is sparse; we're not creating a fat
   template on primary storage and then copying that to a logical volume when we
   deploy from template.

BUG-ID: CLOUDSTACK-508
Bugfix-for: 4.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1353221260 -0700
2012-11-17 23:47:39 -07:00
Alena Prokharchyk
f25a78111f CLOUDSTACK-493: 22x-30 upgrade for Advance SG enabled zone
* enable SG provider if the zone is SG enabled
* don't create public traffic type for the zone if there is no public network exist in the zone in 2.2.x
2012-11-16 10:00:45 -08:00
Vijay Venkatachalam
264f777a2d Remove AutoScale entities while deleting autoscaled loadbalancer. 2012-11-16 12:56:32 +05:30
Vijay Venkatachalam
aea87da410 Autoscale:Sending the Counter params as list
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
2012-11-16 11:07:24 +05:30
Vijay Venkatachalam
affc162556 AutoScale: Fixing issues that occurred during rebase with master 2012-11-16 11:04:37 +05:30
Vijay Venkatachalam
527b5c8ee2 Autoscale: Supporting network element independent counter parameters Reviewed-By:Devdeep 2012-11-16 10:57:00 +05:30
Vijay Vekatachalam
35b0e086d4 enable Autoscale VMs to be named as Autoscale-LB-<lbname> 2012-11-16 10:56:59 +05:30
Vijay Vekatachalam
57416188a2 Enabling aUtoscale VMs to be provisioned in a loadbalancer's network 2012-11-16 10:56:59 +05:30
Deepak Garg
bf1e6ed991 CS-15644-Autoscale: Implemented UUIDs for templateId-serviceOff Reviewed-By:Vijay 2012-11-16 10:56:58 +05:30
Vijay venkatachalam
3e32a29048 Autoscale:Changes for addressing AutoScale bugs CS-15930, CS-15931, CS-15934, CS-15935 2012-11-16 10:56:58 +05:30
Vijay venkatachalam
c1b4bc448c AutoScale. Check vm group's interval during update with existing policiy's duration 2012-11-16 10:56:58 +05:30
Deepak Garg
d2155890cc CS-16168:AutoScale- Deletion of Account doesn't delete the AutoScale LB rule 2012-11-16 10:56:57 +05:30
Vijay Venkatachalam
58db4d0d88 CS-15729:AutoScale. Aligning the NetScaler response time counter, and correcting duration check against interval 2012-11-16 10:56:57 +05:30
Deepak Garg
68fc64cfe9 CS-16159-Fixing the license headers 2012-11-16 10:56:56 +05:30
Pranav Saxena
6daff57fdd CS-15744:Incorrect error message with disable autoscaleVmgroup operation- patch sent by Deepak Garg (deepakgarg.iitg@gmail.com) 2012-11-16 10:56:45 +05:30
Pranav Saxena
e9a4a7b1e6 CS-15745:Incorrect error message with update autoscaleVMgroup :patch-sent by Deepak Garg (deepakgarg.iitg@gmail.com) 2012-11-16 10:56:45 +05:30
Vijay
f96810b9ae AutoScale. Adding default counters
Conflicts:

	server/src/com/cloud/server/ConfigurationServerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-304to305.sql
2012-11-16 10:56:44 +05:30
Vijay
dda4d39b55 AutoScale changes in Apache master 2012-11-16 10:56:44 +05:30
Kelven Yang
7a3ffb47e6 Add pipeline concept to RPC facility, fix javelin build issue 2012-11-15 16:15:24 -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
Pranav Saxena
fe460fac43 Upgrading a network that has Network offering SRX/F5 inline mode to a network offering that has all service provided by VR does not give proper error message: Hence correcting the error message 2012-11-15 13:52:54 +05:30
Kelven Yang
2cae511464 Connnect event bus to messaging layer 2012-11-14 19:28:59 -08:00
Alena Prokharchyk
2914985837 Fixed json response to return "size" parameter (resources count in the system) when pageSize=0 is specified 2012-11-14 15:01:48 -08:00
Alena Prokharchyk
6d9cafbf35 DeployVm: when SG enabled network is passed to the command, but no SG list is defined in the request, add the vm to SG enabled network automatically
Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
2012-11-14 15:01:35 -08:00
Alena Prokharchyk
74622a4dc3 Fixed listNetworks for the case when a) caller is an admin 2) projectId=-1 is specified - admin wasn't able to list networks belonging to regular users' projects 2012-11-14 14:59:51 -08:00
Laszlo Hornyak
499a28cb43 Removed redundant imports from VolumeHostDao
Signed-off-by: Laszlo Hornyak <lhornyak@redhat.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1352883689 +0530
2012-11-14 14:31:29 +05:30
Kelven Yang
b38d9b82b6 CloudStack messaging refactoring skeleton 2012-11-13 17:59:39 -08:00
Satoshi Kobayashi
67490f75e6 Display the reason which failed certificate generation fails
within cloud.server.ConfigurationServerImpl.generateDefaultKeystore

Description:

The reason which failed in generation of the certificate is not displayed now.
At that time, IOException which does not include the reason is raised.
In order to solve the problem quickly, the reason should be included in the message.

(Now)
WARN  [cloud.server.ConfigurationServerImpl] (main:) Would use fail-safe keystore to continue.
java.io.IOException: Fail to generate certificate!
    at com.cloud.server.ConfigurationServerImpl.generateDefaultKeystore(ConfigurationServerImpl.java:490)

(Fix)
WARN  [cloud.server.ConfigurationServerImpl] (main:) Would use fail-safe keystore to continue.
java.io.IOException: Fail to generate certificate!: sudo: sorry, you must have a tty to run sudo
    at com.cloud.server.ConfigurationServerImpl.generateDefaultKeystore(ConfigurationServerImpl.java:490)

Testing Completed:

mvn clean install
mvn -pl :cloud-client-ui jetty:run

And generation of the certificate was made to fail, checked it.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-09 14:25:44 -05:00
Kishan Kavala
f365426b99 temp changes 2012-11-08 23:37:30 +05:30
Alena Prokharchyk
d118a3d764 Fixed the bug in xml response serializing (introduced while resolving merge conflict) 2012-11-07 17:17:17 -08:00
Kelven Yang
d79f1f6fdc Replace Adapters and PluggableServices, use Spring to load them 2012-11-07 15:03:24 -08:00
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
Kelven Yang
aab02e2743 Add Spring annotation to major components 2012-11-07 14:53:39 -08:00
Dave Cahill
476e771c1c SSH key changes 2012-11-05 11:24:33 -08:00
Edison Xu
b101dc7279 KVM agent connet:
* send StartupAnswer right after StartupCommand is recieved
* if post processor going wrong, send out readycommand with error message to agent, then agent will exit
2012-11-05 10:00:16 -08:00
Alex Huang
91e68b5f2c A bunch of .project changes again 2012-11-04 19:25:03 -08:00
Rohit Yadav
d8fbb0dd13 maven: enable jvm heap size for forked surefire test processes
Any forked process that runs from maven surefire plugin gets it own separate
heap which may cause build issues. Patch fixes the issue by explicity args to
the surefire plugin for cloud-server.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-03 18:42:51 +05:30
Alena Prokharchyk
1f458983af CS-16310: don't process Disconnect when:
* attache is not forForward()
* and the Disconnect came through cluster notification event

The fix will prevent delayed AgentDisconnect cluster notification processing.
2012-11-02 10:51:39 -07:00
Alena Prokharchyk
013102c028 CS-16611: when expunge Async job, expunge corresponding sync queue items
Conflicts:

	server/src/com/cloud/async/AsyncJobManagerImpl.java
	server/src/com/cloud/async/dao/SyncQueueItemDao.java
2012-11-02 10:51:29 -07:00
Alena Prokharchyk
fe41325e96 ApiResponseSerializer - replaced all occurrences of string concatenation with StringBuffer.append
Conflicts:

	server/src/com/cloud/api/response/ApiResponseSerializer.java
2012-11-02 10:50:04 -07:00
Alena Prokharchyk
04a3c4ffdc Removed unneeded if statement from VpcVirtualNetworkApplianceManagerImpl 2012-11-02 10:47:34 -07:00
Alena Prokharchyk
efb5f85aad CS-16594: when request is cancelled by the remote peer, in addition to cancelling the request, unblock the agent queue if the request is the current request 2012-11-02 10:47:24 -07:00
Alena Prokharchyk
a5077968db CS-16592: process handleConnectedAgent in a separate thread pool 2012-11-02 10:47:14 -07:00
Alena Prokharchyk
3948d7d7c5 CS-16213: skip agent rebalancing when the management server doesn't own the host any more 2012-11-02 09:59:37 -07:00
Alena Prokharchyk
62607c9a75 HandleDisconnect - don't update the DB when the disconnect event is happening as a part of MS Cluster notification
Reviewed-by: Frank Zhang
2012-11-02 09:59:37 -07:00
Alena Prokharchyk
36babbfcac CS-16213: agent LB - don't process Disconnect event from other management server in cluster, if the recipient is the future owner of the host. The disconnect will be handled during the rebalance host connection process itself.
Reviewed-by: Kelven Yang
2012-11-02 09:59:37 -07:00
Alena Prokharchyk
705130e42c CS-16499: removed useless txn.commit statement. Used to call it to ensure that the lock() on nic object will get removed even in case when we don't do the DB update. But our Transaction code does it automatic 2012-11-02 09:59:37 -07:00
Alena Prokharchyk
597bc8c66c CS-16499: forgot to add @DB to releaseNic() call 2012-11-02 09:59:36 -07:00
Alena Prokharchyk
7bd7884f57 CS-16499: releaseNic - lock the nic row in the DB before checking its state. Hold the lock till the nics attributes + nicCount is updated
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2012-11-02 09:59:36 -07:00
Alex Huang
772f660c33 Changed the create database steps to be create from a single create-schema.sql and then apply database modifications 2012-11-01 13:40:15 -07:00
Joe Brockmeier
db6c8f0176 CLOUDSTACK-439: Fixed typos and changed direct attached to shared network IPs 2012-11-01 14:12:49 -05:00
Edison Su
3423c5d74f add volume service skeleton 2012-10-30 17:34:46 -07:00
Hugo Trippaers
f65b268a2e Active the testrun by default in maven
Exclude the tests that need a database, these should move to the
integration test phase or use an in memory database maybe.
2012-10-30 14:15:07 +01:00
Hugo Trippaers
bd58ceccd8 Summary: Make the authenticator responsible for encoding the password and add a SHA256 salted authenticator
The authenticators now have an encode function that cloudstack will use to encode the user supplied password before storing it in the database. This makes it easier to add other authenticators with other hashing algorithms. The requires a two step approach to creating the admin account at first start as the authenticators are only present in the management-server component locator.

The SHA256 salted authenticator make use of this new system and adds a hashing algorithm based on SHA256 with a salt. This type of hash is far less susceptible to rainbow table attacks.

To make use of these new features the users password will be sent over the wire just as he typed it and it will be transformed into a hash on the server and compared with the stored password. This means that the hash will not go over the wire anymore.

The default authenticator in components.xml is still set to md5 for backwards compatibility. For new installations the sha256 could be enabled.
2012-10-30 12:56:56 +01:00
Kelven Yang
d70154609a Wire up injection for dynamically constructed objects 2012-10-29 16:16:07 -07:00
Edison Su
a2d50c7e43 fix build 2012-10-29 12:55:15 -07:00
Jessica Wang
ce60cfee85 CS-16585: cloudstack 3.0 API - listProjects API - throw an API error if account is specified but domain is not. 2012-10-29 11:19:29 -07:00
Hugo Trippaers
e24456f487 [CLOUDSTACK-415] Workaround this problem for now 2012-10-29 09:26:14 +01:00
Hugo Trippaers
e59726ad95 [CLOUDSTACK-359] Hook up the other side of the event propagation 2012-10-26 14:25:14 +02:00
Alex Huang
a388a748d0 Added a database creator class. not working yet. Edison will look at it 2012-10-25 17:34:54 -07:00
Min Chen
7b7f4cd1fd CLOUDSTACK-409: ThreadLocal Transaction and its db connection got reset for user managed db connnection, causing ClusterHeartBeat thread frequently trying to get db connection. Add unit test to test user managed transaction. 2012-10-25 13:06:50 -07:00
Alex Huang
f92ce72639 Correct dependency errors 2012-10-24 11:12:40 -07:00
Edison Su
059f605ace add more interfaces 2012-10-22 17:50:51 -07:00
Edison Su
b57be3389e add apidocs/devcloud projects 2012-10-21 00:01:47 -07:00
Kelven Yang
8e59b3acfb Architecture refactoring - Stateless management server - Spring Framework initiatives, add missing files 2012-10-19 15:32:24 -07: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