Commit Graph

5188 Commits

Author SHA1 Message Date
Vijayendra Bhamidipati e71732babc CS-14952: Nexus vSwitch: vCenter IP Address and DataCenter information is not present in the "virtual_supervisor_module" table. VSwitch Crendentials are not encrypted.
Description:

	Qualifying the VSM password stored in virtual_supervisor_module
	as encryptable. The encryption/decryption is transparently done
	by the cloudstack DAO layer.
2012-07-03 15:41:42 -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
Vijayendra Bhamidipati f5f356c150 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-07-03 14:01:07 -07:00
Vijayendra Bhamidipati 9e3330374f CS-15151: Cluster_details table stores Vcenter Cluster credentials in clear text
Description:

	Encrypting password values before they're written out to
	the cluster_details db, and decrypting them when reading
	in the values from the db.
2012-07-03 13:47:29 -07:00
anthony 2742c50484 CS-15385 : fix vm start in basic zone 2012-07-03 11:30:59 -07:00
Alena Prokharchyk 1e67de0ac5 VPC: added missing FirewallService to the VR provider 2012-07-03 09:34:45 -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
Sheng Yang c5cdd6947f CS-6840: Fix 0 id returned by createVpnConnection 2012-07-02 16:15:43 -07:00
Jason Bausewein b071260878 CS-15274: Fix NPE on CreateVlanIpRangeCmd()
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2012-07-02 15:08:09 -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
Jessica Wang 1791c7533b cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object). 2012-07-02 13:39: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
Jessica Wang 60da16fe8b cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object). 2012-07-02 10:24:10 -07:00
Deepti Dohare b09e43f977 CS-15300 Limits on domain admin accounts
Reviewed-by: devdeep.singh@citrix.com

change: fix for listResourceLimits
2012-07-02 20:13:06 +05:30
Sheng Yang 618d2541c8 CS-6840: Add status checking for site 2 site VPN 2012-06-29 18:58:52 -07:00
anthony 0f06bc6643 VPC : network usage works in VPC 2012-06-29 17:33:17 -07:00
Alena Prokharchyk 49d8b650e9 VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation) 2012-06-29 15:17:17 -07:00
Jessica Wang e07ec3cd2c cloudstack 3.0: (1) API - CreateVpnConnection API, ListVpnConnections API: set object name for API response.
(2) UI - Add site-to-site VPN dialog - call CreateVpnConnection API after CreateVpnCustomerGateway API returns success.
2012-06-29 14:55:26 -07:00
Jessica Wang 6cf45ad29b cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response. 2012-06-29 14:40:00 -07:00
Alena Prokharchyk 07ef43bc84 VPC: added vpccidr to the list of VPC router bootload args 2012-06-29 13:59:49 -07:00
Alena Prokharchyk 37f29ccb11 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 2012-06-29 13:46:20 -07:00
Deepti Dohare 3f61f42a7e Fix for CS-15300 Limits on domain admin accounts 2012-06-29 23:53:32 +05:30
Jessica Wang d922b99c64 cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response. 2012-06-29 11:05:10 -07:00
kishan 077ca1489c bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-06-28 18:07:47 -07:00
Alena Prokharchyk e6383fc845 VPC: when add guest network to VPC, verify that the list of network services is within the list of services supported by VPC offering 2012-06-28 17:13:39 -07:00
kishan c4cf065a3f bug CS-15221: Encrypt config value before changing category to Hidden. Regression due to af1fc1cf5d361cb6d43e0107a644c42f645a0ccc
status CS-15221: resolved fixed
reviewed-by: Nitin
2012-06-28 15:54:45 -07:00
kishan fc44c5203e bug CS-15168: Use cagetory from DB instead of Config.java, set category to Hidden during upgrade if they are not already
status CS-15168: resolved fixed
reviewed-by: Nitin
2012-06-28 15:49:53 -07:00
Sheng Yang 66a918f51a CS-6840: List all objects without require parameter 2012-06-28 15:25:15 -07:00
Alena Prokharchyk ceb4445166 VPC: createPF/createLBrule: 1) don't allow to pass openFirewall=true 2) when no openFirewall is passed in, defaulted to false if the public ip belongs to VPC 2012-06-28 14:19:14 -07:00
Alena Prokharchyk 90b96642a7 Static route can be created for generic VpcGateway now, not just Private gateway 2012-06-28 13:14:54 -07:00
Sheng Yang 23c96451a7 CS-6840: Add hypervisor commands for site-to-site vpn 2012-06-27 19:06:32 -07:00
Sheng Yang 8670b703d2 CS-6840: Add Site2SiteVpnServiceProvider 2012-06-27 19:05:48 -07:00
Sheng Yang 52e80e5fb0 CS-6840: Add commands for site-to-site vpn 2012-06-27 19:05:41 -07:00
Sheng Yang 67a434243b CS-6840: Add data structure for site-to-site vpn tables 2012-06-27 19:05:33 -07:00
Alena Prokharchyk edb8e04b0e VPC: update public IP info in domain_router table once the VR gets the public nic 2012-06-27 17:41:41 -07:00
Jessica Wang 709e878e43 CS-15356: cloudstack 3.0 API - updateZone API - when internaldns2 parameter is not being passed to updateZone API, leave it as is (i.e. remain original value of internaldns2). 2012-06-27 16:43:55 -07:00
Alena Prokharchyk 74043d28e4 VPC: delete network ACLs as a part of network cleanup 2012-06-27 15:58:09 -07:00
Vijayendra Bhamidipati 4c187a66d1 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-06-27 15:37:50 -07:00
Vijayendra Bhamidipati 73a3c8f496 Bug CS-15372: IdentityProxy info should be copied over during exception handling in API layer for create(), like it is done in execute().
Description:

	1. Added exception processing for uuid lists in exceptions,
	   for commands of type BaseAsyncCreateCmd.
	2. Added nullpointer check in addProxyObject().
	3. Miscellaneous whitespace reformatting for git patching.
2012-06-27 15:33:19 -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 67f4776243 VPC: fixed ip addres assignment in createLB rule 2012-06-27 14:09:33 -07:00
Alena Prokharchyk a65655e559 VPC: as there is no support for FirewallRules/remoteAccessVPN in the VPC, removed the networkId from the list of parameters for corresponding api calls 2012-06-27 14:09:33 -07:00
Alena Prokharchyk e2fd2f7515 VPC: don't generate empty SetStaticRoute command during VR start when there are no static routes for the VPC 2012-06-27 10:31:44 -07:00
Alena Prokharchyk 0b620bc852 VPC: fixed list public ips by vpcId 2012-06-26 16:35:56 -07:00
Alena Prokharchyk 9936e9b731 VPC: 1) Don't allow to delete private gateway when it has static routes assigned. Routes have to be removed first.
2) Re-apply static routes as a part of VPC VR start
2012-06-26 15:14:29 -07:00
Alena Prokharchyk 8a7e525aa9 VPC: fixed getEntityOwnerId() in AssociateIpAddress command to return vpc owner if vpcId is passed in. Added action events for create/delete privateGateway/staticRoutes 2012-06-26 14:08:13 -07:00
Alena Prokharchyk ccb075de6f VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands 2012-06-26 13:36:33 -07:00
Alena Prokharchyk 9d88781e8c VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done 2012-06-26 11:11:26 -07:00
Alena Prokharchyk 2f678f5697 Applied patch https://reviews.apache.org/r/5522/diff/ 2012-06-25 21:19:01 -07:00
Alena Prokharchyk a539c6e824 VPC: intermidiate checkin to Static Routes 2012-06-25 18:08:19 -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 b407b8831c VPC: initial checkin for Static Routes 2012-06-25 15:16:17 -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 9971120897 VPC: moved NetworkACL manager to the vpc folder 2012-06-25 13:19:28 -07:00
anthony c2e3833651 VPC : typo in FirewallRuleVO 2012-06-25 13:09:56 -07:00
Alena Prokharchyk 12bfac6857 VPC: CS-15354 - fixed updateNetworkServiceProvider for VpcVirtualRouter 2012-06-25 11:31:53 -07:00
Alena Prokharchyk 515340b5e3 VPC: listPrivateGateways API implementation 2012-06-25 10:12:10 -07:00
Koushik Das f56795d22b Fix bug CS-15261.
In case IP address is passed to deployVirtualMachine API, the default property on NIC was not getting set and as a result there was a failure down the line and VM creation was failing.
2012-06-25 15:21:20 +05:30
Alena Prokharchyk 05332128e9 VPC: resend private gateway as a part of VPC VR start 2012-06-22 15:47:15 -07:00
Alena Prokharchyk d1700606dd VPC: fixed NPE in network ACL delete (ip address is null for the rule of this type_ 2012-06-22 15:06:58 -07:00
Alena Prokharchyk ba7fddac3b VPC: implemented add/delete Private gateway 2012-06-22 15:06:58 -07:00
Alena Prokharchyk a96a259923 VPC: apply dhcp entries only after all guest nics are plugged 2012-06-22 10:06:26 -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 0dbd487a22 VPC: implemented delete and list Network ACL(s) 2012-06-20 14:24:30 -07:00
Alena Prokharchyk bb30a6b6bb VPC: initial checkin for network ACLs 2012-06-20 12:48:00 -07:00
Alena Prokharchyk 1862942bc9 VPC: fixed user vm start in case when Implemented network existed w/o VR (it was expunged with DestroyRouter command) 2012-06-20 10:37:47 -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
anthony 17b9952b86 VPC : use correc provider for guest network inside VPC 2012-06-19 11:30:11 -07:00
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 77b2b4a372 CS-15256: Unable to associate cluster with Nexus VSM upon a retry if addCluster command fails the first time
Description:

	Putting in code to clean up stale VSM records in case
	addCluster fails to communicate with the vCenter server.
2012-06-18 15:03:59 -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
Vijayendra Bhamidipati 8e47091ccd 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.

Description:

	Replacing placement of db ids in exception messages to uuids
	in the file ManagementServerImpl.java.

	Since there are a large number of files that throw exceptions
	with db ids in them and they need to be changed, we will make
	the changes in multiple commits.
2012-06-18 11:47:58 -07:00
anthony 3b2b8fc143 VPC: fix VPC cidr check 2012-06-18 11:40:59 -07:00
Vijayendra Bhamidipati 79abb862f3 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.

Description:

	Adding a new class AnnotationHelper, that provides routines
	to read annotations from a VO class.

	Cloudstack does the mapping between cloudstack java VO objects
	and the database tables using cglib. cglib creates proxy objects
	as the maps between VO objects and the database.  A VO (value
	object) class is populated after querying from the MYSQL database.

	Ideally, a getAnnotation() issued on a cglib proxy object should
	get a list of all the annotations in all classes in the inheritence
	chain. However, this functionality seems to be currently broken
	in cglib.  Hence, when querying for annotations given the object
	of a VO class, we need to get to the corresponding VO class of that
	cglib proxy class and issue a getAnnotation() on that class. To get
	the VO class, we simply need to get the super class of the proxy
	object. Also, we need to recurse to the root VO class in case the
	VO class extends another VO class.

	Note that the cache used by CS is ehcache.

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
2012-06-18 11:39:36 -07:00
saksham f5f07ca0fd CS-15018: Event USER.LOGIN should contain the client IP address. Changes made in accordance with the coding convention.
Reviewed-by: Alena Prokharchyk
2012-06-18 10:17:51 -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 5c5a2adb90 Completed API / Management server code for Resource tags feature. UI is yet to be done 2012-06-14 15:17:11 -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 c40839599c Initial checkin for resource tags feature 2012-06-12 10:59:56 -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