Commit Graph

12323 Commits

Author SHA1 Message Date
Alena Prokharchyk
d6774e6a86 VPC: don't allow vpcs for the same account with overlapping cidrs 2012-07-06 11:08:58 -07:00
Alena Prokharchyk
83f566cfe7 VPC: added "forVpc" (boolean) parameter to listRouters call - filter by the fact if router belongs to VPC or not 2012-07-06 11:08:48 -07:00
Alena Prokharchyk
234ae447ee VPC: added field networkacl_service_provided to physical_network_service_providers table 2012-07-06 11:08:39 -07:00
Alena Prokharchyk
07eb6e3cf7 VPC: CS-15447 - fail vpc creation when vpc provider is not enabled at least in one physical network in the target zone 2012-07-06 11:08:28 -07:00
Alena Prokharchyk
b4fec75ff7 VPC: added dns1/dns2 + networkDomain to the list of bootload args passed on VPC VR start 2012-07-06 11:08:17 -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
0dfe603d48 VPC: createLB rule - removed duplicated check for ip services when createLB rule
Conflicts:

	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-06 11:07:26 -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
07d478d836 VPC: CS-15426 - In Basic zone always pass control nic when prepare nics for the VR
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-07-03 17:27:46 -07:00
Alena Prokharchyk
5afa83abb6 VPC: CS-15355 - fixed router when deployVm in Basic zone
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-07-03 17:25:07 -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
Alena Prokharchyk
2b799aa9ac VPC: added missing FirewallService to the VR provider 2012-07-03 17:22:41 -07:00
Edison Su
57927c9f23 From: jason.bausewein@tier3.com
Updated script to create cloud_usage database similar to deploy-db-dev.sh.
2012-07-03 15:16:51 -07:00
Edison Su
217fdd2497 From: jason.bausewein@tier3.com
Fixed deployDataCenter.py to select the correct network offering based on if security groups are enabled.  Also added default value to configGenerator.py for basic setup.
2012-07-03 12:56:42 -07:00
Alena Prokharchyk
5bcf73080a Merge branch 'master' into vpc 2012-07-02 17:47:01 -07:00
Alena Prokharchyk
580261119c VPC: corrected the name for PublicIp interface (mistakenly renamed it as a part of previous checkin)
Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-02 17:44:54 -07:00
Alena Prokharchyk
5d5b584a8e VPC: remove network ACLs from VPC VR when shutdown guest network 2012-07-02 17:44:54 -07:00
Alena Prokharchyk
40a3482f13 VPC: multiple fixes:
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
2012-07-02 17:44:54 -07:00
Alena Prokharchyk
183633cf70 VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed)
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-02 17:44:54 -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
Alena Prokharchyk
1ee0c30935 VPC: added vpccidr to the list of VPC router bootload args 2012-07-02 17:44:27 -07:00
Alena Prokharchyk
2dc1a286f6 VPC: set networkId to be null for IP address when the last PF/LB rule is removed for it and the IP belongs to VPC
Conflicts:

	server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-02 17:44:27 -07:00
Sheng Yang
8d16d7f94f Fix build after merge site to site vpn 2012-07-02 16:39:41 -07:00
Sheng Yang
5ee4b79688 CS-6840: Fix 0 id returned by createVpnConnection 2012-07-02 16:29:34 -07:00
Sheng Yang
1d97af3abf CS-6840: Add status checking for site 2 site VPN 2012-07-02 16:29:23 -07:00
Sheng Yang
d9688f74ba CS-6840: List all objects without require parameter 2012-07-02 16:29:10 -07:00
Sheng Yang
3995dc9cb1 CS-6840: Fix wrong command name 2012-07-02 16:28:54 -07:00
Sheng Yang
8d4079d477 CS-6840: Add hypervisor commands for site-to-site vpn
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2012-07-02 16:28:44 -07:00
Sheng Yang
cd9854336a CS-6840: Update ipsectunnel.sh 2012-07-02 16:27:38 -07:00
Clayton Weise
df062f1fe8 CS-6840: Add ipsectunnel script 2012-07-02 16:27:35 -07:00
Sheng Yang
0ce1e78364 CS-6840: Add Site2SiteVpnServiceProvider 2012-07-02 16:27:09 -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
Sheng Yang
9bb65b1126 CS-6840: Add data structure for site-to-site vpn tables 2012-07-02 16:20:58 -07:00
Sheng Yang
78b31bb7db CS-6840: Add tables for site to site VPN use. 2012-07-02 16:20:53 -07:00
Deepti Dohare
c8bbf04c81 CS-15300: Domain Admin accounts now respect the limits imposed on the domain just as a regular account.
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-03 04:35:53 +05:30
Jason Bausewein
0449ae37f1 CS-15274: Fix NPE on CreateVlanIpRangeCmd()
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2012-07-02 15:05:57 -07:00
Murali reddy
9876d34ea4 moving out ELB network element to plugins/network-elements/elastic-loadbalancer 2012-07-02 15:05:58 -07:00
Brian Federle
5fafb0e5e5 CS-15313: Error handling for account section
This fixes an issue where an error is not displayed when entering an
invalid account name.

Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
2012-07-02 11:01:38 -07:00
Brian Federle
b70bc92f46 CS-14907: Only allow download volume for uploaded volumes
This fixes an issue where an uploaded volume that hasn't been moved to
primary storage yet is downloaded, causing an error. This adjusts the
actionFilter to fix this.

Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
2012-07-02 10:41:35 -07:00
David Nalley
de04b8cb79 stopgap to fix the RPM issues created by the plugins
Patch by Hugo Trippaers
https://reviews.apache.org/r/5697/
2012-07-02 13:31:38 -04:00
Murali reddy
8aa2b55dd6 moving out NetApp code to plugins/file-systems/netapp 2012-07-02 08:34:02 -07:00
David Nalley
1581d65c99 License header updates for the core folder from Chip Childers
https://reviews.apache.org/r/5705/
2012-07-02 09:54:47 -04:00
David Nalley
9aa0edf7a4 License header updates for the ovm folder from Chip Childers
https://reviews.apache.org/r/5706/
2012-07-02 09:52:55 -04: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
David Nalley
ae4b66283a cleaning up some line endings 2012-07-02 09:50:28 -04:00
David Nalley
91fd3b772e Applying patch from Prasanna Santhanam
Marvin sandbox example scripts for generating one host configurations
https://reviews.apache.org/r/5656
2012-07-02 09:08:51 -04:00
David Nalley
ad3ae753dd Patch from Hugo Trippaers
https://reviews.apache.org/r/5698
CentOS 6.2 ships tomcat6-el-2.1-api-6.0.24.jar with tomcat just like RedHat
2012-07-02 09:00:06 -04:00
Wido den Hollander
1a2f354f4d Remove message about contacting Cloud support.
CloudStack has gone Apache now.
2012-07-01 15:12:43 +02:00