Commit Graph

16989 Commits

Author SHA1 Message Date
Darren Shepherd ad54ed1790 * Maven 3 support
* Pretty Format POM's
* AWS API compiles now
2012-08-23 14:26:26 -07:00
Darren Shepherd 3976c7478c m2e doesn't like it when the project root is the source folder 2012-08-23 14:26:26 -07:00
Darren Shepherd f78aa9d98a Fix small compilation issue encountered when building with maven 2012-08-23 14:26:25 -07:00
Darren Shepherd b8e95e435f Maven config, initial commit 2012-08-23 14:26:25 -07:00
Jessica Wang 7f8734f124 CS-15802: cloudstack 3.0 UI - stop/reboot virtualRouter/network - add text "All services provided by this virtualRouter/network will be interrupted" in confirm dialog. 2012-08-23 14:08:20 -07:00
Brian Federle 00323f0e5a CS-15967: Don't pass projectId=-1 to zone->guest networks list
reviewed-by: jessica
2012-08-23 13:16:42 -07:00
Brian Federle c0b92958ef CS-16001: Show VPC router details for domain admins 2012-08-23 12:26:03 -07:00
Brian Federle b302ed904a CS-16144: Show warning before enabling local storage in zone wizard
Conflicts:
	ui/dictionary.jsp
2012-08-23 11:08:48 -07:00
Brian Federle 7e3b4408cb UI create form: Support custom checkbox 'on change' event
If field is a checkbox (isBoolean: true) and onChange function is
specified, then call this onChange everytime checkbox is clicked.
2012-08-23 11:08:12 -07:00
Jessica Wang b5d00724fa cloudstack 3.0 UI - basic zone - elastic IP - Add Load Balancer tab - Add VMs button - add a comment to specify code area. (Reviewed-by: Brian) 2012-08-23 10:40:05 -07:00
Abhinandan Prateek 879d62d881 enable tampa pre-release 2012-08-23 12:32:10 +05:30
Abhinandan Prateek cebd9444be fixing the xen systemvm template guest os to reflect the right one 2012-08-23 12:25:46 +05:30
Abhinandan Prateek 3298a481a8 For assignVM, marking older snapshots removed in db 2012-08-23 12:22:02 +05:30
Abhinandan Prateek 6f26894eaf Fix for a corner case during fullsync where it tolerates a VM to exist on two clusters by virtue of it’s current host id and last host id (being on two diff clusters). 2012-08-23 12:13:53 +05:30
Brian Federle e6ef6985f8 CS-16138: Fix instance wizard 'add network' radio button
When no guest networks are present but VPC tier is, fix 'add new
network' radio button being unselected.

reviewed-by: jessica
2012-08-22 15:24:58 -07:00
Chip Childers f1eab9b6a4 Added tools/devcloud/devcloudbox/.vagrant to .gitignore 2012-08-22 16:33:36 -04:00
Pranav Saxena 2cd6382f73 CS-16133:Removing the infinte API add load balancer calls in a basic zone while adding VMs to create a lb rule 2012-08-23 01:21:20 +05:30
Chip Childers e0f505e36f Patch from Greg Burd: Improve portability of the build-apidoc.sh script by replacing readlink
Review: https://reviews.apache.org/r/6733/

Testing: Applied patch, and ran 'ant clean-all build-apidocs'
on both OSX and Ubuntu 12. Initial testing confirmed the issue
that Greg discovered on OSX.  After the patch, the docs built
correctly.
2012-08-22 15:33:17 -04:00
Alena Prokharchyk 3ada5e4a46 VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2012-08-22 11:53:59 -07:00
Alena Prokharchyk 4a2796d7c7 CS-16123: applied the patch from https://reviews.apache.org/r/6723/
original committer: Mice Xia
2012-08-22 09:39:19 -07:00
Jayapal a5248f1cfc Fix for dns issue in multiple pods
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-22 16:48:41 +05:30
Mice Xia eb4e09ec58 CS-16048 Failled to assign VLAN to storage network in zoneWizard 2012-08-22 18:06:03 +08:00
kishan b42a813ff1 bug CS-16112: During unplug nic iptables rules are cleaned up in both cloud_nic.sh and vpc_netusage.sh. Consolidated this code in cloud_nic.sh
status CS-16112: resolved fixed

Conflicts:
	patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
2012-08-22 12:00:02 +05:30
Sheng Yang 95347d2a5e CS-16119: Fix wrong container name of updateVpnCustomerGateway
Reviewed-by: Frank Zhang
2012-08-21 17:25:15 -07:00
Jessica Wang 576f7f6ecb cloudstack 3.0 UI - VPC feature - localize vpc.js (Reviewed-by: Brian) 2012-08-21 16:52:04 -07:00
Jessica Wang 57d95d27f1 cloudstack 3.0 UI - VPC feature - fix a bug that shortLabel was not localizable. (Reviewed-by: Brian) 2012-08-21 16:51:22 -07:00
Jessica Wang 7f6505cd3d cloudstack 3.0 UI - VPC feature - add new translation labels in dictionary.jsp (Reviewed-by: Brian) 2012-08-21 16:50:43 -07:00
Jessica Wang beb9baf950 cloudstack 3.0 UI - VPC feature - add new translation labels in messages.properties (Reviewed-by: Brian) 2012-08-21 16:49:55 -07:00
Prachi Damle 0b31a0af62 [ASFCS40]304 -> 305 DB upgrade merge to 302-> 4.0 2012-08-21 16:27:57 -07:00
Prachi Damle 511e3cb235 [ASFCS40]CS-15373: Awsapi port change to 7080.
Reviewed-By: Frank

Changes:
- Changes to deploy awsapi in separate webapps folder and listeining on 7080 port
- Revert changes which were done to open 7080 on CloudStack

Conflicts:

	awsapi/conf/cloud-bridge.properties
	client/tomcatconf/server-ssl.xml.in
2012-08-21 16:27:55 -07:00
Prachi Damle 4bffd71d71 [ASFCS40]Db upgrade: merging changes from 303->304 upgrade to 3.0.2 -> 4.0 on master branch. 2012-08-21 16:27:54 -07:00
Alena Prokharchyk cd0004bb86 CS-16111 - DB upgrade; fixed foreign keys names 2012-08-21 15:38:17 -07:00
Alena Prokharchyk e252de4999 PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address
Reviewed-by: Frank Zhang

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiResponseHelper.java
2012-08-21 15:35:40 -07:00
Alena Prokharchyk 2bf5c99bc6 CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-08-21 15:31:07 -07:00
Alena Prokharchyk 7d0ad98c93 More logging to lock operations on the network 2012-08-21 15:25:17 -07:00
Alena Prokharchyk 14dd3f07d7 Fixed line endings in VirtualNetworkApplianceManagerImpl 2012-08-21 15:24:44 -07:00
Brian Federle aa5aa30b44 Split JSP into 2 files
Due to file size limit being reached on index.jsp, move dictionary JS
into separate file, dictionary.jsp

reviewed-by: Jessica Wang
2012-08-21 13:43:30 -07:00
Brian Federle 5d94a8de8c VPC UI: Network ACL: Only show 'acl' tab on detail view
reviewed-by: jessica
2012-08-21 13:12:52 -07:00
Pranav Saxena b7f920b4c0 CS-16018:Resources tab not displaying the Resource limits in both in default view as well as projects view 2012-08-22 01:38:10 +05:30
Kelven Yang 3113f32f25 Commit for https://reviews.apache.org/r/6701/ 2012-08-21 11:55:06 -07:00
Brian Federle 93834ea6c6 CS-16007: Show tier name (associated network name) in place of VM name
reviewed-by: jessica
2012-08-21 11:33:03 -07:00
Brian Federle 3f8d9f6b1f VPC UI: Add hover state to virtual router box 2012-08-21 11:22:50 -07:00
Chip Childers 685e59b73d Added a more licensing info. 2012-08-21 13:34:20 -04:00
David Nalley ce54bfa7fa no idea why this config file keeps disappearing 2012-08-21 12:17:40 -04:00
Wido den Hollander 50ca603d04 debian: Protect agent and management configuration from being overwritten
By adding these files to the *.conffiles file we prevent them from being overwritten by dpkg.

We don't want to overwrite these files, since they can contain very specific information regarding the setup.
2012-08-21 14:57:26 +02:00
Pranav Saxena 568cc88c20 CS-15898:Change drop down options in vm tier for vpc 2012-08-21 15:51:41 +05:30
Nitin Mehta 7aa7d6e39f CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swift_id to go and download the snapshot from the swift.
Reviewed-by: Kishan
2012-08-21 13:46:18 +05:30
Sheng Yang 20ccb6c1cb S2S VPN: CS-16092: Add ESP rule to iptables
Otherwise the other end cannot initiate connection.
2012-08-20 17:28:46 -07:00
Brian Federle aa64dc5fdf Instance wizard: add VPC drop-down
Select VPC drop-down was missing previously from the instance wizard,
add network step. This re-adds it.
2012-08-20 15:16:06 -07:00
Wido den Hollander 48227b972a docs: Add network and firewall configuration for Hypervisor 2012-08-21 00:10:31 +02:00