Commit Graph

12282 Commits

Author SHA1 Message Date
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
anthony 0d19de3d4b VPC : fix for geustnw.sh 2012-06-18 15:24:22 -07:00
Vijayendra Bhamidipati df67939386 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-06-18 15:05:10 -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
Jessica Wang f569b75f3f CS-15312 - cloudstack 3.0 UI - Add Zone Wizard - add physical network - remove "L3" option from isolation method. 2012-06-18 15:01:41 -07:00
Jessica Wang 6c8425b279 cloudstack 3.0 UI - edit template - isPublic field - Make it editable if it's root-admin or if allow.public.user.template is true. Make it non-editable otherwise. 2012-06-18 14:06:13 -07:00
Jessica Wang 1656176971 CS-14854: cloudstack 3.0 UI - (1) extend detailView widget to take in dynamic isEditable value. (2) template page - edit template action - for regular user and domain admin: make Extractable field and Featured field non-editable. Do NOT send “isfeatured”, “isextractable” to updateTemplatePermission API when they are non-editable. 2012-06-18 13:25:42 -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
anthony eb26f9569b VPC : fixed vpc_ipassoc 2012-06-18 12:20:51 -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
Sam Robertson 855618e4f4 Bug CS-12441: Generate QueryString from request parameters. 2012-06-18 11:20:18 -07:00
anthony 99e46e4c2f VPC : add vpc_ipassoc.sh vpc_snat.sh
Conflicts:

	wscript
2012-06-18 10:35:32 -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
anthony 53f6739900 CS-12972 : cap is per domain/VM
Conflicts:

	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2012-06-15 11:07:46 -07:00
anthony 52b2408c5f only destroy CDROM for system VMs on current host 2012-06-15 10:51:53 -07:00
anthony 6ce7daf494 CS-15155 : need to eject CD before destroy vbd
reviewed-by : kelven
2012-06-15 10:46:46 -07:00
anthony 89332d2816 CS-15155 : after system VMs boot up, destroy CD virtual device for System VM
when reconnect XenServer host, try to destroy CD virtual device for System VM, this is for upgrade

Reviewed-By : kelven
2012-06-15 10:46:12 -07:00
Alena Prokharchyk 29b82f2778 Added @Implementation to bunch of api commands - used by api doc builder 2012-06-14 19:14:57 -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 f1738e1e2e Changed the command name for adding private gateway 2012-06-14 17:47:43 -07:00
Jessica Wang 11b7675193 CS-15157: cloudstack 3.0 UI - infrastructure page - physical network - network service providers - reset nspMap before populating listNetworkServiceProviders response to nspMap. 2012-06-14 17:28:12 -07:00
Alena Prokharchyk 0b5ed6ef57 Api docs: added category for resource tags commands 2012-06-14 15:26:27 -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
Edison Su 402ee953b2 CS-14826
fix typo
Reviewed-by: sheng
2012-06-14 14:04:33 -07:00
Brian Federle a9d1d13878 CS-14230
Add password confirm to add account/user forms

Original patch by: oyla.smola@gmail.com
Reviewed-by: brian
2012-06-14 11:34:10 -07:00
Prasanna Santhanam 09e7ab0c7e Implementing the SetFirewallRulesCommand for the simulator
* Essential since we need firewall rules open before applying network
 rules. Without the fix one recieves an UnsupportedCommandAnswer and
fails the application of the network rule

* Also RebootCommand responds with a RebootAnswer - minor fix
2012-06-14 12:24:47 +05:30
anthony d83c81b637 VPC : fixed get_domr_version 2012-06-13 19:25:48 -07:00
Jessica Wang 8ad831e691 CS-14604: cloudstack 3.0 UI - Add Zone Wizard - (1) Basic zone: always show Guest Traffic step regardless of whether OVS tunnel manager is enabled. (2) Advanced zone: skip Guest Traffic step if OVS tunnel manager is enabled. 2012-06-13 17:55:49 -07:00
Alena Prokharchyk 127daa5831 Fixed lock problem when add vm to guest network 2012-06-13 16:43:43 -07:00
anthony 8f4ccf9f72 VPC : revert dnsmasq.conf 2012-06-13 15:48:58 -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
Jessica Wang 7d6528b21d CS-14604: cloudstack 3.0 UI - Add Zone Wizard - skip Guest Traffic step if OVS tunnel manager is enabled. 2012-06-13 14:40:17 -07:00
Pranav Saxena ce6b50b3d6 CS-15202: Rename all references in UI of Nexus VSM/dvswitch to Nexus 1000v 2012-06-13 11:21:01 -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
Chirag Jog 17978438ee Adding Netscaler test cases and fixing bugs in HA test suite. 2012-06-13 20:34:14 +05:30
anthony d3720c988b VPC : add vpc_vpn_l2tp.sh 2012-06-12 17:09:50 -07:00
Kelven Yang 93530c60be 1) Fix Console viewer CTRL key problem on Chrome browser
2) Support mouse drag/drop
2012-06-12 15:53:43 -07:00
anthony 4075963767 VPC : revert some change 2012-06-12 15:33:01 -07:00
Alena Prokharchyk 39efa6cd2e Temporarely disabling resource tags commands until gen_toc.py is fixed. 2012-06-12 14:12:07 -07:00
Jessica Wang 286d7b061d cloudstack 3.0 UI - account page - fix a bug that happens when account name includes ampersand or other special characters. Encode account name before it's being passed to API calls. 2012-06-12 13:58:15 -07:00
Alena Prokharchyk 4ded9c173e Fixed build-apidocs 2012-06-12 13:48:34 -07:00