etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,940 Commits 322 Branches 325 Tags 975 MiB
Commit Graph

791 Commits

Author SHA1 Message Date
Harikrishna Patnala f68b407283 CS-17504: Weak SSL ciphers supported by the management server 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f947fad197)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	packaging/centos63/cloud.spec
 2015-03-16 15:50:26 +05:30
Min Chen 84c6cc361b CS-19734:Session cookie is exposed to scripts. 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0b5b9c91e4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-16 15:49:33 +05:30
Rohit Yadav 0269456152 CLOUDSTACK-8160: use preferable protocols 
(cherry picked from commit debfcdef78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	client/tomcatconf/server7-nonssl.xml.in
	client/tomcatconf/server7-ssl.xml.in
	plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
	pom.xml
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
	utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
 2015-01-21 18:11:38 +05:30
Hugo Trippaers b4601be4bf CLOUDSTACK-6892 Create separate package for the mysql HA component 
(cherry picked from commit 539db08956)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	packaging/centos63/cloud.spec
 2014-08-20 12:11:37 +02:00
Nitin Mehta 6f709f59cc CLOUDSTACK-7000: ListSnapshotPolicy should list by policyid. Introduce updateSnapshotPolicy command 
(cherry picked from commit fce21439fa)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-07-30 13:31:14 +02:00
Koushik Das 25b4159723 CLOUDSTACK-6445: Simulator enhancements 
Refer FS - https://cwiki.apache.org/confluence/display/CLOUDSTACK/Simulator+enhancements

(cherry picked from commit 617826d16b)
 2014-07-28 13:58:55 +02:00
Min Chen 6ba541afb7 Disable IAM feature from 4.4 release. 
Conflicts:
	test/integration/smoke/test_vm_iam.py
 2014-05-21 13:49:11 +02:00
Alena Prokharchyk c94158f0fd CLOUDSTACK-6659: fixed the name for the updateIpAddress API command 2014-05-13 23:23:28 +02:00
Alena Prokharchyk a3825f126f CLOUDSTACK-6596: UUID and display flag update support for LBStickinessPolicy and LBHealthCheckPolicy 2014-05-08 09:48:27 +02:00
Min Chen 99bdc8d875 Merge branch 'master' into rbac. 2014-03-13 11:05:03 -07:00
amogh.vasekar 3ee1fc28de CLOUDSTACK-6217: 
Add APIs for ability to add new guest OS types, and their hypervisor specific mappings.
The table guest_os_hypervisor is currently maintained but not used, and the APIs reuse the same

Signed off by: Nitin Mehta <nitin.mehta@citrix.com>
 2014-03-12 17:03:38 -07:00
Min Chen 48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
Min Chen 9f47466fea Fix some issues in renaming iam api, also fix marvin library. 2014-02-26 17:30:34 -08:00
Hugo Trippaers afc188cb5c Forward port the fix by David from 0c2ad0338e 2014-02-25 15:18:16 +01:00
Min Chen 3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Alena Prokharchyk 4305d817ba External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection 2014-02-05 15:56:40 -08:00
Alena Prokharchyk 9641e1dbee External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer 2014-02-05 10:36:21 -08:00
Alena Prokharchyk aaa20947a9 ExternalUUID control support for Firewall and Egress Firewall rules 2014-02-04 17:06:04 -08:00
Prachi Damle f84375442e Merge branch 'master' into rbac 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
 2014-02-04 12:07:32 -08:00
Hiroaki KAWAI cb048f4108 Some rework stratosphere ssp plugin 
* add missing command entry in commands.properties
* migrate httpclient 3.x to 4.x
* fix the broken SspClient
* add webapp session checking in mock ssp server
 2014-01-30 21:31:44 +09:00
Min Chen 748dc1541c Support attaching policy to account. 2014-01-28 10:00:17 -08:00
Min Chen 33cd1ab921 Merge branch 'master' into rbac 2014-01-22 11:23:51 -08:00
Min Chen 929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Alena Prokharchyk bd79fb33a6 CLOUDSTACK-5870: API support for retrieving user data 2014-01-16 15:31:18 -08:00
Min Chen 649d9d927f CLOUDSTACK-5840:Migration from NFS to S3 should be done in one API 
(updateCloudToUseObjectStore) instead of two APIs.
 2014-01-08 17:25:13 -08:00
Hugo Trippaers 612a41e3f5 Add UI interface for managing the OpenDaylight provider and controllers. 
Fix several bugs in the code related to the api handling.

Conflicts:
	ui/scripts/system.js

ui
 2014-01-08 17:08:37 +01:00
Hugo Trippaers 850bc9fa82 Hook the OpenDaylight plugin into CloudStack 2014-01-08 15:58:08 +01:00
tuna ccfe557329 delete old applicationContext 2013-12-10 11:49:10 +07:00
tuna dc151115be AutoScaling without NetScaler 2013-12-10 10:35:55 +07:00
Will Stevens c60a256ebd fixed egress rules for palo alto plugin and cleaned up extra api calls on master 
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2013-12-09 18:26:57 -08:00
tuna 61e80f030a remove unused code 2013-12-09 23:33:15 +07:00
tuna 0624fe5d03 remove unused table: ovs_nic_map 2013-12-09 23:33:15 +07:00
tuna d935d3865a tuna 2013-12-09 23:33:14 +07:00
Tuna 4e914b7087 re-factor gre controller 
Signed-off-by: tuna <ng.tuna@gmail.com>
 2013-12-09 23:33:14 +07:00
tuna 96188a3730 re-factor gre controller prototype 2013-12-09 23:33:14 +07:00
Alena Prokharchyk bd6f706b72 CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API 
Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
	engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
	server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
	usage/src/com/cloud/usage/UsageManagerImpl.java

listAlerts: introduced new parameter "name" to the alertResponse

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java

Added new Admin API - generateAlert. Available to ROOT admin only

Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java

listAlerts: implemented search by alert name

Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	engine/schema/src/com/cloud/alert/AlertVO.java
 2013-12-04 10:05:46 -08:00
Wei Zhou 8b237eb0a2 CLOUDSTACK-4505: allow domain admin to expunge a destroyed VM 2013-11-26 15:02:44 +01:00
Damodar Reddy 67fc2f53e2 CLOUDSTACK-4916: Fixing the issue with DB HA when there are more than 2 db nodes (Issue was mysql DriverManager was returning salve db nodes on random basis which was causing issue) 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-11-14 11:10:48 +05:30
Syed 0076307863 Squashed merge of Ssl Termination feature 
Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support

This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.

The following are the new API's that this patch adds

uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer

Unit tests are also included in the patch.
 2013-11-08 16:49:16 +05:30
Abhinandan Prateek 07b68742c9 CLOUDSTACK-4916: removing spurious comments 2013-11-08 16:44:32 +05:30
Damodar Reddy dcd3c44279 CLOUDSTACK-4916: To Enable Master High Availability using mysql connector params and mysql's 2 way replication 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-11-08 16:18:14 +05:30
Wei Zhou 57ba367f3c CLOUDSTACK-5042: change cloud.keystore to cloudmanagementserver.keystore and install it (cherry picked from commit de448ec479) 2013-11-08 09:00:29 +01:00
Kishan Kavala 3f5b8f7063 CLOUDSTACK-4793 : Added UpgradeRouterTemplate API. Added filters to listRouters API. listRouters response includes verion and required upgrade flag. Min VR version is checked before sending commands to router 2013-11-07 19:49:05 +05:30
Will Stevens 8f8ad3f38e Squashed commit of the Palo Alto Networks firewall integration plugin. 
This patch adds a network plugin to support Palo Alto Networks firewall (their appliance and their VM series firewall).

More information in the FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Palo+Alto+Firewall+Integration

Features supported are:
- List/Add/Delete Palo Alto service provider
- List/Add/Delete Palo Alto network service offering
- List/Add/Delete Palo Alto network with above service offering
- Add instance to the new network (creates the public IP and private gateway/cidr on the PA as well as the source nat rule)
- List/Add/Delete Ingress Firewall rule
- List/Add/Delete Egress Firewall rule
- List/Add/Delete Port Forwarding rule
- List/Add/Delete Static Nat rule
- Supports Palo Alto Networks 'Log Forwarding' profile globally per device (additional docs to come)
- Supports Palo Alto Networks 'Security Profile Groups' functionality globally per device (additional docs to come)

Knowns limitations:
- Only supports one public IP range in CloudStack.
- Currently not verifying SSL certificates when creating a connection between CloudStack and the Palo Alto Networks firewall.
- Currently not tracking usage on Public IPs.

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2013-11-06 10:08:22 -08:00
Min Chen ce3638bb03 Merge branch 'master' into rbac. 2013-11-04 15:49:29 -08:00
Pedro Marques 6b5fab2f5c OpenContrail network plugin 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2013-11-01 17:46:52 +01:00
Min Chen 2ef4d5200c Merge branch 'master' into rbac. 2013-10-31 17:16:33 -07:00
Wei Zhou 5109498783 CLOUDSTACK-4830: allow create account and user by domain admin 
(cherry picked from commit 0d12e3eb9d)
 2013-10-31 11:36:54 +01:00
Alena Prokharchyk 591dcd1d1c ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user 2013-10-29 09:18:11 -07:00
Rajani Karuturi 9300d4a3ba Added an api call to import all the ldap users to the same domains(ou's) in cloudstack 
TODO:
    1. error handling of no domains present, nested hierarchy
    2. handling the case when the api call fails for a specific user/users
    3. test cases for LdapUserManager

Signed-off-by: Ian Duffy <ian@ianduffy.ie>
 2013-10-29 09:04:33 +00:00