Commit Graph

6469 Commits

Author SHA1 Message Date
Prachi Damle 7201eb9ee4 CLOUDSTACK-1968: affinity_groups: Column 'deployment planner' cannot be null when creating a service offering
Added default value to all constructors..
2013-04-11 13:23:37 -07:00
Prachi Damle d38bf8a10c More log statements to debug 2013-04-11 13:23:27 -07:00
Prachi Damle 0f565f2167 Fixes to de-couple the AffinityGroupResponse from UserVmResponse, since ApiDiscoveryService breaks, if we nest two response objects into each other. 2013-04-11 13:23:25 -07:00
Prachi Damle 3403b54773 Added AffinityGroup View in order to include VM details while listing AffinityGroups. 2013-04-11 13:23:23 -07:00
Prachi Damle 09a6eb735d Changes to return affinity groups information during listVMsCmd 2013-04-11 13:23:20 -07:00
Prachi Damle 0b3850c14f Added cleanup of affinitygroups when a VM is expunging and when the account is deleted. 2013-04-11 13:23:18 -07:00
Prachi Damle b633dde744 Adding a unit test for the new affinity groups API 2013-04-11 13:23:11 -07:00
Prachi Damle ee45437036 Build failure fixes after rebase. 2013-04-11 13:23:08 -07:00
Prachi Damle c7c899f62d Fixes after functional tests
Conflicts:

	client/tomcatconf/commands.properties.in
2013-04-11 13:23:04 -07:00
Prachi Damle bb9bdf0173 Changes to make affinity group types configurable. 2013-04-11 13:23:01 -07:00
Prachi Damle 708157d33f API changes to expose the commands 2013-04-11 13:22:59 -07:00
Prachi Damle c8ae2a9d25 API to list planners and set the planner in Service offering
Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql
2013-04-11 13:22:56 -07:00
Prachi Damle e9300d2676 DAO constructor should be lightweight to make Spring DI faster. 2013-04-11 13:22:51 -07:00
Prachi Damle bf9221a370 Separated out host anti-affinity as a plugin. 2013-04-11 13:22:45 -07:00
Prachi Damle fe2a86871f Changes to add AffinityGroupprocessor, deployVM changes 2013-04-11 13:22:42 -07:00
Prachi Damle 1aed5bf9c2 ListAffinityGroups API changes 2013-04-11 13:22:38 -07:00
Prachi Damle 50f53c86f5 DeleteAffinityGroup API changes 2013-04-11 13:22:34 -07:00
Prachi Damle 1e205a3d0b More API changes 2013-04-11 13:22:30 -07:00
Marcus Sorensen ca8ac08cf3 CLOUDSTACK-2003: When accounts and domains are deleted, cleanup can fail,
leaving instances in eternal expunged state. This happens when a domain is
deleted while a deleted account is cleaning up. The cleanup looks for the domain
of the account and we hit a null pointer. Adding null pointer check.

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

Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-04-10 11:35:58 +08:00
Kelven Yang 913f73ab6b Apply patch https://reviews.apache.org/r/10137/ 2013-04-09 17:29:21 -07:00
Chiradeep Vittal 2e6c65fd34 QuickCloud: sanitize logs for normal running of agents outside systemvm 2013-04-09 14:45:27 -07:00
Chiradeep Vittal 271d232d62 QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package
QuickCloud: fix license issue
QuickCloud: use a different activation for deploying quickcloud
Otherwise marvin gets invoked during mvn install -Dquickcloud
2013-04-09 14:45:27 -07:00
Chiradeep Vittal 5ff8bcaa2e QuickCloud: when using SSVM, pass in the new name of the SS class (com.cloud -> org.apache.cloudstack)
QuickCloud : configuration moved to applicationContext.xml from componentContext.xml
QuickCloud: default to enabled state for devcloud zone
QuickCloud: environment.properties helps customize location of pid file
2013-04-09 14:45:26 -07:00
Chiradeep Vittal c5b11df6b7 QuickCloud: option to build with componentContext tailored for quickcloud
For now it replaces ConsoleProxyManagerImpl with StaticConsoleProxyManager
Usage: mvn install -Dquickcloud

QuickCloud: rename deploy profile

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

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-04-08 17:29:54 -07:00
Jessica Wang 98bc240d2a Revert "Dedicate Public IP range"
This reverts commit d6ed8d7cb5.

Conflicts:

	server/test/com/cloud/configuration/ConfigurationManagerTest.java
2013-04-08 17:15:51 -07:00
Chiradeep Vittal 67a99cbbc3 CLOUDSTACK-524: in some cases (especially the built-in CentOS template), the template downloader does not use the configured http proxy
The DownloadProgress command is used to restart failed or stuck download jobs --
It would not include the proxy information, unlike the DownloadCommand which always did

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-04-08 17:07:35 -07:00
Likitha Shetty d6ed8d7cb5 Dedicate Public IP range 2013-04-08 14:46:21 -07:00
Mice Xia a85b498afd 1) fix CLOUDSTACK-1946 2) remove redundant VMSnapshotVO.java 2013-04-07 17:41:26 +08:00
Alena Prokharchyk 42ffac3ae8 CLOUDSTACK-1895: save placeholder nic with not null vmType='DomainRouter' when placeholder is used for the VR ip address 2013-04-04 13:29:17 -07:00
Hugo Trippaers f1259d50bd Fix for _pingTimeout being 0 in AgentMonitor
With commit d79f1f6fdc the AgentMonitor
was replaced with a pluggable service. However the ping timeout in the
original constructor was not passed on anymore, leading to a default
pingTimout of 0. This would fail all agents constantly.

Modified the startMonitor command to take a pingtimeout as an argument
and instruct AgentManagerImpl to pass it along.
2013-04-04 14:23:42 +02:00
Edison Su f18a1d6f14 fix bunch of bugs related to zone wide storage 2013-04-03 21:51:17 -07:00
Brian Spindler 469c4dd139 Removing ^M's from code.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-04 00:53:20 +05:30
Dave Cahill eddf7b9357 MidoNet Networking Plugin
- Supports DHCP, Source NAT, Static NAT, Firewall rules, Port Forwarding
- Renamed MidokuraMidonet to MidoNet
- Related Jira ticket is CLOUDSTACK-996

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

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

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

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

Build
$ mvn -Pdeveloper -Dsimulator clean install

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

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

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

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

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:30 +05:30
Mice Xia 4edef1fd30 fix CLOUDSTACK-1700 2013-04-02 17:36:51 +08:00
Mice Xia dedec164e8 fix CLOUDSTACK-1698 2013-04-02 17:36:51 +08:00
Phong Nguyen aa79ccf985 CLOUDSTACK-922: LXC Support in Cloudstack.
Signed-off-by: Edison Su <sudison@gmail.com>
2013-04-01 15:41:42 -07:00
Jayapal Reddy 8dd0b7747b Mulitiple ip address per nic support for advacned shared networks
Description:
Changes added for supporting multiple ip address per nic for shared networks

Testing Done:
Tested adding and removing the ip for nic using the APIs
2013-04-01 16:24:48 +05:30
Bharat Kumar 355589c1f0 CLOUDSTACK-1395 Upgrade script for cpu and ram overcommit.
It sets the overcommit values of all the clusters to 1.
2013-04-01 10:43:16 +05:30
Alena Prokharchyk cf72aa3274 Fixes/improvements for VPC feature:
1) Added comments to VPC/VPCService/VPCManager interfaces
2) Moved VPC offering related methods from VpcService to the new interface - VpcProvisioningService
3) Fixed static nat creation in the VPC - used to result in NPE due to invalid method referencing while obtaining VPC VR information
2013-03-29 16:56:01 -07:00
Kelven Yang 85971b5194 CLOUDSTACK-1818: make DababaseCreator ready to invoke DatabaseUpgradeChecker, adjust Component startup sequence for integrity checkers
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-29 11:12:36 -07:00
Kelven Yang 3ab744d100 CLOUDSTACK-1795: implement custom AOP to fully support legacy CloudStack AOP semantcis
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-29 11:12:36 -07:00
Kelven Yang 8bb0990144 CLOUDSTACK-1795: implement custom AOP to fully support legacy CloudStack AOP semantcis (rebase fixups) 2013-03-29 11:12:36 -07:00
Kelven Yang 16216720c6 CLOUDSTACK-1276, CLOUDSTACK-1729: Remove autoscanning, ensure adpater execution order in runtime 2013-03-29 11:11:20 -07:00
Alena Prokharchyk e00f22df8a CLOUDSTACK-240: added id/uuid fields to remote_access_vpn table and corresponding VO/Dao objects. The DB upgrade is covered as well. Now tags can be created for the VPN object 2013-03-29 10:40:28 -07:00
Hugo Trippaers 9a5bf78c3e Better error handling for some corner cases
Make the exceptions more descriptive so admins can pinpoint the issue
easier.
2013-03-29 12:06:03 +01:00
Hugo Trippaers 95fce11215 CLOUDSTACK-1156 Fix small typo 2013-03-29 12:05:58 +01:00
Murali Reddy 48311363d6 CLOUDSTACK-1834: Events are not generated for registerUserKeys(),
Enabling account and Editing account.
2013-03-29 15:54:00 +05:30
Murali Reddy b585fa11c1 removing @Autowired, which is not JSR complaint.
initializing the bean 'GlobalLoadBalancingRulesServiceImpl' through the componentContext.xml
2013-03-29 15:53:59 +05:30
Sanjay Tripathi 18695276f7 CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts
Addition of two new resource types i.e. Primary and Secondary storage space in the existing pool of
    resource types.
    Added methods to set the limits on these resources using updateResourceLimit
    API command and to get a count using updateResourceCount. Also added calls in the
    Templates, Volumes, Snapshots life cycle to check these limits and to increment/decrement the new
    resource types

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

    Also added jUnit Tests for the same.
Reviewed by : nitin mehta<nitin.mehta@citrix.com>
2013-03-29 11:26:38 +05:30
Sheng Yang e3f67d126d CLOUDSTACK-1827: Fix redundant router update mechanism
There is a bug that if the smaller number ID RvR stop running, that pair of
RvR's status won't be updated. This patch fixed it.
2013-03-28 15:54:07 -07:00
Nitin Mehta 3e4430d811 CLOUDSTACK-658 - Scaleup vm support for Xenserver
Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests.
2013-03-28 16:43:37 +05:30
Murali Reddy f8b8f60977 Inject GslbServiceProvider using @Inject fails in oss build, as it requires an
implemenation by default to autowire but only implementation avaialable
is in nonoss plugin. So using autowired required=false for injecting
GslbServiceProvider that will work with both oss and non-oss builds.
2013-03-28 16:20:13 +05:30
Murali Reddy e8a144a21d BLOCKER: oss jetty server fails to launch
temporarily disabling spring injection of GslbServiceProvider as only
implementing class is in non-oss, so oss build fails to launch with no
bean fpund exception
2013-03-28 08:49:35 +05:30
Murali Reddy f414b8a850 CLOUDSTACK-1804:Upgrade 4.0 -> 4.1 - DB upgrade fails.
remove the data migration functions that were accidently introduced by
commit b6727e5646
2013-03-27 18:06:22 +05:30
Murali Reddy c5fb8349bf CLOUDSTACK-653 : High Availability: implement GSLB (Global Server Load
Balancing) capability for ELB service

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

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

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-27 15:56:13 +05:30
Alena Prokharchyk 26b892daf3 CLOUDSTACK-1771: fixed VirtualRouter nics assignment in the Shared networks. Before the fix VR could get a different IP address from the network upon recreation. With the fix the IP address assigned to the first VR in the network, will remain with the network till its entire lifecycle (stored in placeholder nic) and will be assigned to the VR every time it recreates in the network.
Shared networks in both - Advance and Basic - zone types are covered by this checkin
2013-03-26 13:29:57 -07:00
Brian Spindler ae3a048350 CLOUDSTACK-1736: Changes required to get cloudstack-management service
working again.

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

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

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

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

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

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

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

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-16 15:22:51 -04:00
Min Chen 1dc1bf00c6 CLOUDSTACK-1684: api.throttling.enabled configuration setting should be set to "false" in Config.java. 2013-03-14 21:17:35 -04:00
Sanjay Tripathi 105618896b CLOUDSTACK-1645 : Resources limit is not validated with update compute offering [ Instances are updated to higher CPU/Memory resources though there are no resources available @ account/domain] 2013-03-14 13:44:34 -07:00
Sheng Yang 98291d043d CLOUDSTACK-1218: Use the first IP in the first vlan range for VR in shared network 2013-03-14 13:13:31 -07:00
Prachi Damle a7231015e8 CLOUDSTACK-1604: deploy VM failed when global setting "vm.allocation.algorithm" is set to "userdispersing"
Changes:
- DeployPlannerSelector was newly introduced for BareMetal feature. It had the planner name hardcoded.
- Change it to decide the planner by referring to the global config vm.allocation.algorithm value
2013-03-14 11:24:35 -07:00
Kishan Kavala 2dd31f331d CLOUDSTACK-1636: Removed the concept of owner region.
Removed region_id from user/account and domain tables.
Removed forwarding of api calls to owner region.
Removed api_key and secret_key from region table.
Included related DB upgrade changes.
2013-03-14 11:53:40 +05:30
Jayapal Uradi b4bab5a152 CLOUDSTACK-1595 removeIpFromNic using uuid and response changes
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-03-13 14:46:31 +05:30
Rohit Yadav 0f8c4d0ac0 baremetal: Remove old templateadapter in cloud-server, fix spring xmls
The BareMetalTemplateAdapter in cloud-server is old and was introduced by recent
branch merges, Frank had separated and moved code to the baremetal plugin so
we will use that.

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

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

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

Signed-off-by: Venkata Swamybabu Budumuru <venkataswamybabu.budumuru@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-06 10:28:37 +05:30
Kelven Yang f077fd9b29 Make RecreatableFencer's constructor public so that it can instantiated through reflection 2013-03-05 19:03:31 -05:00
Kelven Yang 3f2b771e07 CLOUDSTACK-1173: fix the regression caused by life-cycle management changes 2013-03-05 19:03:30 -05:00
Kelven Yang 333dd810d2 CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory 2013-03-05 19:03:30 -05:00
Kelven Yang 72e6fd6e8d CLOUDSTACK-1362: Put a workaround fix to set excutable attribute of injectkys.sh at runtime 2013-03-05 19:03:30 -05:00
Min Chen 33757377c0 CLOUDSTACK-1465: We should pass array instead of a List for SearchCriteria.Op.IN as value. 2013-03-05 14:20:55 -08:00
Min Chen 9c5c4753e9 CLOUDSTACK-1484: provide api.throttling.enabled gloabl configuration settings to enable/disable api throttling feature. 2013-03-05 09:44:09 -08:00
Min Chen 5750fd9631 CLOUDSTACK-1190: make APIChecker throw one sensible exception. 2013-03-05 09:44:08 -08:00
Min Chen 613a061977 Merge branch 'master' into vim51_win8
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
2013-03-04 17:32:52 -08:00
Min Chen 48aa035a71 CLOUDSTACK-1449: listAccounts and listProjectAccounts API lists all the users not account-specific users for each account returned. 2013-03-04 14:42:32 -08:00
Nitin Mehta b12aebefee Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes"
This reverts commit e0019eccd9.
2013-03-04 23:32:52 +05:30
Nitin Mehta e0019eccd9 CLOUDSTACK-658 - Adding Scalevm command and XS related changes 2013-03-04 14:47:55 +05:30
Jayapal Uradi aedb8c478e CLOUDSTACK-24: mipn feature for isolated and vpc networks
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC
 https://issues.apache.org/jira/browse/CLOUDSTACK-24
2013-03-04 11:02:09 +05:30
Min Chen 8b9c45b96d Merge branch 'master' into vim51_win8
Conflicts:
	setup/db/db/schema-40to410.sql
2013-03-01 16:46:58 -08:00
Abhinandan Prateek 14791a9d8f Revert "CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes."
This reverts commit f9d96c9169.
2013-03-01 22:29:47 +05:30
Jayapal Uradi f9d96c9169 CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes. 2013-03-01 16:40:26 +05:30
Roeland Kuipers 68b836d46d review 8701: createSetupGuestNetworkCommand in
VpcVirtualNetworkApplianceManagerImpl.java fails when the broadcast URI
is not a long

Fixed whitespace issues

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-03-01 09:38:56 +01:00
Min Chen 801e5269ea Merge branch 'master' into vim51_win8 2013-02-28 14:25:26 -08:00
Min Chen 6f19895191 Remove unused RandomlyIncreasingVMInstanceDaoImpl to avoid confusion.
Confirmed with Kishan about this.
2013-02-28 14:17:58 -08:00
Kishan Kavala 1d31c3ecaf CLOUDSTACK-241: Moved regions upgrade changes to Upgrade40to41.jav from schema file. Sets the right regins_id from db.properties instead of using default 1.
Conflicts:
	setup/db/db/schema-40to410.sql
2013-02-28 14:35:23 +05:30
Mice Xia 91417115ef CLOUDSTACK-1401 NPE: listCapacity 2013-02-28 11:46:10 +08:00
Min Chen 93f14e7c65 Merge branch 'master' into vim51_win8
Conflicts:
	client/tomcatconf/componentContext.xml.in
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
	vmware-base/test/com/cloud/vmware/TestVMWare.java
2013-02-27 17:47:10 -08:00
Prachi Damle 9afd33d206 CLOUDSTACK-1418- As regular user , we are not allowed to deploy VM on a shared network.
- Added the access type attribute to @acl
- Domainchecker needs the AccessType.UseNetwork value specified to check access to network
2013-02-27 17:16:49 -08:00
Sheng Yang 50f995f8b4 CLOUDSTACK-1170: Use a unified way to generate PublicIp
Tired of manually generate mac address everytime when create PublicIp object.
2013-02-27 14:20:26 -08:00
Murali Reddy 3e0bdaac1e CLOUDSTACK-1391: EventBus is not getting injected after javelin merge
added logic to inject event bus using ComponentContext.getComponent

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

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

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

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

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

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

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

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

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

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-27 13:35:26 +05:30
Edison Su cc81413931 CLOUDSTACK-724: add zone wide storage, createstoragepoolcmd doesn't need cluster/pod any more 2013-02-26 23:16:17 -08:00
Harikrishna Patnala 254275dc26 CLOUDSTACK-1293: resetpasswordforVm shows "passsd reset to undefined" 2013-02-27 12:35:04 +05:30
Sheng Yang a76301bbbe CLOUDSTACK-1232: Only support cidr=64 in IPv6 2013-02-26 19:46:45 -08:00
Edison Su 8e360f342d CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support 2013-02-26 18:39:23 -08:00
Min Chen 8aba25f18d Merge branch 'master' into vim51_win8
Conflicts:
	setup/db/db/schema-410to420.sql
2013-02-26 14:12:36 -08:00
Kishan Kavala 0b35f7184d CLOUDSTACK-1289: Added missing usage command processing for External firewall device. ExternalLoadBalancerUsageManagerImpl should be renamed as ExternalDeviceUsageManagerImpl 2013-02-26 17:34:10 +05:30
Wei Zhou fc3905fb57 CLOUDSTACK-962:setAggBytesSent/setAggBytesReceived in NetworkUsageTask when not in case of dailyor hourly
Removed duplicate userstatsdao injection
2013-02-26 16:27:59 +05:30
Rohit Yadav da7c0b1437 spring: Remove annotations from interfaces and abstract classes
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 14:52:31 +05:30
Kishan Kavala e37fdce125 CLOUDSTACK-241: Removed API based account sync. Removed all the related API changes and RegionsAPIUtil.
Converted tabs to spaces in the related files.
Verified account, user and domain APIs.
2013-02-26 14:21:21 +05:30
Sanjay Tripathi 10236bee26 CLOUDSTACK-1374 - When user uploads a volume using uploadVolume API command, only volume_host_ref table is getting updated with corresponding size of volume and "volumes" table, the size of volume still remains zero even ager the volume gets completely downloaded.
Signed-off-by: Nitin Mehta <nitin.mehta@citrix.com>
2013-02-26 10:51:25 +05:30
Sheng Yang cf90b6cd10 CLOUDSTACK-1332: Add ip6dns to zone and domainrouter response 2013-02-25 19:12:09 -08:00
Sheng Yang 596e940264 CLOUDSTACK-1332: Pass IPv6 DNS to VR 2013-02-25 16:08:15 -08:00
Sheng Yang 1b408509d6 CLOUDSTACK-1332: Add IPv6 DNS for Zone 2013-02-25 16:08:10 -08:00
frank cd291f6b4b From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001
From: Vijayendra <vijayendra.bhamidipati@citrix.com>
Date: Mon, 25 Feb 2013 14:37:27 -0800
Subject: [PATCH] CS-670: Configurable setting to use linked clones or not on
 VMware

Description:

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

Signed-off-by: Vijayendra <vijayendra.bhamidipati@citrix.com>
---
 core/src/com/cloud/vm/UserVmCloneSettingVO.java    |  50 ++++++
 .../hypervisor/vmware/manager/VmwareManager.java   |   3 +
 .../vmware/manager/VmwareManagerImpl.java          |  18 +-
 .../hypervisor/vmware/resource/VmwareResource.java | 117 +++++++++----
 server/conf/migration-components.xml               |   1 +
 server/src/com/cloud/configuration/Config.java     |   1 +
 server/src/com/cloud/vm/UserVmManagerImpl.java     | 184 ++++++++++-----------
 .../com/cloud/vm/dao/UserVmCloneSettingDao.java    |  37 +++++
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java    |  74 +++++++++
 .../vm/dao/UserVmCloneSettingDaoImplTest.java      |  62 +++++++
 .../UserVmCloneSettingDaoTestConfiguration.java    |  52 ++++++
 .../test/resources/CloneSettingDaoTestContext.xml  |  42 +++++
 setup/db/db/schema-410to420.sql                    |   9 +
 13 files changed, 527 insertions(+), 123 deletions(-)
 create mode 100755 core/src/com/cloud/vm/UserVmCloneSettingVO.java
 create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDao.java
 create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
 create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java
 create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java
 create mode 100644 server/test/resources/CloneSettingDaoTestContext.xml
2013-02-25 14:57:57 -08:00
Min Chen 084b6f3e05 Merge branch 'master' into vim51_win8 2013-02-25 11:55:12 -08:00
Min Chen fbfc5c6894 Merge from master and fix conflicts 2013-02-25 11:53:24 -08:00
Edison Su 310e99087f CLOUDSTACK-1380: add db upgrade for vm_template, in 4.1 to 4.2 upgrade procedure 2013-02-25 10:45:04 -08:00
Vijayendra Bhamidipati 6675d2c1a3 CLOUDSTACK-778: user provided hostname to be specified in vCenter instead of CloudStack generated name
Introducing flag to allow display name to be appended to internal instance name.
2013-02-25 18:57:18 +05:30
Kishan Kavala 836ce6c11a CLOUDSTACK-749: External device support for VPC. VPC offering can be created with providers other than VPCVirtualRouter 2013-02-25 18:32:23 +05:30
Deepti Dohare 4d573ddd1b CLOUDSTACK-357 ISOs can be deleted while still attached to a running VM, and they subsequently cannot be detached from a running VM
I made the changes to make sure that:
1. ISO will be deleted from the UI, but it is not deleted from the secondary storage as long as it is attached to a VM.
2. The storage cleanup thread will check whether the iso is attached to any vm, if not, it removes the ISO from the secondary storage.
3. Detach operation is now working which was failing before for the vms having attached iso(deleted).

Updated the patch for template sync during MS restart.

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

test cases:
1. delete ISO1 from UI, gets deleted
2. In VM Details of VM1 and VM2, can see detach ISO option
3. ISO1 exists in secondary storage
4. detach ISO1 from VM1, successful
5. ISO1 still exists in secondary storage.
6. Restart MS, template sync will not delete ISO1.
7. Detach ISO1 from VM2, successfull detached.
8. Wait for storage cleanup thread to execute, ISO1 gets deleted from Secondary storage.
9. Detach ISO2 from VM3
10.ISO2 exists in secondary storage, Delete ISO2 form UI, get deleted from secondary storage.
2013-02-25 16:02:25 +05:30
Alex Huang ac1b529f78 Revert "Revert "Fix fresh db install problem. (still pending one part of finding db""
This reverts commit ebcf6b1b7c.
2013-02-23 19:16:13 -08:00
Min Chen ebcf6b1b7c Revert "Fix fresh db install problem. (still pending one part of finding db"
This reverts commit 5b760f903f.
2013-02-22 21:38:15 -08:00
Min Chen 5b760f903f Fix fresh db install problem. (still pending one part of finding db
script file correctly).
2013-02-22 18:01:55 -08:00
Bharat Kumar 667aa17512 CLOUDSTACK 711: CPU and RAM overcommit update cluster part 2013-02-22 20:09:50 +05:30
Bharat Kumar 23e54bb0f4 Cloudstack-711: Cpu and Ram Overcommit Ratio. 2013-02-22 17:31:06 +05:30
Saksham Srivastava ea3db2f073 CLOUDSTACK-705 IP Address reservation for Isolated Guest Networks
CloudStack uses Guest CIDR for dhcp-range for the Guest VMs. The entire
CIDR is used by CloudStack for assigning IPs to Guest VMs. IP Address
Reservation will allow part of address space to be used fornon CloudStack
hosts/physical servers also, by restricting the address space of CloudStack
Guest VMs. Reservation can be configured using update Network API by specifying
guestvmCidr as an additional parameter. Reservation will be applicable for
Isolated Guest Networks including VPC. reservediprange in the response
will return the IP range that can be used for non Cloudstack hosts.

Tested manually the following scenarios:
Applying reservation when there are running VMs inside the
guest_vm_cidr.
Applying reservation when there are running VMs outside the
guest_vm_cidr.(not allowed)
Applying reservation when external device like Netscaler is configured
in the guest_cidr.
Applying reservation in VPC tiers.
Applying reservation outside the range of guest_cidr.(not allowed)
2013-02-22 15:50:33 +05:30
Mice Xia dae57c1ab2 add missing license header reported by rat 2013-02-22 13:22:14 +08:00
Sheng Yang a0762bc4a7 CLOUDSTACK-1303: Fix NPE when extend vlan with ipv4 only 2013-02-21 18:02:50 -08:00
Prachi Damle 6823adb3ac CLOUDSTACK-1367 NPE noticed in logs while AgentMonitor is monitoring the host ping interval
Added null check. If the host is not found, we dont ping anymore.
2013-02-21 17:40:08 -08:00
frank 1689062334 remove BareMetalVmManagerImpl.java thiat is unused 2013-02-21 17:05:19 -08:00
Edison Su 3bb713c5ce fix adding nfs primary storage and build and load 2013-02-21 16:24:39 -08:00
frank 15ead099a1 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

able to start vm

Conflicts:

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

adding missing scripts back

Conflicts:

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

fixing bugs to align to new code base

Conflicts:

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

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

       CLOUDSTACK-1208: Failed to shutdown guest network

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

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

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

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

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

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

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

Seems like a typo after network refactor.
2013-02-12 20:27:31 -08:00
Sheng Yang 2776ad14c8 CLOUDSTACK-1242: Fix inline mode
Network refactor dropped many inline mode codes. I've added at least part of
them back. Now I can create LB rule for inline mode.
2013-02-12 20:27:26 -08:00
Min Chen c0442e2556 Fix a bug in register template, cannot find template adapter. 2013-02-12 16:56:02 -08:00
Sanjay Tripathi 5828e526b3 CLOUDSTACK-713: Limit Resources(CPU and Memory) to domain/accounts
Addition of two new resource types i.e. CPU and Memory in the existing pool of
resource types.
Added some methods to set the limits on these resources using updateResourceLimit
API command and to get a count using updateResourceCount. Also added calls in the
Virtual machine life cycle to check these limits and to increment/decrement the new
resource types

Resource Name  :: Resource type number
    CPU               8
    Memory            9

Also added Unit Tests for the same.
2013-02-12 12:02:07 -08:00
Rohit Yadav bd034e0b9f CLOUDSTACK-1243: Add @Inject to fix NPE in AccountManagerImpl
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-12 17:58:17 +05:30
Murali Reddy c809d057ef CLOUDSTACK-1241: Network apply rules logic is broken
added logic to check if the network element is configured service
provider for the network before applying rules
2013-02-12 15:28:05 +05:30
Min Chen 6320cad9a1 Merge branch 'master' into vim51_win8 2013-02-11 15:47:08 -08:00
Sheng Yang d9aa051953 Fix a typo
CanUseForDeploy() didn't return correct result due to this
2013-02-08 14:48:14 -08:00
Sheng Yang 0c5c08b78b IPv6: CLOUDSTACK-1107: Add support for createVlanIpRange to extend existed network 2013-02-08 14:48:08 -08:00
Min Chen 1cf85aa87a CLOUDSTACK-1216: insert UUID when we create "admin" user in DB. 2013-02-08 14:18:31 -08:00
anthony 6df0ff2596 fix build issue after revert 2013-02-08 12:30:12 -08:00
anthony c0f2cf1e06 Revert "Revert "CLOUDSTACK-737""
This reverts commit dd67cfc5d0.
2013-02-08 12:19:31 -08:00
anthony b66f6c88f9 Revert "Revert "CLOUDSTACK-737""
This reverts commit 447d49ae91.
2013-02-08 12:19:03 -08:00
Anthony Xu 27d1f3fa07 Revert "CLOUDSTACK-737"
This reverts commit 8a86d08fe3.
2013-02-08 10:47:40 -08:00
Anthony Xu a2fa167613 Revert " CLOUDSTACK-737"
This reverts commit 65210f4e7e.

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

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

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

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2013-02-08 10:42:36 -08:00
Anthony Xu b4f3f92607 Revert " CLOUDSTACK-737,"
This reverts commit 95aef332cc.
2013-02-08 10:29:53 -08:00