etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,879 Commits 323 Branches 325 Tags 836 MiB
Commit Graph

774 Commits

Author SHA1 Message Date
Min Chen 848fea6069 Add ListImageStoresCmd api. 2013-04-08 11:36:53 -07:00
Min Chen a872d6d306 Renamed internal classes to use "imageStorexxx" instead of previous 
"imageDataStorexxx". Add new addImageStoreCmd to use 3 image store
provider plugins.
 2013-04-05 17:33:35 -07:00
Min Chen 7699485b4f Create DB view for Image Data Store. 2013-04-05 11:18:33 -07:00
Min Chen 86a3840412 Fix AddSecondaryStorageCmd to use CloudStack default secondary storage 
store plugin.
 2013-04-05 11:18:33 -07:00
Mice Xia 4edef1fd30 fix CLOUDSTACK-1700 2013-04-02 17:36:51 +08: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
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
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
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
Rajesh Battala 183b989d30 CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful 2013-03-18 14:01:15 +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
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
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
Bharat Kumar 23e54bb0f4 Cloudstack-711: Cpu and Ram Overcommit Ratio. 2013-02-22 17:31:06 +05:30
Saksham Srivastava ea3db2f073 CLOUDSTACK-705 IP Address reservation for Isolated Guest Networks 
CloudStack uses Guest CIDR for dhcp-range for the Guest VMs. The entire
CIDR is used by CloudStack for assigning IPs to Guest VMs. IP Address
Reservation will allow part of address space to be used fornon CloudStack
hosts/physical servers also, by restricting the address space of CloudStack
Guest VMs. Reservation can be configured using update Network API by specifying
guestvmCidr as an additional parameter. Reservation will be applicable for
Isolated Guest Networks including VPC. reservediprange in the response
will return the IP range that can be used for non Cloudstack hosts.

Tested manually the following scenarios:
Applying reservation when there are running VMs inside the
guest_vm_cidr.
Applying reservation when there are running VMs outside the
guest_vm_cidr.(not allowed)
Applying reservation when external device like Netscaler is configured
in the guest_cidr.
Applying reservation in VPC tiers.
Applying reservation outside the range of guest_cidr.(not allowed)
 2013-02-22 15:50:33 +05:30
Edison Su ff047e75d3 refactor snapshot, move existing snapshot code into its own snapshotstrategy 2013-02-21 11:22:49 -08:00
Edison Su a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Mice Xia 9a12756ae4 CLOUDSTACK-684 support vm snapshot 2013-02-14 01:26:30 +08:00
Kishan Kavala fc0bf21a13 CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl 2013-02-05 16:49:34 +05:30
Kelven Yang 296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Kelven Yang 7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Likitha Shetty 13ee8d1865 Persistent Networks support 
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
 2013-02-01 15:10:06 +05:30
Kishan Kavala 9ea90c3359 Merge branch 'master' into regions 
Conflicts:
	client/tomcatconf/components.xml.in
	server/src/com/cloud/api/ApiResponseHelper.java
 2013-02-01 11:38:16 +05:30
Murali Reddy 96c24930ae Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
 2013-02-01 08:45:53 +05:30
Kelven Yang 7bd8bec68a Sync javelin with master up to 894cb8f7d9 2013-01-31 17:20:19 -08:00
Sheng Yang 5cb9df91a1 Merge branch 'ipv6' 
Conflicts:
	api/src/com/cloud/network/NetworkProfile.java
 2013-01-31 15:07:33 -08:00
Murali Reddy e7a554fc6a Merging events framework branch into master. This commit will bring 
following changes

   - introduced notion of event bus with publish, subscribe, unsubscribe
     semantics

   - a plug-in can implement the EventBus abstraction to provide event
     bug to CloudStack

   - A rabbitMQ based plug-in that can interact with AMQP servers to
     provide message broker based event-bug

   - stream lines, action events, usage events, alerts publishing in to
     convineance classed which are also used to publish corresponding
     event on to event bus

   - introduced notion of state change event. On a state change, in the
     state machine corrsponding to the resource, a state change event is
     published on the event bug

   - associated a state machined with Snapshot and Network objects

   - Virtual Machine, Volume, Snaphost, Network object state changes wil
     result in a state change event
 2013-02-01 01:37:24 +05:30
Kelven Yang 1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
Kishan Kavala c607e03f0e Merge branch 'master' into regions 2013-01-31 22:31:25 +05:30
Kishan Kavala 8b1a5b1de2 - Separated RegionServiceImpl and RegionManagerImpl 
- Added comments
- Changed package name to org.apache.cloudstack.region
 2013-01-31 18:08:20 +05:30
Jayapal b6727e5646 CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
Sheng Yang f57cbaacd6 IPv6: Fix VlanIpRangeResponse 2013-01-30 20:01:04 -08:00
Sheng Yang b1972f6c11 IPv6: Update NetworkResponse and NicResponse 2013-01-29 22:01:31 -08:00
Kishan Kavala def9fd1f2e remove finduser, findaccount, finddomain APIs 2013-01-28 17:04:25 +05:30
Kishan Kavala c6ae19d12f Merge branch 'master' into regions 2013-01-25 18:49:47 +05:30
Kishan Kavala de20cb6c1a Apply API refactoring changes. Make changes to Regions API to work with new code 2013-01-25 18:45:01 +05:30
Kishan Kavala 1f57d925eb Apply API refactoring changes. Make changes to Regions API to work with new code 2013-01-25 18:41:59 +05:30
Rohit Yadav 356866c72b Merge branch 'master' into javelin 
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 19:18:53 -08:00
Min Chen 26be5ce2df CLOUDSTACK-355: create DB view for ZoneResponse to fix count for 
listZonesByCmd.
 2013-01-22 16:39:45 -08:00
Prachi Damle aa7b3e0f6d Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId 
Corresponding getter/setter is renamed too.

Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case.
 2013-01-22 12:56:39 -08:00
Edison Su 4fbecf15ec add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00
Min Chen 6e40c33628 CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count 
for ListServiceOfferingsCmd.
 2013-01-21 15:25:49 -08:00
Min Chen 6db719d58b CLOUDSTACK-355: Create DB view to fix count issue for 
listDiskOfferingsCmd.
 2013-01-21 10:50:10 -08:00
Kelven Yang df684261cf Put command classes under Spring injection framework 2013-01-15 18:07:19 -08:00
Rohit Yadav 8eba0ee0bb ApiDispatcher: Remove helper method that proxies via ApiResponseHelper to get entity by IdentityDao 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:20 -08:00
Min Chen 7f8262d45e Remove IdentityProxy and IdentityTypeAdapter class. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-09 17:40:58 -08:00
Min Chen 9924b64830 commit 3a3cb60e85c0254ebceff55d0b210ca1ff5386a6 
Author: Likitha Shetty <likitha.shetty@citrix.com>
Date:   Wed Jan 9 11:54:25 2013 +0530

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

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-09 10:42:44 -08:00
Min Chen 74c15a22a0 Create DB view for ListStoragePools API performance optimization. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-08 12:33:18 -08:00
Rohit Yadav ed0637b8c2 api: Refactor move acl to org.apache.cloudstack 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-06 15:30:58 -08:00
Rohit Yadav f07a98a740 api: Refactor and move s3 to api.command.admin.storage 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-05 15:30:38 -08:00
Rohit Yadav 5119785cf7 Get latest changes, merge branch 'master' into api_refactoring 
Conflicts:
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-04 22:21:20 -08:00
Sheng Yang 177e157cbf CLOUDSTACK-306: Move inline mode parameter from device to network offering 
One F5 device can be used as inline and side-by-side at the same time(for
different networks). So we can define inline or not on network base.
 2013-01-04 19:17:58 -08:00
Min Chen daeb4abcca Create DB views for AsyncJobResponse to speed up listAsyncJobsCmd. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-03 15:35:26 -08:00
Min Chen ebfb90e217 Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-02 17:38:58 -08:00
Min Chen 21c1623a03 Create DB view for Volume to speed up ListVolumesCmd. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2012-12-25 17:08:50 -08:00
Isaac Chiang 5aefd77f77 Fix for CloudStack-648 
Signed-off-by: Gavin Lee <gavin.lxh@gmail.com>
 2012-12-26 00:00:58 +08:00
Rohit Yadav 296b49c2f8 Merge branch 'master' into test-merge-api 
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 13:54:46 -08:00
Min Chen e7fa1a86fb Create DB views to improve ListHostsCmd performance. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2012-12-22 21:47:05 -08:00
Min Chen 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 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 434258080f api: Fix NullPointerException in ApiResponseHelper for DomainResponse 
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 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 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
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
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
Rohit Yadav 88b7af18e6 api: Revert "Move all the DB view DAOs from cloud-server to cloud-api for future api-server package." 
Reverting commit as we don't want the daos to move to cloud-api.
We'll eventually breakout cloud-server and create cloud-api-server for the standalone
api server.

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-13 09:28:42 -08:00
Min Chen 472f4f91b9 Refactor ListProjectInvitationsCmd and ProjectInvitationResponse. 2012-12-12 09:04:43 -08:00
Min Chen 9c93fee0dc Refactor ListProjectAccountCmd and ProjectAccountResponse. 2012-12-11 15:49:15 -08:00
Min Chen 8735716ba0 Refactor ListProjectsCmd and ProjectResponse. 2012-12-11 12:51:08 -08:00
Min Chen c83323fea7 api: Refactoring ListUsersCmd and UserResponse. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-10 17:45:40 -08:00
Min Chen bba96254f5 Refactoring ListVMGroupsCmd and InstanceGroupResponse. 2012-12-10 13:59:20 -08:00
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
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 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 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 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
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 dda4d39b55 AutoScale changes in Apache master 2012-11-16 10:56:44 +05:30
Kishan Kavala f0f33bf4da Added Mock ApiServer, Regions API calls with api keys 2012-10-17 14:16:36 +05:30
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 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
Kishan Kavala 89779cceb8 Merge branch 'master' into regions 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/user/UserVO.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/create-schema.sql
 2012-10-03 14:09:01 +05:30
Kishan Kavala 4fcf64dd74 updated regions branch with changes from master 2012-09-27 17:04:59 +05:30
Koushik Das 65eeeaf071 CS-14277 
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
 2012-09-11 17:22:43 +05:30
Likitha Shetty 8c3450b503 CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI. 2012-08-28 13:52:42 -07:00
Alena Prokharchyk e252de4999 PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address 
Reviewed-by: Frank Zhang

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-21 15:35:40 -07:00
Alena Prokharchyk 335730dc65 CS-15999: added nics to domain router api response 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-16 10:50:09 -07:00
Sheng Yang 1b5103c501 S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime 2012-08-06 15:19:26 -07:00
Alena Prokharchyk b92d2336ad VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details: 
http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec

Conflicts:

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

	api/src/com/cloud/api/commands/ListVPCsCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
 2012-08-01 18:54:08 -07:00
Alena Prokharchyk 48102871e9 VPC: add account/domain info to the API vpc response 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-01 18:48:09 -07:00
Alena Prokharchyk 7706a9c32f Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-31 13:37:28 -07:00
Sheng Yang 67941f818d S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API 2012-07-30 15:52:23 -07:00
Pranav Saxena 36fc2bd9b5 CS-15044:API changes and UI changes to provide option to view the name of the guestnetwork a virtual machine belongs 2012-07-31 02:57:46 +05:30
Sheng Yang 72a4b2f410 S2S VPN: Add name field for customer gateway 
Easier for user to identify the correct gateway
 2012-07-27 16:27:36 -07:00
Alena Prokharchyk 766b7a2706 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-07-23 16:38:58 -07:00
Sheng Yang 7d68e33323 S2S VPN: Use source NAT ip address for VPN gateway 
Conflicts:

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

Conflicts:

	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	setup/db/create-schema.sql
 2012-07-23 14:40:26 -07:00
Sheng Yang 230ce1dfee S2S VPN: Add state for vpn connection response 2012-07-23 14:38:06 -07:00
Jessica Wang 830901d7cc cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object). 2012-07-23 14:21:10 -07:00
Jessica Wang 196885e378 cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object). 2012-07-23 14:20:43 -07:00
Jessica Wang 8fad593ac5 cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response. 2012-07-23 12:14:59 -07:00
Jessica Wang aac0a808c1 cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response. 2012-07-23 12:10:29 -07:00
Alena Prokharchyk 9e5fb17e3d CS-15077: fixed listPublicIpAddresses in basic zone 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-23 11:21:28 -07:00
Alena Prokharchyk 7cf7002571 Merge branch 'master' into vpc 2012-07-23 10:57:55 -07:00
Jessica Wang 8712812ca7 cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response. 2012-07-20 16:49:17 -07:00
Alena Prokharchyk 7cb4ab5e60 VPC: added State to vpc_gateways 2012-07-11 12:05:42 -07:00
Alena Prokharchyk 911ed25fbc Merge branch 'master' into vpc 2012-07-09 18:31:28 -07:00
Alena Prokharchyk d52c6e2313 listPublicIpAddresses api: don't set associatedWithNetworkId if corresponding field is null in the DB 2012-07-09 18:13:32 -07:00
Alena Prokharchyk 63d6941bdc ResourceTags: respect tag parameter in listTemplates/listIsos commands 
Conflicts:

	server/src/com/cloud/storage/dao/VMTemplateDao.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
 2012-07-06 16:59:14 -07:00
Alena Prokharchyk 353423acec Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-06 12:04:10 -07:00
Alena Prokharchyk 7acf8585b1 Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed 
2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)

Conflicts:

	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
	api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
	api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
	api/src/com/cloud/api/commands/ListSnapshotsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	api/src/com/cloud/api/response/VolumeResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/vm/dao/UserVmDaoImpl.java
 2012-07-06 11:43:31 -07:00
Alena Prokharchyk 540ea34f57 VPC: removed NetworkACL interface; added getTrafficType() to Firewall 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-07-06 11:08:00 -07:00
Alena Prokharchyk 31f9d718fb Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
 2012-07-03 17:32:50 -07:00
Alena Prokharchyk f2078afbd8 VPC: added zoneName to the VPC api response 2012-07-03 17:28:20 -07:00
Alena Prokharchyk 21d87f3fa5 VPC: fixed response tag for VpcRespnse 2012-07-03 17:23:50 -07:00
Alena Prokharchyk da6d876cd4 VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java
 2012-07-03 17:23:40 -07:00
kishan 6a1b0f3ecf Add Region APIs 2012-07-03 13:05:19 -07:00
Alena Prokharchyk b565f63e42 VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation) 
Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-07-02 17:44:28 -07:00
Sheng Yang 8d16d7f94f Fix build after merge site to site vpn 2012-07-02 16:39:41 -07:00
Sheng Yang 24c480f9e6 CS-6840: Add commands for site-to-site vpn 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	utils/test/com/cloud/utils/net/NetUtilsTest.java
 2012-07-02 16:26:34 -07:00
David Nalley e87558256c Patch from Chip Childers 
https://reviews.apache.org/r/5704/
License header updates for the server folder
 2012-07-02 09:51:21 -04:00
Alena Prokharchyk 634cd78baa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
 2012-06-28 17:41:40 -07:00
Alena Prokharchyk 1a232171eb VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done 2012-06-28 10:11:41 -07:00
Alena Prokharchyk d35eb73c9b VPC: initial checkin for Static Routes 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-25 20:59:33 -07:00
Alena Prokharchyk 030458a37b VPC: implemented add/delete Private gateway 
Conflicts:

	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/dc/DataCenterVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-06-25 20:54:14 -07:00
Alena Prokharchyk 374a600746 VPC: initial checkin for network ACLs 
Conflicts:

	client/tomcatconf/commands.properties.in
 2012-06-20 17:19:49 -07:00
Alena Prokharchyk 55a12582b4 Completed API / Management server code for Resource tags feature. UI is yet to be done 2012-06-20 15:45:08 -07:00
Alena Prokharchyk 62d45b9670 Initial checkin for resource tags feature 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
	setup/db/create-schema.sql
 2012-06-20 15:45:08 -07:00
Alena Prokharchyk 810151586b 1) Allow having multiple shared networks with the same vlan 
2) Added new parameter to listNetworks command - canUseForDeploy(boolean). When true, list only networks that can be used for vm deployment (networks have enough ip addresses to allocate from for the vm)

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
 2012-06-15 16:47:13 -07:00
Alena Prokharchyk c56998e876 Support for IPAssoc inside VPC 2012-06-15 14:10:33 -07:00
Alena Prokharchyk 9ec8526281 1) Added VPC restart support - new api command RestartVPC. The purpose of the call is to shutdown and start VPC including VPCVirtualRouter restart, rules re-implement, etc 
2) Only networks created from offerings with conserveMode=false, can participate in VPC
 2012-06-15 14:10:09 -07:00
Alena Prokharchyk b9a4e79277 1) Added search by vpcId to listRouters/listNetworks Apis 
2) Don't allow to add new networks/implement existing ones for VPC in Disabled state. Disabled state indicates that there was unsuccessful attempt to remove the VPC, and the further cleanup will be taken care of by cleanup thread.

Conflicts:

	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-06-15 14:09:37 -07:00
Alena Prokharchyk 60b52f90dd Initial checkin for VPC feature: 
1) Added API frameworks for the feature. New commands:
* CreateVPCCmd
* ListVPCsCmd
* DeleteVPCCmd
* UpdateVPCCmd
* CreateVPCOfferingCmd
* UpdateVPCOfferingCmd
* DeleteVPCOfferingCmd
* ListVPCOfferingsCmd

2) New db tables:

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

and corresponding VO/Dao objects.

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

3) New Manager and Service interfaces- VpcManager/VpcService

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

5) New Action events:

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

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

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	setup/db/create-schema.sql
 2012-06-15 13:53:59 -07:00
prachi 3fd17ae029 Merge awsapi related changes to CloudStack 2012-05-25 14:40:53 -07:00
Alena Prokharchyk 51eeb62f9f CS-14894: listTemplates - return hypervisor type to everybody 2012-05-18 12:47:06 -07:00
Nitin Mehta 07cbec95fa bug CS-14957: Return hypervisor type for uploaded volume 2012-05-17 19:22:19 +05:30
Nitin Mehta 2153ce96f7 bug CS-14321: Correcting listVolumes API call to return valid value for isExtractable for ISO derived disk and DATA disk. 2012-05-16 21:47:45 +05:30
Nitin Mehta 838d01754b bug CS-14785: Improvements to volumes sync so that it can recover from any error. Introduced new state UploadOp which signifies that the volume os on secondary and the status would be picked up from volume host ref table. 2012-05-11 11:42:42 +05:30
Nitin Mehta 9097b53eab bug CS-10789: Put zone id in the volumehost ref table. make list volume to show the percent uploaded. 2012-05-03 10:46:02 +05:30
Alena Prokharchyk c7cbae4c48 Set ha host to false when no ha tag is enabled 2012-04-25 11:04:35 -07:00
Salvatore Orlando 8ccb4b6680 CS-14270: return VLAN id only if the broadcast URI starts with 'vlan' 2012-04-24 21:27:26 +01:00
Salvatore Orlando 2340ebced3 Now using vnets instead of network id for creating networks 
Fixed issues with vif scripts on 5.6FP1
Fixed ipv6 issue on 5.6FP1
Plus other various fixes and improvements

Starting to remove debug code
NOTE: Network is configured correctly but instances do not start. Possibly indefinite wait occuring on some commands
 2012-04-23 22:33:18 +01:00
Alena Prokharchyk 03ccb7f313 CS-14512: fixed deployVm with ipToNetworkList when uuid is used for networkIds 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-04-16 15:43:56 -07:00
Alena Prokharchyk 676a28177b Added one more parameter - haHost(boolean) - to listHosts api command. The parameter identifies if the host is dedicated for ha only 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-04-12 11:50:36 -07:00
David Nalley 59436be4ee fixing line endings in server 2012-04-07 20:13:10 -04:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Alena Prokharchyk 5599713268 bug 14401: return juniper srx as a firewall provider along with the Virtual router 
status 14401: resolved fixed
 2012-03-20 11:51:48 -07:00
Alena Prokharchyk ad1192e264 bug 14239: limit number of Isolated account specific networks per account 
status 14239: resolved fixed

Conflicts:

	api/src/com/cloud/api/commands/CreateNetworkCmd.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-03-12 15:53:30 -07:00
Alena Prokharchyk f3935d667f bug 14156: return instancename parameter in userVm response to ROOT admin only 2012-03-06 13:39:13 -08:00
Alena Prokharchyk 2e9511e2ae Changed isElastic to isSystem for the publicIpAddress assigned during the vm deployment in EIP enabled network 
Reviewed-by: Chiradeep
 2012-02-21 15:39:49 -08:00
Alena Prokharchyk 12b79da6c2 bug 13903: return vm's hostName as a displayName when displayName is null in bunch of api responses 
status 13903: resolved fixed
Reviewed-by: Kelven Yang
 2012-02-21 10:46:00 -08:00
frank a1fa313902 Bug 13568 - secondary storage VM's static route for nfs server breaks things! 
status 13568: resolved fixed
reviewed-by: Sheng Yang
 2012-02-17 16:24:32 -08:00
Alena Prokharchyk 31a3b878a3 bug 13864: for elastic IP address return the purpose (staticNat or Lb) in listPublicIpAddresses api response 
Reviewed-by: Frank
 2012-02-17 15:42:21 -08:00
Alena Prokharchyk 4d27f3c44b bug 13866: return publicIp info in listVms api response when vm is linked to public ip via static nat 
Reviewed-by: Frank
 2012-02-17 15:42:17 -08:00
Alena Prokharchyk 313659d730 Return hostName as displayName in the listvms api resonse, just the way it was before 41df47cc6873b4d8acd0503b16535051a3cbde14) 
Reviewed-by: Kelven Yang
 2012-02-17 14:51:25 -08:00
Nitin Mehta 680ab2f908 Bug 13059: Using Float instead of float for percentage. 
Reviewed-By: Kishan
 2012-02-10 11:11:47 +05:30
Sheng Yang 18ec438793 Revert zone guest cidr setting 2012-02-08 15:54:16 -08:00
Nitin Mehta e6beb08f1b Bug 13059: Keeping the param name more intuitive Also adding the ciode for listing used and total capacity as well. 
Reviewed-By: Kishan
 2012-02-08 18:03:22 +05:30
frank 02075c3a2d Bug 13476 - Public IP's are not shown in the UI for the System VMs 
status 13476: resolved fixed
 2012-02-07 10:58:11 -08:00
frank b59c3c595e return netmask in listStorageNetworkIpRangeCmd 2012-02-06 14:37:56 -08:00
Nitin Mehta 93b8178f19 Bug 13059: Introduce a new api to list top consumed resources in cloudstack. 
Reviewed-By: Kishan
 2012-02-06 20:32:40 +05:30
kishan b5d465f74a Bug 12649: Added ROOT to domain path and removed trailing slash 
Status 12649: resolved fixed
Reviewed-By: Abhi
 2012-02-06 14:27:55 +05:30
Alena Prokharchyk 1490e45a1c Fixed format style in a bunch of files (replaced tabs with spaces as a part of it) 2012-02-03 13:49:11 -08:00
frank e30ca89c7c Bug 13185 - CloudStack UI shows incorrect info for SSVM public IP 
status 13185: resolved fixed
 2012-02-02 10:52:18 -08:00
Alena Prokharchyk edd4c84ca1 Add domain name info for private zones in listZones api response 2012-02-01 11:26:00 -08:00
Kelven Yang 00ffe10b05 bug 12017: when owner host is not in UP state, mark VM state as UNKNOWN 2012-01-31 17:20:16 -08:00
Alena Prokharchyk c2f99796bb Return only VirtualRouter as a firewall provider in listSupportedNetworkServices api response 2012-01-31 14:37:44 -08:00
Kelven Yang 8f2b6dc791 do not default display name from null to other name like host name 2012-01-30 14:57:50 -08:00
kishan cdbf85e3e6 Bug 12649: Added new param path to listDomains respone 
Status 12649: resolved fixed
Reviewed-By: Nitin

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-01-27 17:58:48 +05:30
Alena Prokharchyk 8bcf30da85 bug 12869: more changes to NAAS feature 2012-01-20 14:16:30 -08:00
Alena Prokharchyk 212c22b256 Added isElastic flag to ip address 2012-01-19 13:58:35 -08:00
Alena Prokharchyk 630cbb2243 Added elb and eip capabilities to network offering response 2012-01-19 13:57:37 -08:00
Alena Prokharchyk 56b3561033 bug 12856: network offerings with services w/o providers support 
status 12856: resolved fixed
 2012-01-17 16:17:09 -08:00
Abhinandan Prateek be6642bf37 bug 13005: added response object name casuing this 2012-01-13 14:49:43 +05:30
Sheng Yang 8f2cd77c87 bug 12931: Add conserve mode in network offering response 2012-01-10 11:48:21 -08:00
Alena Prokharchyk adaea570e4 bug 12934: added name to physical network 
status 12934: resolved fixed
 2012-01-09 14:20:37 -08:00
frank 5ea56cdfeb Bug 12777 - Add storage network configuration into CloudStack 
polish API per Alena's review
 2012-01-09 11:06:21 -08:00
Alena Prokharchyk c581506103 bug 12306: list* command revamp 2012-01-09 10:07:42 -08:00
frank f72940e041 Bug 12777 - Add storage network configuration into CloudStack 
most finish
 2012-01-06 11:06:18 -08:00
frank 0b01c5dc1a Bug 12777 - Add storage network configuration into CloudStack 
create APIs
 2012-01-06 11:06:17 -08:00
Sheng Yang 89ca2fe48e bug 12656: Add restriction for network update and new rules 
status 12656: resolved fixed
 2012-01-05 21:08:41 -08:00
anthony 646d95a846 bug 12364: fixed export template with swift 
status 12364: resolved fixed
 2011-12-21 16:07:06 -08:00
Alena Prokharchyk 6049afa5fe Revert "bug 12426: return account information for Shared networks" 
This reverts commit 150f9c62ce381099a27bc084007c7b947117f47c.

Confirmed with Will - we shouldn't return accountId info for shared networks as these types of networks belong to system and available for everyone in the domain/zone
 2011-12-16 14:43:00 -08:00
anthony 79e0f1f39e SWIFT : refine api 2011-12-15 12:52:58 -08:00
anthony 235c5aa6eb SWIFT: api refine 2011-12-15 12:37:34 -08:00
anthony fb0f77711f SWIFT: fixed delete template/iso 2011-12-14 19:53:56 -08:00
Sheng Yang ab50f65ed8 bug 12483: Discard zone's cidr 
status 12483: resolved fixed
 2011-12-14 17:23:24 -08:00
anthony 1821019b7b SWIFT: fixed listtemplate/iso 2011-12-13 18:07:37 -08:00
kishan 6f9bc008f4 bug 12481: Added account ID to listusers response 
status 12481: resolved fixed
reviewed-by: Nitin
 2011-12-13 15:54:58 +05:30
Edison Su e02520a518 bug 10195: if vm's host is in alert state, return unknown state in listvmcmd 
status 10195: resolved fixed
 2011-12-12 16:21:02 -08:00
Alena Prokharchyk 28913c791b bug 11626: return same fields in queryAsyncJobResult and listAsyncJobs API commands 
status 11626: resolved fixed
 2011-12-09 16:50:08 -08:00
Alena Prokharchyk 7ff1417cbb bug 12229: added restartRequired field to the network object 
The value is set to true when shutdownResources or implementResources fail.
 2011-12-09 15:37:11 -08:00
Alena Prokharchyk 3a94a41baf bug 12305: drop max_connections from the network offering as this information is being set on network element level now 
status 12305: resolved fixed
 2011-12-09 09:00:08 -08:00
kishan e23f36b135 Check for null CIDR before converting to netmask 2011-12-08 19:51:40 +05:30
Alena Prokharchyk c83b1ddb05 bug 12380: return cidr in listNetworks response 
status 12380: resolved fixed
 2011-12-07 18:11:38 -08:00
Alena Prokharchyk 97a1276cec bug 12426: return account information for Shared networks 
status 12426: resolved fixed
 2011-12-07 17:03:29 -08:00
Sheng Yang 2902f3d8bd Update service offering id in the NetworkServiceOfferingResponse 2011-12-06 16:51:47 -08:00
Alena Prokharchyk cabb02f944 Removed unused values from the networkOffering response 2011-12-06 14:44:18 -08:00
Alena Prokharchyk 9092765183 1) In Advance zone allow ipAssoc only to the Isolated network with the source nat service enabled 
2) Added zoneName parameter to the listNetworks response
 2011-12-06 14:44:18 -08:00
Alena Prokharchyk edd25b93a1 bug 12336: pass correct service offering id to createNetworkOffering command 2011-12-06 10:10:28 -08:00
Murali Reddy bc88d2eee3 specify which network service capabilities can be choosed as part of network offering 2011-12-05 17:59:54 -08:00
Alena Prokharchyk 7b8287d323 bug 10804: Api and middle layer support for default route feature 2011-12-05 14:53:45 -08:00
Abhinandan Prateek c4f624e7c9 bug 8313: ldap authentication, still need to fix the MD5 encoded password, cuurent authenticator only works with plaintext password 2011-12-04 15:11:06 +05:30
frank d343af96e5 change allocationState of HostResponse to resourceState 2011-12-01 13:53:07 -08:00
Naredula Janardhana Reddy 09905b641b bug 10617: merge code from branch bug10617. 2011-12-01 14:17:52 +05:30
Naredula Janardhana Reddy e4b5a62402 bug 10796: merging code from branch 2011-11-30 15:03:43 +05:30
Alena Prokharchyk fc2b95d9c3 Fixed NPE in listIso API 2011-11-24 10:27:00 -08:00
Alena Prokharchyk 38b25f3466 bug 11289: return only Free ip addresses as available Ips as a part of listAccounts 
status 11289: resolved fixed
 2011-11-22 15:25:45 -08:00
Alena Prokharchyk f111d8377e bug 11702: removed obsolete ipaddress parameter from userVm response 
status 11792: resolved fixed
 2011-11-22 14:29:13 -08:00
Alena Prokharchyk 1ce1f520f1 bug 11406: don't return hypervisor type in API response 2011-11-22 14:13:07 -08:00
Alena Prokharchyk 74f217e1d0 Introduced new parameter to listNetworkOfferings API - sourceNatEnabled (Boolean). 2011-11-22 10:54:29 -08:00
Abhinandan Prateek 488ac8238e bug 11311: lis host takes in a additional parameter to fine tune the details, the default behavious is still unchanged. 2011-11-22 16:26:52 +05:30
Kelven Yang 061ff36434 bug 11814: TemplateResponse now returns template details info 2011-11-18 16:40:32 -08:00
Abhinandan Prateek 489847fcb7 bug 11867: split the host details into [all, capacity, events, stats, min] 2011-11-18 18:07:05 +05:30
Alena Prokharchyk 337c07c0d1 Default gateway service to sourceNat service in the API 2011-11-17 16:28:10 -08:00
prachi b0cdb86d9e Merging listSupportedNetworkServices and listSupportedNetworkServiceProviders. 
listSupportedNetworkServiceProviders returs list of services with providers and capabilities of each service.
It supports 2 parameters:
-service : list providers and capabilities of this service
-provider: list services of this provider
- if none is specified, lists all services supported
 2011-11-17 12:54:31 -08:00
Murali Reddy cbc72f3ef7 adding service capabities to network offering response 2011-11-16 13:43:09 -08:00
Kelven Yang 16530b532f Make XML serializer support all fields within the class tree 2011-11-15 15:01:47 -08:00
Alena Prokharchyk bb2a8cf7ea NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param 2011-11-14 18:13:47 -08:00
prachi da846e9c08 Adding UUID to new entities and API commands. PhysicalNetwork, PhysicalNetworkTrafficType, PhysicalNetworkServiceProviders changed. 2011-11-11 13:23:23 -08:00
Alena Prokharchyk 08160fa882 Fixed responsename for VirtualRouter element 2011-11-11 11:03:01 -08:00
Naredula Janardhana Reddy f1b99f4f07 Revert "bug 10617: merging code from branch bug10617" 
This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2011-11-11 20:23:26 +05:30
Alena Prokharchyk 039e09ce93 * Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account - 
only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id
 2011-11-10 18:34:56 -08:00
Sheng Yang 7adedca8a3 NaaS: Update listVirtualRouterElements to accept nspid as parameter 
Also fix VirtualRouterProviderResponse by adding objectName.
 2011-11-10 17:26:11 -08:00
Sheng Yang bde1f6d2de Merge branch 'networkasservice' 
Conflicts:
	api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java
	api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	setup/db/create-schema.sql
 2011-11-10 16:36:08 -08:00
Alex Huang d6c22c42fe Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-11-10 15:26:39 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Naredula Janardhana Reddy 02adbd4bd3 bug 10617: merging code from branch bug10617 2011-11-10 15:23:48 +05:30
Sheng Yang 4ea3aaeb18 NaaS: Add checking for gateway service in update network offering 2011-11-09 19:14:16 -08:00
Sheng Yang 5c1773dd26 NaaS: Add response for VirtualRouterProvider 2011-11-09 18:52:34 -08:00
Alena Prokharchyk 0228bca0c2 Use type instead of guestType in network API response (just the way it was done in 2.2.x) 2011-11-09 15:29:13 -08:00
Murali Reddy db991dd8f6 NAAS : adding support for service capabilities to be specified as part of network offering 2011-11-08 13:01:44 -08:00
alena 3a845d2d75 Keep Service/Provider map per network as well as per networkOffering (to handle the case when there are multiple providers defined for the same service in the network offering, and only one is picked when the network is created) 2011-11-07 16:16:03 -08:00
frank d6db4a686e Bug 11313 - Add an account param/detail/map in the XXXAccount API calls 
status 11313: resolved fixed
 2011-11-07 14:24:36 -08:00