etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,104 Commits 323 Branches 325 Tags 929 MiB
Commit Graph

12104 Commits

Author SHA1 Message Date
Brian Federle ff3c236776 CS-13091: Enable/disable physical network UI actions 
Conflicts:

	ui/index.jsp
 2012-05-24 12:16:51 -07:00
Alena Prokharchyk 036c7a0dce Removed unused comments 2012-05-24 12:03:45 -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
Kelven Yang ae2b599b8d CS-15080 - add support for private network on a VLAN under VMware 2012-05-24 11:40:43 -07:00
Jessica Wang d81f72ee28 add new labels in Chinese translation file. 2012-05-24 10:47:40 -07:00
Pranav Saxena abc1711e07 CS-13738: IE compatibility issues -No data to show text 2012-05-24 20:14:37 +05:30
Pranav Saxena d33c9e61ef CS-15078: Standard name for vSwitch 2012-05-24 18:09:26 +05:30
Pranav Saxena 9a22bbe184 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-05-24 16:25:46 +05:30
Sanjay Tripathi a99ac06d32 NexusVswitch UI development 2012-05-24 16:24:01 +05:30
Pranav Saxena 746f1634d4 NexusVswitch UI enable/disable messages 2012-05-24 16:23:42 +05:30
Sanjay Tripathi b04ba4f8e0 NexusVswitch UI development modified enable disable actions and details tab 2012-05-24 15:25:15 +05:30
Sanjay Tripathi 060090fdbb NexusVswitch UI development modified listCiscoNexusVSM command 2012-05-24 14:19:43 +05:30
anthony 175f396c1e CS-14946, check if it is linux bridge before call ovs 2012-05-23 19:08:17 -07:00
anthony b650fef1e0 CS-14784, CS-15065 , after release IP, reapply other IPs in the same eth device, to prevent secondary IPs are removed when primary IP is removed 2012-05-23 18:45:49 -07:00
Vijayendra Bhamidipati 4a18385e47 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-05-23 18:30:08 -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
Jessica Wang 219bbb4324 CS-13739: localize more labels 2012-05-23 17:20:45 -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 44b88e093f CS-15070: remove invalid refs from storage_pool_host_ref 2012-05-23 14:50:03 -07:00
Jessica Wang 63d512b808 CS-14989: cloudstack 3.0 UI - VM wizard - select template step - populate only templates whose hypervisor(s) are supported in the selected zone. 2012-05-23 14:12:36 -07:00
Brian Federle 4cf1cb744f Don't send VSM details if vSwitch isn't enabled 
Conflicts:

	ui/scripts/system.js
 2012-05-23 13:11:37 -07:00
Brian Federle 1e1eb45b0f CS-15067 
Provide Nexus vSwitch fields on add cluster form, if on VMware
hypervisor and vSwitch is enabled in configuration
 2012-05-23 13:08:50 -07:00
Sheng Yang 1ab26e11de Revert "bug 10946: Add default buffer length for compressed request" 
This reverts commit e3d30c6be6.

This fix CS-14646.
 2012-05-23 12:11:37 -07:00
Ewan Mellor 42773d8a33 Added a category declaration for CiscoNexus (I put it in the Network category) 
and improved the exception.
 2012-05-23 12:03:48 -07:00
Brian Federle 661fa30bcf vSwitch UI fixes 
commit 531ebe165de441fdf8e8bb86c76056504cf3aadb
Author: Brian Federle <brian.federle@citrix.com>
Date:   Wed May 23 10:27:51 2012 -0700

    Fix vSwitch password field

reviewed-by: brian

commit e51a0bd5e198483704d6d7f2dc4cb4c74e7c9167
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Wed May 23 19:40:13 2012 +0530

    CS-9919: Changes to integrate UI changes for nexus feature

reviewed-by: brian

Conflicts:

	ui/scripts/system.js
 2012-05-23 11:16:39 -07:00
Devdeep Singh dabccbd085 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-05-23 19:01:22 +05:30
Devdeep Singh 5062643dd9 CS-9919: Changes to integrate UI changes for nexus feature. 
Reviewed by: Sateesh, Pranav.
 2012-05-23 18:56:49 +05:30
kishan 242ddfb23b bug CS-15004: Do not collecting network usage while stopping Direct network Virtual Router in VMware 
status CS-15004: resolved fixed
reviewed-by: Nitin
 2012-05-23 18:50:22 +05:30
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
Sateesh Chodapuneedi 53d4c8f532 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 
Conflicts:
	server/src/com/cloud/resource/ResourceManagerImpl.java
 2012-05-23 16:30:52 +05:30
Sateesh Chodapuneedi e413f5522a CS-9919: Support for Nexus Swiches (Cisco Vswitches) 
Updating the checks for VSM parameter validation while adding cluster.
 2012-05-23 16:24:07 +05:30
Prasanna Santhanam a8a1d37ab1 imports in the libs for remoteSSHClient 2012-05-23 15:35:40 +05:30
Prasanna Santhanam 2d7281ce43 more corrections to remoteSSHclient imports 2012-05-23 15:02:08 +05:30
Prasanna Santhanam 27690101ea Package imports for remoteSSHClient were not correct 2012-05-23 12:13:07 +05:30
Jayapal 173a894a8b CS-13500 Added hairpin NAT fix for static NAT 2012-05-23 12:03:55 +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 a056581e21 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-05-22 19:11:53 -07:00
Vijayendra Bhamidipati ab12628925 CS-15055: DB exception when creating n1kv VSM when adding a cluster via the latest management server GUI. 
Description:

	Missed a check for Null pointer.
 2012-05-22 19:10:47 -07:00
prachi 83aa7ee125 CS-15061: Not able to add account based ingress rules.NullPointerException seen in management server logs. 
Reviewed-By: Sheng Yang

Adding null check - regression due to CS 14968
 2012-05-22 18:04:41 -07:00
Vijayendra Bhamidipati 686064a8be CS-15055: DB exception when creating n1kv VSM when adding a cluster via the latest management server GUI. 
Description:

	Adding an optional flag to the addCluster command,
	"addvsmflag". If this is set to true, the API will
	throw an exception if any VSM parameter is missed
	out. The above bug was running into a DB exception
	because the vCenter ipaddress wasn't passed in and
	the API didn't catch it.
 2012-05-22 17:54:32 -07:00
Vijayendra Bhamidipati e90e5e9c8c Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-05-22 17:25:51 -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
Jessica Wang ce07dcff85 CS-15042: cloudstack 3.0 UI - Create Network Offering dialog - when Guest Type is "Isolated", exclude "Security Groups" from services list. 2012-05-22 15:35:28 -07:00
Jessica Wang fddafbce0b CS-14206: cloudstack 3.0 UI - Create Network Offering dialog - When Guest Type is "Shared", include LB and StaticNAT in services regardless of zone type. 2012-05-22 14:48:36 -07:00
Brian Federle 58c8254dd2 Add cluster: conditionally hide vSwitch fields 
-When in add cluster screen, show the add vSwitch fields when
 hypervisor == VMware and 'vmware.use.nexus.vswitch' configuration
 flag is enabled.

-Remove 'add Nexus vSwitch' checkbox, as the vSwitch fields will
 always be shown for VMware if the above config flag is set.
 2012-05-22 13:45:47 -07:00
Brian Federle d0b6bc7d2b Remove trailing comma 2012-05-22 12:34:02 -07:00
Brian Federle f854455df7 Use IE-compatible method for changing browser title 2012-05-22 12:32:53 -07:00
Brian Federle 6401205d5d CS-13796: Fix typos in onscreen text 
reviewed-by: brian

commit c16320209eb5b4cde019c6dbe1480160fa8097df
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Tue Apr 24 02:06:43 2012 +0530

    CS-13796: Typos in Onscreen text
 2012-05-22 12:11:58 -07:00
Brian Federle fb36212726 CS-14911: Fix missing 'mine' filter from instances 
reviewed-by: brian

commit 98ead3ad5b9266e0f2a1b0e037a4f511d9e1e240
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Wed May 16 01:04:12 2012 +0530

    CS-14911 : mine is missing from Instance Filter
 2012-05-22 11:59:50 -07:00
Brian Federle 2ae25b7a2f CS-14953: 'CloudStack' -> 'CloudPlatform' 
reviewed-by: brian

commit 4488f0a66766286e960a47d34cd2e5148162bcab
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Tue May 22 15:15:40 2012 +0530

    Renaming CloudStack to CloudPlatform for Proprietary builds
 2012-05-22 11:50:12 -07:00