Commit Graph

738 Commits

Author SHA1 Message Date
Alena Prokharchyk a0a0113b51 VPC: fixed listStaticRoutes when search by gatewayId 2012-07-11 14:51:19 -07:00
Koushik Das d4d1b1c5a9 Revert "Fix for CS-15345". This issue was caused due some bug in VPC related cleanup code. The bug got fixed as part of 3caffc7855, so this is no longer needed.
This reverts commit a8c1568b37.
2012-07-11 14:19:29 +05:30
Alena Prokharchyk a3424cf8a0 VPC: add vm to network - no need to prepare nic when add vm in Stopped state to the network; the nic will be prepared once the vm starts up 2012-07-10 18:02:44 -07:00
Alena Prokharchyk 954b937a42 VPC: unplugNic - release the nic in the DB only after the command is executed succesfully on the backend 2012-07-10 18:02:44 -07:00
Alena Prokharchyk 4e5355b192 VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call 2012-07-10 15:15:30 -07:00
Alena Prokharchyk 3caffc7855 VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method 2012-07-10 14:33:24 -07:00
Alena Prokharchyk 1657486f41 VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to 2012-07-09 13:00:03 -07:00
Alena Prokharchyk c49cc27b1c VPC: CS-15485 - dont' create a record for VPC VR private gateway nic in router_network_ref; do it for regular guest networks only 2012-07-06 14:54:25 -07:00
Vijayendra Bhamidipati 3a557c2998 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-07-05 17:06:02 -07:00
Vijayendra Bhamidipati f1ec4fddd3 CS-15217: Security: Malicious user is able to get the size of the cloud by enumerating IDs
Description:

	As part of the fix for Bug CS-13127, a new overloaded function,
	addProxyObject() was added to facilitate transparent db id to
	uuid conversions when db IDs were added to exceptions that were
	thrown in the Cloudstack mgmt server code. However, it turns out
	that there are quite many db IDs still in the code that are
	being directly embedded in the String message that is passed
	during exception creation.

	In this commit, we modify the default constructor of
	InvalidParameterValueException so that it takes a second
	argument of type List<IdentityProxy>. This will help developers
	see that there is a second parameter required, and make them
	look into what that parameter is about. Hopefully, this will
	stop db IDs from being embedded into the exception message.

	The parameter can be set to null though, since there are many
	places in the code that don't embed any DB IDs in the exception.

	This is still a WIP, so the older default constructor for
	InvalidParameterValueException has not been removed yet. When
	all instances of throw new InvalidParameterValueException()
	have been moved over to the new default constructor, the old
	one will be removed, else compilation will break. The reason
	for having to do this in batches is that there are way too
	many places in the code that throw exceptions, and they all
	cannot be covered in a single commit without it taking much
	time.

	In following commits, all other exceptions will be changed
	in the same way as InvalidParameterValueException.
2012-07-05 16:48:36 -07:00
Alena Prokharchyk 2699e2c508 VPC: CS-15447 - fail vpc creation when vpc provider is not enabled at least in one physical network in the target zone 2012-07-05 13:34:34 -07:00
Alena Prokharchyk 3a56e3c55c VPC: CS-15426 - In Basic zone always pass control nic when prepare nics for the VR 2012-07-03 17:10:12 -07:00
Alena Prokharchyk 9f6d03b87b VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only 2012-07-03 15:37:07 -07:00
Alena Prokharchyk 1011dfd31c 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)
2012-07-03 14:47:07 -07:00
Koushik Das a8c1568b37 Fix for CS-15345
During account cleanup, associated network is accessed without checking whether it is present or not. Added a check to use it only when present.
2012-07-03 18:52:36 +05:30
Alena Prokharchyk 6af13737fa VPC: corrected the name for PublicIp interface (mistakenly renamed it as a part of previous checkin) 2012-07-02 17:31:47 -07:00
Alena Prokharchyk e3ca32af2a VPC: remove network ACLs from VPC VR when shutdown guest network 2012-07-02 16:44:43 -07:00
Alena Prokharchyk 481f59df3b 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 14:14:34 -07:00
Alena Prokharchyk 4415c67604 VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed) 2012-07-02 12:58:30 -07:00
Sheng Yang 8670b703d2 CS-6840: Add Site2SiteVpnServiceProvider 2012-06-27 19:05:48 -07:00
Alena Prokharchyk 74043d28e4 VPC: delete network ACLs as a part of network cleanup 2012-06-27 15:58:09 -07:00
Alena Prokharchyk bc9b23dfcd VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete) 2012-06-27 15:12:56 -07:00
Alena Prokharchyk 84a4a7c1c8 VPC: update ip address object after the ip is associated with the network 2012-06-25 16:26:19 -07:00
Alena Prokharchyk 32c858ecd2 VPC: finilize start for the VR - send ip assoc commands only after plug nic is done for all public nics 2012-06-25 15:59:23 -07:00
Alena Prokharchyk 8cbf5f749f VPC: Don't allow to do ip assoc to the network in the VPC. The ip should be assigned to the VPC itself 2012-06-25 13:19:28 -07:00
Alena Prokharchyk ba7fddac3b VPC: implemented add/delete Private gateway 2012-06-22 15:06:58 -07:00
Alena Prokharchyk 516628273f VPC: apply firewall ACLs as a part of VPC router start/restart and VPC network implement 2012-06-21 15:10:15 -07:00
Alena Prokharchyk 4ea750680b Added NicTO to SetSourceNat command, CreateLoadBalancerConfigCommand, SetNetworkACLCommand
Conflicts:

	api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
2012-06-21 10:05:31 -07:00
Alena Prokharchyk e56dbdf78e canUseForDeploy is always false for system networks 2012-06-20 15:42:41 -07:00
Alena Prokharchyk bb30a6b6bb VPC: initial checkin for network ACLs 2012-06-20 12:48:00 -07:00
Alena Prokharchyk b8f67f0249 Vpc: fixed the network shutdown happening as a part of GC thread for VPC networks 2012-06-19 14:30:50 -07:00
Sheng Yang 830f12aadf Don't need to check guest cidr overlap
It's not external devices, so guest network with different vlan can be the same.
2012-06-18 16:03:03 -07:00
Vijayendra Bhamidipati b9263b0c51 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-06-18 13:01:11 -07:00
Vijayendra Bhamidipati 2ef8287287 Bug CS-14448: Wrong error message on using the createVlanIpRange cmd
Description:

	Fixing two other scenarios apart from the reported one
	where we were not passing in database IDs for translation
	into uuids, in the exception.
2012-06-18 12:57:56 -07:00
Vijayendra Bhamidipati e03ed60540 Bug 13127: API error text refer to database ids instead of uuids
Bug CS-14448: Wrong error message on using the createVlanIpRange cmd

Cherry-picking from master for bug 14448 into 3.0.x. Resolved
conflicts encountered during cherry-picking.

Description:

	Adding overloaded addProxyObject() function to CloudException
	and RuntimeCloudException classes and using this function
	to stuff exceptions with IDs, to reduce code footprint.

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
2012-06-18 12:55:44 -07:00
Vijayendra Bhamidipati 7860b78049 Bug 13127: API error text refer to database ids instead of uuids
Bug CS-14448: Wrong error message on using the createVlanIpRange cmd

Cherry-picking from master for bug 14448 into 3.0.x. Resolving
conflicts arising from the pick.

Description:

	Modifying the API functions' exception handling to call
	addProxyObject() wherever applicable, and removing some
	wrong calls to addProxyObject() that were put in in an
	earlier commit for this bug.

	With this commit, we cover many API functions to use the
	new exception handling code, but some pieces may still be
	left out. These will be covered as work in progress, when
	making changes to the CS API code.

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
2012-06-18 12:44:18 -07:00
Vijayendra Bhamidipati 6d48578234 Bug 13127: API error text refer to database ids instead of uuids
Bug CS-14448: Wrong error message on using the createVlanIpRange cmd

Cherry-picking from master for bug 14448 into 3.0.x. Modified the
pick to resolve some conflicts.

Description:

	Removed some wrong invocations to addProxyObject() when
	throwing exceptions in NetworkManagerImpl.java.

	Replaced db ids with uuids in various points in the code
	of NetworkManagerImpl.java, where exceptions are thrown.

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-18 12:18:17 -07:00
anthony 3b2b8fc143 VPC: fix VPC cidr check 2012-06-18 11:40:59 -07:00
Alena Prokharchyk 1abdb876c9 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
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/network/NetworkService.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
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
2012-06-15 15:57:56 -07:00
Alena Prokharchyk aaf0d24a83 Merge branch 'vpc-3.0.x' into 3.0.x
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/AssociateIPAddrCmd.java
	api/src/com/cloud/api/commands/EnableStaticNatCmd.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/rules/RulesService.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
	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/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java
	setup/db/create-schema.sql
	wscript
2012-06-14 19:04:59 -07:00
Alena Prokharchyk 9c01ca2785 VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip) 2012-06-12 10:58:20 -07:00
Alena Prokharchyk d1598e366e Release acquired lock for VPC 2012-06-11 14:31:39 -07:00
Alena Prokharchyk 3b943d84dd Fixed addDhcpEntry/userdata/password in VPC setup 2012-06-11 13:37:38 -07:00
Alena Prokharchyk cf1882a2c8 1) Added VpcVirtualNetworkApplianceService interface
2) Pass dns1/dns2 to setupGuestNetworkCommand
3) Network implement - don't get source nat ip address for Vpc if it already has one
2012-06-10 12:31:47 -07:00
Kelven Yang 3e16945914 bug CS-15191: remove a sanity check that prevent us from getting traffic lable under VMware
Reviewed-by: anthony
2012-06-06 15:14:26 -07:00
Kelven Yang 400602ee9f CS-15080: VMware control network is CloudStack management network, correct the way to send down a correct traffic label to VMware resource
Reviewed-by: Anthony
2012-06-06 15:14:03 -07:00
Alena Prokharchyk 3ae5b0b5c8 Modified virtual router startup procedure - initial start happens with control nic only; then we plug Public and then Guest nic to it 2012-06-05 11:33:31 -07:00
Alena Prokharchyk 460bab4a7d Support for adding private network 2012-06-05 10:57:29 -07:00
Alena Prokharchyk ddae550a55 AssociateIpAddress to VPC - the ip gets associated to the network only when the first rule for the ip gets created.
When the last rule is removed for vpc ip, networkId is set to null
2012-05-30 19:46:40 -07:00
Alena Prokharchyk 6a097ad3b6 Support for IPAssoc inside VPC 2012-05-29 11:27:26 -07:00