12140 Commits

Author SHA1 Message Date
David Nalley
b7ca7f8df2 Doh, broke the build - fixing that. 2012-06-06 23:21:54 -04:00
David Nalley
bd55f18534 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-06-06 23:06:41 -04:00
David Nalley
937a9f7c45 fixing utils license header 2012-06-06 23:06:02 -04:00
Kelven Yang
ef4f0c695a bug CS-15179: ensure route before connecting
Reviewed-by: anthony
2012-06-06 16:58:13 -07:00
Kelven Yang
d0bdab98ae bug CS-15191: remove a sanity check that prevent us from getting traffic lable under VMware
Reviewed-by: anthony
2012-06-06 16:57:49 -07:00
Kelven Yang
8b6936bde6 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 16:57:27 -07:00
Kelven Yang
874544fd64 bug CS-15119: check previously named datastore before we mount new one to support backwards compatibility
Reviewed-by:Anthony
2012-06-06 16:56:41 -07:00
Kelven Yang
9298e5d25d bug 15080: check traffic type in host discovery stage - cluster level checks 2012-06-06 16:54:16 -07:00
Kelven Yang
d8d4232a7b bug : CS-15080 - check traffic label at host discovery stage also 2012-06-06 16:53:53 -07:00
Alena Prokharchyk
7092532ae8 CS-15220: fixed db upgrade for networks using external devices
Reviewed-by: Sheng Yang

Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java

Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-05 15:10:49 -07:00
Alena Prokharchyk
d390261710 CS-15197: correct default value for service_offering.nw_rate
Reviewed-by: Will Chan

Conflicts:

	setup/db/db/schema-302to303.sql
2012-06-05 15:09:46 -07:00
Wido den Hollander
1df520c8e4 debian: Remove the Console Proxy
Signed-off-by: Wido den Hollander <wido@widodh.nl>
2012-06-04 23:41:40 -04:00
David Nalley
0131f964ff removing an errant reference to Forrest 2012-06-04 22:24:01 -04:00
David Nalley
4cfbe5cf8b fixing license headers for usage 2012-06-04 10:22:57 -04:00
David Nalley
e293fb887a cleaning up licensing notices in the UI directory to conform with ASF guidelines 2012-06-02 00:07:09 -04:00
David Nalley
db1e80b0de adding some process docs and templates 2012-06-01 23:46:52 -04:00
Sheng Yang
79c276ba6b 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-05-31 18:57:11 -07:00
Sheng Yang
96e7e3d1ca CS-15175: Fix public interfaces of redundant router
We need to use ifup/ifdown to bring up the interfaces, because ifconfig don't
know the ip of the interface after we modify cloud-early-config to avoid
first start up of public interface.

Reviewed-by: Edison
2012-05-31 17:58:02 -07:00
Sheng Yang
985757ffe6 CS-14421: Clean /etc/network/interfaces when sysytemvm reboot
In order to make sure next time, booting process would use cloud-early-config's
setup, rather than networking scripts to bring up interfaces.

Reviewed-by: Kelven Yang
2012-05-31 17:57:55 -07:00
butanet
2c001bbe21 Fix variable name in createtmplt.sh 2012-05-28 14:18:47 -04:00
butanet
f5eefc0493 Fix variable name in createtmplt.sh ($tmplfs -> $tmpltfs) 2012-05-28 14:13:37 -04:00
Wido den Hollander
003d628992 debian: Do not package the css, js, ui and images directory in the agent package
Signed-off-by: Wido den Hollander <wido@widodh.nl>
2012-05-27 19:45:04 -04:00
John Kinsella
efe318336a CS-14955: security_group.py only creates ICMP iptables rules for ICMP type -1
Description:
Unindented 3 lines to update logic flow to execute iptables when
passed ICMP type is not -1.
2012-05-27 19:39:56 -04:00
Robert Schweikert
980f7931f7 - support SLES and openSUSE as configuration and build targets 2012-05-27 19:31:27 -04:00
Vijayendra Bhamidipati
90b87585e7 CS-14956 Support for rate limiting policies in Nexus dvSwith feature for CloudStack
Removed global parameters that are not required. Cleanup.
Reviewed-by: Devdeep

Not sure why but changes in VmwareServerDiscoverer.java were not picked up
when cherry-picking from 3.0.x. Putting them in this separate commit.
2012-05-25 19:50:50 -07:00
Sateesh Chodapuneedi
4ad8845b28 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-25 19:41:36 -07:00
Devdeep Singh
0e3bf8cabb CS-14956: Fixing an issue that surfaced while testing rate limiting
policies. An error was getting reported during policy map creation that
config operation was in progress, Added synchronization to make sure
sending and receiving commands are seralized. Also removed the retry logic
as after this change it is not needed.

Reviewed-By: Vijay
2012-05-25 19:35:34 -07:00
Sateesh Chodapuneedi
ab768f03fd CS-14956 Support for rate limiting policies in Nexus dvSwith feature for CloudStack
Reviewed-by: Devdeep

Conflicts:

	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
2012-05-25 19:20:58 -07:00
Vijayendra Bhamidipati
7cf04c1fe4 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Incorporating Salvatore's review comments.
2012-05-25 19:02:00 -07:00
Sateesh Chodapuneedi
8eff665784 CS-15073 Nexus vSwitch: Source NAT is being programmed on the wrong nic on the Virtual Router
Reviewed-by: Devdeep

Conflicts:

	vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
2012-05-25 18:42:24 -07:00
Vijayendra Bhamidipati
ec83e0e939 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Removing the CiscoNexusVSMService class since
	we don't use it anywhere.
2012-05-25 18:38:42 -07:00
Vijayendra Bhamidipati
daa190b4cb CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Deleting the row in cluster_vsm_map after
	a cluster is deleted, if the cluster type
	is vmware and the global vswitch nexus
	config flag is set to true.
2012-05-25 18:38:30 -07:00
Vijayendra Bhamidipati
7f26a43d48 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-25 18:37:50 -07:00
Vijayendra Bhamidipati
15d0cf782a 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.

Conflicts:

	api/src/com/cloud/api/commands/AddClusterCmd.java
2012-05-25 18:37:20 -07:00
Devdeep Singh
1593900402 CS-9919: Changes to integrate UI changes for nexus feature.
Reviewed by: Sateesh, Pranav.

Conflicts:

	ui/scripts/system.js
2012-05-25 18:33:53 -07:00
Sateesh Chodapuneedi
70fbee2cf2 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Updating the checks for VSM parameter validation while adding cluster.

Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
2012-05-25 18:31:49 -07:00
Vijayendra Bhamidipati
63de97e63c CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Modifying column names in db tables to
	adhere to naming conventions.
2012-05-25 18:28:34 -07:00
Vijayendra Bhamidipati
6920d76995 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-25 18:28:25 -07:00
Vijayendra Bhamidipati
82ffddc7b8 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-25 18:28:10 -07:00
Vijayendra Bhamidipati
ed0ba1a0e6 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.

Conflicts:

	client/tomcatconf/cisconexusvsm_commands.properties.in
	server/src/com/cloud/server/ManagementServerImpl.java
2012-05-25 18:27:29 -07:00
Devdeep Singh
5fc5b7a0eb CS-9919: Adding helper routines to query details of a port profile and
associated policy maps. Also updating the error message logs.
2012-05-25 18:24:20 -07:00
Vijayendra Bhamidipati
9fcdfe5b19 CS-15024: NullPointerException thrown while executing GetVmStatsCommand
Description:

	Fixing incorrect non-null object check.
2012-05-25 18:24:02 -07:00
Vijayendra Bhamidipati
ffaa8cc20a CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	More changes incorporating Alena's review comments:

	  1. Changed id to clusterId for better naming.

	  2. Changed the name of GetCiscoVSMByClusterIdCmd
	     to ListCiscoVSMDetailsCmd.

	  3. Removed the GetCiscoVSMDetailsCmd command.

	  4. Removed catch{} blocks in each of the Nexus
	     related APIs since the exceptions raised in
	     the API implementations will be caught in the
   	     command dispatcher.

	  5. Added ActionEvent annotation to
	     deleteCiscoNexusVSM() function.

	  6. Modified each Nexus API command's
	     getEntityOwnerId() to return
	     Account.ACCOUNT_ID_SYSTEM.
2012-05-25 18:23:51 -07:00
Vijayendra Bhamidipati
e7246847ac CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Putting in code changes as per Alena's reviews:

	  Replaced references to CiscoNexusVSMDeviceVO
	  in GetCiscoVSMByClusterIdCmd to work with an
	  interface that CiscoNexusVSMDeviceVO instead,
	  since VO objects should not be directly accessed
	  in APIs.

	  Made associated changes in other files.

	More commits incorporating Alena's review comments
	will follow.
2012-05-25 18:23:40 -07:00
Vijayendra Bhamidipati
78d40da1bf CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Removing two unexposed APIs that we never use:
		ConfigureCiscoNexusVSMCmd
		ListCiscoNexusVSMCmd

	More changes to follow.
2012-05-25 18:23:21 -07:00
Vijayendra Bhamidipati
a31aa29423 Bug CS-15020: DB inconsistencies after upgrade from Acton to Bonita
Description:

	Putting in table creation DMLs in upgrade script
	when upgrading from Acton (3.0.2) to Bonita (3.0.3).
	Please note that the field names in the tables need
	to be changed as per naming conventions. Those changes
	will be checked in in an upcoming commit.

Conflicts:

	setup/db/db/schema-302to303.sql
2012-05-25 18:22:41 -07:00
Sateesh Chodapuneedi
e952f0d5f3 CS-15010 Nexus vSwitch: Advanced Zone - System VMs failed to deploy due to Start Command Failure
CS-15016 SSH connections to VSM are not cleared [Once the connections are exceeded it failed to connect to VSM]

Conflicts:

	core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
2012-05-25 18:17:59 -07:00
Vijayendra Bhamidipati
b28568a221 CS-9919 Support for Nexus Swiches (Cisco Vswitches)
Description:

	Modified the following commands to be Async:
		a. EnableCiscoNexusVSM
		b. DisableCiscoNexusVSM
		c. DeleteCiscoNexusVSM

	Cleaned up miscellaneous code.
2012-05-25 18:11:04 -07:00
Vijayendra Bhamidipati
b3e05a7dcb CS-14937: System VMs and Router VMs does not come up after upgrading from 3.0 to Bonita
Description:

	Reverting my earlier fix for bug 14937. The fix is
	not needed.
2012-05-25 18:10:35 -07:00
Vijayendra Bhamidipati
f7797e8b02 CS-14937: System VMs and Router VMs does not come up after upgrading from 3.0 to Bonita
Description:

	Putting in fix for bug 14937. Please note however,
	that this fix may be modified later.
2012-05-25 18:10:18 -07:00