Commit Graph

1573 Commits

Author SHA1 Message Date
Alena Prokharchyk da6c58ed30 VPC: plug guest nic on guest network implement, and unplug on shutdown 2012-06-19 10:00:56 -07:00
Alena Prokharchyk 7a23556513 Network usage for VPC implementation 2012-06-18 17:48:35 -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
Alena Prokharchyk 375bb99f09 Don't send public/guest nic info when start VR in VPC 2012-06-18 15:57:58 -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 5235894b20 Changed log level to trace for vpc router element 2012-06-15 12:58:15 -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 127daa5831 Fixed lock problem when add vm to guest network 2012-06-13 16:43:43 -07:00
Alena Prokharchyk 2412b7837d Isolated non-vpc networks: start router with 3 nics from the very beginning 2012-06-13 14:56:04 -07:00
Alena Prokharchyk a5f0b64562 Added new capabilities to VPN and Firewall services defining if VPN is S2S or Remote access, and if the Firewall rules should be created per cidr or per public ip address 2012-06-13 10:17:48 -07:00
anthony 4075963767 VPC : revert some change 2012-06-12 15:33:01 -07:00
Alena Prokharchyk 97ca76856a VPC: more changes to ipAssoc 2012-06-12 13:35:15 -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 287ebd350d More logging to plug nic code 2012-06-11 15:58:26 -07:00
Alena Prokharchyk 07be6918d8 VPC: fixed guest network shutdown 2012-06-11 15:01:51 -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
Alena Prokharchyk 7bdcb244a2 StartRouter: set only control nic during the initial router start; plug exising public and guest nics after the router is started with control nic 2012-06-06 16:56:38 -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 d9758045d9 Added NicTO to setupGuestNetworkCommand constructor - we need this info for guest network configuraiton 2012-06-05 16:10:20 -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
anthony 0d89f34a48 1. move control network to eth0 on domr
2. if it is basic mode, use guest NIC as Control NIC
2012-06-04 16:35:27 -07:00
Sheng Yang 0b730969ef CS-15116: When GetDomRVersion failed, let VR creation fail
Because there are more commands after GetDomRVersion command. Though
GetDomRVersion command itself is not that critical, the commands after it may
including DHCP and firewall related commands. The failure of GetDomRVersion
command would result in the following commands fail to be executed. So it should
fail, and fail loudly.
2012-06-04 16:29:18 -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
Alena Prokharchyk a7c8354c7b Destroy VPC if it fails to start during the deployment 2012-05-29 10:36:46 -07:00
Sateesh Chodapuneedi fb85787a76 CS-14956 Support for rate limiting policies in Nexus dvSwith feature for CloudStack
Removed global parameters that are not required. Cleanup.
Reviewed-by: Devdeep
2012-05-26 05:22:03 +05:30
Alena Prokharchyk d3b1925e55 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-05-25 15:34:51 -07:00
Alena Prokharchyk fbdf10bac7 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.
2012-05-25 14:16:23 -07:00
Vijayendra Bhamidipati 3266dde7ae CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Incorporating Salvatore's review comments.
2012-05-25 09:43:00 -07:00
Alena Prokharchyk d7f0689bcb Support for delete VPC 2012-05-24 16:12:45 -07:00
Alena Prokharchyk aa0c0cb260 Added support for network shutdown in VPC guest networks 2012-05-24 15:33:52 -07:00
Alena Prokharchyk 269d4dac83 CS-15083: fixed source nat ip assoc for the case when account owns more than 1 guest network, and 1+ public account specific ranges 2012-05-24 13:41:16 -07:00
Alena Prokharchyk 4c83520dd1 CS-15082: don't allow to remove guest network in Basic zone when there are non-expunged CPVM/SSVMs using it. 2012-05-24 11:48:47 -07:00
Vijayendra Bhamidipati 0083074be4 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Incorporating more changes from Alena's review.

	Modified the Nexus Enable and Disable commands
	to return CiscoNexusVSMResponse instead of
	SuccessResponse.

	Put event annotations for enable/disable functions
	that the enable/disable nexus commands cal into.
2012-05-23 17:42:39 -07:00
Vijayendra Bhamidipati a48a3bbfbd CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Removed the vcenter_dc_name and vcenter_ipaddr
	fields from the virtual_supervisor_module
	table, the CiscoNexusVSMDeviceVO, addClusterCmd,
	and all other references to these two fields.

	Fixing null pointer exceptions when checking
	for nexus related global parameter values in
	addClusterCmd.
2012-05-23 16:53:27 -07:00
Alena Prokharchyk 2014cb0feb Plug nic support 2012-05-23 16:18:41 -07:00
kishan c85117078f bug CS-14982: Make traffic sentinel metering zones configurable. Global config default will be used when no zones are listed while adding Traffic Sentinel Host
status CS-14982: resolved fixed
reviewed-by: Nitin
2012-05-23 18:39:05 +05:30
Vijayendra Bhamidipati f3169e616f CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Modifying column names in db tables to
	adhere to naming conventions.
2012-05-22 19:13:43 -07:00
Vijayendra Bhamidipati f3647ff0b5 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Incorporating more changes post review by Alena.

	1. Renamed the ListCiscoVSMDetailsCmd command
	   to ListCiscoNexusVSMsCmd. The command will
	   return a list of VSMs always, depending on
	   what parameter is passed to it. If a clusterId
	   is passed to it, it will return the VSM
	   associated to that cluster, if present. If
	   a zoneId is passed in, it will return a list
	   of all VSMs configured for any clusters of
	   type VMware within that zone. If neither is
	   passed, it will return a list of all VSMs
	   configured in the management server. If no
	   VSMs are found, it will return an exception
	   response.

	2. Cleaned up miscellaneous code.
2012-05-22 17:22:29 -07:00
Alena Prokharchyk 9fb9149c99 1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support
2) Added services api support for plugging/unplugging the nics to VpcElement
2012-05-22 16:53:27 -07:00