Commit Graph

12313 Commits

Author SHA1 Message Date
Alena Prokharchyk f013c28536 Fixed unittest 2012-06-21 15:43:02 -07:00
anthony 566b066466 VPC : change script name 2012-06-21 15:32:29 -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
anthony 51e1bda448 VPC : change name 2012-06-21 12:29:42 -07:00
anthony bfc4722ad4 VPC : add vpc_netusage.sh 2012-06-21 12:23:44 -07:00
anthony 49d389d3c0 VPC : add vpc_loadbalancer.sh 2012-06-21 11:48:43 -07:00
olgasmola 3d10eaaafa Make templates or Isos calls when setup new instance on templates tab. 2012-06-21 11:26:56 -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
Abhinandan Prateek 71f3bd436d bug CS-15285: preserving order of network ids so that first network in the list is taken as the default network 2012-06-21 06:06:35 +01:00
Prasanna Santhanam 6fbd7503da adding unittest-xml-reporting as a dependency to marvin 2012-06-21 09:28:24 +05:30
anthony e5fd090053 VPC : completed setupNetworkACLCommand 2012-06-20 17:52:45 -07:00
anthony f99c203aa0 VPC : add vpc_nat. sh for port_forwarding and static nat 2012-06-20 16:36:37 -07:00
Alena Prokharchyk e56dbdf78e canUseForDeploy is always false for system networks 2012-06-20 15:42:41 -07:00
bfederle 615dff8d80 CS-14110: Show timestamp for general alerts
Original patch by: olga.smola
reviewed-by: brian
2012-06-20 14:52:12 -07:00
Alena Prokharchyk 0dbd487a22 VPC: implemented delete and list Network ACL(s) 2012-06-20 14:24:30 -07:00
anthony 997bc8d9ce VPC : pass subnet to guestnw.sh 2012-06-20 12:48:14 -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
Likitha Shetty 9c1d3e6614 CS-14985. Fix for ec2-describe-snapshots filters. Component: awsapi.
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
2012-06-20 10:28:14 +05:30
Likitha Shetty 6b76e708e1 CS-15122. Provide filter support for ec2-describe-availability-zones. Component: awsapi. Updated the header in the new file to conform with ASF guidelines as per review comments.
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
2012-06-20 10:27:53 +05:30
Likitha Shetty c9e6c88782 CS-14986. ec2-describe-volumes supported filters. Component: awsapi. Fix for two filters, attachment.attach-time and create-time.
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
2012-06-20 10:27:33 +05:30
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
Pranav Saxena 1dc3ee51f5 cs-15286: incorrect result when edit pod
Original patch by: olga.smola
reviewed-by: brian
2012-06-19 14:26:40 -07:00
anthony 205fd844e5 VPC : when plug VIF , get unused VIF number 2012-06-19 12:30:07 -07:00
anthony 17b9952b86 VPC : use correc provider for guest network inside VPC 2012-06-19 11:30:11 -07:00
anthony 88aa19796f VPC : fixed snat 2012-06-19 10:23:30 -07:00
anthony 63fc767a70 VPC : disable Network-usage for vpc, will revisit later 2012-06-19 10:23:30 -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
anthony 1a690c7041 VPC : fixed vpc_snat script 2012-06-18 17:21:43 -07:00
Jessica Wang ff74234fe3 CS-15311: cloudstack 3.0 UI - Add Zone Wizard - add physical network step - no isolation method dropdown if network type is Basic. 2012-06-18 16:36:05 -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
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