Commit Graph

16749 Commits

Author SHA1 Message Date
Prasanna Santhanam 993afdba6a ignore the tests looking for db
These tests require DB to be present to do upgrade. Revisit later.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-01 12:04:06 +05:30
Nitin Mehta e5c542aaf1 rat: Fix the license, the mouse is squeaking, Frank stepped on it :) 2013-03-01 11:19:27 +05:30
Sateesh Chodapuneedi 5d7f42d647 CLOUDSTACK-1403 Storage and console-proxy related error
Aborting lease over VM/template if uploading file fails.
Earlier the lease was completed successfully even if upload fails due to IOException or ConnectionException while uploading file to HTTP URL.

Porting the fix from 4.1 branch to master.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-01 09:41:30 +05:30
Joe Brockmeier b2a9d7558c CLOUDSTACK-427 removing a hardcoded reference from the AWS API Setup docs 2013-02-28 19:10:54 -06:00
Joe Brockmeier 38dcf4e304 Working on CLOUDSTACK-427 (hardcoded steps) and CLOUDSTACK-313 (cross references) 2013-02-28 19:02:04 -06:00
Brian Federle 260669ad9e Regions UI: Show (Default) in header if no regions are available 2013-02-28 16:02:19 -08:00
Brian Federle 990071b9d7 Regions UI: Fix gradient/text alignment 2013-02-28 16:02:19 -08:00
Min Chen 737dac2e65 Some cosmetic changes to VmwareClient private methods. 2013-02-28 15:42:56 -08:00
frank bd0fc2f354 CloudStack CLOUDSTACK-723
Enhanced baremetal servers support on Cisco UCS

change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema  to db upgrade schemaOh

Conflicts:

	client/pom.xml
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
2013-02-28 15:42:48 -08:00
frank dcef281bad CloudStack CLOUDSTACK-723
Enhanced baremetal servers support on Cisco UCS

change API response in line with new API response convention

Conflicts:

	api/src/org/apache/cloudstack/api/ApiConstants.java
2013-02-28 15:40:41 -08:00
Brian Federle 558b808a18 Regions UI: Show selected region name in header 2013-02-28 15:31:52 -08:00
Brian Federle c954d8000b Install wizard logo text: lighten trademark text to match color 2013-02-28 15:11:30 -08:00
Min Chen 801e5269ea Merge branch 'master' into vim51_win8 2013-02-28 14:25:26 -08:00
Min Chen 6f19895191 Remove unused RandomlyIncreasingVMInstanceDaoImpl to avoid confusion.
Confirmed with Kishan about this.
2013-02-28 14:17:58 -08:00
Brian Federle e653c02515 Merge branch 'master' into ui-multiple-nics 2013-02-28 12:47:36 -08:00
Hugo Trippaers 97ca7791b3 Don't load from a fixed path, but load from the classpath so admins or packagers can overwrite the logging config 2013-02-28 21:28:46 +01:00
Jessica Wang b1fcccc3f1 CLOUDSTACK-452: cloudstack UI - Zone Wizard - add IPv6 DNS1 field, IPv6 DNS2 field. 2013-02-28 12:07:33 -08:00
Jessica Wang ac89c3e7e1 CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - guest network - network detail - View IP Ranges (only available in Advanced zone) - add IPv6 Start IP, IPv6 End IP field to listView and Add IP Range dialog. 2013-02-28 12:05:56 -08:00
Jessica Wang 5dd44b0dde CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - physical network - create guest network - add IPv6 Gateway, IPv6 CIDR, IPv6 Start IP, IPv6 End IP field. 2013-02-28 12:05:12 -08:00
Jessica Wang 3f876060c0 CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - physical network - guest network - add IPv6 CIDR, IPv6 Gateway to listView and detailView. 2013-02-28 12:04:15 -08:00
Noa Resare 5477d096d5 rpm packaging fix: Add symlink for log4j-cloud.xml in client webapp
web.xml now references a log4j-cloud.xml relative to the webapp root
to capture early logging from spring.  This change introduces a symlink
in the client webapp to the system wide log4j-cloud.xml which works around
a problem starting cloud-management described in CLOUDSTACK-1436

CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]

Signed-off-by: David Nalley <david@gnsa.us>
2013-02-28 19:51:05 +00:00
Noa Resare 9801667199 Revert classpath.conf.in to before .deb packaing merge
This change is apparently incompatible with the centos packaging,
temporarily reverting until we have discussed a proper fix

CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]

Signed-off-by: David Nalley <david@gnsa.us>
2013-02-28 19:45:46 +00:00
Min Chen bcaac324aa Rebase with master, bring into Vmware vswitch change. 2013-02-28 11:00:03 -08:00
Rohit Yadav f16347960a rat: Fix the license, the mouse is squeaking, Nitin stepped on it :)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 18:35:43 +05:30
Wido den Hollander 01db2df23e debian: Copy the 4.2 jar files to the destination directories.
This is FAR from perfect, but it works for now.

the VERSION variable returns 4.1 from the debian/changelog file, but in
the Maven configuration everything is already set to 4.2

So generated JAR files have 4.2.XX-SNAPSHOT in their name.

We probably want to find a better way to match this, extracting the version
somewhere out of Maven maybe?
2013-02-28 13:48:14 +01:00
Wido den Hollander ca6c1eba9c debian: Require either Java 6 or 7
Our source is 1.6 compatible (pom.xml), but users can choose to compile
with JDK7 and run with JRE 7 if they want.
2013-02-28 13:48:14 +01:00
Radhika PC 4446b9dff6 CLOUDSTACK-1221 2013-02-28 18:11:13 +05:30
Rohit Yadav e80ccea517 CLOUDSTACK-1340: Jenkins fails for changing directories, rvm sourcing fails
http://jenkins.cloudstack.org/job/build-systemvm-master/64/console

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 17:37:02 +05:30
Rohit Yadav 54bfd7e04a orchestration: Fix VirtualMachineEntityFactory to process spring injections
The bug was found was Harikrishna P. when iso was used, in case of Isos, the
create vm from scratch which fails due to factory being used to get the object
which is not spring injected

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 17:28:15 +05:30
Rohit Yadav 44f345e4c6 CLOUDSTACK-1340: Fix destination path issue, vbox's internalcommands issue
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:55:41 +05:30
Nitin Mehta 2081aa3100 CLOUDSTACK-658 - Adding Scalevm commands 2013-02-28 16:54:39 +05:30
Rohit Yadav 80a6aaf7e1 CLOUDSTACK-1340: Fix locale, cmd, disk size and remove multiple apt-get installs
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:15:09 +05:30
Rohit Yadav 6380e2004c CLOUDSTACK-1340: apt-get autoclean and then clean to remove cached debs
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:02:44 +05:30
Rohit Yadav 673700a1a2 CLOUDSTACK-1340: Fix raw disk export using vbox internalcommand
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 15:58:50 +05:30
Kishan Kavala 1d31c3ecaf CLOUDSTACK-241: Moved regions upgrade changes to Upgrade40to41.jav from schema file. Sets the right regins_id from db.properties instead of using default 1.
Conflicts:
	setup/db/db/schema-40to410.sql
2013-02-28 14:35:23 +05:30
Mice Xia 6a46656c72 CLOUDSTACK-1448 Failed to start VM with standard vSwitch on VMware 2013-02-28 16:31:06 +08:00
Pranav Saxena 9446eba78c CLOUDSTACK-1447:Persistent Status is not displayed for VPC Tiers 2013-02-28 13:27:27 +05:30
Rohit Yadav 644a73bb2f CLOUDSTACK-1340: Don't remove all scripts in /root, rm only those copied by veewee
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 13:19:59 +05:30
Pranav Saxena b1fd371655 Vmware dvSwitch UI integration - tooltips 2013-02-28 12:16:50 +05:30
Pranav Saxena c25a0d8d8e Displaying persistent network property in the detail view for VPC networks 2013-02-28 11:54:04 +05:30
Pranav Saxena 680a360624 Merge branch 'dvswitch-UI' 2013-02-28 11:09:04 +05:30
Mice Xia 398b049327 add license header for a js file reported by rat 2013-02-28 11:50:07 +08:00
Mice Xia e5bf4a8fc4 CLOUDSTACK-1434 BeanCreationException: Error creating bean with name 'apiRateLimitServiceImpl' when starting up mgmt server 2013-02-28 11:49:12 +08:00
Mice Xia 91417115ef CLOUDSTACK-1401 NPE: listCapacity 2013-02-28 11:46:10 +08:00
Min Chen 93f14e7c65 Merge branch 'master' into vim51_win8
Conflicts:
	client/tomcatconf/componentContext.xml.in
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
	vmware-base/test/com/cloud/vmware/TestVMWare.java
2013-02-27 17:47:10 -08:00
Prachi Damle 9afd33d206 CLOUDSTACK-1418- As regular user , we are not allowed to deploy VM on a shared network.
- Added the access type attribute to @acl
- Domainchecker needs the AccessType.UseNetwork value specified to check access to network
2013-02-27 17:16:49 -08:00
Min Chen 36f4b44c36 Fix CLOUDSTACK-1425 and CLOUDSTACK-1399: Failed to load UserVmDaoImpl in
new Spring framework and register it into internal dao map.
2013-02-27 15:47:07 -08:00
Sheng Yang 50f995f8b4 CLOUDSTACK-1170: Use a unified way to generate PublicIp
Tired of manually generate mac address everytime when create PublicIp object.
2013-02-27 14:20:26 -08:00
Brian Federle 91d1835c6e Merge branch 'ui-regions' 2013-02-27 13:51:00 -08:00
Min Chen 7d2ebc9fc3 Add some comments on some code source to give credit to vmware sample
code.
2013-02-27 13:46:43 -08:00