Commit Graph

1521 Commits

Author SHA1 Message Date
Jean-Francois Vincent 068e508e3b Add the Userdata setting to the UI on VM creation step 2014-12-09 11:32:49 +01:00
Rajani Karuturi 4722fa3de9 Merge branch '4.5'
Conflicts:
	client/WEB-INF/classes/resources/messages_ja_JP.properties
	client/WEB-INF/classes/resources/messages_zh_CN.properties
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/event-bus/rabbitmq/pom.xml
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/VolumeApiServiceImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	setup/db/db/schema-442to450.sql
	test/integration/component/test_persistent_networks.py

This closes #53
2014-12-08 15:27:53 +05:30
Mihaela Stoica a07938752a CLOUDSTACK-8010: [UI] Fixed unlocalized string "label.add.private.gateway" 2014-12-04 12:55:46 -08:00
vetrivelc 9ce8a1cd00 Fixed label issue and externalized hardcoding issues
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-12-04 11:28:44 -08:00
Rohit Yadav bf88be5b25 Revert "CLOUDSTACK-8011: Upgrade maven dependencies"
This reverts commit 482815d084.
2014-12-04 19:47:23 +05:30
Rohit Yadav 482815d084 CLOUDSTACK-8011: Upgrade maven dependencies
Changes;
- Upgrades maven-war plugin to 4.5 (faster war packaging)
- Upgrade spring framework to latest minor release
- Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies
- Upgrade to latest ipv6 library, fix unit test NetUtilsTest
- httpcore and httpclient are sharing same version variable
- commons-httpclient is different that httpclient, the fix gives it a separate var
- Apidocs failed to generate and get stuck with new reflections version, for now
  we will continue using 0.9.8

Newer dependencies can be listed using:
mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm

Testing;
- Tested using Maven 3.2.1
- Local noredist build with unit tests succeeds
- CloudStack mgmt server started, basic business layer tests work
- Observed 10-15% build time improvement using new maven-war plugin

Branch: bugfix/4.5-8011 (commits are squashed in favour of a linear history)

Pull request:
https://github.com/apache/cloudstack/pull/50

This closes #50

TravisCI build summary:
https://travis-ci.org/shapeblue/cloudstack/builds/42902172

- Build passes with unit tests
- Apidocs generates successfully
- Most integration tests pass, some fail due to timeout errors, second re-run
  passes some of them

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit fac7bfc5d5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	pom.xml
2014-12-04 02:14:54 +05:30
Rohit Yadav fac7bfc5d5 CLOUDSTACK-8011: Upgrade maven dependencies
Changes;
- Upgrades maven-war plugin to 4.5 (faster war packaging)
- Upgrade spring framework to latest minor release
- Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies
- Upgrade to latest ipv6 library, fix unit test NetUtilsTest
- httpcore and httpclient are sharing same version variable
- commons-httpclient is different that httpclient, the fix gives it a separate var
- Apidocs failed to generate and get stuck with new reflections version, for now
  we will continue using 0.9.8

Newer dependencies can be listed using:
mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm

Testing;
- Tested using Maven 3.2.1
- Local noredist build with unit tests succeeds
- CloudStack mgmt server started, basic business layer tests work
- Observed 10-15% build time improvement using new maven-war plugin

Branch: bugfix/4.5-8011 (commits are squashed in favour of a linear history)

Pull request:
https://github.com/apache/cloudstack/pull/50

This closes #50

TravisCI build summary:
https://travis-ci.org/shapeblue/cloudstack/builds/42902172

- Build passes with unit tests
- Apidocs generates successfully
- Most integration tests pass, some fail due to timeout errors, second re-run
  passes some of them

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-04 02:12:51 +05:30
Wei Zhou 21b0ad4a62 Remove error message when start management server if JAVA_HOME is not set
(cherry picked from commit 449d123ce7)
2014-12-01 13:38:27 +01:00
Wei Zhou 449d123ce7 Remove error message when start management server if JAVA_HOME is not set 2014-12-01 13:25:00 +01:00
Wei Zhou af2f21894c CLOUDSTACK-7983: Create Disk/Service Offering for Domain Admin 2014-12-01 13:03:37 +01:00
Daniel Vega 93f8213412 CLOUDSTACK-7915: Remove hard-coded values for Load Balancer algorithms in UI
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit ba6dfd8470)
2014-11-25 15:55:44 +05:30
Daniel Vega ba6dfd8470 CLOUDSTACK-7915: Remove hard-coded values for Load Balancer algorithms in UI
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-11-25 11:56:34 +05:30
Brian Federle ebd42a8435 Fix missing 'add LDAP account' label 2014-11-21 09:16:41 -08:00
vetrivelc 66e805cba9 Fixes: Hardcoded strings externalized from various JS files.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-11-21 08:02:49 -08:00
Frank Zhang 2db1dd7432 CLOUDSTACK-7629
addBaremetalRct() API call is not available in cloudstackAPI library in marvin.
2014-11-19 17:01:34 -08:00
Frank Zhang 3dfe532e42 CLOUDSTACK-7629
addBaremetalRct() API call is not available in cloudstackAPI library in marvin.
2014-11-19 17:00:43 -08:00
vetrivelc 5327038c16 Missing label id and removed duplicate label.ids.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-11-18 14:03:13 -08:00
Milamber 317606859b Update L10N resource files on master branch with 4.5 translation strings 2014-11-15 08:48:44 +00:00
Milamber 303fc90057 Update L10N resource files on master branch (with 4.5 translation strings) 2014-11-15 08:40:23 +00:00
vetrivelc bdcaaca40e Updated transaltions to JA & SC Files
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-11-14 08:09:35 -08:00
vetrivelc 03fa319473 Fixes: [UI] Added missing label to properties.file.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-11-04 13:01:22 -08:00
Rohit Yadav f543d86eff saml: Use camelCase api names for SAML login/logout apis
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 01:24:39 +05:30
Rohit Yadav cd52bed477 saml: Use camelCase api names for SAML login/logout apis
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 85c0bd68ae8a76c231ab402dd0311e3672155f71)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 00:32:29 +05:30
Hugo Trippaers 4ebaf0a583 Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
Gabor Apati-Nagy 55264b24a6 CLOUDSTACK-7808: Typo in Zone Creation Wizard 2014-10-28 14:34:36 -07:00
vetrivelc 4e1284147e Fixed incorrect label issue.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-10-23 13:25:20 -07:00
Jessica Wang 3db112f75c CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label. 2014-10-17 14:58:51 -07:00
Jessica Wang e796d418b4 CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label. 2014-10-17 14:57:51 -07:00
Mihaela Stoica 28f8c41a19 CLOUDSTACK-7645: [UI] Fixing incorrect labels, including instances of "???label.*???"
- removed duplicate entries in dictionary
- added dictionary entries that have been missed during the dictionary split
- added missing entries in messages.properties
- fixed other localization issues

(cherry picked from commit 0646588fc6)
2014-10-13 00:23:20 -04:00
Anthony Xu 69d1b44bbf cloudmanagementserver.keystore is corrupted by ant.filters.ReplaceTokens,
(cherry picked from commit 055fdd5048)
2014-10-13 00:07:16 -04:00
vetrivelc 3fd97ca3b8 Fixed Encoding issue to message_ja_JP & message_zh_CN properties files.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
(cherry picked from commit 03e3a39ede)
2014-10-13 00:00:19 -04:00
Mihaela Stoica 0646588fc6 CLOUDSTACK-7645: [UI] Fixing incorrect labels, including instances of "???label.*???"
- removed duplicate entries in dictionary
- added dictionary entries that have been missed during the dictionary split
- added missing entries in messages.properties
- fixed other localization issues
2014-10-02 10:51:52 -07:00
Anthony Xu 055fdd5048 cloudmanagementserver.keystore is corrupted by ant.filters.ReplaceTokens, 2014-09-29 11:26:37 -07:00
vetrivelc 03e3a39ede Fixed Encoding issue to message_ja_JP & message_zh_CN properties files.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-09-25 12:36:25 -07:00
vetrivelc 6a11d099cf Fix Externalization of hard-coded label strings
-Split 'dictionary.jsp' into two files -> 'dictionary.jsp' and
'dictionary2.jsp' -- this is due to JSP file constraints as the
localization object is getting quite long

-Per change above, 'dictionary' object is now split into an additonal
'dictionary2' object, which is merged with the main dict object on page
load

-All new dictionary mappings should be added to 'dictionary2' now.

Signed-off-by: Brian Federle <brian.federle@citrix.com>
2014-09-17 13:59:13 -07:00
rayeesn df198d07e1 CLOUDSTACK-7474:Failed to start MS with java7 version mismatch error 2014-09-04 10:25:36 -07:00
Jessica Wang 5e55b6b478 CLOUDSTACK-7480: UI > instance page > change "XenServer Tools Version 6.1+ field" to "Original XS Version is 6.1+" because what the field really presents is the original XenServer version when a VM is initially created. 2014-09-03 11:37:34 -07:00
Rohit Yadav 2a264cc726 client: add getSPMetadata API in commands.properties
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:24 +02:00
Vania Xu 30fbff8687 Changes/additions related to SolidFire automation tests 2014-08-27 16:02:29 -06:00
Brian Federle 26904d1a2b CLOUDSTACK-5952: Add 'VM IP Address' field to IP detail view 2014-08-26 14:38:55 -07:00
Damodar 7ea7deded0 CLOUDSTACK-7106 : RPM build failing with RHEL7 Reviewed By : Rayees
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-26 11:04:48 +05:30
Daniel Vega 233445ed68 CLOUDSTACK-6998: GloboDNS, Integration with external DNS Provider
This is a feature to handle DNS entries by means of an external DNS Provider,
such as Bind. These entries include DNS domains and reverse domains, VM records
and reverse records.

For a complete description, please refer to the design document available at
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Bind+and+PowerDNS+integration+by+Globo+DNSAPI

For the discussion about this feature on the dev mailing list, please refer to
http://markmail.org/thread/fvwf36hpxotiibka

Summary:
- new Network Service Provider called GloboDNS
- new Network Element to manage network domains and VM records (entries) on an external API
- new Network Resource to communicate with GloboDNS (open source)
- new API command to add DNS server
- new global option to determine if this provider should override VM entries on external DNS server
- changes in UI to include GloboDNS in Providers list

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-21 11:54:44 +02:00
seif 59ea2e2960 Added the listHostTags API command 2014-08-17 20:38:46 -06:00
Rohit Yadav 6016613d5b commands.properties: add login,logout,samlsso,samlslo apis
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-12 12:01:29 +02:00
Rohit Yadav f7f8f07f47 client: add saml2 plugin dependency on client artifact
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-12 12:01:29 +02:00
Mihaela Stoica 57f611df16 CLOUDSTACK-6695: Added support to the UI for uploading a chain of certificates
In the "SSL Certificate" dialog we added:
- new field for the root certificate;
- a button to add intermediate certificates if necessary; when this is pressed, a new field, called "Intermediate certificate 1" is added; pressed again, "Intermediate certificate 2" field is added, and so on.

We upload the certificates in order: first the root certificate (with id=1), then the intermediate certificates (with id=2,3,..) and finally the server certificate.
When uploading a certificate, we wait for the upload to be completed successfully and only then we proceed to uploading the next one. If one fails, we report failure and don't continue with the remaining.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-08-08 10:57:12 -07:00
seif 67ca2557f9 Changes for a new API command to list the storage tags 2014-08-07 17:46:06 -06:00
Alena Prokharchyk 6d1482b97b CLOUDSTACK-7283: listUsers API is available for regular users now 2014-08-07 14:01:58 -07:00
Edison Su 29f711e0a9 remove unused servlet 2014-08-01 16:55:35 -07:00
Rajani Karuturi 32e8fda965 Fixed CLOUDSTACK-6980: UI for RegisterTemplate API does not expose requireshvm parameter 2014-07-28 11:20:04 -07:00