etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,989 Commits 327 Branches 325 Tags 908 MiB
Commit Graph

6399 Commits

Author SHA1 Message Date
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
Kishan Kavala c40aac0add Add Mock managers for Regio API server 2012-10-17 17:02:13 +05:30
Kishan Kavala f0f33bf4da Added Mock ApiServer, Regions API calls with api keys 2012-10-17 14:16:36 +05:30
Alena Prokharchyk a9fab0526b CLOUDSTACK-348: decrement resource count when the network gets removed 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-10-16 16:18:36 -07:00
Alena Prokharchyk 9d07ad8ecb CLOUDSTACK-304: default number of concurrent snapshots is NULL (unlimited) - to provide backwards compatibility for existing customers. 
Conflicts:

	setup/db/db/schema-305to306.sql
 2012-10-16 11:25:05 -07:00
Alena Prokharchyk 3f5733cea7 CS-16412: fixed count for following commands: 
listVlanIpRanges
listOsCategories
listOsTypes
listSystemVms
listPhysicalNetworks
listCounters
listConditions
listAutoScalePolicies
listAutoScaleVmProfiles
listAutoScaleVmGroups
listConfigurations
listStoragePools
listClusters
listPods
listInstanceGroups
listSSHKeyPairs
listHypervisorCapabilities
listNetworkServiceProviders
listVpnCustomerGateways
listVpnGateways
listVpnConnections
listProjects
listProjectAccounts
listProjectInvitations
listTrafficTypes

Conflicts:

	api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java
	api/src/com/cloud/api/commands/ListConditionsCmd.java
	api/src/com/cloud/api/commands/ListCountersCmd.java
	api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
	api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
	api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
	api/src/com/cloud/network/as/AutoScaleService.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/as/dao/CounterDao.java
	server/src/com/cloud/network/as/dao/CounterDaoImpl.java
	server/src/com/cloud/projects/ProjectManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-10-15 18:16:59 -07:00
Edison Su 0a7d03c90b javelin is revived 2012-10-15 15:42:59 -07:00
Edison Su 112143def6 add templateprofile 2012-10-15 14:10:49 -07:00
Alena Prokharchyk 1d458c7a2d CLOUDSTACK-347: ipAddressResponse/NetworkResponse API - return vlan info only when the caller is ROOT admin 2012-10-15 11:39:38 -07:00
Alena Prokharchyk 8f2d9a09e5 CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 
Fixes the count in commands:

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

Conflicts:

	api/src/com/cloud/api/commands/ListVMsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 2012-10-12 13:58:59 -07:00
Kelven Yang 5d7509e964 Merge DB query builders from master 2012-10-11 18:24:33 -07:00
Kelven Yang 5fee891162 merge from master 2012-10-11 17:42:25 -07:00
Edison Su 513b680d96 CLOUDSTACK-316: if public network is not specified, set to guest network 2012-10-11 16:46:23 -07:00
Rohit Yadav 6dd5c3fd42 CLOUDSTACK-70: Improve restart network behaviour for basic network 
If cleanup=true, network elements and resources are shutdown and
reimplemented. Else, shutdown/reimplementation is skipped. Enabled
cleanup checkbox in CS UI.

For both cases, VRs are only deployed for Pods with no running
or starting VRs and Pods having running or starting user vms.

New DAO helpers introduced:
HostPodDao: listByDataCenterIdVMTypeAndStates
DomainRouterDao: listByPodId and listByPodIdAndStates
VMInstanceDao: listByPodId and corrected definition of listByTypeAndState

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-10-11 19:33:26 +05:30
Alena Prokharchyk 339aa41442 CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host. 
Conflicts:

	core/src/com/cloud/async/AsyncJobVO.java
	core/src/com/cloud/async/SyncQueueVO.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/async/AsyncJobManagerImpl.java
	server/src/com/cloud/async/SyncQueueManager.java
	server/src/com/cloud/async/SyncQueueManagerImpl.java
	server/src/com/cloud/async/dao/SyncQueueDao.java
	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
	server/test/com/cloud/async/TestSyncQueueManager.java
	setup/db/create-schema.sql
 2012-10-10 13:40:00 -07:00
Alena Prokharchyk c36744a18c Fixed deployVR - used to fail in case when system.vm.default.hypervisor was set to not NULL value 2012-10-10 13:05:39 -07:00
Alena Prokharchyk 839929b9b2 Fixed lineendings and trailing whitespaces in a bunch of files 
Conflicts:

	core/src/com/cloud/async/SyncQueueItemVO.java
	core/src/com/cloud/async/SyncQueueVO.java
	server/src/com/cloud/async/dao/SyncQueueDaoImpl.java
	server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java
 2012-10-09 17:17:36 -07:00
Alena Prokharchyk 290e8954f7 Removed more unused imports in Snapshots code 
Conflicts:

	server/src/com/cloud/storage/dao/SnapshotScheduleDao.java
 2012-10-09 17:07:03 -07:00
Alena Prokharchyk 823f0c9669 Fixed ipAssoc and createNetworkACL (for vpc) commands - didn't work in Project scenario 
Conflicts:

	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
 2012-10-09 16:26:26 -07:00
Alena Prokharchyk 43b406279a listTemplates/listIsos - template filter "all" can be specified by admin only. Throw an error when user tries to use it 2012-10-09 16:23:05 -07:00
Alena Prokharchyk c9aa9a5557 CLOUDSTACK-287: don't allow API call against system account (adding users to system account is prohibited; can't delete/update System account) 
Conflicts:

	server/src/com/cloud/user/AccountManagerImpl.java
 2012-10-09 09:37:27 -07:00
Alena Prokharchyk ffa5276222 Fixed CLOUDSTACK-287 
1) Always fail to authenticate system user.
2) DB - always create system user with RANDOM not null password
3) Don't allow modifying (setting api/secretKeys, etc) system user via API

Conflicts:

	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/db/schema-305to306.sql
 2012-10-09 09:37:27 -07:00
Mice Xia a5bca0999a CLOUDSTACK-118 Status of host resorce stuck in ErrorInMaintenance 2012-10-08 14:05:05 +08:00
Alena Prokharchyk 436960d2aa Fixed unittest 2012-10-05 15:38:20 -07:00
Alena Prokharchyk fa81f27254 CLOUDSTACK-271: when check for vnet conflicts against existing physical networks, skip the networks with null vnet ranges 2012-10-05 15:10:31 -07:00
Alena Prokharchyk be2017849a CLOUDSTACK-84: fixed NPE that used to happen on API layer when list resource of the project was called when project was going through removal process. 2012-10-05 15:10:31 -07:00
Rohit Yadav 5cd7fb8408 CLOUDSTACK-121: Fixed "Incorrect username/domainId login causes NullPointerException " 2012-10-05 11:42:04 -07:00
Anthony Xu 15f6fbbee4 CLOUDSTACK-251 : 
when host is reconnected, CS try to make sure the host can access primary storage,
CS only do this when primary storage is UP, and even host cannot access primary storage,
that is okay, do not throw exception, just print a warning message
 2012-10-04 11:31:53 -07:00
Murali Reddy 4e1f3f9410 CS-16426 For network offerings with IP conserved mode off, LB/PF/StaticNAT rule creation fails if the first rule is firewall 
fixes, accidental modification of network services map object corresponding to a public IP
 2012-10-03 17:18:00 -07:00
Kishan Kavala 89779cceb8 Merge branch 'master' into regions 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/user/UserVO.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/create-schema.sql
 2012-10-03 14:09:01 +05:30
Hugo Trippaers 78c08de467 Removed unused imports (that caused a dependency on xapi) 2012-10-02 10:30:26 -07:00
Chip Childers b7a93be47e Added license header to Upgrade40to41.java 2012-10-02 13:06:59 -04:00
Hugo Trippaers f16b5103d8 Merge some stuff from maven-waf branch into master 2012-10-01 15:04:08 -07:00
Hugo Trippaers 93aaa5f975 Provide an (for now) empty upgrade path so the server will start. 2012-10-01 14:07:24 -07:00
Hugo Trippaers aa6355ffe6 Updated master to 4.1.0 
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT
 2012-10-01 11:00:55 -07:00
Alena Prokharchyk 11fe086ada Fixing CLOUDSTACK-226: don't allow physical networks with overlaping vnet ranges, belong to the same zone. Fixed create and update physical network code 2012-09-28 13:11:20 -07:00
Alena Prokharchyk dc64fcab93 Removed unused code that was commented out in SnapshotManagerImpl- you can alway retrieve it back from the history if needed 
Conflicts:

	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2012-09-27 11:13:37 -07:00
Alena Prokharchyk efab2f413b Removed more unused imports in Snapshots code 
Conflicts:

	server/src/com/cloud/storage/dao/SnapshotScheduleDao.java
	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
 2012-09-27 11:12:53 -07:00
Alena Prokharchyk c27b44e7f7 Removed unused imports from snapshot manager 2012-09-27 10:50:48 -07:00
Alena Prokharchyk 6875f48966 Validate port ranges in PF rule only when startPort != endPort in private or public range 2012-09-27 10:50:30 -07:00
Alena Prokharchyk bbbccc0a7b Port ranges for PF rules: public port start should be equal to ending port start; the same applies to end ports 2012-09-27 10:50:04 -07:00
Kishan Kavala 4fcf64dd74 updated regions branch with changes from master 2012-09-27 17:04:59 +05:30
Kishan Kavala 39d394a8e8 Propogate Domain and User commands 2012-09-27 16:44:12 +05:30
Mice Xia daeac9ec57 CLOUDSTACK-215 CPVM load balance didn't work, VNC console sessions go to one CPVM and ignore other CPVMs 2012-09-27 13:03:09 +08:00
Marcus Sorensen 3c25d0ea67 CLOUDSTACK-202 Can't create VM from ISO, when in VPC 
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
 2012-09-27 10:07:15 +08:00
Kishan Kavala 6540ff8fa1 bug CLOUDSTACK-198: VPN user add, on failure remove user currently being added only, other users will remain in Add state 2012-09-26 13:54:49 +05:30
Mice Xia 2da5b448a1 CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start (add exception handling) 2012-09-26 14:51:17 +08:00
Mice Xia 7e75140537 CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start 2012-09-26 14:05:37 +08:00
Alena Prokharchyk 51041e4f77 Fixed security problem in listAccounts call (regular user could see other accounts' info when domainId was passed in to listAccounts call) 2012-09-25 10:44:22 -07:00
Sheng Yang a82ee7715e CLOUDSTACK-191: Update checking for updateCustomerGateway 
Reviewed-by: Anthony Xu

Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-09-24 17:47:09 -07:00
Edison Su a01304e65b CLOUDSTACK-123: fix NPE 2012-09-18 16:43:05 -07:00
Mice Xia 955cbd97bc CLOUDSTACK-10 Deleting a disconnected primary storage results in partial removed state 2012-09-18 11:18:44 +08:00
Alex Huang 387c6fc135 Merge branch 'master' into javelin 2012-09-17 15:31:37 -07:00
Mice Xia 16c1fd9288 CLOUDSTACK-116 Guest Network created in a Sub Domain which doesn't have a network domain suffix, is assigned the network domain suffix of the zone instead of that of the Parent domain of the Sub domain 2012-09-17 21:23:41 +08:00
Murali Reddy ff81fda4e0 adding missing import that should have been part of commit b28749f2b1 2012-09-17 13:18:32 +05:30
Murali Reddy b28749f2b1 upgrade external devices support from 2.2.14 to network offering framework 2012-09-17 11:39:41 +05:30
Alex Huang db9cc97ab3 Brought over new changes from master 2012-09-13 11:43:22 -07:00
Alex Huang 06b7d80fec latest changes 2012-09-13 11:31:54 -07:00
Manikanta Kattamuri cfc2b85651 Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-09-13 14:18:14 -04:00
Koushik Das a9559cbb67 When a VM is force deleted and the host is not available then CS simply marks the state in db as "Destroyed/Expunging". The VM is still running on the host and once it becomes available again there is a discrepancy in state of the VM. In this scenario the VM is removed from the host when the next full cluster sync happens. 2012-09-13 16:34:53 +05:30
Mice Xia 5532f58bbc remove cloud.com license headers 2012-09-13 12:34:32 +08:00
Mice Xia 55bcfaf805 CLOUDSTACK-88 Cannot listVM by vpcId which is required by VPC UI 2012-09-13 11:21:11 +08:00
Sheng Yang fe8a2992a2 Elimiate mystery guestIp in IpAddressTO 
Nobody can explain why it's there...

Also fix wrong return result of several empty network element callbacks
 2012-09-12 15:42:48 -07:00
Saksham Srivastava a56631bc66 bug CS-15278: Added global setting login.attempts.allowed which defines the maximum incorrect password attempts allowed. 
Also after the maximum attempts are reached the user account is disabled
 2012-09-12 19:35:24 +05:30
Prasanna Santhanam cd77e42a71 Closing open transactions from SecurityGroupWorkDao 
reviewed-by : Prachi Damle
 2012-09-12 18:48:33 +05:30
Alena Prokharchyk 2307117a24 Fixed unittest 2012-09-11 17:38:31 -07:00
Alena Prokharchyk 9445c9e73b CS-16187: don't allow vpc offering creation with unsupported services (Firewall, SecurityGroup) 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-09-11 17:38:30 -07:00
Alena Prokharchyk 331598243c Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code) 2012-09-11 17:38:29 -07:00
Fang Wang 63ab0c2728 Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton. 2012-09-11 17:38:28 -07:00
Likitha Shetty 1c96ef41c1 CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded. 2012-09-11 17:38:27 -07:00
Alena Prokharchyk 4a8ffe34e2 CS-16239: don't try to pull key information if the key was removed in the system 
As a part of the commit, also checking deleteSshKeyPair name - admin was unable to delete the key on behalf of another user

Conflicts:

	server/src/com/cloud/api/ApiDBUtils.java
 2012-09-11 17:38:24 -07:00
Koushik Das 2404d3493d CS-14277 
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
 2012-09-11 17:38:15 -07:00
Fang Wang 452e34908f Fix the output of instance-id and vm-id to UUID 2012-09-11 17:38:06 -07:00
Fang Wang 88f85b29c2 Replace db-id by UUID for user VM's vm-id. 2012-09-11 17:38:05 -07:00
Alena Prokharchyk b02551dcf6 Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails" 
This reverts commit ecd1ac214c.
 2012-09-11 17:38:02 -07:00
Anthony Xu efd0905fbd only check ISO which is downloaded status 2012-09-11 17:37:58 -07:00
Rohit Yadav e5a16f40cd CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails 
If cleanup=true, removes all VRs and creates VR, implements network.
If cleanup=false, skips running VRs, implements network for stopped/deleted VRs.

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
 2012-09-11 17:37:05 -07:00
Edison Su 3afc9cc630 Add KVM to hypervisor types allowed in VPC 
RB: https://reviews.apache.org/r/6926/
Send-by: Marcus Sorensen
 2012-09-11 17:33:24 -07:00
Prachi Damle e1b3f0cf87 CS-16258: Load Test - 1 host stuck in "Rebalancing" state forever. "java.lang.NullPointerException" seen in "Cluster-Worker" thread that was handling this process. 
- Using temp to not affect the return value for the method.
 2012-09-11 17:33:00 -07:00
Prachi Damle 4e29e0d5c3 CS-16022: If host connection fails due to some DB error, host disconnect does not happen and mgmt_server_id is not removed. 
Making sure host disconnect is called.
 2012-09-11 17:32:59 -07:00
Alena Prokharchyk c876a66b3f Fixed unittest 2012-09-11 17:26:20 -07:00
Alena Prokharchyk f5c9397327 CS-16187: don't allow vpc offering creation with unsupported services (Firewall, SecurityGroup) 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-09-11 17:05:04 -07:00
Alena Prokharchyk d0c526fdcd Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code) 2012-09-11 17:03:11 -07:00
Fang Wang 6fd7da8f56 Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton. 2012-09-11 17:03:11 -07:00
Likitha Shetty cc80d09d77 CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded. 2012-09-11 16:58:09 -07:00
Alena Prokharchyk acd08e61e6 CS-16239: don't try to pull key information if the key was removed in the system 
As a part of the commit, also checking deleteSshKeyPair name - admin was unable to delete the key on behalf of another user

Conflicts:

	server/src/com/cloud/api/ApiDBUtils.java
 2012-09-11 14:37:25 -07:00
Koushik Das 65eeeaf071 CS-14277 
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
 2012-09-11 17:22:43 +05:30
Fang Wang 4b8fb79ef6 Fix the output of instance-id and vm-id to UUID 2012-09-10 18:02:34 -07:00
Fang Wang 663e250334 Replace db-id by UUID for user VM's vm-id. 2012-09-10 18:01:08 -07:00
Alena Prokharchyk d6b6529951 Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails" 
This reverts commit ecd1ac214c.
 2012-09-10 16:34:21 -07:00
Anthony Xu 0442917381 only check ISO which is downloaded status 2012-09-10 13:30:25 -07:00
Rohit Yadav ecd1ac214c CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails 
If cleanup=true, removes all VRs and creates VR, implements network.
If cleanup=false, skips running VRs, implements network for stopped/deleted VRs.

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
 2012-09-10 14:13:24 +05:30
Edison Su 24fa14845b Add KVM to hypervisor types allowed in VPC 
RB: https://reviews.apache.org/r/6926/
Send-by: Marcus Sorensen
 2012-09-07 15:39:23 -07:00
Prachi Damle 60f130c509 CS-16258: Load Test - 1 host stuck in "Rebalancing" state forever. "java.lang.NullPointerException" seen in "Cluster-Worker" thread that was handling this process. 
- Using temp to not affect the return value for the method.
 2012-09-06 16:31:00 -07:00
Prachi Damle 61a19eb089 CS-16022: If host connection fails due to some DB error, host disconnect does not happen and mgmt_server_id is not removed. 
Making sure host disconnect is called.
 2012-09-06 16:30:50 -07:00
Alex Huang 1d0a10c69e Merged master over to javelin to get new poms and maven build 2012-09-05 14:31:24 -07:00
Sheng Yang 86427559cb CS-16269: Fix savePassword on one stopped RvR 2012-09-05 13:46:44 -07:00
Alena Prokharchyk 51cc301fef CS-16222: send password reset command only to the element responsible for the userdata service in network 
Reviewed-by: Sheng Yang
 2012-09-04 13:41:10 -07:00
Jessica Wang f509efe2d8 cloudstack 3.0 - API response serializer - change XML serialized string's encoding from ISO-8859-1 to UTF-8 to support more characters - fix "L10N: DE, ES, FR, JA, KO, SC: Garbage characters appear when using localized characters in Subscriptions page" (Reviewed-by: Brian) 2012-09-04 11:43:29 -07:00
Mice Xia dd07d1598f Fix Bug CloudStack-9 can not change OS preference from OS to none 2012-09-04 20:51:03 +08:00
Edison Su 73cc474157 add secondary storage provider 2012-09-02 19:26:20 -07:00
Prachi Damle 083cef37f1 CS 16158: Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14. 
Reviewed-By: Alena

Changes:
- Removing unnecessary search over op_host_capacity table in StorageCapacitylistener.
 2012-08-31 13:40:18 -07:00
Prachi Damle 3d0069bb56 CS-16158 : Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14. 
Changes:

There is an unnecessary search over capacity table that scans entire table.
 2012-08-31 13:40:17 -07:00
Gavin Lee 39a676c496 Correct license header mainly for patches folder 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
I've assumed that Gavin's commit is appropriate, based
on an assumption that we will keep these files in the source
tree.  If https://issues.apache.org/jira/browse/LEGAL-146
results in a different opionion from the members, then we
will end up having to do something more drastic anyway.
 2012-08-31 10:50:46 -04:00
Alex Huang 2fd99fe955 Deleted files 2012-08-30 09:59:27 -07:00
Alex Huang 6309253de1 Deleted some useless files 2012-08-30 09:59:25 -07:00
Gavin Lee d3921139ed Patch from Gavin Lee: Change license to ASL2.0 in server and tools 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-08-30 10:36:29 -04:00
Darren Shepherd f7acd8fed8 Create random version for StartupCommands in dev env setup 2012-08-30 08:47:02 +02:00
Nitin Mehta 79ebffe4f3 CS-13594: Download template is unable to handle multiple SSVMs per zone 
Reviewed-by: Kishan
 2012-08-29 15:25:00 +05:30
Jayapal eb4a3cf6c8 bug CS-15398: fix for basic zone dns issue in multiple pods 2012-08-29 14:33:27 +05:30
Kelven Yang 2300310243 Messaging facility initials for new architecture 2012-08-28 17:58:45 -07:00
olivier lamy f6f1be62b9 configuring tomcat maven plugin too 2012-08-28 23:58:06 +02:00
olivier lamy f218003607 Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack 2012-08-28 23:30:57 +02:00
Likitha Shetty 8c3450b503 CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI. 2012-08-28 13:52:42 -07:00
Darren Shepherd ff7c964a66 Add ability to do jetty:run in eclipse 2012-08-28 09:16:44 -07:00
Darren Shepherd 43e4de429e Fix up some dependencies 2012-08-28 09:03:25 -07:00
Abhinandan Prateek 5e0ede8bd9 bug 13946: reducing poll interval 2012-08-28 12:22:46 +05:30
Alena Prokharchyk 38e26f8dbd IpAssoc: when set ROUTER_GUEST_IP, get network id from associatedNetworkId field of the ip address instead of networkId as networkId is the id of the public network the ip belongs to 
Reviewed-by: Sheng Yang
 2012-08-27 16:26:32 -07:00
Sheng Yang 82cb1095dc CS-16188: S2S VPN: Limit VPN customer gateway name duplicate checking within account 
Reviewed-by: Anthony Xu

Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-27 16:11:36 -07:00
Alena Prokharchyk fbdc7fc59f CS-16178 - when remove PF rule, in VPC setup make sure if the rule is the last one for the network, disassociate it from the network 
Reviewed-by: Sheng Yang
 2012-08-27 13:46:36 -07:00
Alena Prokharchyk 48806fcc54 VPC: CS-16179 - only offerings in Enabled state can be used for VPC creation 
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-27 11:11:55 -07:00
Kelven Yang 3609e44b58 commit for https://reviews.apache.org/r/6608/ 2012-08-27 10:39:49 -07:00
Alena Prokharchyk 93ac01db0b Fixed unittest 2012-08-27 09:46:56 -07:00
olivier lamy a06ed5728c remove intermediate parent poms 2012-08-27 16:43:24 +02:00
olivier lamy 3aa469da2a groupdId is now org.apache.cloudstack 2012-08-25 09:20:21 +02:00
olivier lamy 0d9b81aac6 that was an unused import not a missing dependency 2012-08-25 00:44:14 +02:00
olivier lamy e7b4e15b42 add missing dependency 2012-08-25 00:37:25 +02:00
olivier lamy 5ef60aceb1 %s/tab/ws/ 2012-08-25 00:03:23 +02:00
Darren Shepherd 4a4007e652 Add license 2012-08-24 11:18:54 -07:00
Darren Shepherd ebc0fa458a * Maven 3 support 
* Pretty Format POM's
* AWS API compiles now
 2012-08-24 11:18:54 -07:00
Darren Shepherd 490e87a617 Fix small compilation issue encountered when building with maven 2012-08-24 11:18:53 -07:00
Darren Shepherd f826971fea Maven config, initial commit 2012-08-24 11:18:52 -07:00
Hugo Trippaers e3f2cf908a Only use the PremiumSecondaryStorageResource if VmWare is the hypervisor 2012-08-24 15:57:18 +02:00
kishan 4ea36b82e9 propogate account changes to other Regions 2012-08-24 15:59:59 +05:30
Prachi Damle a08ae8e42c [ASFCS40]CS-15586: Public Vlan for an account fails in case of multiple Physical networks 
Changes:
- Since Now a zone can have multiple physical networks, we need to find the physical network Id from the networkOffering's tag and zoneId and trafficType when we create a guest network

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2012-08-23 18:18:12 -07:00
Kelven Yang d06d6dae72 add maven eclipse project files from Darren 2012-08-23 17:55:20 -07:00
Prachi Damle aec6b4af48 [ASFCS40]Upgrade to 4.0: host_details unique key addition needs IGNORE keyword to correct the duplicates 2012-08-23 17:52:04 -07:00
Kelven Yang 9a51ff3bfc Maven worksplace fixes/patches from Darren 2012-08-23 14:26:27 -07:00
Darren Shepherd 2f6cc4b0cb Add license 2012-08-23 14:26:26 -07:00
Darren Shepherd ad54ed1790 * Maven 3 support 
* Pretty Format POM's
* AWS API compiles now
 2012-08-23 14:26:26 -07:00
Darren Shepherd f78aa9d98a Fix small compilation issue encountered when building with maven 2012-08-23 14:26:25 -07:00
Darren Shepherd b8e95e435f Maven config, initial commit 2012-08-23 14:26:25 -07:00
Abhinandan Prateek 3298a481a8 For assignVM, marking older snapshots removed in db 2012-08-23 12:22:02 +05:30
Abhinandan Prateek 6f26894eaf Fix for a corner case during fullsync where it tolerates a VM to exist on two clusters by virtue of it’s current host id and last host id (being on two diff clusters). 2012-08-23 12:13:53 +05:30
Alena Prokharchyk 3ada5e4a46 VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor 
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2012-08-22 11:53:59 -07:00
Alena Prokharchyk 4a2796d7c7 CS-16123: applied the patch from https://reviews.apache.org/r/6723/ 
original committer: Mice Xia
 2012-08-22 09:39:19 -07:00
Jayapal a5248f1cfc Fix for dns issue in multiple pods 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2012-08-22 16:48:41 +05:30
kishan b42a813ff1 bug CS-16112: During unplug nic iptables rules are cleaned up in both cloud_nic.sh and vpc_netusage.sh. Consolidated this code in cloud_nic.sh 
status CS-16112: resolved fixed

Conflicts:
	patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
 2012-08-22 12:00:02 +05:30
Prachi Damle 0b31a0af62 [ASFCS40]304 -> 305 DB upgrade merge to 302-> 4.0 2012-08-21 16:27:57 -07:00
Prachi Damle 4bffd71d71 [ASFCS40]Db upgrade: merging changes from 303->304 upgrade to 3.0.2 -> 4.0 on master branch. 2012-08-21 16:27:54 -07:00
Alena Prokharchyk cd0004bb86 CS-16111 - DB upgrade; fixed foreign keys names 2012-08-21 15:38:17 -07:00
Alena Prokharchyk e252de4999 PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address 
Reviewed-by: Frank Zhang

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-21 15:35:40 -07:00
Alena Prokharchyk 2bf5c99bc6 CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed 
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-08-21 15:31:07 -07:00
Alena Prokharchyk 7d0ad98c93 More logging to lock operations on the network 2012-08-21 15:25:17 -07:00
Alena Prokharchyk 14dd3f07d7 Fixed line endings in VirtualNetworkApplianceManagerImpl 2012-08-21 15:24:44 -07:00
Nitin Mehta 7aa7d6e39f CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swift_id to go and download the snapshot from the swift. 
Reviewed-by: Kishan
 2012-08-21 13:46:18 +05:30
Edison Su 481aae1ebc add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -07:00
David Nalley ac9dee94ac fix from Pradeep Soundararajan for removing build dependency on mysql-connector-java https://reviews.apache.org/r/6180 2012-08-20 13:38:19 -04:00
Sheng Yang 86d49e7aa0 CS-16060: Firewall service should be excluded from conserve mode checking 2012-08-17 17:05:04 -07:00
Sheng Yang a8efbcda58 S2S VPN: Fix license headers 2012-08-17 16:52:06 -07:00
Sheng Yang 1cfcefd2fb CS-16043: Using network based router rather than account for RVR detection 2012-08-17 16:52:06 -07:00
Sheng Yang ea6f3eb6f9 CS-14253: Apply IP when firewall rule is in place 2012-08-17 16:52:06 -07:00
Sheng Yang 4cb7a100c6 Revert "bug 14484: Apply existed firewall rules when associating IP" 
This reverts commit b409615a32.

In order to fix CS-15503. Fix of bug 14484(CS-14253) would be applied later.
 2012-08-17 16:52:06 -07:00
Edison Su 9059740dc1 HA worker thread needs to have its own worker thread configuration 2012-08-17 12:59:52 -07:00
Alena Prokharchyk f8bd05a1e3 Fixed regression in GuestNetworkGuru - get networkId from the network object passed to the method call instead of retrieving it from tne NicProfile when it wasn't set yet 2012-08-17 09:43:34 -07:00
kishan 691be5c60e bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic 
status CS-15577: resolved fixed
 2012-08-17 17:07:13 +05:30
Jayapal 98ae204972 giving diff ip to VR 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2012-08-17 13:49:39 +05:30
Chiradeep Vittal 48521e74e6 ElbVmMapDaoTest requires active DB backend for tests, hence jenkins test fails. 
Also, ELB feature using virtual router does not work and is deprecated currently.
 2012-08-16 12:59:00 -07:00
Chiradeep Vittal ae5d22b4ab bug CS-16036 ResourceManagerTest does not test what is says it tests 
also fixes unit test failures
 2012-08-16 12:11:41 -07:00
Chiradeep Vittal 5b85edb961 bug CS-16034 getRandomIp can return -1 unexpectedly 
also fixes unit test failures
 2012-08-16 11:42:25 -07:00
Alena Prokharchyk 335730dc65 CS-15999: added nics to domain router api response 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-16 10:50:09 -07:00
Alena Prokharchyk 0bf6de3eb2 CS-16030: set UUID when persist public ip address 2012-08-16 10:13:39 -07:00
Nitin Mehta 72f896044d bug CS-15278: Download Volume fails in case of Multiple Secondary Storages. Correcting it to use the same secondary storage to copy the volume and creating the soft link 
Reviewed-by: Kishan
 2012-08-16 15:53:00 +05:30
Mice Xia 7e093a949d CS-15823 Failed snapshot should be marked as Error and cleanup asynchronously 2012-08-15 11:06:25 +08:00
Alena Prokharchyk fe3786341f Fixed unittest for VPC - added missing implementation for some methods in Mock classes used by the test 2012-08-14 13:47:04 -07:00
kishan 65c90227ae bug CS-15648: For volumes created from snapshot, create usage event after successful volume 
status CS-15648: resolved fixed
reviewed-by: Nitin
 2012-08-14 11:58:07 +05:30
Anthony Xu 5060f98268 CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second 2012-08-13 17:45:38 -07:00
Kelven Yang 04bf1a33c6 apply patch https://reviews.apache.org/r/6572/ 2012-08-13 17:28:41 -07:00
Alena Prokharchyk b3760350fe VPC: CS-15805 - guest cidr should be RFC1918 complient 2012-08-13 17:17:06 -07:00
Alena Prokharchyk 7120ce0717 Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2) 2012-08-13 16:50:06 -07:00
Alena Prokharchyk 62526a715a Fixed unitest 2012-08-13 16:20:09 -07:00
Alena Prokharchyk 4433c5a51a Database upgrade from 302 to 40 2012-08-13 16:20:09 -07:00
Alena Prokharchyk 71ead9ef4e VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-08-13 14:03:39 -07:00
Alena Prokharchyk e74969fdec VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan 
Conflicts:

	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-08-13 11:55:34 -07:00
tomoe@midokura.jp ce12d0d70d Submit Midokura SDN controller stubs 2012-08-13 18:55:11 +05:30
Nitin Mehta a50cf618ec bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code. 2012-08-13 16:20:57 +05:30
Mice Xia 42fbf24f86 Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
anthony 822cf3c9ee VPC : typo in FirewallRuleVO 2012-08-12 10:55:21 -07:00
Alena Prokharchyk 32f55f3e3c Merge branch 'master' into vpc 2012-08-12 10:22:54 -07:00
Koushik Das ff773a8122 CS-15621: Using migrateVolumes method which does not perform input validation. Some input validation in the migrateVolume method prevented migration of volume in READY state. Also using volume disk offering to check if it is a local or shared one. 
Verified on XS 6.0.2

Test scenario
- Created 2 shared primary storage pools
- Created data volume using shared disk offering
- Attached it to a running VM (created in one storage pool)
- Detached it (now it is in READY state)
- Created a new VM in stopped state (using deployVirtualMachine API with startVm=false)
- Attached the data volume to this new VM
- Started new VM (migrated volume scenario got hit when the planner assigned the other shared pool)
 2012-08-12 17:05:28 +05:30
Alena Prokharchyk b61468d65c Merge branch 'master' into vpc 
Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 2012-08-11 18:27:18 -07:00
Alena Prokharchyk d93c5d0531 VPC: CS-15950 - throw networkConflictException when try to create network rule for the ip address that is already in use for another service 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-08-10 16:37:33 -07:00
Sheng Yang 327b4833ce S2S VPN: CS-15947: Add global config for S2S VPN VPN connection counts limitation 
And subnets limitation for each customer gateway

Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-10 16:24:35 -07:00
Sheng Yang 302c9048e8 S2S VPN: CS-15932: Allow user to update customer gateway when connection state is ERROR 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-10 16:20:52 -07:00
Sheng Yang 830aec3562 S2S VPN: CS-15936: Prevent user from connecting to different customer gateway with overlapped subnets 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-10 16:20:52 -07:00
Sheng Yang a4431b5740 S2S VPN: Use coma instead of semicolon for separating cidr list 2012-08-10 16:20:52 -07:00
Edison Su 263216caa5 Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage). 
RB: https://reviews.apache.org/r/6470/
Send-by: shadowsor@gmail.com
 2012-08-10 13:33:06 -07:00
Alena Prokharchyk ccac505944 Merge branch 'master' into vpc 2012-08-10 10:47:49 -07:00
Alena Prokharchyk 5c349dd5e5 Fixed NetworkManagerImpl - tabs weren't replaced with spaces in some places 2012-08-10 10:45:38 -07:00
Mice Xia a74687128e Fix bug CS-15679 Max guest limit of hypervisor capabilities does not work properly 2012-08-10 16:50:47 +08:00
Mice Xia bd2a130251 fix unittest SecurityGroupManagerImpl2Test 2012-08-10 16:01:43 +08:00
Alena Prokharchyk 6cddd1e767 Removed trailing whitespaces and fixed line endings in some files 2012-08-09 23:30:33 -07:00
Alena Prokharchyk 3cf13c8b7c Fixed unittest 
Conflicts:

	server/test/com/cloud/vpc/VpcApiUnitTest.java
 2012-08-08 19:00:08 -07:00
Alena Prokharchyk c5e3493792 Merge branch 'master' into vpc 2012-08-08 18:38:35 -07:00
Alena Prokharchyk a1f361904e Reverted "Initialize user context from AccountManager" committed to master branch by mistake 
This reverts commit da26302049.
 2012-08-08 15:26:45 -07:00
Alena Prokharchyk 057d6ccbb8 Name change for vpc/Dao package (dao is lowercased now) 2012-08-08 14:51:51 -07:00
Alex Huang 457f3b3dc9 Removed all javax source code from utils package 2012-08-08 12:58:22 -07:00
Alena Prokharchyk a5f99a2ca0 VPC: set event details in the method called by API 2012-08-08 11:52:46 -07:00
Alena Prokharchyk 048c5e50cf Merge branch 'master' into vpc 
Conflicts:
	utils/test/com/cloud/utils/component/MockComponentLocator.java
 2012-08-08 11:50:39 -07:00
Alena Prokharchyk da26302049 Initialize user context from AccountManager 
Conflicts:

	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-08 11:17:01 -07:00
Mice Xia a74c6e3104 fix CS-15814 Description of global configuration 'encode.api.response' is incorrect 2012-08-08 16:29:53 +08:00
Sheng Yang 2641b5d6b8 S2S VPN: Fix multiply remote side guest networks 2012-08-07 18:39:45 -07:00
Alex Huang c1c952b42b should have used non url safe 2012-08-07 16:58:16 -07:00
Sheng Yang 5e0eb93fe6 S2S VPN: CS-15882: Only allow VPN connection between same account's gateways 2012-08-07 16:27:04 -07:00
Alex Huang a6a864a1a8 Removed Base64 file and use the apache version 2012-08-07 15:41:54 -07:00
Sheng Yang 46a12b378c CS-15243: Add service combination check at create network offering 2012-08-07 13:17:48 -07:00
Alena Prokharchyk 95449da4be Merge branch 'master' into vpc 2012-08-07 11:37:45 -07:00
Alena Prokharchyk bda1e2d08d VPC: more unittests for VpcService 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-07 11:37:36 -07:00
Alena Prokharchyk d38e9eebed VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-07 11:25:02 -07:00
Alena Prokharchyk a83c753354 VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules 2012-08-07 11:24:04 -07:00
Alena Prokharchyk cf64fda5d5 VPC: unittest preparation 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-08-07 11:23:52 -07:00
Alena Prokharchyk 972fe01aec VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-07 11:21:53 -07:00
Chip Childers 81ff7a09fd CS-15875 resolved via patch from Andy Gross. 2012-08-07 14:10:11 -04:00
Abhinandan Prateek 0a2b6436dd bug CS-15859: put a check on volume limit 
Author: Abhinandan Prateek <aprateek@apache.org>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2012-08-07 10:47:54 +05:30
Sheng Yang 6e7b4bc07b S2S VPN: CS-15642: Re-initiate the VPN connections after router reboot 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-06 15:32:18 -07:00
Sheng Yang a8cbba9e82 S2S VPN: CS-15820: Remove account information of vpn gateway and vpn connection 
The owner would be always same as VPC owner.

Conflicts:

	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
	setup/db/db/schema-304to305.sql
 2012-08-06 15:21:54 -07:00
Sheng Yang 70d704c786 S2S VPN: Allow name to be modified in updateCustomerGateway 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-06 15:20:33 -07:00
Sheng Yang 1b5103c501 S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime 2012-08-06 15:19:26 -07:00
Alena Prokharchyk 5a72044dc7 Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
Alena Prokharchyk 237d91d4c9 Removed @author tags in some classes 2012-08-03 14:25:17 -07:00
Alena Prokharchyk 3496a73878 VPC: CS-15812 - fixed listVPCs by projectId 2012-08-03 14:23:56 -07:00
Alena Prokharchyk e7a1862867 VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java
 2012-08-03 14:23:45 -07:00
Alena Prokharchyk 6eba8a818a VPC: applyStaticRoutes - don't exclude static routes in Revoke state 2012-08-03 14:15:50 -07:00
Chip Childers 78764c8b6e License header updates for the server folder. 2012-08-03 09:41:27 -04:00
Nitin Mehta 3c68f1f8e8 bug CS-15200: Introducing state transition when volume is getting copied from secondary storage and it is put into Creating state 
Reviewed-by: Kishan
 2012-08-03 17:18:13 +05:30
Alena Prokharchyk 0e0b75a041 Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
 2012-08-02 18:45:37 -07:00
Alena Prokharchyk befd6dd0c6 listVirtualMachines: implemented search by templateId/isoId 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/ListVMsCmd.java
 2012-08-02 18:15:13 -07:00
Alena Prokharchyk d6df2fdc64 VPC: createPrivateGateway - added cleanup part happening in case when the gateway fails to be applied on the backend 
Conflicts:

	api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
	api/src/com/cloud/api/response/AsyncJobResponse.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-02 18:12:19 -07:00
Alena Prokharchyk 0588c9748c VPC: CS-15818 - don't allow having ICMP networkACLs with the same cidr and icmpType=-1 for rule1 and icmpType!=-1 for rule 2 as the rule1 covers rule2 in this case 
Conflicts:

	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	utils/src/com/cloud/utils/net/NetUtils.java
 2012-08-02 18:09:10 -07:00
Alena Prokharchyk 39485a4a56 VPC: CS-15821 - corrected mac address format for vpc private network 2012-08-02 18:07:15 -07:00
Edison Su 3996094e55 Fix bug: can not deploy VM on ESXi due to incorrect 
secondaryStorageResource used for SSVM

Issue:
For deploying VMware VMs, cloud service on SSVM needs to be started with
PremiumSecondaryStorageResource, a bunch of VMware related commands rely
on it.

Changes:
1)include cloud-vmware.jar in systemvm.zip
2)start cloud service in SSVM with PremiumSecondaryStorageResource

RB: https://reviews.apache.org/r/6320/
Send-by: mice_xia@tcloudcomputing.com
 2012-08-02 11:20:35 -07:00
Edison Su e116c24989 Removed obsolete file SearchCriteria2Test.java which caused ant unittest 
to fail.
cleanup.sql cleans up CLOUD and CLOUD_USAGE databases which are required
by many unit-testcases.
RB: https://reviews.apache.org/r/6283/diff/3/
Send-by: saksham.srivastava@citrix.com
 2012-08-02 10:33:06 -07:00
mice xia 895b6a3e4b CS-15780 Global configuration 'account.cleanup.interval' is used by event purge thread 
changes:
add a new global configuration event.purge.interval for event purge thread
leave account.cleanup.interval only for account cleanup thread.
 2012-08-02 21:50:44 +05:30
Alena Prokharchyk 8f797afd42 VPC: CS-15813 - ICMP type and code validation 
Conflicts:

	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	utils/src/com/cloud/utils/net/NetUtils.java
 2012-08-01 19:55:51 -07:00
Alena Prokharchyk ce9f1afa78 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-08-01 19:04:28 -07:00
Alena Prokharchyk 21e8fb372b VPC: CS-15805 - verify vpc guest network cidr only against networks in the same vpc 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-01 19:02:43 -07:00
Alena Prokharchyk a4c52d41e8 VPC: CS-15811 - removed Netscaler from the list of supported providers in VPC 2012-08-01 18:57:52 -07:00
Alena Prokharchyk b92d2336ad VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details: 
http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
 2012-08-01 18:57:33 -07:00
Alena Prokharchyk 5cbe3d9722 ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute 
Conflicts:

	api/src/com/cloud/api/commands/ListVPCsCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
 2012-08-01 18:54:08 -07:00
Alena Prokharchyk d2df3e0102 VPC: CS-15791 - allow having the same NetworkACL for 2 different protocols 2012-08-01 18:48:21 -07:00
Alena Prokharchyk 48102871e9 VPC: add account/domain info to the API vpc response 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-01 18:48:09 -07:00
Alena Prokharchyk 1168747128 Fixed numerous bugs in listNetworks call related to filtering by projectId/listAll/domainId/etc. All the rules below are followed now: 
1) When account/domainId or projectId are passed in:

* list all account specific networks of the account/project
* list all domain level networks from the domainId + subdomains if the targeted network has allowSubdomainAccess = true

In other words, we use all the networks that can be used for vm deployment by account/domainId.

If listAll is not specified in the request, account/domainId are being defaulted to the account/domainId of the caller
listAll is ignored if the call is being done by the regular user.

2) listAll is passed in by the Root admin, we list:

* all Account specific networks in the system
* all domain specific networks in the system

3) listAll is passed by the Domain admin, we list:

* All Account specific networks belonging to domain/subdomains of the domain admin.
* All domain specific networks belonging to domain/subdomains of the domain admin
* All domain specific networks allowing subdomain access belonging to the parent domain.

4) domainId - can be passed either with or without listAll. We list:

* all account specific networks belonging to the domain
* all domain specific networks of the domain
* all domain specific networks of the subdomains if isRecursive = true is passed in

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-08-01 18:46:36 -07:00
Alena Prokharchyk 7cceaae912 VPC: moved vpc related code from NetworkManager to VpcManager 
Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-08-01 18:45:06 -07:00
Alena Prokharchyk ebe53a91d7 VPC: reduced visability for some vpc related methods 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-01 18:33:12 -07:00
Alena Prokharchyk 70713043cf VPC: CS-15774 - VPC and guest networks of VPC should belong to the same zone 2012-08-01 18:20:43 -07:00
Alena Prokharchyk 9be0a5525d VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only 2012-08-01 18:19:20 -07:00
Alena Prokharchyk e0c85c0d41 VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands 2012-08-01 18:19:03 -07:00
Sheng Yang 904ef73398 Build fix. 2012-08-01 16:41:38 -07:00
Sheng Yang 96ac18d8ed S2S VPN: CS-15810: Add check for customer gateway subnets / VPC CIDR overlap 2012-08-01 15:31:17 -07:00
Koushik Das 3f571684aa CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above 
Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.

Signed-off-by: Koushik Das <Koushik.Das@citrix.com>
 2012-08-01 19:39:30 +05:30
Nitin Mehta 85398bb2e0 bug CS-13935: correcting description for create.volume.from.snapshot.wait global setting 
Reviewed-by: Kishan
 2012-08-01 18:16:01 +05:30
Alena Prokharchyk 7706a9c32f Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-31 13:37:28 -07:00
Edison Su 9a9c96df64 Patch fixes file names and imports wherever used, in files introduced in 
73be77a4c1
I've renamed discover to discoverer to fix the issue. My ant debug fails
with:
     [java] ERROR [utils.component.ComponentLocator] (main:) Unable to
load configuration for management-server from components.xml
     [java] com.cloud.utils.exception.CloudRuntimeException: Unable to
find class: com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer

RB: https://reviews.apache.org/r/6239/
Send-by: rohit.yadav@citrix.com
 2012-07-31 10:38:11 -07:00
Alena Prokharchyk 721d3ef3dc Fixed listNetworks to return domain level networks when listAll is passed to the request 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-07-31 10:24:09 -07:00
Edison Su 73be77a4c1 add missing files 2012-07-30 16:00:45 -07:00
Sheng Yang 67941f818d S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API 2012-07-30 15:52:23 -07:00
Sheng Yang d90be0d9bc S2S VPN: CS-15748: Deleting customer vpn gateway when delete account 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-07-30 15:34:41 -07:00
Edison Su 7a0a9231c3 Move KVM related code into plugins/hypervisor/kvm, a new jar file is 
created: cloud-kvm.jar
 2012-07-30 14:55:47 -07:00
Pranav Saxena 36fc2bd9b5 CS-15044:API changes and UI changes to provide option to view the name of the guestnetwork a virtual machine belongs 2012-07-31 02:57:46 +05:30
Alena Prokharchyk 9ec89b9240 Allow EIP/ELB network creation only in Basic zone 2012-07-30 13:39:42 -07:00
Alena Prokharchyk 372568cb9a CS-15743: disable static nat as a part of network resources cleanup 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-30 11:08:33 -07:00
Hugo Trippaers 236f63fd34 When cleaning up or setting ip associations the NiciraNvpElement should be ignored. 
Implemented a generic ConnectivyProvider interface work around the dependency from server to nicira-plugin.
 2012-07-30 15:17:35 +02:00
kishan 7026822e20 Fixed unittest build failure 2012-07-30 15:15:47 +05:30
kishan e87147de2e fixed build failure 2012-07-30 13:55:12 +05:30
Hugo Trippaers 3313cc4a86 rrq 5834: fix for broken attachVolume command 2012-07-30 08:38:50 +02:00
Alena Prokharchyk 2943dc22d7 CS-15717: fail to delete the network when corresponding network elements fail to be destroyed 2012-07-27 23:37:46 -04:00
kishan 9611a017e9 bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:37:46 -04:00
Wido den Hollander c894555924 setup: Add database upgrade for 3.0.3 to 4.0 
Also added a upgrade path from 3.X.X to 4.0, this should work.
 2012-07-27 23:37:46 -04:00
Sheng Yang b410cbff5f CS-15730: Prohibit create VPN connection from different gateway to same customer gateway 2012-07-27 17:41:47 -07:00
Sheng Yang 3c90fc842f CS-15704: Fix wrong domain id setting of non-root domain 2012-07-27 16:28:06 -07:00
Sheng Yang fd9ef34a0f CS-15719: Fix state change when stopping 2012-07-27 16:28:06 -07:00
Sheng Yang 8eee8f342e S2S VPN: CS-15650: Add connection status update to s2s vpn 2012-07-27 16:28:06 -07:00
Sheng Yang 786d5995df S2S VPN: Add list function for normal users 2012-07-27 16:27:36 -07:00
Sheng Yang 736c4c1510 CS-15670: Allow normal users to configure S2S VPN 2012-07-27 16:27:36 -07:00
Sheng Yang 72a4b2f410 S2S VPN: Add name field for customer gateway 
Easier for user to identify the correct gateway
 2012-07-27 16:27:36 -07:00
Alena Prokharchyk fe2681fa10 VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-07-27 13:59:08 -07:00
Alena Prokharchyk 807a9ed2c3 VPC: added global configuration for limiting number of networks per vpc (vpc.max.networks) 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-07-27 13:56:25 -07:00
Alena Prokharchyk 190329286c VPC: 
1) CS-15692 - ipAddress is always null for NetworkACL rule
2) CS-15699 - redundant router = true when provider is VirtualRouter
3) CS-15701 - fixed error message

Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-07-27 13:55:39 -07:00
Alena Prokharchyk 110903a91a VPC: added vif info to ipassoc command 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-27 13:53:41 -07:00
Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
 2012-07-27 13:47:46 -07:00
kishan 468f2720eb bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:13:18 +05:30
Wido den Hollander 2a95258fe9 setup: Add database upgrade for 3.0.3 to 4.0 
Also added a upgrade path from 3.X.X to 4.0, this should work.
 2012-07-27 18:06:38 +02:00
chip.childers@gmail.com 6d15ba85d3 Removed Citrix license header. 2012-07-26 23:04:18 -04:00
Alena Prokharchyk 7d406bf3d1 Added missing action events for enable/disable static nat 2012-07-26 15:28:50 -07:00
Wido den Hollander 406fd95d87 Add RBD support for primary storage 
This patch adds RBD (RADOS Block Device) support for primary storage in combination with KVM.

To get this patch working you need:
- libvirt-java 0.4.8
- libvirt with RBD storage pool support (>0.9.13)
- Qemu with RBD support (>0.14)

The primary storage does not support all the functions of CloudStack yet, for example snapshotting is disabled
due to the fact that backupping up a RBD snapshot is not possible in the way CloudStack wants to do it.

Creating templates from RBD volumes goes well, creating a VM from a template however is still a hit-and-miss.

NFS primary storage is also still required, you are not able to run your System VM's from RBD, they will need
to run on NFS.

Other then these points you can run instances with RBD backed disks.
 2012-07-26 22:22:26 +02:00
Edison Su 50ffa95f63 ifix CS-15609 Volumes can be created as a part of VM creation when 
un-allocated space is insufficient on primary storage

check the availability of un-allocated primary storage space during
planning stage, for multiple-volume VM creation scenario
modification in StorageManagerImpl.java and StorageManager.java:
add a new method storagePoolHasEnoughSpace(List<Volumes>, StoragePool),
check if storagePool has enough space for all requested volumes
modification in FirstfitPlanner.findPotentialDeploymentResources:
handle multiple volume case, keep track of allocated volumes for pools
and call storagePoolHasEnoughSpace to check space availability
modification in AbstractStoragePoolAllocator.java:
extract capacity computation logic and make a new method in
StorageManagerImpl

RB: https://reviews.apache.org/r/6028/
Send-by: mice_xia@tcloudcomputing.com
 2012-07-26 10:10:18 -07:00
Sheng Yang 522bdf8163 S2S VPN: Fix incorrect conn returned by resetVpnConnection cmd 2012-07-25 19:27:16 -07:00
Alena Prokharchyk 58a9b94dfb Fixed listNetworks by domainId/aclType=Domain 2012-07-25 14:50:56 -07:00
Pranav Saxena 3fedd56adb CS-12707: UI/API - templates> select view: ISOs filter by: featured or mine> provides unending pages of 2 ISO entries, DB contains only 19 ISO entrie- reviewed by Alena 2012-07-25 22:05:24 +05:30
Alena Prokharchyk 6420ecbd6f Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-24 16:13:06 -07:00
Alena Prokharchyk 119e4e7443 VPC: CS-15681 - execute VPC related methods only when router is a vpc router 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-07-24 16:12:13 -07:00
Alena Prokharchyk 7d0338bd82 listPublicIpAddresses: when do join with nics table, count only non-removed nics 
Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-24 12:42:46 -07:00
Sheng Yang a00456bc57 CS-15676: Fix NPE when stop non-VPC router 2012-07-24 11:43:30 -07:00
Alena Prokharchyk c99b1d104a Fixed broken unittest 2012-07-24 10:30:39 -07:00
Sheng Yang 1920c2a735 CS-15534: Mark VPN connection as Disconnected when rebootRouter 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-07-23 21:14:49 -07:00
Sheng Yang 6cb10ce993 S2S VPN: Add check for router status before apply vpn 2012-07-23 19:53:39 -07:00
Alena Prokharchyk 766b7a2706 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-07-23 16:38:58 -07:00
Alena Prokharchyk 46cd99f01e VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones 2012-07-23 16:38:14 -07:00
Koushik Das 88f7872b81 CS-15279 
Issue happens when ROOT volume gets created and there is subsequent failure in starting the VM. During retry if allocator assigns a different storage pool the scenario was not handled. Now in case of local storage the volume get recreated on the newly assigned pool and old one gets cleaned up. In case of shared storage the existing volume is migrated to new storage pool.
 2012-07-23 14:49:04 -07:00
Sheng Yang b18d90af04 CS-15615: Fix Site2SiteVpnService injection 2012-07-23 14:46:17 -07:00
Sheng Yang c357134330 CS-15574: Delete VPN gateway and connection when deleting VPC 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-07-23 14:45:42 -07:00
Sheng Yang 7d68e33323 S2S VPN: Use source NAT ip address for VPN gateway 
Conflicts:

	api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-07-23 14:44:05 -07:00
Sheng Yang 671475242c S2S VPN: Add domain and account for VPN 
Admin can add VPN connection for others

Conflicts:

	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	setup/db/create-schema.sql
 2012-07-23 14:40:26 -07:00
Sheng Yang 230ce1dfee S2S VPN: Add state for vpn connection response 2012-07-23 14:38:06 -07:00
Sheng Yang df9315ff02 CS-15447: Don't enable s2s vpn when provider is disabled 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManager.java
 2012-07-23 14:37:40 -07:00
Sheng Yang 0dec6ea804 CS-15456: Prohibit creating more than one VPN gateway of VPC 2012-07-23 14:35:52 -07:00
Jessica Wang 830901d7cc cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object). 2012-07-23 14:21:10 -07:00
Jessica Wang 196885e378 cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object). 2012-07-23 14:20:43 -07:00
Jessica Wang 8fad593ac5 cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response. 2012-07-23 12:14:59 -07:00
Jessica Wang aac0a808c1 cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response. 2012-07-23 12:10:29 -07:00
Alena Prokharchyk 9e5fb17e3d CS-15077: fixed listPublicIpAddresses in basic zone 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-23 11:21:28 -07:00
Alena Prokharchyk 7cf7002571 Merge branch 'master' into vpc 2012-07-23 10:57:55 -07:00
Alena Prokharchyk 7bef9a961d Resource tags: CS-15661 - don't accept NULL or empty key value when create resource tag 2012-07-23 10:51:20 -07:00
bfederle c8f72c9198 Merge branch 'master' into vpc 
Conflicts:
	ui/scripts/network.js
 2012-07-23 10:36:25 -07:00
Alena Prokharchyk 65551cff82 Resource tags: CS-15647 - delete resource tags when SG is expunged 2012-07-23 10:33:59 -07:00
Alena Prokharchyk 394f55d9e3 More logging to the VirtualRouter manager 2012-07-20 17:12:34 -07:00
Alena Prokharchyk 966c1b0ad8 VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-07-20 17:12:34 -07:00
Alena Prokharchyk cf895d34d2 CS-15622: always get router info from the DB 2012-07-20 17:12:34 -07:00
Alena Prokharchyk 2b7ec3f4a8 VPC: one more fix for multiple public nic case for the VPC VR 
Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-20 17:12:34 -07:00
Alena Prokharchyk 5a64d4fbb1 VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-20 17:12:34 -07:00
Jessica Wang 8712812ca7 cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response. 2012-07-20 16:49:17 -07:00
Alena Prokharchyk 9b4c578e0d More logging on nic release 2012-07-20 16:44:24 -07:00
Chiradeep Vittal 308cb36066 Unnecessary INFO log cluttering up the logs. Also make logs more informative 2012-07-19 16:35:45 -07:00
Alena Prokharchyk 8e648e4a98 Fixed update endpointe.url global config var 2012-07-18 15:47:37 -07:00
Alena Prokharchyk 281b23c2cd Fixed license headers 2012-07-18 14:52:13 -07:00
kishan f2bbf62d9d Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only. 2012-07-18 14:20:04 -07:00
Alena Prokharchyk 6ad2388c72 VPC: added one more default network offering for VPC - the one not having LB service 2012-07-17 17:46:17 -07:00
Alena Prokharchyk 519c4929bf VPC: fixed listPublicIpAddresses for the addresses with NULL network_id 2012-07-17 17:12:00 -07:00
Alena Prokharchyk d51719ddc3 Fixed unittest 2012-07-17 15:50:56 -07:00
Alena Prokharchyk 7c2b123d94 Merge branch 'master' into vpc 2012-07-16 15:43:16 -07:00
Alena Prokharchyk 097c260690 Resource tags: CS-15591 - delete tags for template/iso when corresponding vo object is removed 2012-07-16 15:43:06 -07:00
Alena Prokharchyk 47615a26b6 VPC: CS-15583 - hostName for the vm should be unique inside the network domain 2012-07-16 15:42:47 -07:00
Alena Prokharchyk a3d4ee3d87 VPC: CS-15598 - update ipVO object after getting system ip as a part of elastic LB 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
 2012-07-16 15:42:36 -07:00
Alena Prokharchyk 4a7149e6b5 VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-07-13 17:09:16 -07:00
anthony 829acf6e27 CS-15551 : if 'xen.check.hvm' is false, don't check template hvm in allocator 2012-07-13 16:45:57 -07:00
Alena Prokharchyk 7a5efcc2e8 CS-15579 - perform check when account/domainId is passed to list call by the regular user 2012-07-13 15:59:15 -07:00
Alena Prokharchyk a1acfd3bfa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
 2012-07-13 13:52:58 -07:00
Alena Prokharchyk 4dd71cb635 VPC: CS-15562 - get info about VR's guest networks from nics table 2012-07-13 13:35:18 -07:00
Alena Prokharchyk 534e6d4d80 VPC: CS-15564 - when send the rules to the backend, form the list of rules after the rules were marked with Revoke state 
Conflicts:

	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
 2012-07-13 13:35:06 -07:00
Alena Prokharchyk d48d4c24e7 VPC: CS-15569/CS-15568 - release ip address from VPC when fail to enable static nat 
Conflicts:

	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-13 13:34:19 -07:00
Alena Prokharchyk ad80f426a0 VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network 
Conflicts:

	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-13 13:32:14 -07:00
Alena Prokharchyk 1781f706f9 VPC: added forVpc parameter to listNetworks api call. If true, list networks not belonging to any vpc 2012-07-13 13:27:10 -07:00
Alena Prokharchyk b475396438 VPC: CS-15550 - fixed listVPCs by cidr 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-07-13 13:26:59 -07:00
Alena Prokharchyk eb52f4a610 VPC: mark gateway with Deleting state when all static routes are gone 2012-07-13 13:26:04 -07:00
Alena Prokharchyk 5923659dba VPC: CS-15548 - don't plug the nic for guest network to router when network not in Implemented state 2012-07-13 13:25:56 -07:00
Alena Prokharchyk b15c2576a7 VPC: fixed listStaticRoutes when search by gatewayId 2012-07-13 13:25:47 -07:00
Alena Prokharchyk a848ecae8b VPC: fixed logging 2012-07-13 13:25:39 -07:00
Prasanna Santhanam 3d7f6a35ad CS-15560 : Improve HVM logging of hosts 
When a host is not considered for deployment because it has disabled HVM, then call that out in the logs for debugging.

Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
 2012-07-13 10:51:56 -07:00
Hugo Trippaers 79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
Edison Su 8b7b838c8a CS-15544: recreate router if router filesystem is crashed 2012-07-11 16:14:28 -07:00
Alena Prokharchyk ef8208af00 Merge branch 'master' into vpc 2012-07-11 13:18:51 -07:00
Alena Prokharchyk ab2669b01d CS-15459: fixed listTags by resourceType 2012-07-11 12:08:34 -07:00
Alena Prokharchyk 7cb4ab5e60 VPC: added State to vpc_gateways 2012-07-11 12:05:42 -07:00
Alena Prokharchyk d2e491a377 VPC: don't send staticRoutes in Revoke state to the VPC VR 2012-07-11 12:05:33 -07:00
Alena Prokharchyk b407b3beaa VPC: add vm to network - no need to prepare nic when add vm in Stopped state to the network; the nic will be prepared once the vm starts up 2012-07-10 18:07:45 -07:00
Alena Prokharchyk 697aa4589b VPC: unplugNic - release the nic in the DB only after the command is executed succesfully on the backend 
Conflicts:

	api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-10 18:07:09 -07:00
Alena Prokharchyk f59b935da5 VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call 
Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
 2012-07-10 15:20:39 -07:00
Sheng Yang ade3ae4e3c CS-15512: Fix delete vpn connection 2012-07-10 14:47:50 -07:00
Alena Prokharchyk c2f9417de4 VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method 2012-07-10 14:35:50 -07:00
Sheng Yang 94c62f2127 CS-15513: Fix group 5 of s2s vpn 
Conflicts:

	utils/test/com/cloud/utils/net/NetUtilsTest.java
 2012-07-10 10:38:17 -07:00
Alena Prokharchyk 911ed25fbc Merge branch 'master' into vpc 2012-07-09 18:31:28 -07:00
Alena Prokharchyk c2134b431f VPC: CS-15505 - allocate guest nics when new VR starts in VPC 2012-07-09 18:30:58 -07:00
Alena Prokharchyk 525ba472e8 VPC: CS-15481: don't allow creating networkACLs for overlapping cidrs/ports 2012-07-09 18:23:58 -07:00
Alena Prokharchyk 55db112990 CS-15503: don't send Ips in Releasing state as a part of VPC VR start 2012-07-09 18:23:50 -07:00
Alena Prokharchyk 21519070fc VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManager.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-09 18:23:35 -07:00
Alena Prokharchyk d52c6e2313 listPublicIpAddresses api: don't set associatedWithNetworkId if corresponding field is null in the DB 2012-07-09 18:13:32 -07:00
Alena Prokharchyk 10dcc117c3 VPC: CS-15486 - prepare public nic as a part of VR deployment 2012-07-09 18:12:54 -07:00
Deepti Dohare 29e90f8358 CS-15429: When an instance is created with data volume, account limit for this data volume was not checked against. Adding a check for that. 
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
 2012-07-10 06:02:30 +05:30
Alena Prokharchyk 84cdf2c28d CS-15459: fixed listTags by resourceType 2012-07-09 14:59:58 -07:00
Alena Prokharchyk a6086dc806 Removed @author tag from bunch of resources 2012-07-06 17:25:36 -07:00
Alena Prokharchyk 63d6941bdc ResourceTags: respect tag parameter in listTemplates/listIsos commands 
Conflicts:

	server/src/com/cloud/storage/dao/VMTemplateDao.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
 2012-07-06 16:59:14 -07:00
Alena Prokharchyk 5be0a3eeb1 VPC: fixed listNetworkACLs by networkId 
Conflicts:

	api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
 2012-07-06 16:43:39 -07:00
Alena Prokharchyk c9eb0c59bf VPC: allow adding private gateway to the VPC when the VR is in Stopped state 2012-07-06 15:28:07 -07:00
Alena Prokharchyk 818a3c72ac VPC: CS-15485 - dont' create a record for VPC VR private gateway nic in router_network_ref; do it for regular guest networks only 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
 2012-07-06 14:57:26 -07:00
Alena Prokharchyk 353423acec Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-06 12:04:10 -07:00
Alena Prokharchyk 85677b71fe Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value 
Conflicts:

	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java
 2012-07-06 11:43:31 -07:00
Alena Prokharchyk ec26e836fc CS-15459: fixed listTags for userVms 2012-07-06 11:43:31 -07:00
Alena Prokharchyk 7acf8585b1 Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed 
2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)

Conflicts:

	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
	api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
	api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
	api/src/com/cloud/api/commands/ListSnapshotsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	api/src/com/cloud/api/response/VolumeResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/vm/dao/UserVmDaoImpl.java
 2012-07-06 11:43:31 -07:00
Alena Prokharchyk 7044fa695d VPC: CS-15469: createNetworkACL - startPort is not accepted if protocol is ICMP 2012-07-06 11:11:36 -07:00
Alena Prokharchyk e1fe1616d7 VPC: fixed CS-15465 - lb creation for ip not associated with any networks 2012-07-06 11:09:56 -07:00
Alena Prokharchyk e19e26ec4e VPC: don't fail when create/remove static route when VPC VR is in Stopped state 2012-07-06 11:09:15 -07:00
Alena Prokharchyk b13acc6459 VPC: don't allow vm to be a part of more than one VPC 2012-07-06 11:09:06 -07:00
Alena Prokharchyk d6774e6a86 VPC: don't allow vpcs for the same account with overlapping cidrs 2012-07-06 11:08:58 -07:00
Alena Prokharchyk 83f566cfe7 VPC: added "forVpc" (boolean) parameter to listRouters call - filter by the fact if router belongs to VPC or not 2012-07-06 11:08:48 -07:00
Alena Prokharchyk 234ae447ee VPC: added field networkacl_service_provided to physical_network_service_providers table 2012-07-06 11:08:39 -07:00
Alena Prokharchyk 07eb6e3cf7 VPC: CS-15447 - fail vpc creation when vpc provider is not enabled at least in one physical network in the target zone 2012-07-06 11:08:28 -07:00
Alena Prokharchyk b4fec75ff7 VPC: added dns1/dns2 + networkDomain to the list of bootload args passed on VPC VR start 2012-07-06 11:08:17 -07:00
Alena Prokharchyk 540ea34f57 VPC: removed NetworkACL interface; added getTrafficType() to Firewall 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-07-06 11:08:00 -07:00
Alena Prokharchyk 0dfe603d48 VPC: createLB rule - removed duplicated check for ip services when createLB rule 
Conflicts:

	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
 2012-07-06 11:07:26 -07:00
kishan 470cd120d1 Added ASF license 2012-07-05 12:28:15 -07:00
Edison Su 27e9cdbece add console proxy support for devcloud 2012-07-03 23:38:39 -07:00
Alena Prokharchyk 31f9d718fb Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
 2012-07-03 17:32:50 -07:00
Alena Prokharchyk f2078afbd8 VPC: added zoneName to the VPC api response 2012-07-03 17:28:20 -07:00
Alena Prokharchyk 07d478d836 VPC: CS-15426 - In Basic zone always pass control nic when prepare nics for the VR 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-07-03 17:27:46 -07:00
Vijayendra Bhamidipati 023c2e4f59 Encrypting password values that are stored in the cluster_details table 2012-07-03 17:27:21 -07:00
Alena Prokharchyk 5afa83abb6 VPC: CS-15355 - fixed router when deployVm in Basic zone 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-07-03 17:25:07 -07:00
Alena Prokharchyk 21d87f3fa5 VPC: fixed response tag for VpcRespnse 2012-07-03 17:23:50 -07:00
Alena Prokharchyk da6d876cd4 VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java
 2012-07-03 17:23:40 -07:00
Alena Prokharchyk 2b799aa9ac VPC: added missing FirewallService to the VR provider 2012-07-03 17:22:41 -07:00
kishan b5563e832e Add Region APIs 2012-07-03 13:06:21 -07:00
kishan 6a1b0f3ecf Add Region APIs 2012-07-03 13:05:19 -07:00
Alena Prokharchyk 580261119c VPC: corrected the name for PublicIp interface (mistakenly renamed it as a part of previous checkin) 
Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-02 17:44:54 -07:00
Alena Prokharchyk 5d5b584a8e VPC: remove network ACLs from VPC VR when shutdown guest network 2012-07-02 17:44:54 -07:00
Alena Prokharchyk 40a3482f13 VPC: multiple fixes: 
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
 2012-07-02 17:44:54 -07:00
Alena Prokharchyk 183633cf70 VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed) 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-02 17:44:54 -07:00
Alena Prokharchyk b565f63e42 VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation) 
Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-07-02 17:44:28 -07:00
Alena Prokharchyk 1ee0c30935 VPC: added vpccidr to the list of VPC router bootload args 2012-07-02 17:44:27 -07:00
Alena Prokharchyk 2dc1a286f6 VPC: set networkId to be null for IP address when the last PF/LB rule is removed for it and the IP belongs to VPC 
Conflicts:

	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-02 17:44:27 -07:00
Sheng Yang 8d16d7f94f Fix build after merge site to site vpn 2012-07-02 16:39:41 -07:00
Sheng Yang 5ee4b79688 CS-6840: Fix 0 id returned by createVpnConnection 2012-07-02 16:29:34 -07:00
Sheng Yang 1d97af3abf CS-6840: Add status checking for site 2 site VPN 2012-07-02 16:29:23 -07:00
Sheng Yang d9688f74ba CS-6840: List all objects without require parameter 2012-07-02 16:29:10 -07:00
Sheng Yang 8d4079d477 CS-6840: Add hypervisor commands for site-to-site vpn 
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 2012-07-02 16:28:44 -07:00
Sheng Yang 0ce1e78364 CS-6840: Add Site2SiteVpnServiceProvider 2012-07-02 16:27:09 -07:00
Sheng Yang 24c480f9e6 CS-6840: Add commands for site-to-site vpn 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	utils/test/com/cloud/utils/net/NetUtilsTest.java
 2012-07-02 16:26:34 -07:00
Sheng Yang 9bb65b1126 CS-6840: Add data structure for site-to-site vpn tables 2012-07-02 16:20:58 -07:00
Deepti Dohare c8bbf04c81 CS-15300: Domain Admin accounts now respect the limits imposed on the domain just as a regular account. 
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
 2012-07-03 04:35:53 +05:30
Jason Bausewein 0449ae37f1 CS-15274: Fix NPE on CreateVlanIpRangeCmd() 
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2012-07-02 15:05:57 -07:00
Murali reddy 9876d34ea4 moving out ELB network element to plugins/network-elements/elastic-loadbalancer 2012-07-02 15:05:58 -07:00
Murali reddy 8aa2b55dd6 moving out NetApp code to plugins/file-systems/netapp 2012-07-02 08:34:02 -07:00
David Nalley e87558256c Patch from Chip Childers 
https://reviews.apache.org/r/5704/
License header updates for the server folder
 2012-07-02 09:51:21 -04:00
David Nalley ae4b66283a cleaning up some line endings 2012-07-02 09:50:28 -04:00
Wido den Hollander 1a2f354f4d Remove message about contacting Cloud support. 
CloudStack has gone Apache now.
 2012-07-01 15:12:43 +02:00
Alena Prokharchyk 1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Alena Prokharchyk 634cd78baa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
 2012-06-28 17:41:40 -07:00
Murali reddy c41094154d moving out OVS code to plugins/network-elements/ovs 2012-06-28 17:23:41 -07:00
Alena Prokharchyk 377b03acde VPC: when add guest network to VPC, verify that the list of network services is within the list of services supported by VPC offering 2012-06-28 17:18:27 -07:00
Alena Prokharchyk 24772bcb4e VPC: createPF/createLBrule: 1) don't allow to pass openFirewall=true 2) when no openFirewall is passed in, defaulted to false if the public ip belongs to VPC 2012-06-28 17:18:15 -07:00
Alena Prokharchyk c19639e4a2 Static route can be created for generic VpcGateway now, not just Private gateway 2012-06-28 17:17:44 -07:00
Alena Prokharchyk 46b97cbf7d VPC: update public IP info in domain_router table once the VR gets the public nic 2012-06-28 10:25:24 -07:00
Alena Prokharchyk 308fd39a73 VPC: delete network ACLs as a part of network cleanup 2012-06-28 10:18:23 -07:00
Alena Prokharchyk b03265bc76 VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete) 2012-06-28 10:18:14 -07:00
Alena Prokharchyk cec5012d5a VPC: fixed ip addres assignment in createLB rule 2012-06-28 10:18:03 -07:00
Alena Prokharchyk c8ec262dea VPC: as there is no support for FirewallRules/remoteAccessVPN in the VPC, removed the networkId from the list of parameters for corresponding api calls 2012-06-28 10:17:53 -07:00
Alena Prokharchyk 5ecdad7399 VPC: don't generate empty SetStaticRoute command during VR start when there are no static routes for the VPC 
Conflicts:

	server/src/com/cloud/user/AccountManagerImpl.java
 2012-06-28 10:17:34 -07:00
Alena Prokharchyk 09bd4e1725 VPC: fixed list public ips by vpcId 2012-06-28 10:16:22 -07:00
Alena Prokharchyk 42dac79e08 VPC: 1) Don't allow to delete private gateway when it has static routes assigned. Routes have to be removed first. 
2) Re-apply static routes as a part of VPC VR start
 2012-06-28 10:13:48 -07:00
Alena Prokharchyk 1140f081df VPC: fixed getEntityOwnerId() in AssociateIpAddress command to return vpc owner if vpcId is passed in. Added action events for create/delete privateGateway/staticRoutes 2012-06-28 10:13:36 -07:00
Alena Prokharchyk a78fcedb5e VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands 
Conflicts:

	server/src/com/cloud/network/element/NetscalerElement.java
 2012-06-28 10:13:19 -07:00
Alena Prokharchyk 1a232171eb VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done 2012-06-28 10:11:41 -07:00
Edison Su 5f6387e113 add clouddev 2012-06-27 23:28:34 -07:00
Jessica Wang 3938c24b45 CS-15356: cloudstack 3.0 API - updateZone API - when internaldns2 parameter is not being passed to updateZone API, leave it as is (i.e. remain original value of internaldns2). 2012-06-27 16:57:03 -07:00
Murali reddy 8197f1f07c moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware 2012-06-26 19:48:55 -07:00
Murali reddy 550b22576f Moving out XenServer support code into plugins/hypervisors/xen 2012-06-26 16:42:31 -07:00
Murali reddy cefbbb3850 moving random storage allocator to plugins/storage-allocators 2012-06-26 15:17:25 -07:00
Murali reddy 3ceb8d5667 moving out plaintext authenticator to plugins/user-authenticators 2012-06-26 14:33:27 -07:00
Murali reddy eb5e02e4e1 moving out MD5 authenticator to plugins/user-authenticators 2012-06-26 14:18:42 -07:00
Alena Prokharchyk 66e14e2627 Applied patch https://reviews.apache.org/r/5522/diff/ 2012-06-25 21:19:48 -07:00
Alena Prokharchyk ce876e24de VPC: intermidiate checkin to Static Routes 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
 2012-06-25 21:00:57 -07:00
Alena Prokharchyk 8be74c033f VPC: update ip address object after the ip is associated with the network 2012-06-25 21:00:12 -07:00
Alena Prokharchyk 96c273ad55 VPC: finilize start for the VR - send ip assoc commands only after plug nic is done for all public nics 2012-06-25 21:00:00 -07:00
Alena Prokharchyk d35eb73c9b VPC: initial checkin for Static Routes 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-25 20:59:33 -07:00
Alena Prokharchyk 83ed35f06b VPC: Don't allow to do ip assoc to the network in the VPC. The ip should be assigned to the VPC itself 2012-06-25 20:58:00 -07:00
Alena Prokharchyk b770c8b979 VPC: moved NetworkACL manager to the vpc folder 2012-06-25 20:57:50 -07:00
Alena Prokharchyk 4e7b65ef71 VPC: CS-15354 - fixed updateNetworkServiceProvider for VpcVirtualRouter 2012-06-25 20:57:37 -07:00
Alena Prokharchyk dc04e0b2e5 VPC: listPrivateGateways API implementation 2012-06-25 20:57:09 -07:00
Alena Prokharchyk d3ccc3a7de VPC: fixed NPE in network ACL delete (ip address is null for the rule of this type_ 2012-06-25 20:55:37 -07:00
Alena Prokharchyk 030458a37b VPC: implemented add/delete Private gateway 
Conflicts:

	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/dc/DataCenterVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-06-25 20:54:14 -07:00
Alena Prokharchyk 300110931c VPC: apply dhcp entries only after all guest nics are plugged 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-25 20:51:09 -07:00
Alena Prokharchyk 1b1e52ddb0 VPC: apply firewall ACLs as a part of VPC router start/restart and VPC network implement 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-06-25 20:47:29 -07:00
Murali reddy 1a6102be1e moving LDAP authenticator to plugins/user-authenticators/ldap 2012-06-25 19:30:00 -07:00
Murali reddy 974ad65b01 moving out random host allocator to plugins/host-allocators/random/ 2012-06-25 18:47:47 -07:00
Murali reddy 621f2447bb Moved out user concentrated pod deployment planner to plugins/deployment-planners/user-concentrated-pod 2012-06-25 17:58:45 -07:00
Murali reddy 392ae5cb13 moving out Srx code into Plugins/network-elements 2012-06-25 16:55:53 -07:00
Murali reddy 422c4ce513 moving out F5 code from server into plugins/network-elements/f5/ 2012-06-23 14:16:59 -07:00
Vijayendra Bhamidipati 361ca9643d CS-15173: Additional Cluster is allowed to add with the same VSM IPaddress as the previous cluster 
Description:

    Restricting association of a Cisco Nexus VSM to a single
    cluster.
 2012-06-22 13:31:56 -07:00
Murali reddy 49b88472a5 moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler 2012-06-21 18:57:18 -07:00
Sheng Yang ae32736151 Fix compile-tests 2012-06-21 12:25:06 -07:00
Alena Prokharchyk 887970690b Added NicTO to SetSourceNat command, CreateLoadBalancerConfigCommand, SetNetworkACLCommand 2012-06-21 10:02:33 -07:00
Wido den Hollander 85fc31ec7f Make the update proces of the SystemVM SSH keys more reliable. 
On systems where sudo is used "echo ~" might return the homedirectory from the user who executed the sudo command.

By specifically using "echo ~username" we make sure we get back the correct homedirectory.

The same story goes for when updating the key on disk.
 2012-06-21 11:56:54 +02:00
Alena Prokharchyk ccec9192a2 VPC: implemented delete and list Network ACL(s) 2012-06-20 17:20:04 -07:00
Alena Prokharchyk 374a600746 VPC: initial checkin for network ACLs 
Conflicts:

	client/tomcatconf/commands.properties.in
 2012-06-20 17:19:49 -07:00
Alena Prokharchyk 7fda6306b8 VPC: fixed user vm start in case when Implemented network existed w/o VR (it was expunged with DestroyRouter command) 2012-06-20 17:19:17 -07:00
Alena Prokharchyk d2abc0e275 canUseForDeploy is always false for system networks 2012-06-20 15:45:14 -07:00
Alena Prokharchyk 55a12582b4 Completed API / Management server code for Resource tags feature. UI is yet to be done 2012-06-20 15:45:08 -07:00
Alena Prokharchyk 62d45b9670 Initial checkin for resource tags feature 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
	setup/db/create-schema.sql
 2012-06-20 15:45:08 -07:00
Wido den Hollander bc94948e06 agent: Set the listen addr of a VM specificly to the private IP of a host 
Now users have to modify their /etc/libvirt/qemu.conf vnc_listen, this is not needed anymore
 2012-06-20 15:29:26 +02:00
Alex Huang e2a32ab4f7 Introduced plugins directory. 
Moved ovm into plugins.
Introduced build.xml for ovm.
 2012-06-19 18:27:09 -07:00
Deepti Dohare e0860d5a48 CS-14345 Fixing for Login API also. 
Signed-off-by: Deepti Dohare <deepti.dohare@citrix.com>
 2012-06-19 23:07:31 +05:30
Alena Prokharchyk 19f648f1aa VPC: plug guest nic on guest network implement, and unplug on shutdown 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-19 10:09:46 -07:00
Alena Prokharchyk 89d7e54732 Network usage for VPC implementation 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-19 10:08:03 -07:00
Alena Prokharchyk 214782cc8c Don't send public/guest nic info when start VR in VPC 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-19 10:05:06 -07:00
unknown fc9a656b97 CS-14345 Logout API is not returning XML header 
Signed-off-by: Deepti Dohare <deepti.dohare@citrix.com>
 2012-06-19 14:26:18 +05:30
U-CITRITE\\koushikd 817595daf8 Fix bug CS-15261 In case IP address is passed to deployVirtualMachine API, the default property on NIC was not getting set and as a result there was a failure down the line and VM creation was failing. 
Signed-off-by: U-CITRITE\koushikd <koushikd@banlkoushikd01.citrite.net>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2012-06-19 06:53:43 +01:00
Sheng Yang 590b2332de Don't need to check guest cidr overlap 
It's not external devices, so guest network with different vlan can be the same.
 2012-06-18 16:06:14 -07:00
saksham f6d16d0ab5 CS-15018: Event USER.LOGIN should contain the client IP address. Changes made in accordance with the coding convention. 
Reviewed-by: Alena Prokharchyk
 2012-06-18 10:18:30 -07:00
Alena Prokharchyk 810151586b 1) Allow having multiple shared networks with the same vlan 
2) Added new parameter to listNetworks command - canUseForDeploy(boolean). When true, list only networks that can be used for vm deployment (networks have enough ip addresses to allocate from for the vm)

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
 2012-06-15 16:47:13 -07:00
Alena Prokharchyk 38215583ea Fixed lock problem when add vm to guest network 2012-06-15 14:33:32 -07:00
Alena Prokharchyk 9ae62d32cd Isolated non-vpc networks: start router with 3 nics from the very beginning 2012-06-15 14:33:14 -07:00
Alena Prokharchyk b3985a3b48 Added new capabilities to VPN and Firewall services defining if VPN is S2S or Remote access, and if the Firewall rules should be created per cidr or per public ip address 2012-06-15 14:33:06 -07:00
anthony e69561b857 VPC : revert some change 2012-06-15 14:32:47 -07:00
Alena Prokharchyk 3e5f391c85 VPC: more changes to ipAssoc 2012-06-15 14:32:39 -07:00
Alena Prokharchyk 982562b9fb VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip) 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-15 14:31:58 -07:00
Alena Prokharchyk c82885021b More logging to plug nic code 2012-06-15 14:27:49 -07:00
Alena Prokharchyk aa2b7d2d8c VPC: fixed guest network shutdown 2012-06-15 14:27:42 -07:00
Alena Prokharchyk 39422a3138 Release acquired lock for VPC 2012-06-15 14:27:33 -07:00
Alena Prokharchyk 7e119e4c94 Fixed addDhcpEntry/userdata/password in VPC setup 2012-06-15 14:27:24 -07:00
Alena Prokharchyk aa84256542 1) Added VpcVirtualNetworkApplianceService interface 
2) Pass dns1/dns2 to setupGuestNetworkCommand
3) Network implement - don't get source nat ip address for Vpc if it already has one
 2012-06-15 14:27:00 -07:00
Alena Prokharchyk d70d2f82d4 StartRouter: set only control nic during the initial router start; plug exising public and guest nics after the router is started with control nic 2012-06-15 14:25:31 -07:00
anthony 973ccdaf4b VPC : pass netmask once for secondary storage VM 2012-06-15 14:23:51 -07:00
Alena Prokharchyk 31b8f07bb5 Added NicTO to setupGuestNetworkCommand constructor - we need this info for guest network configuraiton 2012-06-15 14:22:40 -07:00
Alena Prokharchyk 72974831a0 Modified virtual router startup procedure - initial start happens with control nic only; then we plug Public and then Guest nic to it 2012-06-15 14:22:19 -07:00
Alena Prokharchyk 0a7faa9838 Support for adding private network 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
 2012-06-15 14:20:34 -07:00
anthony 396fa72ee3 1. move control network to eth0 on domr 
2. if it is basic mode, use guest NIC as Control NIC
 2012-06-15 14:18:38 -07:00
Alena Prokharchyk 929997f54e AssociateIpAddress to VPC - the ip gets associated to the network only when the first rule for the ip gets created. 
When the last rule is removed for vpc ip, networkId is set to null

Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	api/src/com/cloud/api/commands/EnableStaticNatCmd.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/rules/RulesService.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-06-15 14:18:24 -07:00
Alena Prokharchyk c56998e876 Support for IPAssoc inside VPC 2012-06-15 14:10:33 -07:00
Alena Prokharchyk 1189e92708 Destroy VPC if it fails to start during the deployment 2012-06-15 14:10:22 -07:00
Alena Prokharchyk 9ec8526281 1) Added VPC restart support - new api command RestartVPC. The purpose of the call is to shutdown and start VPC including VPCVirtualRouter restart, rules re-implement, etc 
2) Only networks created from offerings with conserveMode=false, can participate in VPC
 2012-06-15 14:10:09 -07:00
Alena Prokharchyk b9a4e79277 1) Added search by vpcId to listRouters/listNetworks Apis 
2) Don't allow to add new networks/implement existing ones for VPC in Disabled state. Disabled state indicates that there was unsuccessful attempt to remove the VPC, and the further cleanup will be taken care of by cleanup thread.

Conflicts:

	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-06-15 14:09:37 -07:00
Alena Prokharchyk d5507e1379 Support for delete VPC 2012-06-15 14:08:26 -07:00
Alena Prokharchyk f28cefc4c3 Added support for network shutdown in VPC guest networks 2012-06-15 14:07:59 -07:00
Alena Prokharchyk d9fd7e02a5 Plug nic support 
Conflicts:

	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
 2012-06-15 14:07:46 -07:00
Alena Prokharchyk f4060c3c1d 1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support 
2) Added services api support for plugging/unplugging the nics to VpcElement

Conflicts:

	api/src/com/cloud/network/NetworkService.java
	core/src/com/cloud/vm/VMInstanceVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-06-15 14:04:09 -07:00
Alena Prokharchyk c12ba9c86d Add type and rpcfilter to the virtual router bootload arguments even when there is no guest network is being configured. 2012-06-15 13:57:27 -07:00
Alena Prokharchyk bdfd484444 Deploy VR as a part of VPC: set elementId to the VR element id of the first physical network in the zone by now. TODO - add logic for handling the case when VR has 1 to many element ids relationship 2012-06-15 13:57:11 -07:00
Alena Prokharchyk ab680bc30c Start Virtual Router as a part of VPC start 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-06-15 13:57:00 -07:00
Alena Prokharchyk 9debd3a5df 1) Added start logic to the VPC 
2) VirtualRouterManagerImpl - refactored deployVirtualRouter method
3) Added vpcId to domain_router/user_ip_address tables and corresponding vo objects

Conflicts:

	server/src/com/cloud/network/IPAddressVO.java
 2012-06-15 13:56:05 -07:00
Alena Prokharchyk afd2d0331f Set networkId as a join parameter in DomainRouterDaoImpl as networkId was moved to the helper table 2012-06-15 13:55:01 -07:00
Alena Prokharchyk 998cf66e6c Removed network_id reference from domain_router table as now VirtualRouter can be associated with multiple networks (VPC case). Code modifications were done accordingly to the places where this field was used. 
Router->Networks (one to many) are held in router_network_ref table now
 2012-06-15 13:54:48 -07:00
Alena Prokharchyk 60b52f90dd Initial checkin for VPC feature: 
1) Added API frameworks for the feature. New commands:
* CreateVPCCmd
* ListVPCsCmd
* DeleteVPCCmd
* UpdateVPCCmd
* CreateVPCOfferingCmd
* UpdateVPCOfferingCmd
* DeleteVPCOfferingCmd
* ListVPCOfferingsCmd

2) New db tables:

* `cloud`.`vpc`
* `cloud`.`vpc_offerings`
* `cloud`.`vpc_offering_service_map`

and corresponding VO/Dao objects.

Added vpc_id field to `cloud.`networks` table - not null when network belongs to VPC

3) New Manager and Service interfaces- VpcManager/VpcService

4) Automatically create new VpcOffering (if doesn't exist) on system start

5) New Action events:

* VPC.CREATE
* VPC.UPDATE
* VPC.DELETE

* VPC.OFFERING.CREATE
* VPC.OFFERING.UPDATE
* VPC.OFFERING.DELETE

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	setup/db/create-schema.sql
 2012-06-15 13:53:59 -07:00
Kelven Yang d0bdab98ae bug CS-15191: remove a sanity check that prevent us from getting traffic lable under VMware 
Reviewed-by: anthony
 2012-06-06 16:57:49 -07:00
Kelven Yang 8b6936bde6 CS-15080: VMware control network is CloudStack management network, correct the way to send down a correct traffic label to VMware resource 
Reviewed-by: Anthony
 2012-06-06 16:57:27 -07:00
Kelven Yang 9298e5d25d bug 15080: check traffic type in host discovery stage - cluster level checks 2012-06-06 16:54:16 -07:00
Kelven Yang d8d4232a7b bug : CS-15080 - check traffic label at host discovery stage also 2012-06-06 16:53:53 -07:00
Alena Prokharchyk 7092532ae8 CS-15220: fixed db upgrade for networks using external devices 
Reviewed-by: Sheng Yang

Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java

Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
 2012-06-05 15:10:49 -07:00
Sheng Yang 79c276ba6b CS-15116: When GetDomRVersion failed, let VR creation fail 
Because there are more commands after GetDomRVersion command. Though
GetDomRVersion command itself is not that critical, the commands after it may
including DHCP and firewall related commands. The failure of GetDomRVersion
command would result in the following commands fail to be executed. So it should
fail, and fail loudly.
 2012-05-31 18:57:11 -07:00
Vijayendra Bhamidipati 90b87585e7 CS-14956 Support for rate limiting policies in Nexus dvSwith feature for CloudStack 
Removed global parameters that are not required. Cleanup.
Reviewed-by: Devdeep

Not sure why but changes in VmwareServerDiscoverer.java were not picked up
when cherry-picking from 3.0.x. Putting them in this separate commit.
 2012-05-25 19:50:50 -07:00
Sateesh Chodapuneedi 4ad8845b28 CS-14956 Support for rate limiting policies in Nexus dvSwith feature for CloudStack 
Removed global parameters that are not required. Cleanup.
Reviewed-by: Devdeep
 2012-05-25 19:41:36 -07:00
Vijayendra Bhamidipati 7cf04c1fe4 CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Incorporating Salvatore's review comments.
 2012-05-25 19:02:00 -07:00
Vijayendra Bhamidipati daa190b4cb CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Deleting the row in cluster_vsm_map after
	a cluster is deleted, if the cluster type
	is vmware and the global vswitch nexus
	config flag is set to true.
 2012-05-25 18:38:30 -07:00
Vijayendra Bhamidipati 7f26a43d48 CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Incorporating more changes from Alena's review.

	Modified the Nexus Enable and Disable commands
	to return CiscoNexusVSMResponse instead of
	SuccessResponse.

	Put event annotations for enable/disable functions
	that the enable/disable nexus commands cal into.
 2012-05-25 18:37:50 -07:00
Vijayendra Bhamidipati 15d0cf782a CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Removed the vcenter_dc_name and vcenter_ipaddr
	fields from the virtual_supervisor_module
	table, the CiscoNexusVSMDeviceVO, addClusterCmd,
	and all other references to these two fields.

	Fixing null pointer exceptions when checking
	for nexus related global parameter values in
	addClusterCmd.

Conflicts:

	api/src/com/cloud/api/commands/AddClusterCmd.java
 2012-05-25 18:37:20 -07:00
Sateesh Chodapuneedi 70fbee2cf2 CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Updating the checks for VSM parameter validation while adding cluster.

Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
 2012-05-25 18:31:49 -07:00
Vijayendra Bhamidipati 63de97e63c CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Modifying column names in db tables to
	adhere to naming conventions.
 2012-05-25 18:28:34 -07:00
Vijayendra Bhamidipati 6920d76995 CS-15055: DB exception when creating n1kv VSM when adding a cluster via the latest management server GUI. 
Description:

	Missed a check for Null pointer.
 2012-05-25 18:28:25 -07:00
Vijayendra Bhamidipati 82ffddc7b8 CS-15055: DB exception when creating n1kv VSM when adding a cluster via the latest management server GUI. 
Description:

	Adding an optional flag to the addCluster command,
	"addvsmflag". If this is set to true, the API will
	throw an exception if any VSM parameter is missed
	out. The above bug was running into a DB exception
	because the vCenter ipaddress wasn't passed in and
	the API didn't catch it.
 2012-05-25 18:28:10 -07:00
Vijayendra Bhamidipati ed0ba1a0e6 CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Incorporating more changes post review by Alena.

	1. Renamed the ListCiscoVSMDetailsCmd command
	   to ListCiscoNexusVSMsCmd. The command will
	   return a list of VSMs always, depending on
	   what parameter is passed to it. If a clusterId
	   is passed to it, it will return the VSM
	   associated to that cluster, if present. If
	   a zoneId is passed in, it will return a list
	   of all VSMs configured for any clusters of
	   type VMware within that zone. If neither is
	   passed, it will return a list of all VSMs
	   configured in the management server. If no
	   VSMs are found, it will return an exception
	   response.

	2. Cleaned up miscellaneous code.

Conflicts:

	client/tomcatconf/cisconexusvsm_commands.properties.in
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-05-25 18:27:29 -07:00
Vijayendra Bhamidipati ffaa8cc20a CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	More changes incorporating Alena's review comments:

	  1. Changed id to clusterId for better naming.

	  2. Changed the name of GetCiscoVSMByClusterIdCmd
	     to ListCiscoVSMDetailsCmd.

	  3. Removed the GetCiscoVSMDetailsCmd command.

	  4. Removed catch{} blocks in each of the Nexus
	     related APIs since the exceptions raised in
	     the API implementations will be caught in the
   	     command dispatcher.

	  5. Added ActionEvent annotation to
	     deleteCiscoNexusVSM() function.

	  6. Modified each Nexus API command's
	     getEntityOwnerId() to return
	     Account.ACCOUNT_ID_SYSTEM.
 2012-05-25 18:23:51 -07:00
Vijayendra Bhamidipati e7246847ac CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Putting in code changes as per Alena's reviews:

	  Replaced references to CiscoNexusVSMDeviceVO
	  in GetCiscoVSMByClusterIdCmd to work with an
	  interface that CiscoNexusVSMDeviceVO instead,
	  since VO objects should not be directly accessed
	  in APIs.

	  Made associated changes in other files.

	More commits incorporating Alena's review comments
	will follow.
 2012-05-25 18:23:40 -07:00
Vijayendra Bhamidipati 78d40da1bf CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Removing two unexposed APIs that we never use:
		ConfigureCiscoNexusVSMCmd
		ListCiscoNexusVSMCmd

	More changes to follow.
 2012-05-25 18:23:21 -07:00
Vijayendra Bhamidipati b28568a221 CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Modified the following commands to be Async:
		a. EnableCiscoNexusVSM
		b. DisableCiscoNexusVSM
		c. DeleteCiscoNexusVSM

	Cleaned up miscellaneous code.
 2012-05-25 18:11:04 -07:00
Vijayendra Bhamidipati 187d32057e CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Didn't stage all modified files in previous
	commit by mistake. Checking in the rest of
	the changes in this commit. Please refer to
	immediate previous commit for CS-9919 for
	details on what changes went in with this
	commit.

Conflicts:

	client/tomcatconf/cisconexusvsm_commands.properties.in
 2012-05-25 18:07:48 -07:00
Vijayendra Bhamidipati c5aba77927 CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Removed the AddCiscoNexusVSMCmd command, and all
	references to it. From now on, we shall support
	adding a Nexus VSM only when the cluster is being
	created. The VSM ipaddress, username, password,
	the vCenter DC Name and vCenter Ipaddress that it
	serves and connects to respectively can be passed
	to the addClusterCmd command optionally. To support
	these new parameters, parameters have been added
	to the addClusterCmd command.

	Added a debug statement in the code that runs checks
	when attempting to delete a VSM.
 2012-05-25 18:06:59 -07:00
Vijayendra Bhamidipati c08716db00 CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Added a new API GetCiscoVSMDetailsCmd. This
	API gets all details of a VSM when provided
	with the VSM ID.

Resolved Conflicts:

	client/tomcatconf/cisconexusvsm_commands.properties.in

Conflicts:

	client/tomcatconf/cisconexusvsm_commands.properties.in
 2012-05-25 18:06:27 -07:00
Vijayendra Bhamidipati b793c4c0fe CS-14929: Exception while creating a port forwarding rule on an acquired ip 
CS-14943: Unable to deploy VM due to Unable to identify the provider by name CiscoNexus1000vVSM

Description:

	Ignore the CiscoNexus1000vVSM provider when checking for
	providers when applying port forwarding rules.
 2012-05-25 18:04:46 -07:00
Sateesh Chodapuneedi 49673d772b CS-14940 VSM access credentials are logged in clear text with Management-server.log 
Removed debug log after fetching the credentials.
 2012-05-25 18:04:33 -07:00
Sateesh Chodapuneedi 67bfe23d28 CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Avoid detection of public traffic label for basic zones. Check switch types along with global parameter for enabling a particular vmware vswitch types. Move credentials information into resource and load during resource configuration. Cleanup.

Conflicts:

	server/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
 2012-05-25 18:00:13 -07:00
Sateesh Chodapuneedi c65199cd8c CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Added VSM credentials to AddClusterCmd(optonal params only).
Cleanup.

Conflicts:

	api/src/com/cloud/api/commands/AddClusterCmd.java
 2012-05-25 17:56:46 -07:00
Sateesh Chodapuneedi 9709774b4b CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Instance configuration to join distributed vNetwork.

Conflicts:

	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
 2012-05-25 17:53:00 -07:00
Vijayendra Bhamidipati f774ef7415 CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Missed out a file in previous commit when adding
	the new API getCiscoVSMByClusterId. Stub file was
	added by Sateesh to prevent breakage. Putting the
	file in in this commit plus better exception
	handling.
 2012-05-25 17:45:03 -07:00
Sateesh Chodapuneedi 75d0f91186 CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Added command class GetCiscoVSMByClusterIdCmd.
 2012-05-25 17:44:52 -07:00
Sateesh Chodapuneedi c59d5415ad CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Portprofile shaping policies will be fetched
	from nexus vswitch instead of vcenter.
	ACLs and Policies won't be synced to vCenter.
	Get physical network label while adding cluster.
	Cleanup.

Conflicts:

	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-05-25 17:44:02 -07:00
Vijayendra Bhamidipati d933358f10 CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Adding command getCiscoVSMByClusterId to
	retrieve a VSM associated with a cluster.
 2012-05-25 17:41:24 -07:00
Sateesh Chodapuneedi b6687faf89 CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Retreving physical network configuration from
	database. Passing configuration down to resource.
	Cleanup.

Conflicts:

	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	server/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
 2012-05-25 17:40:38 -07:00
Vijayendra Bhamidipati 7e845cfa62 CS-9919 Support for Nexus Swiches (Cisco Vswitches) 
Description:

	1. Removed CiscoNexusVSM.java.

	2. Put in invocation of Netconfhelper's
	   connect method to a VSM, in
	   CiscoNexusVSMDeviceManagerImpl.java.
 2012-05-25 17:29:35 -07:00
Sateesh Chodapuneedi 205f4a2192 CS-9919 - Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Code changes to manage Cisco Nexus 1000v in CloudStack.
	VmwareResource has been modified to leverage Nexus vSwitch.

	Providing following global configuration parameters,

vmware.use.nexus.vswitch -
	This would decide whether Nexus vSwitch in the VMware
	cluster environment would be used/managed by CloudStack
	for it's network infrastructure needs.

vmware.guest.network.vswitch.type -
	This setting would enable CloudStack to use Nexus vSwitch
	in the VMware cluster environment for guest traffic.

vmware.private.network.vswitch.type -
	This setting would enable CloudStack to use Nexus vSwitch
	in the VMware cluster environment for private traffic.

vmware.public.network.vswitch.type -
	This setting would enable CloudStack to use Nexus vSwitch
	in the VMware cluster environment for private traffic.

Functional Specification -
	http://wiki.cloudstack.org/display/RelOps/Cisco+Nexus+1000v+Support+in+CloudStack+-+Functional+Specification

Documentation / README for usage instructions -
	http://wiki.cloudstack.org/display/RelOps/Configuration+instructions+for+CloudStack+Deployment+with+Nexus+vSwitch

Conflicts:

	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	server/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
 2012-05-25 17:27:00 -07:00
Vijayendra Bhamidipati 781f0b4966 Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	1. Added the PortProfile infrastructure:

	    a. PortProfileVO : The VO class to represent a db
	    record of the table port_profile. Each db record
	    represents one port profile.

	    b. PortProfileDao: The interface that declares search
	    functions on the port_profile table.

	    c. PortProfileDaoImpl: The class that defines the
	    interfaces declared in PortProfileDao.

	    d. PortProfileManagerImpl: The class that contains
	    routines that will add or delete db records from
	    the port_profile table. If you want to create/delete
	    a portprofile, call functions from this class.

	    e. Changes to create-schema.sql to create the port_profile
	    table.

	2. Cleaned up code:

	    a. Removed a number of unused Dao and Manager objects in
	    CiscoNexusVSMDeviceManagerImpl.

	    b. Removed the ListCiscoNexusVSMNetworksCmd command.

	    c. Removed a bunch of import statements in a few files.
 2012-05-25 17:17:56 -07:00
Vijayendra Bhamidipati 0f28222cce Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	1. Modify addCiscoNexusVSMCmd to enable a VSM
           by default, when it is added to a cluster.

	2. Put in two new APIs exposed to the user -
                a. EnableCiscoNexusVSMCmd
                b. DisableCiscoNexusVSMCmd

        Disabling a VSM does not delete it. It only
        prevents the Management Server from using that
        VSM. This is useful if the VSM is in
        maintenance mode.
 2012-05-25 17:17:37 -07:00
Vijayendra Bhamidipati 38c140b181 Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

        1. Put in invocation to the deleteCiscoNexusVSM()
	   function in the deleteCiscoNexusVSM command
	   chain.

        2. Put in additional check for physical servers
	   present in a cluster that still is tied to a
	   VSM. The previous check would query for all
	   hosts in a cluster, causing the check to see
	   if a cluster has any physical servers in it
	   to always fail and thus block the VSM from
	   getting deleted. By putting in a check to see
	   if a host if of type "Routing", we refine this
	   search to only hypervisors.

        3. Other miscallaneous code + cleanup.
 2012-05-25 17:17:29 -07:00
Vijayendra Bhamidipati 037ac6592e Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

        1. Changed AddCiscoNexusVSMCmd to:
             a. Extend BaseCmd instead of BaseAsyncCmd.
             b. Take in more required parameters (viz
                vCenterDCName and vCenterIpAddress)

        1a. Changed DeleteCiscoNexusVSMCmd to also
            extend BaseCmd.

        2. Put in changes that will ensure that
           When a VSM is added, it is disabled by default.

        3. Fixed code that was leading to exceptions
           related to DB reads/writes to VSM related tables.

        4. Added new API Constants in ApiConstants.java.
           NOTE - Always initialize new attributes in
           ApiConstants.java to values in small case.
           Never put in upper case there. Also regardless
           of what names you give attributes in the
           *Cmd.java's class, you pass in parameters via
           API calls by specifying <key>=<value> where the
           <key> is taken from the value you specified in
           ApiConstants.java.

        5. Modified the addCiscoNexusVSM() function in
           CiscoNexusVSMDeviceManagerImpl.java to write VSM
           records to the db.
 2012-05-25 17:17:18 -07:00
Vijayendra Bhamidipati ab957b8928 CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Fixed type of argument taken by AddCiscoNexusVSMCmd
	from ZONE_ID to CLUSTER_ID.
 2012-05-25 17:16:38 -07:00
Vijayendra Bhamidipati 414435c7f3 CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	Fixing failure to load ClusterVSMMapDao by
	putting in a constructor that takes no
	arguments, inClusterVSMMapVO.
 2012-05-25 17:10:04 -07:00
Vijayendra Bhamidipati 7380f52f12 CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	1. Missed replacing older table name for VSMs in a few
	   files (changed the name from
	   external_virtual_switch_management_devices to
	   virtual_supervisor_module). Fixed that in this commit.

	2. Missed adding the new Dao ClusterVSMMapDao in the Dao
	   loading in DefaultComponentLibrary. Fixed.

	3. Fixed wrong searchbuilder options passed to ipaddrSearch
	   in CiscoNexusVSMDeviceDaoImpl.
 2012-05-25 17:09:41 -07:00
Vijayendra Bhamidipati a940d962ca Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	1. Added a new VO class to represent a new table
	   "cluster_vsm_map". The class is ClusterVSMMapVO
	   in ClusterVSMMapVO.java. This table has only
	   two fields - clusterId, VSMId. The clusterId can
	   occur only once. But the same VSMId can be tied
	   to different clusterIds.

	2. Added the Dao interface + implementation of the
	   interface. This provides the functions required
	   to populate objects of type ClusterVSMMapVO with
	   records from the cluster_vsm_map table. The
	   interface is defined in ClusterVSMMapDao.java,
	   and the implementation is in ClusterVSMMapDaoImpl.java.

	3. Changed the table name that represents the VSM to
	   "virtual_supervisor_module" from the earlier overly
	   generic "external_virtual_switch_management_devices".

	4. Added search/remove functions to the Dao of the VSM.
	   This is the Dao for the Cisco Nexus VSM -

		CiscoNexusVSMDeviceDao:CiscoNexusVSMDeviceDaoImpl
		 --> This is the Dao Implementation that would let
		     us query/update records on the
		     "virtual_supervisor_module" table that contains
		     the records of all the VSMs that are added to
		     the Management Server.

NOTE::
======
These were some of the changes made as part of the previous commit (#7):

	1. Renamed CiscoNexusVSMResource.java to CiscoNexusVSM.java.

	2. Changed it to not implement a true resource, but to be
	   just a class providing functionality to talk to a VSM.

	3. Modified the AddCiscoNexusVSMCmd class to take in clusterId
	   instead of zoneId + your fix of the String to Long.
 2012-05-25 17:09:26 -07:00
Vijayendra Bhamidipati 28568e694b Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Description:

	This is work in progress. This set of changes will not
	compile. Checking in for team wide code sync up.

	Changes are underway to test if VMWareResource can be
	leveraged to talk to the VSM, instead of creating a
	new resource for the VSM, like we've been doing up
	until now.
 2012-05-25 17:09:08 -07:00
Vijayendra Bhamidipati b0facd16e4 Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
At this point, the mgmt server comes up, loading the
	   Nexus related modules without dying.

Description:

	1) Added a new properties file for Cisco N1kv VSM commands:
		cisconexusvsm_commands.properties.in

	2) Added the CiscoNexusVSMElement to the components.xml file.

	3) Modified CiscoNexusVSMElement to implement NetworkElement.

		The NetworkElement interface functions are not
	  	relevant to the N1KV VSM, so we override them
	  	with noops.

	4) Added an addDao() of CiscoNexusVSMDeviceDaoImpl in populateDaos(),
	   else we'd run into a failure to look up the VSM's dao when the
	   mgmt server is starting up:

		com.cloud.utils.exception.CloudRuntimeException: Unable to find DAO com.cloud.network.dao.CiscoNexusVSMDeviceDao

	5) Also added the CiscoNexusVSMElementService in populateServices(),
	   and modified CiscoNexusVSMElement to implement Manager as well.

	6) populateServices() was running into an exception that indicated
	   that it was unable to find a commands.properties file for the
	   cisco n1kv vsm service. Fixed it by changing getProperties() in
	   CiscoNexusVSMElement to return the correct string
	   "cisconexusvsm_commands.properties", and putting in an @Override
	   for getProperties() in CiscoNexusVSMElement. Also fixed up all
	   the other functions in CiscoNexusVSMElement that needed to have
	   @Override. Also updated build/developers.xml with this file
	   location. And did other small cleanup.

	7) More clean up in CiscoNexusVSMDeviceManagerImpl.

Conflicts:

	server/src/com/cloud/configuration/DefaultComponentLibrary.java
 2012-05-25 17:07:03 -07:00
Vijayendra Bhamidipati 32ba2ef17a CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Reviewed by: Sateesh Chodapuneedi, Devdeep Singh

Description:

This is the first in a series of commits for integrating the
Cloudstack Management Server with the Nexus 1000v Virtual
Supervisor Module.

These changes introduce the necessary API command interfaces
to work with a Cisco N1KV VSM. The backend logic is still to
be put in and will be incorporated in subsequent commits.
Please do not attempt to use these APIs until then. Also,
these are not yet filled in into commands.xml, so they are
not currently exposed.

Additional APIs would be added if required.

These changes will not break any current management server
functionality.

Given below is a description of the changes put in here:

	Added Cisco N1KV commands to core/api:
	    These are the added commands -

		AddCiscoNexusVSMCmd
		DeleteCiscoNexusVSMCmd
		ConfigureCiscoNexusVSMCmd
		ListCiscoNexusVSMCmd
		ListCiscoNexusVSMNetworksCmd

	Added a Network Element service file for Cisco N1KV.

	Declared the interface functions that we'll need for
	the N1KV VSM.

	Defined a DeviceVO file for the Cisco Nexus Element.

	Created a response file for Cisco Nexus VSM.

	Created new event types for external Switching Management devices.

	Put in logic to call interface methods in ListCiscoNexusVSMNetworksCmd
	and ListCiscoNexusVSMCmd

NOT VSM RELATED:
	Fixed minor typo in some of the event types for external load balancers.

       Added properties of a VSM in the VSM VO class.

       Replaced the "url" input parameter by "ipaddress"
       in the AddCiscoNexusVSMCmd API.

       Added a new file - CiscoNexusVSMElement.java to
       contain the implementation of the functions
       declared in the VSMElementService interface, and
       put in implementations of the functions for the
       Nexus VSM API commands. These functions are
       defined in the CiscoNexusVSMElement class.

       Added a class for Port Profiles (PortProfile.java).
       The fields in this class are still not correctly
       declared as of now. We'll make the required changes
       going forward.

	Added CiscoNexusVSMDeviceManagerImpl class.

	Added CiscoNexusVSMResource class.

	Created a new class to provide a package to
	connect to Cisco Nexus VSMs. This will be a
	set of Java wrapper functions that allow us
	to connect/disconnect and send commands and
	receive the results of those commands via
	XML-RPC. These functions are yet to be
	implemented, and will be checked in in future
	commits.

	Added two new classes, VSMCommand and
	VSMResponse, to encapsulate XML-RPCcommands
	and responses to and from a Ciscon Nexus VSM.

	Put in the following function stubs inside the
	CiscoNexusVSMService class:

		connectToVSM()
		disconnectFromVSM()
		executeVSMCommand()

	Added new field in the Type enum of the "Host"
	interface, for Cisco Nexus VSMs.

	Added two parameters to AddCiscoNexusVSMCommand
		vsmName
		zoneId

	Modified the CiscoNexusVSMDeviceVO constructor to
	take in an zoneId as a parameter when creating
	the VO object.

	Added new interface and class for the DeviceDao
	implementation for Cisco Nexus VSM devices:
		CiscoNexusVSMDeviceDao
		CiscoNexusVSMDeviceDaoImpl

	Removed the vsmvCenterDomainId property, since it's
	going to the same as vsmDomainId, which is the VSM's
	switch Domain Id.

	Have started putting in the following query functions
	in the CiscoNexusVSMDeviceDao interface:

	Put in DAO implementations of some of the above functions in the CiscoNexusVSMDeviceDaoImpl class.

	Added a vsmName parameter to the CiscoNexusVSMDeviceVO class.
 2012-05-25 17:05:15 -07:00
prachi 3fd17ae029 Merge awsapi related changes to CloudStack 2012-05-25 14:40:53 -07:00
prachi f1fae9d57f CS-14753: When Vm is deployed with a Security Group , it also gets associated with the default security group. 
Changes:
- StartVM needed to be changed to add default security group only when none is present.
- DeployVm: createAdvancedSecurityGroupVirtualMachine changed to follow the same rule - add default SG only if none is specified.
 2012-05-25 14:40:31 -07:00
prachi 0c1c9141f4 DeployVMCmd: Do not place the instance in default security group if groupId is provided 2012-05-25 14:40:28 -07:00
Edison Su d646f30e7a bug CS-15095: vm cpu freq <= host cpu freq 2012-05-25 11:17:55 -07:00
Alena Prokharchyk c7bffc7b89 CS-15082: changed search criteria for Running vms in Network. Ip4 Address for guest network can be null for nic in Basic zone when vm originally fails to start. 
Reviewed-by: Frank
 2012-05-25 10:18:43 -07:00
Nitin Mehta 4bb4e98eae bug CS-14945: Throw an error message if the user is trying to attach the volume in local only storage zone. 
Reviewed-by: Kishan
 2012-05-25 18:46:44 +05:30
Alena Prokharchyk f6efcd39a3 CS-15083: fixed source nat ip assoc for the case when account owns more than 1 guest network, and 1+ public account specific ranges 2012-05-24 13:47:14 -07:00
Alena Prokharchyk 434f166c02 Removed unused comments 2012-05-24 12:04:02 -07:00
Alena Prokharchyk e65465929d CS-15082: don't allow to remove guest network in Basic zone when there are non-expunged CPVM/SSVMs using it. 2012-05-24 11:38:32 -07:00
Alena Prokharchyk 737543ce3e CS-15025 
listTemplates: made executable filters to work for regular user
 2012-05-21 15:35:10 -07:00
anthony 224bf84f31 CS 14006: log fix 2012-05-21 11:46:04 -07:00
Murali reddy a4b0759c52 bug CS-14862: EIP/ELB - SSVM and CPVM should be given an ip address from the public ip address range. 
With this fix  both SSVM and CPVM will get public IP's in case of basic zone with EIP service.
A static NAT rule is implicitly configured on the EIP service provider to map public IP to a
guest IP address associated with SSVM/CPVM
 2012-05-21 20:18:37 +05:30
Nitin Mehta a4adc25295 bug CS-14945: 
UploadVolume API is async now with the guidance for all the new apis added in 3.0.x need to be async. Though the success/failure wont be available through the queryAsync job which will report only the initial validation success or failure. The success or failure and the progress will all be available through listVolumes api.
 2012-05-21 14:46:17 +05:30
Alena Prokharchyk 51eeb62f9f CS-14894: listTemplates - return hypervisor type to everybody 2012-05-18 12:47:06 -07:00
Nitin Mehta 07cbec95fa bug CS-14957: Return hypervisor type for uploaded volume 2012-05-17 19:22:19 +05:30
anthony a32f675875 CS-14237 GC commands only sent to UP host 
resolved fixed
 2012-05-16 17:21:36 -07:00
Kelven Yang e8a5d51da7 Support console access through rebooting with XAPI session re-negotiation 2012-05-16 17:02:22 -07:00
Edison Su 26e78bd0b7 send ssh key to kvm host, even if it's developer env 2012-05-16 14:51:04 -07:00
frank d2b3ec84e9 CS-13853 secstorage.allowed.internal.sites is not allowed to be 0.0.0.0 
resolved fixed
 2012-05-16 11:57:36 -07:00
Nitin Mehta 2153ce96f7 bug CS-14321: Correcting listVolumes API call to return valid value for isExtractable for ISO derived disk and DATA disk. 2012-05-16 21:47:45 +05:30
Edison Su bafc3f2a5a CS-14521 
Remove CLVM, due to license issue
 2012-05-15 15:13:15 -07:00
Edison Su 9fa63cfe61 CS-14609 
turn on debug log, if zone is not ready to start ssvm/cpvm.
"Zone host is ready, but console proxy template" means system vm template is not in "Downloaded" state on secondary storage
"Primary storage is not ready" means the template is not been downloaded to primary storage, possible reasons: haven't add primary storage, or primary storage download is not finished/failed.
 2012-05-15 14:44:48 -07:00
Edison Su 403addc59d bug CS-14833: if iso is xen/vmware tools, attach it to vm; status CS-14833: resolved fixed 2012-05-15 14:04:16 -07:00
Alena Prokharchyk d11dceaccc CS-14904 
Fixed the bug where vm_instance.ha_enabled wasn't updated during service offering upgrade

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
 2012-05-15 12:36:40 -07:00
Nitin Mehta c01d03e53f bug CS-14249: cluster.localStorage.capacity.notificationthreshold text is incorrect 2012-05-15 19:58:30 +05:30
Nitin Mehta 7e0863555b bug CS-14814: Do not allow attaching volume to a stopped vm for an uploaded volume. Make changes to accomodate volume attaching for a vm created in Stopped state. 2012-05-15 18:28:12 +05:30
Murali reddy 3b1aca19b3 bug CS-14291: support EIP with multiple NetScalers in basic zone 
This fix will enable support for multiple NetScaler devices providing EIP service in same zone.

    - Introduced global setting "eip.use.multiple.netscalers" to turn multiple netscaler support
    - Enhanced configureNetscalerLoadBalancer API to take the PBR setup between the POD's subnet
      and NetScaler device
    - logic to pick a NetScaler (based on the guest IP and corresponding pod) while configuring INAT rule
 2012-05-15 14:00:32 +05:30
frank 910ae7446b don't call _secMgr.generateSetupCommand each time copying template 
it will reboot httpd making in processing copy fail
 2012-05-14 14:15:30 -07:00
Pranav Saxena 28aaab4031 CS-14873 : Authentication errors 2012-05-14 11:13:39 -07:00
Alena Prokharchyk 2daf7998c8 CS-14692: don't allow to remove account specific ip range when it has sourceNat ip address, and associated with non-removed Guest network 2012-05-14 10:13:44 -07:00
Nitin Mehta acd55bac90 bug CS-14785: Allow attaching the volume for Uploaded volume. Also have transition fo delete volume. 2012-05-14 16:46:49 +05:30
Alena Prokharchyk 4f12a5191a CS-14783 
Fixed limit check when acquire public ip range for the account.
 2012-05-11 15:40:17 -07:00
Alena Prokharchyk e6c764f149 CS-14685: Added customdiskofferingmaxsize to the listCapabilities response 2012-05-11 13:45:31 -07:00
Nitin Mehta 838d01754b bug CS-14785: Improvements to volumes sync so that it can recover from any error. Introduced new state UploadOp which signifies that the volume os on secondary and the status would be picked up from volume host ref table. 2012-05-11 11:42:42 +05:30
Nitin Mehta 189ac88a11 bug CS-14785: String equality should be through equals function....what was i thinking !!!. 2012-05-08 16:07:52 +05:30
Naredula Janardhana Reddy d0a09732d2 Bug 14120: Enabling SNAT for all the public NICs. 
Summary of changes:
    - snat flag is set to true if it is first ip of the NIC.

reviewed-by: Abhi
 2012-05-07 10:08:51 +05:30
Nitin Mehta 0d2422720b bug CS-14739: Check for the volume and vm hypervisor compatibility before attaching the volume to vm in case the volume is on secondary storage. 2012-05-04 17:29:22 +05:30
kishan 9fbc81e405 bug CS-14763: Added missing 301 to 302 path for 2.2.10 upgrade 
status CS-14763: resolved fixed
reviewed-by: Abhi

Conflicts:

	server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
 2012-05-04 16:08:01 +05:30
Nitin Mehta c65d3bdace bug CS-10789: Some more code to make the Uploav volume more robust. 2012-05-03 10:50:12 +05:30
Nitin Mehta 9097b53eab bug CS-10789: Put zone id in the volumehost ref table. make list volume to show the percent uploaded. 2012-05-03 10:46:02 +05:30
Salvatore Orlando a794e49545 CS-14724 : Making the default network label configurable, improving exception management 
Please also see notes added to wiki.cloudstack.org/display/QA/Open+vSwitch+Tunnel+Manager
 2012-05-02 15:16:10 +01:00
kishan 1ac0ac956b bug CS-14695: Encrypt VNC password during 3.0.0 upgrade 
status CS-14695: resolved fixed
reviewed-by: Abhi
 2012-05-01 11:10:59 +05:30
Alena Prokharchyk 2feafb18a0 bug 14694: when select valid clusters, exclude the removed ones 
status 14694: resolved fixed
 2012-04-30 13:10:57 -07:00
Abhi 03b23d3645 adding a plaintext authenticator 2012-04-30 16:43:40 +05:30
Abhi 13b927fb25 bug CS-14663: accepting encoded password for MD5 2012-04-28 12:36:48 +05:30
Salvatore Orlando 469ed78a58 CS-14606: Restoring config parameter which was accidentally removed 2012-04-27 17:17:49 +01:00
Salvatore Orlando 8080bc2d26 CS-14606: Change name for config parameter 2012-04-27 17:17:34 +01:00
Alena Prokharchyk 5da0fdaecb CS-14637: db upgrade - fixed inconsistencies in category/component fields for a bunch of global config variables 2012-04-26 10:10:05 -07:00
Alena Prokharchyk c7cbae4c48 Set ha host to false when no ha tag is enabled 2012-04-25 11:04:35 -07:00
Salvatore Orlando 2bf0c7f7ff CS-14605: OVS cleanup 
Fix syntax errors in ConfigurationManager and Resource Manager test
 2012-04-25 10:53:41 +01:00
Salvatore Orlando 6e0a86862a CS-14605: OVS Tunnel Manager Clean-up 
1) Remove old VLAN-in-overlay manager
2) Remove unused DAO objects
3) Fix code using removed object (all stale lines)
 2012-04-25 10:50:17 +01:00
Alena Prokharchyk afb97f128b Account specific vlan ranges - fixed deleteVlanRange 
Conflicts:

	api/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
 2012-04-24 17:18:27 -07:00
Alena Prokharchyk eaf9d3d820 Catch all exceptions when change engine and row_format - can fail when table is full. Just skip as its not a critical fix 2012-04-24 15:49:28 -07:00
Salvatore Orlando 8ccb4b6680 CS-14270: return VLAN id only if the broadcast URI starts with 'vlan' 2012-04-24 21:27:26 +01:00
Alena Prokharchyk a678988f33 CS-14622: fixed adding vlan range per account - associate it with the Guest network, not public 
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-04-24 11:44:00 -07:00
Salvatore Orlando 026ed52f1d CS-14437: Final changes to ensure proper tunnel creation (rebase problems) 2012-04-24 15:53:10 +01:00
Alena Prokharchyk 5021274232 CS-14256: throw executionException when finalizeStart fails (no point to retry). 2012-04-23 15:56:23 -07:00
Salvatore Orlando eb36cd5aba Removing basic connectivity provider and OVS network offering as not 
needed for Bonita
 2012-04-23 22:35:15 +01:00
Salvatore Orlando ccbdee899c Now finding the IP address also for the remote endpoint 2012-04-23 22:33:19 +01:00
root 59e93d9f29 Minor changes to string format command 2012-04-23 22:33:19 +01:00
Salvatore Orlando ec472fcaaa Forgot to add new dao into component library! 2012-04-23 22:33:19 +01:00
Salvatore Orlando b980993864 Adding DB support for interfaces OVS tunnel manager will use as GRE endpoints 2012-04-23 22:33:19 +01:00
root 3513551ae3 Hacking for demo 2012-04-23 22:33:19 +01:00
Salvatore Orlando 02cd1484b7 Removing superfluous log statements 2012-04-23 22:33:18 +01:00
Salvatore Orlando 2340ebced3 Now using vnets instead of network id for creating networks 
Fixed issues with vif scripts on 5.6FP1
Fixed ipv6 issue on 5.6FP1
Plus other various fixes and improvements

Starting to remove debug code
NOTE: Network is configured correctly but instances do not start. Possibly indefinite wait occuring on some commands
 2012-04-23 22:33:18 +01:00
Salvatore Orlando e2cc2c1f6e Fixing remaining issues with per-VIF flow script and removing version-specific scripts. 
Now generating XSnetwork names using gre keys

Plus other minor corrections
 2012-04-23 22:32:52 +01:00
Salvatore Orlando 8987499cda Now using vnets instead of network id for creating networks 
Fixed issues with vif scripts on 5.6FP1
Fixed ipv6 issue on 5.6FP1
Plus other various fixes and improvements

Starting to remove debug code
NOTE: Network is configured correctly but instances do not start. Possibly indefinite wait occuring on some commands
 2012-04-23 22:32:52 +01:00
unknown ac052ed4f0 Now allocating vnets for GRE keys 2012-04-23 22:32:51 +01:00
Alena Prokharchyk 3b4690424d bug 14295: allow regular user to create network with the custom cidr 
status 14295: resolved fixed

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-04-23 22:32:16 +01:00
Salvatore Orlando 8268635846 Adding Missing file to source control 2012-04-23 22:32:16 +01:00
Salvatore Orlando 9f321ffeac Open vSwitch tunnel manager 
Applying patch with new ovs-tunnel-manager on top of cloudstack oss-master
 2012-04-23 22:32:16 +01:00
anthony 352f3d95ed add CentOS 6.0, CentOS 5.7, RHEL 5.7 support for XenServer 6.0.2 2012-04-23 13:57:59 -07:00
Abhi 6857750566 bug CS-14593, CS-14541: fixed encryption issue 2012-04-23 15:29:38 +05:30
Nitin Mehta d6e185a5f4 bug CS-10789: Decrement and increment the resource count on volume correctly. 2012-04-23 13:45:09 +05:30
Nitin Mehta 4434aa0d2d bug CS-10789: More changes for the imageformat, introdueced new column in db for the format, created scripts for doffernt hypervisors ...and the list goes on. 2012-04-23 13:44:34 +05:30
Nitin Mehta f0911817ed bug CS-10789: Make the custome disk offering as system so that its not availble to the regular user. 
Reviewed By: Kishan
 2012-04-23 13:43:46 +05:30
Nitin Mehta 14adf23700 bug CS-10789: Adding more code changes for usage, delete volume . 2012-04-23 13:42:53 +05:30
Nitin Mehta ac2175bdbc bug CS-10789: Adding volume sync and delete functionality. 2012-04-23 12:29:38 +05:30
Nitin Mehta 54956280e6 Preliminary upload and attach changes work .. 2012-04-23 12:28:36 +05:30
Nitin Mehta 564cef8ddf More changes for uploadVolume. Create framework for upload volume progress communication between MS and SSVM. 2012-04-23 12:14:35 +05:30
kishan 2e80fba2b6 bug CS-14587: Process 500 rows at a time to encrypt vnc_password in vm_instance table. Added addtional logging. 
status CS-14587: resolved fixed
reviewed-by: Alena
 2012-04-22 22:33:37 +05:30
Alena Prokharchyk 3b4fb0b55e Fixed db upgrade bug: do vnc password encryption only for non-removed vms 2012-04-21 22:30:21 -07:00
Alena Prokharchyk 7990e15f09 More logging to the db upgrade 2012-04-21 22:29:51 -07:00
anthony bbd0259ad2 bug 14582: fix one big in upgrade from 2.1.4 to 3.0.2 
status 14582: resolved
 2012-04-20 17:02:57 -07:00
Alena Prokharchyk e4e0fff2eb Fixed db upgrade for 2.1-3.0 2012-04-20 12:00:37 -07:00
Kelven Yang 102bc1f39f Don't use dynamic quiried key size as it varies on different JVM implementation and security providers 2012-04-20 11:43:06 -07:00
kishan 316267f684 bug CS-14576: Fail 2.2.14 to 3.0.0 upgrade if encryption is not enabled 
status CS-14576: resolved fixed
reviewed-by: Nitin
 2012-04-20 16:12:03 +05:30
Nitin Mehta 44f4a5219a bug CS-14530: Whwnever creating an agent of type Routing update the capacity state as there is a transition in the resource state of the host. 
Reviewed By: Kishan
 2012-04-20 10:34:15 +05:30
Sheng Yang 329b06087e CS-14542: Fix wrong traffic label for KVM agent 
Conflicts:

	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
 2012-04-19 18:29:36 -07:00
prachi f76ad76775 Bug 14158 - 2.2.x - 3.0 db upgrade for multiple physical networks 
-Create multiple physical networks if there are distinct tags found in network_tags table.
-One physical network per tag.
-Currently all tags flow to xenserver traffic type label.
 2012-04-19 15:29:09 -07:00
Kelven Yang c5083787c2 Hardening console proxy AJAX protocol to address security concerns 2012-04-19 12:10:33 -07:00
kishan e5571480d4 bug CS-14566: set up physical networks before encrypting config values 
status CS-14566: resolved fixed
reviewed-by: Nitin
 2012-04-19 21:59:51 +05:30
Rajesh Battala 327049b5c5 CS-14546: Fixed bug Unable to view console in System and Guest VMs and Added Upgrade script 2012-04-19 21:15:45 +05:30
Nitin Mehta 0b18117db9 bug CS-14530: Whwnever creating an agent for the host put in enabled and disabled according to the hierarchy. 
Reviewed By: Kishan
 2012-04-19 19:00:53 +05:30
Nitin Mehta e04822eb70 bug CS-14530: Whenver adding a new capacity check the state of the resource - if its disabled/enabled. 
Reviewed By: Kishan
 2012-04-19 14:24:12 +05:30
Alena Prokharchyk d7f4d5d4ec CS-14553: db upgrade - for default network offerings: 
1) Change display text to match fresh 3.0.2
2) Delete lb service for the offerings using VR as a provider and not having source nat service
 2012-04-18 17:10:52 -07:00
kishan 7be811905f bug CS-14532: during 2211-2212 upgrade, do not add resource count entries for resourceTypes that were added in later releases 
status CS-14532: resolved fixed
reviewed-by: Nitin
 2012-04-18 15:39:21 +05:30
Alena Prokharchyk 03ccb7f313 CS-14512: fixed deployVm with ipToNetworkList when uuid is used for networkIds 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-04-16 15:43:56 -07:00
Vijayendra Bhamidipati 1543c01e8d Bug CS-14448: Wrong error message on using the createVlanIpRange cmd 
Description:

	Fixing two other scenarios apart from the reported one
	where we were not passing in database IDs for translation
	into uuids, in the exception.
 2012-04-16 15:27:52 -07:00
Alena Prokharchyk 662a234916 CS-14297: added "forced" option to deleteStoragePool command. If forced=true, all destroyed volumes are marked as Expunged even when we can't reach primary storage at the moment of deletion. 
Conflicts:

	api/src/com/cloud/api/commands/StopVMCmd.java
 2012-04-16 13:22:46 -07:00
Alena Prokharchyk 9b089f2eb7 AdvanceStart: do cleanup() call with force=true when the start command wasn't sent to the backend yet 2012-04-13 17:19:02 -07:00
Sheng Yang f6383f844d bug 14470: Return true for applyRules unless specified 
Only DHCP entry need to know if no one apply the entries(when VM is starting
up), other rules should be safe when return true anyway.

status 14470: resolved fixed
 2012-04-13 14:51:25 -07:00
Alena Prokharchyk 76c7c22b34 Bug CS-14447: set crossZones attribute for the template before persisting it to the db 2012-04-13 14:16:18 -07:00
Abhi a8ab24be96 bug CS-14466: removing blank statement 2012-04-13 13:49:09 +05:30
frank cc4e4e69d8 CS-14341 Order of Compute offerings does not stick 
resolved fixed
 2012-04-12 17:26:09 -07:00
Alena Prokharchyk 676a28177b Added one more parameter - haHost(boolean) - to listHosts api command. The parameter identifies if the host is dedicated for ha only 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-04-12 11:50:36 -07:00
Alex Huang 7c6932ef80 some reformatting and a new way to get vos into the system 2012-04-12 11:04:38 -07:00
Abhi 2c3c0f06ca bug CS-13303: updating resource state on upgrade 2012-04-12 17:46:18 +05:30
frank 9684ea7397 CS-14429 Cloud db schema differences between fresh installed 3.0.2 & upgraded 3.0.2 
do check befor droping index i_host__allocation_state`(`allocation_state`)
 2012-04-11 17:25:35 -07:00
prachi 4f116fb24f Bug 14646 - Enabling Host into maintenance mode is stopping the VMs instead of live migrating them to other hosts in the cluster. 
Changes:
-  While listing UP hosts in the cluster of the host, the query has changed and now also considers the Host 'resourceState' field and picks only those hosts that have value 'enabled'.
   This query result does not include the host being put in maintainance; unlike the earlier query that used to include it.
-  But the logic to find out if this is the last host in the Cluster is not updated and has a bug when it compares the list size.
- Fixed this.
 2012-04-11 16:24:31 -07:00
Alena Prokharchyk 8084318e5e Remove obsolete network_tags table as a part of db upgrade cleanup 2012-04-11 16:23:51 -07:00
Kelven Yang 8b8973f941 Complete XenServer Secure Console proxy implementation 2012-04-10 15:57:52 -07:00
Alena Prokharchyk 52539e798d bug 14449: added logging to createVlanIpRange 
status 14449: resolved fixed
 2012-04-10 11:24:36 -07:00
Rajesh Battala 3cbb8bc198 Xenserver Secure Console Proxy Phase I 2012-04-10 18:01:56 +05:30
Alena Prokharchyk 85b35978de Db upgrade path for 3.0.2 to 3.0.3 2012-04-09 15:50:10 -07:00
Alena Prokharchyk 98fd5cf959 bug 14622: introduced ha tagging for host 
status 14622: resolved fixed

Conflicts:

	server/src/com/cloud/host/dao/HostDao.java
 2012-04-09 15:18:01 -07:00
Abhi d6e9f49c09 bug CS-14396: the VMs with current host id should be listed here, probably this fix did not make to this branch, is there is 2.2.14 branch 2012-04-09 12:27:18 +05:30
David Nalley 59436be4ee fixing line endings in server 2012-04-07 20:13:10 -04:00
Alena Prokharchyk 6ff3dc3951 Return password as a result of startVm command if the vm was originally deployed with startVm=false parameter 2012-04-06 13:46:49 -07:00
Alena Prokharchyk 2d1a6b0b35 bug 14615: deployVm can work 2 diff ways now: 1) Default way - create and start the vm. 2) Create the vm without starting it. Note that vm's volumes stay in Allocated state -not created on the backend till the point where vm starts 
status 14615: resolved fixed
 2012-04-06 11:30:48 -07:00
Kelven Yang c112088fc5 bug 14618: Protect servlet container from shutting down on unexpected runtime exceptions 
Reviewed-By: Kelven
 2012-04-05 15:06:39 -07:00
Kelven Yang 93a5b7c0bc Bug 14301: Perform socket-level only management server pings 
Reviewed-By: kelven
 2012-04-05 15:06:25 -07:00
Alena Prokharchyk 1dc99a17eb Fixed unittest 2012-04-04 16:13:51 -07:00
Alena Prokharchyk c0130a5c41 Code cleanup for createVlanRange api 2012-04-04 15:03:04 -07:00
Alena Prokharchyk 25e85e177e bug 14589: don't accept empty username/firstname/lastname in update/createUser apis 2012-04-04 12:55:02 -07:00
Alena Prokharchyk b14bac0977 bug 14539: 1) introduced 2 new config parameters defining default offerings for ssvm and cpvm - consoleproxy.service.offering and secstorage.service.offering 
2) Added new api - changeServiceForSystemVm - to support service offering upgrade for system vms
3) Removed global config parameters that are not in use anymore: consoleproxy.ram.size, consoleproxy.cpu.mhz, secstorage.vm.ram.size, secstorage.vm.cpu.mhz
 2012-04-03 10:52:32 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Alena Prokharchyk def05c9da5 bug 14567: put db entry insertion in try/catch block and fail gracefully when the insertion fails (can happen when 2 MS try to insert the same entry) 
status 14567: resolved fixed
 2012-04-02 14:21:29 -07:00
Kelven Yang 74754f0a56 bug 14564: Upon management server startup, for detected inactive management server (based on timestamp), perform ping-test before we really mark it as down 
Reviewed-By: kelven
 2012-03-30 16:46:13 -07:00
Alena Prokharchyk a4e8133b78 bug 14559: podId is required parameter in addCluster api 
status 14559: resolved fixed
 2012-03-30 10:37:14 -07:00
Kelven Yang c12b00099b Bug 14551: add top-level catch clause to protect task/thread from stalling 
Reviewed-By: Kelven
 2012-03-29 18:25:53 -07:00
prachi 1b6e38f3d5 Bug 14536 - DB exception while trying to delete physical network 
Reviewed-By: Sheng Yang

Changes:
Added proper cleanup for virtual router elements.
 2012-03-29 12:40:06 -07:00
prachi 23915b7481 Bug 14536 - DB exception while trying to delete physical network 
Reviewed-By: Sheng Yang

Changes:
Added 'removed' column to physical_network_service_providers to avoid the Foreign Key constraint error.

Conflicts:

	setup/db/db/schema-30to301.sql
 2012-03-29 10:15:30 -07:00
frank f53dc35d9f change a comment in ApiResponseGsonHelper.java 
reviewed-by: edison
 2012-03-28 16:18:42 -07:00
Kelven Yang 16ab819502 bug 14301: suppress expected exceptions from showing annoying stack dump, the message will be logged at TRACE level. 
Reviewed-By: Kelven
 2012-03-28 15:47:00 -07:00
Alena Prokharchyk d6cf594ef7 bug 14292: don't try to reboot vm as part of resetVmPassword if the vm is in Stopped state 
status 14292: resolved fixed
 2012-03-28 13:51:14 -07:00
Alena Prokharchyk dc1af9e5f4 bug 14444: specifyVlan should always be false for the network offering of type Isolated supporting sourceNat service 
status 14444: resolved fixed
 2012-03-28 11:24:09 -07:00
Alena Prokharchyk e4d16551fc bug 14465: throw exception when try to send email invitation while smtp session wasn't configured 
status 14465: resolved fixed
 2012-03-28 10:05:54 -07:00
Kelven Yang 5602f3b550 bug 14301: 
1) Support HTTP keep-alive in clustering communication channel
2) Increase concurrency level for clustering message delivery

Reviewed-By: Kelven (with unit test)
 2012-03-27 16:37:22 -07:00
Kelven Yang 7d87f48ef4 bug 14301: 
1) Drop synchronized call semantic for ClusterManagerImpl.broadcast()
2) Have no choice now but to use an unbound thread pool to notify upper layer. This is to prevent thread starvation when we have cross-management server waitings.

Reviewed-By: Kelven(with unit test)
 2012-03-27 16:09:55 -07:00
Kelven Yang 880188466c bug 14301: fix regressions caused by new clustering transport. Correct usage of HttpClient to avoid socket staying in CLOSE_WAIT state for too long. Reviewed-By: Kelven 2012-03-27 16:08:57 -07:00
Kelven Yang b0e8f08a3e bug 14301: Decouple synchronized crosss management server call with clustering transport. Reviewed-by: Kelven 2012-03-27 16:05:52 -07:00
Kelven Yang 0f34744c9e bug 14301: Decouple synchronized crosss management server call with clustering transport. Reviewed-by: Kelven 2012-03-27 16:01:54 -07:00
kishan bed3f7f7e2 bug 14512: Create user_stats entry for router while persisting routerVO 
status 14512: resolved fixed
reviewed-by: Nitin
 2012-03-27 19:04:34 +05:30
kishan 57f935ca03 Added since version to API response docs 2012-03-27 11:12:59 +05:30
prachi c2570b9e7d Bug 14482 - When user tries to delete an acquired Ip address ,right after this is successful, UI calls listRemoteAccessVpns() which results in java.lang.NullPointerException.User is presented with "Internal error executing command" error 
Reviewed-By: Sheng

Changes:
- Added the null check for account object.
 2012-03-26 14:43:49 -07:00
Sheng Yang b409615a32 bug 14484: Apply existed firewall rules when associating IP 
It's not a elegant fix. The status for firewall rules should remain unchanged
before/after ip association/disassociation. But the related change is tricky
than this fix, may not get enough test for 3.0.1. So we would apply existed
firewall rules again, which would work, just result in some unnecessary
commands.

status 14484: resolved fixed

Reviewed-by: Edison Su
 2012-03-26 13:55:43 -07:00
frank c504e8aa35 Bug 14492 - Stop and start of SSVM in Zone1 fails if Zone2 is configured with Storage network 
status 14492: resolved fixed
reviewed-by: edison
 2012-03-26 11:58:12 -07:00
Alena Prokharchyk ce8e9a9f51 bug 14500: set default value for is_system field as a part of 3.0 to 3.0.1 upgrade 
status 14500: resolved fixed
reviwed-by: Frank Zhang

Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
	setup/db/db/schema-30to301.sql
 2012-03-26 10:27:15 -07:00
Nitin Mehta a78537398c Bug 14490: Fix NPE in ListCapacity 2012-03-24 16:24:51 +05:30
Nitin Mehta a5a7be4c7e Bug 10808: Add Upload Volume api and do validation. 2012-03-24 13:59:59 +05:30
Edison Su 1e4893b69c bug 1443: even adding host failed, return success in api. status 14443: resolved fixed; Reviewed-by: sheng 2012-03-23 18:23:10 -07:00
Alena Prokharchyk 4060be1842 bug 14445: automatically enable firewall service for VR when VR is a provider for PF/StaticNat services 
status 14445: resolved fixed
reviewed-by: Sheng Yang
 2012-03-22 14:17:15 -07:00
Alena Prokharchyk 15019d1e5c bug 14439: added search by name/description to listGuestOS and listGuestOSCategories apis 
status 14439: resolved fixed
reviewed-by: Frank Zhang
 2012-03-22 11:33:22 -07:00
Alena Prokharchyk c42fceab27 bug 14446: removed elasticLBVm from components.xml 
status 14446: resolved fixed
reviewed-by: Frank Zhang
 2012-03-22 10:26:48 -07:00
Abhi 90da4d1c92 bug 12947: support for 1.5 beta; reviewed-by: nitin 2012-03-22 17:30:56 +05:30
Nitin Mehta 2a837c3ebd Bug 14345: DB discrepecy for capacity.check.period, cluster.memory.allocated.capacity.disablethreshold, pool.storage.allocated.capacity.disablethreshold, pool.storage.capacity.disablethreshold. 
Reviewed-By: Kishan
 2012-03-22 10:01:49 +05:30
prachi 45c7ad63bf Bug 14299 - Fix adding public ip range per account 
Changes:
Fixed as described in the bug.

* CreateVlanIpRangeCmd still accept account/domainId info
* if account owns:
- one Isolated network with source nat service enabled, use this network
- more than one Isolated network with source nat service enabled - error out
- none Isolated networks with source nat service enabled, create it only in
case when there is an Isolated network offering with Availability=Required and
source nat service enabled.
 2012-03-21 16:52:32 -07:00
Kelven Yang 9c55b7b695 bug 14313: add map type adapter to ApiGsonBuilder as some API response classes are using Map<String, String> 2012-03-21 15:16:47 -07:00
Kelven Yang 7c327ec658 bug 14188: always make sure to inject SSH keys before copying systemvm ISO to secondary storage 2012-03-21 14:24:52 -07:00
Sheng Yang 1ca493e4fa bug 14042: Don't set dhcp:router option on DHCP server for non-default network on CentOS/RHEL 
The routing table with two nics may be messed up, due to we sent same
router(gateway) information from different DHCP server, in order to specify
default gateway. E.g.

Network A: 192.168.1.0/24, gw 192.168.1.1
Network B: 192.168.2.0/24, gw 192.168.2.1

User VM: Nic 1 connect to network A, get ip 192.168.1.10; nic 2 connect to
network B, get ip 192.168.2.10.

Set network A as the default network of user VM.

Currently we would send this information to user VM through DHCP offer:
In network A: dhcp-option:router 192.168.1.1
In network B: dhcp-option:router 192.168.1.1

So both NIC in the guest VM would receive 192.168.1.1 as router(gateway).

But, in CentOS 5.6, dhclient-scripts try to tell if the gateway is reachable
for current subnet.

So when we try to enable nic 2(eth1) of user VM, dhclient would receive:
IP: 192.168.2.10
Mask: 255.255.255.0
Router: 192.168.1.1

Then it would found that the specified gateway(router) is not within its own
subnet(192.168.2.0/24). But since we send out this ip(192.168.1.1) as the
gateway for it, dhclient thought that it should got someway to access the
network through this IP. So it would execute:

ip route add 192.168.1.1 dev eth1
ip route replace default via 192.168.1.1 dev eth1

But it can never reach 192.168.1.1(which is in the eth0's subnet and the
gateway of eth0) by go through eth1 interface. So it is messed up.

We've tested Windows 2008 R2, CentOS 5.3, CentOS 5.6 and Ubuntu 10.04. Windows
and Ubuntu are fine with above policy.

To solve this, we send different dhcp:router option according to the guest OS
type now.

We may need expand this list later, but for now we only know that CentOS and
RHEL would behavior in this way.

status 14042: resolved fixed
 2012-03-21 10:38:18 -07:00
Sheng Yang 319dbccabf Fix not sending DNS in DHCP command 2012-03-21 10:38:12 -07:00
Murali reddy 99e1ca123f bug 13899: CloudStack (Advanced Mode) should not allow "NetScaler" as provider for StaticNAT service 
status 13899: resolved fixed
 2012-03-21 16:54:44 +05:30
Abhi d3673506cf bug 14216: rightly initializing to avoid NPE 2012-03-21 15:33:05 +05:30
Abhi d354897780 bug 12947: enabling XCP 1.5 2012-03-21 10:23:04 +05:30
prachi e43914ab58 Bug 14336 - Login API does not return UUID's 
Changes done:
- Provide UUID for userid and domainid only while constructing the login response. Session will hold the DB id's as before, to ensure other parts keep working.
- This reverts commit de28aa3ddde5b601f2f234f2eccef871fbaf1a06.
 2012-03-20 16:59:04 -07:00
prachi a5d7cd3d51 Bug 14336 - Login API does not return UUID's 
Changes:
- login API now returns back UUID for user and domain
 2012-03-20 16:59:02 -07:00
prachi 280d533a6f Bug 14047 - login API fails when UUID is used for domain_id 
Changes:
- API should accept UUID for domain and convert to id when needed
 2012-03-20 16:59:00 -07:00
Vijayendra Bhamidipati 24e57e283e Bug 14071: queryAsyncJobResult in xml format gives incorrect UUIDs back 
Description:

	Incorrectly removed part of the XML serializer that serialized
	the IdentityProxy object in normal responses, when putting in
	support for serialization of lists of IdentityProxy objects in
	exception responses as part of the code changes put in for bug
	13217, resulting in this bug. Putting it back in place.
 2012-03-20 16:22:43 -07:00
Alena Prokharchyk 29c61e6341 bug 14369: remove host entry when destroy CPVM/SSVM instances 
status 14369: resolved fixed
 2012-03-20 14:10:18 -07:00
Alena Prokharchyk 5599713268 bug 14401: return juniper srx as a firewall provider along with the Virtual router 
status 14401: resolved fixed
 2012-03-20 11:51:48 -07:00
Alena Prokharchyk 59a05660ab bug 14420: listNetworkOfferings by networkId - respect specifyVlan flag of the original offering 
status 14420: resolved fixed
 2012-03-20 11:31:13 -07:00
Alena Prokharchyk 81d7f9bdbf bug 14407: update network count for account/domain as a part of 3.0 to 3.0.1 upgrade 
status 14407: resolved fixed
 2012-03-20 10:40:32 -07:00
Alena Prokharchyk e53cfeceb6 bug 14379: don't enable 8096 port by default (set global config variable to null by default, and don't create a listener on this port unless its set to valid integer) 2012-03-19 16:19:38 -07:00
frank 4303e30ae0 add missing cleanup.sql 2012-03-19 15:27:43 -07:00
Alena Prokharchyk fec3a87d09 bug 14388: don't return console proxy / ssvm service offerings 
status 14388: resolved fixed
 2012-03-19 14:50:09 -07:00
frank 3773b52b2f add cleanup.sql to DB upgrade test 2012-03-19 14:36:57 -07:00
Alena Prokharchyk c01ed2f754 Added upgrade path from 3.0.x to 3.0.1 2012-03-19 13:38:38 -07:00
frank 26c77e62ce move fake.sql to proper folder 2012-03-19 13:10:41 -07:00
frank ea007f833f use fake.sql for db upgrade test 2012-03-19 13:06:43 -07:00
Salvatore Orlando 0c4191bb75 Bug 14370 - addSecondaryStorage always fails: "Can't find pod with specificied podId null" 
status 14370: resolved fixed
 2012-03-19 17:14:03 +00:00
frank a6a54a2f87 Bug 14189 - multiple physical nw - SSVM fail to download guest templates from storage server which is in isolated network only accessible by host's bridge 
if storage network is present, don't set route through private ip when adding internal download site

status 14189: resovled fixed
 2012-03-16 14:49:30 -07:00
Vijayendra Bhamidipati 005ba5e2b5 Bug 13127: API error text refer to database ids instead of uuids 
Description:

	Adding overloaded addProxyObject() function to CloudException
	and RuntimeCloudException classes and using this function
	to stuff exceptions with IDs, to reduce code footprint.
 2012-03-15 16:27:52 -07:00
frank 7f8cf5a9ff fix copying template 
Conflicts:

	console-proxy/scripts/ipfirewall.sh
 2012-03-15 14:43:03 -07:00
Alena Prokharchyk e73a23e8c0 bug 14271: return only domainId in error message when caller is not authorized to operate within the domain 
status 14271: resolved fixed
 2012-03-14 13:31:43 -07:00
Alena Prokharchyk 1b4954d63a bug 14295: allow regular user to create network with the custom cidr 
status 14295: resolved fixed

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-03-14 10:50:15 -07:00
Likitha Shetty 59262d67a3 Bug 13842 Check for snapshots in BackedUp state during the deletion of secondary storage 
behalf of: pranav
reviewed by: kishan
 2012-03-14 17:59:38 +05:30
Vijayendra Bhamidipati b1bb0afad4 Bug 13127: API error text refer to database ids instead of uuids 
Description:

	Modifying the API functions' exception handling to call
	addProxyObject() wherever applicable, and removing some
	wrong calls to addProxyObject() that were put in in an
	earlier commit for this bug.

	With this commit, we cover many API functions to use the
	new exception handling code, but some pieces may still be
	left out. These will be covered as work in progress, when
	making changes to the CS API code.
 2012-03-12 18:05:45 -07:00
Sheng Yang ec5a225a78 Refactor VirtualRouterNetworkManagerImpl 
Refactor applyDhcpEntry and applyUserData to use applyRules framework.
 2012-03-12 16:10:48 -07:00
Alena Prokharchyk ad1192e264 bug 14239: limit number of Isolated account specific networks per account 
status 14239: resolved fixed

Conflicts:

	api/src/com/cloud/api/commands/CreateNetworkCmd.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-03-12 15:53:30 -07:00
Sheng Yang 21fe5e1087 bug 14074: Specify networkId for list public ip 
status 14074: resolved fixed
 2012-03-12 12:00:31 -07:00
Alena Prokharchyk 251af27a7a bug 14247: implemented search by storage id in listSystemVms 
status 14247: resolved fixed
 2012-03-12 10:24:48 -07:00
abhi ecad50c801 bug 14151,14153: configuration variables are now hidden; added ldapRemove command 2012-03-12 16:50:00 +05:30
abhi 64eb2dfcb1 bug 14224: allowing Xenserver 6.0.2, with the assumption that the same patches and guest os type will work as with 6.0 2012-03-12 16:39:22 +05:30
abhi 87a32a4866 bug 14224: adding 6.0.2 2012-03-12 16:39:22 +05:30
Sheng Yang 476c671374 Refactor VirtualNetworkApplianceManagerImpl 
Add separate create command for dhcp, userdata and password.
 2012-03-09 19:02:47 -08:00
Sheng Yang d62d3b5a01 Refactor rules appling in the VirtualNetworkApplianceManagerImpl 2012-03-09 18:00:06 -08:00
Alena Prokharchyk 6910740582 Revert "bug 14151,14153: configuration variables are now hidden; added ldapRemove command" 
Reverting the commit in order to fix the build
This reverts commit 0ab0fcfa5c3b8825b8a92e3c2d2dee8e8ca6152b.
 2012-03-09 09:53:56 -08:00
abhi b7b751fdf6 bug 14151,14153: configuration variables are now hidden; added ldapRemove command 2012-03-09 16:56:01 +05:30
Vijayendra Bhamidipati df51744979 Bug 13127: API error text refer to database ids instead of uuids 
Description:

	Removed some wrong invocations to addProxyObject() when
	throwing exceptions in NetworkManagerImpl.java.

	Replaced db ids with uuids in various points in the code
	of NetworkManagerImpl.java, where exceptions are thrown.
 2012-03-09 01:13:36 -08:00
Vijayendra Bhamidipati a70f8a9b3d Bug 13127: API error text refer to database ids instead of uuids 
Description:

	Replacing placement of db ids in exception messages to uuids
	in the file ManagementServerImpl.java.

	Since there are a large number of files that throw exceptions
	with db ids in them and they need to be changed, we will make
	the changes in multiple commits.
 2012-03-08 23:25:50 -08:00
Vijayendra Bhamidipati 6ac79c4be2 Bug 13127: API error text refer to database ids instead of uuids 
Description:

	Adding a new class AnnotationHelper, that provides routines
	to read annotations from a VO class.

	Cloudstack does the mapping between cloudstack java VO objects
	and the database tables using cglib. cglib creates proxy objects
	as the maps between VO objects and the database.  A VO (value
	object) class is populated after querying from the MYSQL database.

	Ideally, a getAnnotation() issued on a cglib proxy object should
	get a list of all the annotations in all classes in the inheritence
	chain. However, this functionality seems to be currently broken
	in cglib.  Hence, when querying for annotations given the object
	of a VO class, we need to get to the corresponding VO class of that
	cglib proxy class and issue a getAnnotation() on that class. To get
	the VO class, we simply need to get the super class of the proxy
	object. Also, we need to recurse to the root VO class in case the
	VO class extends another VO class.

	Note that the cache used by CS is ehcache.
 2012-03-08 17:34:28 -08:00
Sheng Yang e152e64ac0 Fix several wrong ResourceUnavailableException scopes 2012-03-08 11:55:31 -08:00
Alena Prokharchyk 4f741c833c bug 14170: issues #1-#3 are fixed 2012-03-07 13:37:16 -08:00
Alena Prokharchyk 65e160b7e6 bug 14173: add eip/elb network offering (if missing) during the management server start 
status 14173: resolved fixed
 2012-03-07 10:02:24 -08:00
Alena Prokharchyk f3935d667f bug 14156: return instancename parameter in userVm response to ROOT admin only 2012-03-06 13:39:13 -08:00
prachi 5148145d18 Bug 14028 - Add hostid parameter to StartVmCmd to enable admins to start VM on a particular host 
Changes:
- Added hostid to StartVMCmd. Only root admin can use it.
 2012-03-05 17:50:23 -08:00
Vijayendra Bhamidipati 57c54e23d6 Bug 14060: Include a CloudStack error code in an Exception Response 
Bug 13127: API error text refer to database ids instead of uuids

Code-Reviewers: Ewan Mellor, Kelven Yang

Description:

	1. A new class CSExceptionErrorCode has been added to utils.
	   It contains a list of error codes for each type of
	   Exception class. Use fully qualified package paths for
	   Exceptions in CSExceptionErrorCode.  We log any exception
	   name not found in the list of error codes for exceptions.

	2. Whenever we throw an exception exobj anywhere in the
	   CS code, the CSErrorCode is set in the base class
	   constructor.

	3. We add a new field csErrorCode in classes CloudException,
	   RuntimeCloudException, ExecutionException and
	   ExceptionResponse.

	4. Two places in ApiServer.java were wrongly modified when
	   putting in changes for bug 13127 to not throw an exception.
	   This has been corrected in this commit.
 2012-03-05 17:39:09 -08:00
prachi 996110c928 Bug 14000 - Neither Admin or regular user can create a VM when the Pod is disabled 
Bug 14006 - Admin could not create a VM when the cluster is Disabled

Changes:
- For Root admin, planner will not filter out the disabled pods or clusters from the resource list
 2012-03-05 17:04:22 -08:00
prachi d2ecd8c89a Bug 13999 - Non-admin user should not be able to take snapshots 
Changes:

If Zone is disabled, deny permission to regular user while creating snapshots
 2012-03-05 17:04:13 -08:00
Alena Prokharchyk 96cdc408d4 bug 14103: mark account for cleanup only in cleanupAccount and disableAccount method, not in the callers methods 
status 14103: resolved fixed
 2012-03-05 16:19:12 -08:00
frank d7fb9177d1 allow more commands when resource state in maintenance mode 2012-03-05 15:38:06 -08:00
frank b55997d39b allow SetupCommand when resource is in maintenance mode. 
Since maintenance is resource state not agent status right now
 2012-03-05 15:38:00 -08:00
frank 77ba5d0f8e Bug 14068 - Db upgrade: resource_state is incorrect for the host in UP state after the db upgrade from 2.2.x to 3.0 
Bug 14099 - Db upgrade for storage network

status 14068: resovled fixed
status 14099: resovled fixed
 2012-03-05 15:37:46 -08:00
Sheng Yang 1cd4ef5f07 bug 14110: Fix error message 
status 14110: resolved fixed
 2012-03-05 11:02:19 -08:00
kishan de997c1e45 Bug 13952: Changed category of Usage configs 
Status 13952: resolved fixed
Reviewed-By: Abhi
 2012-03-05 18:58:49 +05:30
kishan 637b228130 Bug 14081: Added 3.0.0 templtae upgrade support. Added unit test case and DB dump 
Status 14081: resolved fixed
Reviewed-By: Abhi
 2012-03-05 17:25:38 +05:30
Likitha Shetty 9e716e6de3 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2012-03-05 10:33:12 +05:30
Alena Prokharchyk 66e7e64915 Db upgrade for security group provider 2012-03-02 16:07:42 -08:00
Sheng Yang d58f0a976d Fix element_id upgrade with network_id=0 2012-03-02 11:15:56 -08:00
kishan d74260e197 Added systemVm template upgrade queries for XenServer 2012-03-02 20:33:26 +05:30
Alena Prokharchyk 6a1d7e309d More fixes to 2.2.x - 3.0 db upgrade 2012-03-01 18:31:50 -08:00
Alena Prokharchyk fa0e25d146 bug 14080: do EQ instead of LIKE search when search for duplicated users during the user update 
status 14080: resolved fixed
 2012-03-01 15:11:46 -08:00
Sheng Yang 887256ad12 bug 14076: Fix the exception scope 
status 14076: resolved fixed
 2012-03-01 14:58:40 -08:00
kishan 93b859970f Bug 14039: Changed SSO key category Secure 
Status 14039: resolved fixed
Reviewed-By: Abhi
 2012-03-01 21:00:48 +05:30
Likitha Shetty 25db257a9a Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2012-03-01 14:39:43 +05:30
Alena Prokharchyk 152dfe4fd2 More fixes to the db upgrade 2012-02-29 16:26:44 -08:00
Alena Prokharchyk e992a25e1a bug 14033: root/domain admin limits are always Unlimited. Return it as Unlimited in listResourceLimit response 
status 14033: resolved fixed
 2012-02-29 15:15:36 -08:00
Alena Prokharchyk 25676aa3c6 bug 14017: 1) Don't allow NULL value for Boolean type of config 2) Added a null check when compare config values 
status 14017: resolved fixed
 2012-02-29 13:09:47 -08:00
Alena Prokharchyk ce433f9df2 Wrap deletePhysicalNetwork in transaction 2012-02-29 11:02:57 -08:00
Likitha Shetty 6915bd7e6a Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2012-02-29 18:48:48 +05:30
Kelven Yang 5aade501dc fix merge conflicts 2012-02-28 17:06:23 -08:00
Kelven Yang 52ebf15e7c Console proxy refactoring incremental check-in - new VNC protocol implementation 2012-02-28 17:03:38 -08:00
Sheng Yang 0d2693c1c4 Add element_id for 3.0 upgrade 2012-02-28 16:19:38 -08:00
Alena Prokharchyk 2eaefc4aa8 Fixed unittest and some issues with 2.2.14-3.0 upgrade 2012-02-28 15:17:14 -08:00
Likitha Shetty 62610f9207 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2012-02-28 15:03:01 +05:30
Vijayendra Bhamidipati 83101a752f Bug 13127: API error text refer to database ids instead of uuids 
Description:

	Modified the IdentityTypeAdapter's custom serializer to
	identify whether this is an exception response that is being
	serialized, by checking if the idFieldName is set. If so,
	serialize both uuid and the uuidProperty (for eg, zoneId and
	"zoneId" (string)) and pass back the json representation of that.

	Modified XML serializer also to build a list of uuids+fieldnames.

	Introduced a new field "cserrorcode" in ExceptionResponse. This
	refers to an error code that can be according to the specific
	Exception being thrown. This will be serialized as usual. There
	shouldn't be any need to do a db lookup for conversion for these
	error codes.
 2012-02-27 17:55:06 -08:00
Vijayendra Bhamidipati 59631452b9 Bug 13127: API error text refer to database ids instead of uuids 
Description:

	Modify Exception handling to enable addition of multiple
	uuids in a single exception thrown by API functions. Both
	XML and JSON outputs will store all uuids and Fieldnames.
	This will make it easier to provide more information when
	an exception occurs - for example, a zone id, a cluster id,
	host id, and then a specific property id.
 2012-02-27 17:55:03 -08:00
Vijayendra Bhamidipati bfe1122bc6 Bug 13127: API error text refer to database ids instead of uuids 
Description:

	Added a field name for the db id in the IdentityProxy class, and
	modified setProxyObject() to take an additional id name parameter.
	This will let us know the name of the uuid that we are returning.
	E.g.- domainId, zoneId, etc. The client can view this field in
	the json/xml output. Modified the JSON/XML serialization routines
	to append this new parameter to the serialized output for Exception
	Responses.
 2012-02-27 17:55:01 -08:00
Vijayendra Bhamidipati e5b4cf5cf1 Bug 13127: API error text refer to database ids instead of uuids 
Description:

	1) Put in an IdentityProxy object in the ExceptionResponse class.
	   This allows us to copy over the IdentityProxy object contained
	   in the exception caught by handlerequest() when thrown by the
	   command's execute() method, into the Response object that is
	   prepared to return an exception response to the calling API
	   invocation.

	2) Modified the GSON serialization method to conver the entire
	   exception object into JSON format and not just the error text.

	3) Modify the updateDomain API to populate the exception it throws
	   upon detecting a duplicate domain to include the tablename and
	   domain db id in the exception's IdentityProxy object.

	NOTE:
	1) We can modify the base exception classes and the ExceptionResponse
	   class to contain a list of IdentityProxy objects rather than a
	   single one.
	2) We will need to modify all commands such that wherever applicable
	   (wherever a db id is involved), they populate the IdentityProxy
	   object(s) before throwing an exception.
 2012-02-27 17:54:58 -08:00
Vijayendra Bhamidipati c3fbe29cf8 Bug 13127: API error text refer to database ids instead of uuids 
Description:

	1) Added a setProxyObject() method to CloudException and RuntimeCloudException
	2) Modified a bunch of throw exceptions in NetworkManagerImpl.java to call setProxyObject() before throwing an exception.
	3) Changed scope of ProxyIdentity attribute to protected.
	4) Added routines to ServerApiException to get/set IdentityProxy object, and
	   routine in RuntimeCloudException to get the Idproxy object.
	5) Modified the exception handling around the dispatcher and handlerequest()
	   to copy over the IdentityProxy information before rethrowing an exception
	   eventually back to handle().
	6) Removed duplicate IdentityProxy object in ServerApiException.
	   It was extending RuntimeCloudException which already had an
	   IdentityProxy object.
 2012-02-27 17:54:56 -08:00
Vijayendra Bhamidipati 768d7a2a26 Bug 13127: API error text refer to database ids instead of uuids 
Description:

1)	Moved RuntimeCloudException from api/ to utils/.

	Added simple constructor to RuntimeCloudException.

	Modified all classes that extended RuntimeException
	to extend RuntimeCloudException. These classes
	are listed below:

		ServerApiException
		CloudAuthenticationException
		CloudExecutionException
		AsyncCommandQueued
		HypervisorVersionChangedException
		RuntimeCloudException

2)	Added overloaded constructed to CloudException.
	Modified all classes that extend Exception to extend CloudException instead.
	These classes are listed below:

		ConcurrentOperationException
                ConflictingNetworkSettingsException
                ConnectionException
                DiscoveryException
                InsufficientCapacityException
                ManagementServerException
                ResourceUnavailableException
                VirtualMachineMigrationException
                AgentControlChannelException
                OperationTimedoutException.java
                UnsupportedVersionException.java
                UsageServerException.java
                UnableDeleteHostException.java
                AgentAuthnException.java
                HttpCallException.java
                ActiveFencingException.java
                ClusterInvalidSessionException.java
                GreTunnelException.java
                OvsVlanExhaustedException.java
 2012-02-27 17:54:53 -08:00
U-CITRITE\vijayendra1 698c1ebe12 Bug 13127: API error text refer to database ids instead of uuids 
Description:

1)	Adding two new classes, CloudException and RunTimeCloudException.
	The former extends Exception and the latter RunTimeException.
	These will be used by classes that formerly directly extended
	Exception and RuntimeException. These two classes have an attribute
	of type IdentityProxy to enable exceptions fill in db ids in separate
	attribute fields rather than in a string. Doing so will allow the
	serialization module (GSON for JSON and other for XML) to kick in
	and convert this db id to a uuid in ApiServer.java just before the
	JSON/XML responses are sent out.

2)	Moving IdentityProxy.java from api/ to utils/ since
	both CloudException and RuntimeCloudException refer to it.

3)	Changing references to IdentityProxy class from api/ to utils/.

4)	While rebasing to master, a new file was added, merging
	api/src/com/cloud/api/response/IsoVmResponse.java to this diff.
 2012-02-27 17:54:50 -08:00
Kelven Yang 7eded374b7 bug 13860: add sanity check to ApiResponseSerializer when serializing XML response. Reviewed-By: Anthony 2012-02-27 16:07:39 -08:00
Kelven Yang 2d9a949ff8 bug 13989: get domr control IP from NIC table, the old private ip in domain_router table is no longer valid under basic zone configuration. Reviewed-By: Anthony 2012-02-27 15:05:18 -08:00
Alena Prokharchyk 50b2c26d3e Fixed XML api writer 
Reviewed-by: Alena
 2012-02-27 12:38:30 -08:00
Likitha Shetty 61ec79da44 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2012-02-27 14:43:50 +05:30
Alena Prokharchyk 8f988b97cb Clone services map when do provider/service verification during network offering addition. 
Reviwed-by: Prachi Damle
 2012-02-24 15:32:01 -08:00
Kelven Yang b597362e50 bug 13989: GetDomRVersion command context is not correctly set for VMware under Basic zone configuration. Reviewed-By: Anthony 2012-02-24 10:01:07 -08:00
Alena Prokharchyk 6612744c61 bug 13971: return only offerings with matching tags when zoneId is passed in and corresponding zone has more than 1 physical network 
status 13971: resolved fixed
Reviewed-by: Prachi Damle
 2012-02-23 16:52:50 -08:00
Alena Prokharchyk c052d96428 bug 13966: cleanup the vm (stop it on the backend) when work step is Release. Also never retry when finalizeStart failed 
status 13966: resolved fixed
reviewed-by: Alex Huang
 2012-02-23 15:13:47 -08:00
frank d9019b3f70 Bug 13962 - CloudRuntimeException: Failed to update keypairs on disk: cannot create key file null/.ssh/id_rsa 
Changes for Script.java:
1. Even the script is non-timeout one, set default timeout to one hour. This avoid a wrongn script forever hang
2. When InterruptedException happens, check if timeout is really reached, if not, continue

status 13962: resolved fixed
reviewed-by: Alex, Edison
 2012-02-23 13:43:10 -08:00
anthony cde66fb4fe bug 13832: fixed NPE 
status 13832: resolved fixed
 2012-02-23 13:27:01 -08:00
Alena Prokharchyk f03fc196ad bug 13961: always return NetworkUsageAnswer from the networkUsageCommand 
status 13961: resolved fixed
Reviewed-by: Alex Huang
 2012-02-23 11:15:38 -08:00
Sheng Yang e2c7fe5f4f Fix debug messages in RulesManagerImpl 
Reviewed-by: Edison
 2012-02-23 10:58:57 -08:00
Alena Prokharchyk 836a063a9e bug 13924: default Firewall provider to Juniper when Juniper is a provider for Pf/StaticNat or source nat service 
status 13924: resolved fixed
reviewed-by: Will Chan
 2012-02-22 18:46:04 -08:00
Alena Prokharchyk 6b9abf832b bug 13944: when delete the account, expunge detached volumes on the backend 
status 13944: resolved fixed
Reviewed-by: Frank Zhang
 2012-02-22 17:59:22 -08:00
prachi f619e26c48 Bug 13850 - VM stuck in starting state if it is started during the HA-Work of the corresponding router 
Reviewed-By: Kelven

Changes:
- Update the pending work Item to be DONE if we are changing the VM state during fullSync.
 2012-02-22 17:36:00 -08:00
prachi e37732c4de Bug 13766 - VMs are still running after disabling the zone 
Reviewed-by: Sheng Yang

Changes:
- Do not check if allocation_state is 'Enabled' in planner if the caller is Root Admin.
- This should let Root Admin create a VM in a disabled Zone.
 2012-02-22 17:34:00 -08:00
Edison Su 90020679a4 bug 13771: don't send pre snapshot if it's migrated 
status 13771: resolved fixed
Reviewed-by: anthony
 2012-02-22 17:21:24 -08:00
Alena Prokharchyk 798accae10 Added isTagged parameter to listNetworkOfferings api. When set to true, it will return offerings with not null tag values 
Reviewed-by: Jessica Wang
 2012-02-22 16:09:35 -08:00
Alena Prokharchyk d4a8db75d7 bug 13763: fixed api doc for logout command 
status 13763: resolved fixed
Reviewed-by: Jessica Tomechak
 2012-02-22 15:17:22 -08:00