apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
14,070 Commits 308 Branches 324 Tags
Commit Graph

320 Commits

Author SHA1 Message Date
Kelven Yang
d70154609a Wire up injection for dynamically constructed objects 2012-10-29 16:16:07 -07:00
Kelven Yang
8e59b3acfb Architecture refactoring - Stateless management server - Spring Framework initiatives, add missing files 2012-10-19 15:32:24 -07:00
Prasanna Santhanam
6e9d7aa45b property files and build file fixes for simulator db changes 2012-09-17 17:33:26 +05:30
Wido den Hollander
7eaf537d95 Rename cloud-agent-scripts to cloud-scripts 
The management server also depends on a couple of these scripts, so renaming
to cloud-scripts makes more sence then installing cloud-agent-scripts.

In the future we might want to split this up in two packages.
 2012-09-13 16:29:01 +02:00
Mice Xia
0ae1d58c19 CLOUDSTACK-50 build-apidocs ClassNotFoundException: com.cloud.api.commands.DeleteCiscoNexusVSMCmd 2012-09-08 10:56:32 +08:00
Edison Su
5ae15f8bbf first OSS build 2012-09-05 17:45:25 -07:00
Rajesh Battala
39aa7d86af Moved Awsapi (EC2/S3) from Hibernate framework to CloudStack Generic Dao Framework 
Created/Modified new VO's and Dao Impl classes to use Generic Dao Framework
 2012-08-31 11:44:58 -07:00
Prachi Damle
511e3cb235 [ASFCS40]CS-15373: Awsapi port change to 7080. 
Reviewed-By: Frank

Changes:
- Changes to deploy awsapi in separate webapps folder and listeining on 7080 port
- Revert changes which were done to open 7080 on CloudStack

Conflicts:

	awsapi/conf/cloud-bridge.properties
	client/tomcatconf/server-ssl.xml.in
 2012-08-21 16:27:55 -07:00
Hugo Trippaers
cf06317671 Probably a left-over of a merge conflict 2012-08-02 09:33:48 +02:00
Alena Prokharchyk
ce9f1afa78 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-08-01 19:04:28 -07:00
Chip Childers
99b0ea7b10 License header update for the client folder 2012-08-01 13:49:10 -04:00
Sheng Yang
736c4c1510 CS-15670: Allow normal users to configure S2S VPN 2012-07-27 16:27:36 -07:00
Alena Prokharchyk
a39fd61249 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
 2012-07-27 13:47:46 -07:00
Salvatore Orlando
7b18b72eca CS-15664 There is a typo in component.xml relating to Nicira NVP Integration 2012-07-25 15:14:40 +05:30
Alena Prokharchyk
6420ecbd6f Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-24 16:13:06 -07:00
Hugo Trippaers
766a17b3ef Typo in components.xml.in 2012-07-24 15:47:40 -04:00
bfederle
c8f72c9198 Merge branch 'master' into vpc 
Conflicts:
	ui/scripts/network.js
 2012-07-23 10:36:25 -07:00
kishan
f2bbf62d9d Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only. 2012-07-18 14:20:04 -07:00
Alena Prokharchyk
14fa5279e2 Merge branch 'master' into vpc 2012-07-17 17:12:17 -07:00
kishan
88205a7a83 Added ant target deploy-server-encrypt to enable encryption in dev setup 2012-07-16 16:11:44 -07:00
Alena Prokharchyk
a1acfd3bfa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
 2012-07-13 13:52:58 -07:00
Hugo Trippaers
79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
Sheng Yang
37ab2dd49b S2S VPN: Add privilege for normal users on list commands 2012-07-10 18:58:33 -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
5bcf73080a Merge branch 'master' into vpc 2012-07-02 17:47:01 -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
3995dc9cb1 CS-6840: Fix wrong command name 2012-07-02 16:28:54 -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
Murali reddy
9876d34ea4 moving out ELB network element to plugins/network-elements/elastic-loadbalancer 2012-07-02 15:05:58 -07:00
Murali reddy
8aa2b55dd6 moving out NetApp code to plugins/file-systems/netapp 2012-07-02 08:34:02 -07:00
Hugo Trippaers
3f534b8194 dao objects for OVS are in com.cloud.network.ovs 
Fixes regression of moving Ovs code to plugins/network-elements/ovs
 2012-06-29 11:12:22 -07:00
Alena Prokharchyk
1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Alena Prokharchyk
634cd78baa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
 2012-06-28 17:41:40 -07:00
Murali reddy
c41094154d moving out OVS code to plugins/network-elements/ovs 2012-06-28 17:23:41 -07:00
Murali reddy
8197f1f07c moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware 2012-06-26 19:48:55 -07:00
Alena Prokharchyk
ce876e24de VPC: intermidiate checkin to Static Routes 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
 2012-06-25 21:00:57 -07:00
Alena Prokharchyk
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
dc04e0b2e5 VPC: listPrivateGateways API implementation 2012-06-25 20:57:09 -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
Murali reddy
392ae5cb13 moving out Srx code into Plugins/network-elements 2012-06-25 16:55:53 -07:00
Murali reddy
422c4ce513 moving out F5 code from server into plugins/network-elements/f5/ 2012-06-23 14:16:59 -07:00
Murali reddy
49b88472a5 moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler 2012-06-21 18:57:18 -07:00
Alena Prokharchyk
ccec9192a2 VPC: implemented delete and list Network ACL(s) 2012-06-20 17:20:04 -07:00
Alena Prokharchyk
374a600746 VPC: initial checkin for network ACLs 
Conflicts:

	client/tomcatconf/commands.properties.in
 2012-06-20 17:19:49 -07:00
Alena Prokharchyk
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
03fe667b75 Changed the command name for adding private gateway 2012-06-15 14:33:55 -07:00
Alena Prokharchyk
0a7faa9838 Support for adding private network 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
 2012-06-15 14:20:34 -07:00
Alena Prokharchyk
1189e92708 Destroy VPC if it fails to start during the deployment 2012-06-15 14:10:22 -07:00
Alena Prokharchyk
9ec8526281 1) Added VPC restart support - new api command RestartVPC. The purpose of the call is to shutdown and start VPC including VPCVirtualRouter restart, rules re-implement, etc 
2) Only networks created from offerings with conserveMode=false, can participate in VPC
 2012-06-15 14:10:09 -07:00
Alena Prokharchyk
f4060c3c1d 1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support 
2) Added services api support for plugging/unplugging the nics to VpcElement

Conflicts:

	api/src/com/cloud/network/NetworkService.java
	core/src/com/cloud/vm/VMInstanceVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-06-15 14:04:09 -07:00