Commit Graph
7896 Commits
Author SHA1 Message Date
Carlos Martín 174ba75d63 Feature #1112: Move datastore definition from image template to xml-rcp parameter 2012-02-15 16:47:52 +01:00
Hector Sanjuan 5dbf040f9c Feature #1089: Upload support for images in Sunstone.
Follows the same principles as SelfService.
2012-02-15 14:10:24 +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
Ruben S. Montero d754c987e6 feature 1112: Work integrating datastores and images 2012-02-15 00:19:42 +01:00
Hector Sanjuan 2630d1c6a7 Improve Selfservice/OCCI upload.
Wait until images have been successfully copied into the repository by opennebula  to return from request.
2012-02-14 18:59:00 +01:00
Patrice LACHANCE 10d4412a54 Added EC2 Regions, Security Groups, VPC ID, Tags and Context management 2012-02-14 14:27:33 +01:00
Hector Sanjuan 07adba6f54 Merge remote-tracking branch 'upstream/master' 2012-02-14 14:05:12 +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
Hector Sanjuan 3571898d56 Merge remote-tracking branch 'upstream/master' 2012-02-13 21:45:47 +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
Hector Sanjuan 4ccaf9704a 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.
2012-02-13 15:55:11 +01:00
Hector Sanjuan 6bb9cb74a2 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
2012-02-13 15:51:55 +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
Ruben S. Montero 45382e76b1 feature #1112: Initial changes in the Image driver to support multiple Datastores 2012-02-13 12:33:16 +01:00
Carlos Martín e9d026e3ae Feature #1112: WIP associate Images to Datastores 2012-02-10 19:28:18 +01:00
Carlos Martín bab1573f31 Feature #1112: Fix onedatastore show output 2012-02-10 19:01:20 +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
Carlos Martín 354ef28985 Feature #1112: Continue integration of DatastorePool in Nebula class 2012-02-10 13:24:52 +01:00
Ruben S. Montero e73ef59fc1 feature #1112: Fix compilation warining in tests 2012-02-10 01:20:08 +01:00
Ruben S. Montero 2762ed5a62 feature #1112: Fix compilation of tests 2012-02-10 01:19:49 +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
Hector Sanjuan 1cd6406dc5 Feature #1030: Fix onetemplate when no name is provided 2012-02-09 18:57:47 +01:00
Carlos Martín 2531db2d7a Feature #1112: Ruby OCA and CLI for datastores 2012-02-09 18:55:18 +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
Carlos Martín 9ec4b450a4 Feature #1112: Create Datastore and DatastorePool classes, and RM methods 2012-02-09 17:56:47 +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