Commit Graph
3817 Commits
Author SHA1 Message Date
Daniel Molina 52ab2afea6 feature #924: Change MSG_FORMAT in Logger class 2012-02-29 13:27:01 +01:00
Daniel Molina 3ed87c071a feature #924: Add logger to OCCI 2012-02-27 17:36:34 +01:00
Daniel Molina 8db484ce41 feature #924: Add CloudLogger module 2012-02-27 17:34:49 +01:00
Daniel Molina e97040d3e5 Add more OCCI tests 2012-02-22 17:17:23 +01:00
Daniel Molina 66e314c021 Sort OCCI collections and instance_types 2012-02-22 17:17:23 +01:00
Carlos Martín b70b8e2dbe Bug #1128: Remove deprecated method from Java OCA
(cherry picked from commit 3e21d79a22)
release-3.4-s0
2012-02-21 01:34:18 -08:00
Jaime Melis ae35b61159 Bump to 3.3.0 2012-02-20 12:31:34 +01:00
Carlos Martín b177159a3c Bug #1134: Remove double object creation in VirtualNetworkPool::allocate 2012-02-17 19:56:35 +01:00
Carlos Martín f1e4e3815a Bug: DB default configuration value was not inserted in NebulaTemplate.cc 2012-02-17 19:44:46 +01:00
Daniel Molina 997df82202 Add instance_type request by ID to OCCI 2012-02-17 13:35:23 +01:00
Ruben S. Montero d2adccbc51 Merge branch 'bug-1123'
Conflicts:
	src/sunstone/models/SunstoneServer.rb
2012-02-17 12:30:35 +01:00
Ruben S. Montero 6cf74c9b7c Merge branch 'feature-1048' 2012-02-17 12:19:15 +01:00
Hector Sanjuan 502ec84ef3 Feature #1067: Improve VLAN support in Sunstone
(cherry picked from commit 5f984c664b)
2012-02-17 10:30:32 +01:00
Daniel Molina b70a4e33ba feature #1048: Refactor one_vmm_ec2 and add suspend/reboot/resume support 2012-02-16 12:43:40 +01:00
Daniel Molina 179487ac35 bug #1130: Use period_to_str in onevm 2012-02-15 19:56:14 +01:00
Hector Sanjuan fcb430e4a8 Feature #1089: Upload support for images in Sunstone.
Follows the same principles as SelfService.
(cherry picked from commit 5dbf040f9c)
2012-02-15 18:56:08 +01:00
Ruben S. Montero c3931e8fc6 Increase default image register polling in OCCI server to 5 secs 2012-02-15 00:32:37 +01:00
Hector Sanjuan a5d72b936c Improve Selfservice/OCCI upload.
Wait until images have been successfully copied into the repository by opennebula  to return from request.
(cherry picked from commit 2630d1c6a7)
2012-02-15 00:29:08 +01:00
Patrice LACHANCE 10d4412a54 Added EC2 Regions, Security Groups, VPC ID, Tags and Context management 2012-02-14 14:27:33 +01:00
Ruben S. Montero d0c6453c9b Bug: pass file object to occi.post_compute method 2012-02-14 13:04:11 +01:00
Daniel Molina 00f8b78f9a bug #1123: Filter Sunstone monitoring information by user 2012-02-14 12:09:59 +01:00
Hector Sanjuan 0652b11c29 Feature #1069: Fix typo in OpenNebulaVNC
(cherry picked from commit 29ac3aa88568925b49209b55b79d4e59e587d642)
2012-02-14 12:03:17 +01:00
Ruben S. Montero b66ebf5982 Merge branch 'feature-1069' 2012-02-14 11:52:48 +01:00
Daniel Molina d922575af7 Add verbose option to OCCI resources
(cherry picked from commit 9cd3d3df1b)
2012-02-14 11:50:47 +01:00
Hector Sanjuan 7bad159c7d Feature #1069: Update config plugin to accept full configuration object.
Whitespace cleanup and minor fixes in .rb files.
(cherry picked from commit da1e4a822937eaa3e5a2ef4c2126a5bbde15952b)
2012-02-14 11:41:59 +01:00
Hector Sanjuan 8285b50b65 Feature #1076: support full configuration response in selfservice.
Plus minor fixes in occi-server
(cherry picked from commit f3fe56b383f78d0795ed72b565a0325b097ffc37)
2012-02-14 11:41:46 +01:00
Daniel Molina 9cd3d3df1b Add verbose option to OCCI resources 2012-02-14 11:29:07 +01:00
Ruben S. Montero 8ecc77cd78 feature #1076: UI configuration returned as XML 2012-02-13 18:23:05 +01:00
Javi Fontan da82e97164 bug #1130: use period_to_str in oneacct 2012-02-13 17:54:22 +01:00
Javi Fontan 407350bbb1 bug #1130: add period_to_str method
This methods is used to create strings for time periods with this format:

  80d 10:23:33
2012-02-13 17:52:26 +01:00
Hector Sanjuan 0449177b85 Feature #1076: Add VNC support in SelfService.
When enabled in the occi server configuration file, UI users will be able to click the VNC icon that appears in the VM information.

Then the websockets proxy will be set up, provided that the machine has been configured with the appropiate GRAPHICS section etc. This must be done in the OCCI templates, and cannot be done by the UI user.

Wss sessions can be configured in the occi server configuration file. Unlike Sunstone, here they are transparent to the user and whenever they are enabled VNC sessions will be launched using wss:// automaticly. As such, it is not up to the user to choose the type of connection, and it fully depends on the server configuration.

Additionally the install_novnc.sh script has been updated and improved. The install.sh has been updated too.
(cherry picked from commit 4ccaf9704a)
2012-02-13 17:51:51 +01:00
Ruben S. Montero 9f66d8b2e2 feature #1069: Minor changes in OpenNebulaVNC class. Return user configuration in JSON 2012-02-13 17:50:49 +01:00
Hector Sanjuan cea817e964 Feature #1069: Improvements for wss support and configuration in Sunstone.
Allow non quoted yes | no values in configuration. Set wss configuration choice for the session so it stays if page reloaded
(cherry picked from commit 6bb9cb74a2)
2012-02-13 16:21:33 +01:00
Hector Sanjuan 589e19142c Feature #1069: Support secure-websocket-based VNC session in Sunstone.
This commit adds support for using wss capabilities of websockify:
* Add configuration option to Sunstone and saving/restore in user template support
* Add new options to sunstone server configuration file
* VNC session is started according to user setting
* The code related to VNC proxy launch has been outsourced to OpenNebulaVNC.rb, so it can be mantained more easily and reused by, for example, SelfService.
* Install novnc script has been corrected to point to "websockify" full path.

Note: this commit changes vnc-related sunstone-server.conf keys and breaks vnc support in former versions of the configuration file. Update if necessary.
(cherry picked from commit 00cf42e6b6)
2012-02-13 16:21:17 +01:00
Javi Fontan 6e718906bd bug #1094: take out uneeded xmlparser requirement 2012-02-13 15:58:13 +01:00
Daniel Molina 115091be5f Fix typo in error message 2012-02-13 15:26:50 +01:00
Ruben S. Montero 17ac1484bd Merge branch 'feature-1091' 2012-02-13 14:57:58 +01:00
Javi Fontan 3f901ac6f8 bug #1042: fix units for du size 2012-02-13 12:57:57 +01:00
Daniel Molina d907919f99 feature #1090: Add user and group information to OCCI resources 2012-02-13 12:56:50 +01:00
Daniel Molina ab5db1ceb3 feature #1091: Add extended information to the OCCI pools 2012-02-10 18:20:12 +01:00
Daniel Molina 59419f54df feature #1091: Fix require path 2012-02-10 17:01:40 +01:00
Daniel Molina 9c1e0db1ed feature #1091: Refactor OCCICLient 2012-02-10 16:06:52 +01:00
Ruben S. Montero 96c0c823e9 Bug: Fix acct printing for network metrics 2012-02-09 22:06:54 +01:00
Hector Sanjuan c8f9e86b48 Feature #1030: Fix onetemplate when no name is provided
(cherry picked from commit 1cd6406dc5)
2012-02-09 19:50:44 +01:00
Daniel Molina 63f5a989e3 Merge branch 'master' of git.opennebula.org:one 2012-02-09 18:50:56 +01:00
Daniel Molina 9cac009e8e feature #1124: Improve EC2 describe_instances performance 2012-02-09 18:50:30 +01:00
Carlos Martín aafefad6ab Add onedb migrator 3.2.1_to_3.3.0.rb 2012-02-09 18:14:22 +01:00
Daniel Molina e5302cab2e bug #1113: Default quota keys must be specified in uppecase 2012-02-09 17:42:26 +01:00
Daniel Molina 68fe3f91cf bug #1114: econe client should set the default path '/' if not specified 2012-02-09 17:40:21 +01:00
Carlos Martín 03ddf136b7 Bug #1119: set right values for uid,gid columns in migrator 3.1.80_to_3.2.0 2012-02-09 03:22:11 -08:00