Commit Graph

5950 Commits

Author SHA1 Message Date
Rohit Yadav 08892c51a3 api: Fix jobid and entitytype for BaseResponse and QueryAsyncJob*
- Fix jobid serialization issue that broke the UI
- Fix AsyncJob Result and Response
- Get rid of getUuid(), setUuid(), just use getId, setId for uuid...
- All uuids from over the wire are UUIDs

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 20:51:51 -08:00
Rohit Yadav 5572707ec6 maven: Bump httpcore version, add guava and httpclient dependency
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 20:44:48 -08:00
Min Chen 79f8c104eb Remove IdentityProxy from GuestOSResponse and GuestOSCategoryResponse.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 18:01:31 -08:00
Min Chen e017dc2c00 commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44
Author: Min Chen <min.chen@citrix.com>
Date:   Mon Dec 17 17:42:30 2012 -0800

    Remove IdentityProxy from AlertResponse and AsyncJobResponse.

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 17:44:39 -08:00
Min Chen 348d3ae448 Conflicts:
api/src/org/apache/cloudstack/api/response/AccountResponse.java

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

Unit tests added for the new cleaning function as well.

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

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

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

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

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

Conflicts:
	api/src/com/cloud/api/ApiConstants.java
2012-12-17 15:18:31 +05:30
Rohit Yadav f8a483fc5a api: Include cloudstack-version in both xml and json api response
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 21:37:03 -08:00
Rohit Yadav 59fc89abe3 api: Fix ApiServer role base acl logic and response type value
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 18:13:29 -08:00
Min Chen c167ad45e3 Move view based VO and Dao classes to cloud-server module to hide the
details from API client, also extract query related methods into
QueryService interface.
2012-12-14 10:47:58 -08:00
Hugo Trippaers 2235776aed Unittests for NiciraNvpGuestNetworkGuru
These unittests do not depend on the componentlocator but instead are
completely dependent on mock objects. This ensures that they can be run
standalone without any requirements on the environment.

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

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

    Missed encoding of URI when discovering ESX cluster in vCenter.

    Signed-off-by: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
2012-12-13 22:43:59 -08:00
Chip Childers 82a17a413b CLOUDSTACK-505: Removed logging of deployVirtualMachine and resetPasswordForVirtualMachine commands.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-12-13 16:00:30 -05:00
Rohit Yadav 88b7af18e6 api: Revert "Move all the DB view DAOs from cloud-server to cloud-api for future api-server package."
Reverting commit as we don't want the daos to move to cloud-api.
We'll eventually breakout cloud-server and create cloud-api-server for the standalone
api server.

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-13 09:28:42 -08:00
Rohit Yadav 7dbdf786cc api: FIXME for api access checker adapter
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-12 14:21:38 -08:00
Min Chen 472f4f91b9 Refactor ListProjectInvitationsCmd and ProjectInvitationResponse. 2012-12-12 09:04:43 -08:00
Min Chen 3661f7f992 Fix several bugs of new refactored list apis. 2012-12-11 17:37:16 -08:00
Min Chen 9c93fee0dc Refactor ListProjectAccountCmd and ProjectAccountResponse. 2012-12-11 15:49:15 -08:00
Rohit Yadav c455cf9271 api: refactor common code to get classname for an api in ApiServer
- Refactor common code to get classname from apiname
- Fix search mechanism within api access checker adapter to:
  * check permissions
  * get class name for an apiname

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

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

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

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

Thanks to Alex for helping out on this one.

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

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

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 15:29:33 -08:00
Min Chen 1cf8b86ce5 api: Load InstanceGroupJoinDao to component Library
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 15:17:07 -08:00
Min Chen bba96254f5 Refactoring ListVMGroupsCmd and InstanceGroupResponse. 2012-12-10 13:59:20 -08:00
Koushik Das 238c55fb6e CLOUDSTACK-596 : DeployVM command takes a lot of time to return job id Issue happens while deploying VM in advanced zone and 'networkids' parameter is not passed to deployVM command. In this case CS tries to identify a default guest network to be used for deploying VM. This logic is not optimized and latency increases with increase in user accounts and guest networks. Optimized logic for getting default network.
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-12-10 15:02:53 +05:30
Rohit Yadav e398b1e47a api: Refactor command and response classes to org.apache.cloudstack.api.*
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 19:23:24 -08:00
Rohit Yadav af28c06998 api: move and group all under command, org.apache.cloudstack.command.*
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 18:30:54 -08:00
Min Chen 30941c2d31 api: Refactoring ListEventsCmd and EventResponse, and create Event db view.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 16:54:45 -08:00
Rohit Yadav 41268d1237 api: Fix test failure in cloud-server
Added newly added dao class as part of list api optimizations to be picked up
by the locator.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 15:06:51 -08:00
Min Chen acf7afd7f5 api: Refactor ResourceTagResponse and ListTagsCmd, add db view for ResourceTag.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 09:57:52 -08:00
Min Chen 8a313d7f84 api: SecurityGroupResponse and SecurityGroupRuleResponse refactoring
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 16:04:48 -08:00
Min Chen eba353099e api_refactoring: Fix build issue with api_refactoring branch.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 15:00:48 -08:00
Rohit Yadav da6e81aa21 api_refactoring: Fix build issues and incorrect imports
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 13:48:20 -08:00
Rohit Yadav 089db9c631 api_refactor: capacity, hypvsr, alert and cert apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:25:56 -08:00
Rohit Yadav 780eb95830 api_refactor: swift, ldap and vlan apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:13:46 -08:00
Rohit Yadav 28305904e8 api_refactor: move cluster apis to admin package
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:04:24 -08:00
Rohit Yadav 6c2ed5cb66 api_refactor: move pod apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:02:57 -08:00
Rohit Yadav e763fd7d36 api_refactor: move userkeys api to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:59:26 -08:00
Rohit Yadav 1f1ac79a6c api_refactor: move disk and service offering to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:53:42 -08:00
Rohit Yadav ecc8249365 api_refactor: move cfg admin apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:50:26 -08:00
Rohit Yadav ab4fac54e5 api_refactor: move admin level domain apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:44:40 -08:00
Rohit Yadav c3853677c5 api_refactor: move zone apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:41:10 -08:00
Rohit Yadav 7f61d29c37 api_refactor: move zone and hypervisor user level apis to appropriate pkg names
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:36:26 -08:00
Rohit Yadav cc386b791b api_refactor: move storagepool api to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:32:58 -08:00
Rohit Yadav 163fe7b8c3 api_refactor: move systevm apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:28:37 -08:00
Rohit Yadav 1b1d91dc4f api_refactor: move admin level account apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:25:20 -08:00
Rohit Yadav 2a7fa674c7 api_refactor: Move host apis to admin pkg
- Moved host related apis to admin pkg
- Change namespace to org.a.cs.api, fix mappings in commands-prop.

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

  Details:

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

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

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

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

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

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

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

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

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-12-06 11:55:19 +05:30
Murali Reddy 28bbf6c527 Summary: partical check-in for L4-L7 network services in the shared network in the advanced zone
Details:

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

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 20:06:20 -08:00
Rohit Yadav c59de6cbde api_refactor: router apis for admin pkg
- Fix missing api mapping in commands.prop
- Refactor package namespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 15:23:31 -08:00
Rohit Yadav ceddaf122c api_refactor: refactor user apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:55:58 -08:00
Rohit Yadav ba8e61bfb5 api_refactoring: for network api refactoring move interfaces so it works
Move ExternalNetworkDeviceManager to cloud-api, as server depends on cloud-api
The api refactoring of one of the api required this interface

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

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

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

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

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

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

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

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

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

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

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:44:14 -08:00
Rohit Yadav 9a0df30766 api_refactor: refactor account apis
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.

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

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

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

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:05:44 -08:00
Rohit Yadav e0b4430070 api_refactor: refactor iso apis
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
- Note: copyIso uses copyTemplate, refactor copyTemplate

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

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

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 21:27:02 -08:00
Rohit Yadav 5edfc2760a refactor: remove redundant imports, fix trailing chars 2012-12-03 13:54:37 -08:00
Alena Prokharchyk 7857b1f62a CLOUDSTACK-573: check if external provider enabled, only when finalize the service/provider list for the network 2012-11-30 13:07:01 -08:00
Alena Prokharchyk 1aa4ad6a3c CLOUDSTACK-572: Advance SG enabled zone - allow deploying vm in SG disabled Account specific networks
Conflicts:

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

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

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-29 20:23:30 +01:00
Chip Childers e4a5173199 CLOUDSTACK-505: Do not log the command response object for the createSSHKeyPair command.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-29 12:24:42 -05:00
Rohit Yadav 55447c2572 CLOUDSTACK-424: Fix NPE while updating user data
Replace newlines in userdata only when it's not null.

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

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

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

	server/src/com/cloud/server/ConfigurationServerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-304to305.sql
2012-11-16 10:56:44 +05:30
Vijay dda4d39b55 AutoScale changes in Apache master 2012-11-16 10:56:44 +05:30
Rohit Yadav 4c86b1545d CLOUDSTACK-424: Update userdata should propagate to VR
The code that would propage userdata to router, when updateVirtualMachine api
is called, was missing. As per the docs [0], userdata should be a base64 encoded
string upto 2KB which is put on domr's html directory adn using HTTP GET the
userdata information can be obtained from the domr.

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

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

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

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

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-15 18:43:51 +05:30
Murali Reddy 82f02bac34 Merge branch 'master' into events-framework 2012-11-15 15:46:16 +05:30
Murali Reddy cbc9bce6ae -adds the plugin that implements EventBus with AMQP broker as MOM provider
-modify the components.xml to load the RabbitMQ plugin as EventBus
2012-11-15 15:39:29 +05:30
Pranav Saxena fe460fac43 Upgrading a network that has Network offering SRX/F5 inline mode to a network offering that has all service provided by VR does not give proper error message: Hence correcting the error message 2012-11-15 13:52:54 +05:30
Alena Prokharchyk 2914985837 Fixed json response to return "size" parameter (resources count in the system) when pageSize=0 is specified 2012-11-14 15:01:48 -08:00
Alena Prokharchyk 6d9cafbf35 DeployVm: when SG enabled network is passed to the command, but no SG list is defined in the request, add the vm to SG enabled network automatically
Conflicts:

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

Description:

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

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

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

Testing Completed:

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

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

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-09 14:25:44 -05:00
Alena Prokharchyk d118a3d764 Fixed the bug in xml response serializing (introduced while resolving merge conflict) 2012-11-07 17:17:17 -08:00
Murali Reddy 9bb34be7a9 Merge branch 'master' into events-framework 2012-11-06 11:47:33 +05:30
Dave Cahill 476e771c1c SSH key changes 2012-11-05 11:24:33 -08:00
Edison Xu b101dc7279 KVM agent connet:
* send StartupAnswer right after StartupCommand is recieved
* if post processor going wrong, send out readycommand with error message to agent, then agent will exit
2012-11-05 10:00:16 -08:00
Rohit Yadav d8fbb0dd13 maven: enable jvm heap size for forked surefire test processes
Any forked process that runs from maven surefire plugin gets it own separate
heap which may cause build issues. Patch fixes the issue by explicity args to
the surefire plugin for cloud-server.

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

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

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

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

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

Conflicts:

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

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

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

The default authenticator in components.xml is still set to md5 for backwards compatibility. For new installations the sha256 could be enabled.
2012-10-30 12:56:56 +01:00
Rohit Yadav 803f539239 Merge branch 'master' into events-framework 2012-10-30 14:29:04 +05:30
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
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
Edison Su b57be3389e add apidocs/devcloud projects 2012-10-21 00:01:47 -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
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
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
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
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
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
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
Murali Reddy 600a166d4f publish actione events, usage events and alerts on the event bus 2012-09-17 03:19:01 +05:30
Murali Reddy 967289d8c5 framework to publish and subscribe events 2012-09-17 02:37:02 +05:30
Murali Reddy 5ae868d0f9 publish alerts from a single place 2012-09-17 01:57:07 +05:30
Murali Reddy 9c40bb4f1b moving usage event persiste code to single place so as to make it easier to use it for to publish to external systems 2012-09-17 01:01:55 +05:30
Murali Reddy b89f7c61b3 adds a state machine and state listener to Network objects 2012-09-16 21:03:59 +05:30