Commit Graph
9738 Commits
Author SHA1 Message Date
Hector Sanjuan 48f363cebc Merge branch 'master' into feature-1004
Conflicts:
	install.sh
	src/sunstone/etc/sunstone-server.conf
	src/sunstone/public/js/plugins/hosts-tab.js
	src/sunstone/public/js/plugins/vnets-tab.js

I have updated the vnets plugin to include missing translations.
2011-12-12 15:18:43 +01:00
Javi Fontan 8cbc0aeab7 fix deployment for new versions of xen 2011-12-12 14:23:39 +01:00
Ruben S. Montero e30782e5e2 feature #863: Add missing parameters for post actions 2011-12-12 13:34:37 +01:00
Ruben S. Montero bcd9281b63 bug: solve reference by name in CONTEXT attribute for name and virtual network 2011-12-10 21:08:03 +01:00
Ruben S. Montero 67a594474e feature #863: fixes bug 2011-12-09 16:51:56 +01:00
Ruben S. Montero dca599c5dc feature #863: Make use of action_info to pass extra parameters to net drivers 2011-12-08 00:29:05 +01:00
Daniel Molina ce182b20e4 Merge branch 'master' of git.opennebula.org:one 2011-12-08 00:08:31 +01:00
Daniel Molina 10e52c413c Add network.erb for OCCI 2011-12-08 00:08:18 +01:00
Tino Vazquez fb34a12573 feature #1020: Fix typo in configuration file 2011-12-07 19:57:04 +01:00
Carlos Martín 6d0b58da21 onedb migrator to 3.1.80: Improvements, better handling of new VLAN attribute for VNETs 2011-12-07 19:20:07 +01:00
Daniel Molina 4c6d787272 Merge branch 'master' of git.opennebula.org:one 2011-12-07 19:03:57 +01:00
Daniel Molina 966db94478 Do not show FSTYPE in OCCI if type OS 2011-12-07 19:03:41 +01:00
Jaime Melis 1a5c7921b0 Merge branch 'master' of git.opennebula.org:one 2011-12-07 19:01:48 +01:00
Jaime Melis 1a8b2ef6a4 feature #863: fix tests 2011-12-07 19:01:41 +01:00
Tino Vazquez 3f0c7c6fd2 Merge branch 'master' into feature-1020 2011-12-07 18:59:38 +01:00
Daniel Molina 71449e75b5 Merge branch 'master' of git.opennebula.org:one 2011-12-07 18:55:39 +01:00
Daniel Molina 63e9ad23f0 Use HTTP_CODES in OCCI 2011-12-07 18:55:17 +01:00
Jaime Melis 5dc3797e4c Merge branch 'master' of git.opennebula.org:one 2011-12-07 18:37:52 +01:00
Hector Sanjuan 1d11cbc586 Task #864, Feature #602: Small fixes to vnets in Sunstone. Removal of commented code.
(cherry picked from commit 1ad5326f29)
2011-12-07 18:39:04 +01:00
Jaime Melis d9d82dca99 feature #863: the post scripts require the deploy_id 2011-12-07 18:36:54 +01:00
Daniel Molina 2a2f0ca7b4 Merge branch 'master' of git.opennebula.org:one 2011-12-07 18:30:17 +01:00
Daniel Molina cee7ae3c5d Use a constant for pool filtering in OCCI 2011-12-07 18:30:09 +01:00
Daniel Molina 4c1832ff4e Update VNET render in OCCI 2011-12-07 18:29:30 +01:00
Carlos Martín 5c5ce06ae7 Feature #862: Make VMs private. VMs from the same group don't show in 'onevm list g' by default.
This behaviour can be changed with an ACL rule similar to this one: "@1 VM/@1 INFO"
2011-12-07 18:18:36 +01:00
Tino Vazquez d062e6f351 feature-#1020: Add contextualization driver for vmware 2011-12-07 16:26:41 +01:00
Jaime Melis 7e86e29e98 Merge branch 'feature-863' 2011-12-07 15:28:07 +01:00
Jaime Melis d69d767420 feature #863: specific xpath filters for each network driver 2011-12-07 14:49:07 +01:00
Carlos Martín 1b02cf8136 Feature #862: 'one* list g' shows by default public resources in the user's group, instead of any resource in the group 2011-12-07 13:07:15 +01:00
Ruben S. Montero 384f194b5c Merge branch 'master' of git.opennebula.org:one 2011-12-07 12:03:49 +01:00
Ruben S. Montero 0bf92a0f22 Merge branch 'feature-863' 2011-12-07 12:03:19 +01:00
Javi Fontan 879f66ce5b make ldap drivers compatible with 3.2 (return driver name) 2011-12-07 11:14:08 +01:00
Hector Sanjuan 2cfa7ab0dc Task #864, Feature #602: Improve leases support in Sunstone and new vnet operations in Sunstone
This commit includes:

 * Support for ip_start, ip_end parameters when creating ranged vnetworks.
 * Removal of the add lease/remove lease dialogs.
 * Renewal of the representation of leases pool in the "extended information" windows. The list of leases is represented so that it is clearly visible those leases which are free, on hold (reserved), or used by a VM. Right on the list, leases can be added, updated or deleted.
(cherry picked from commit eccae0e731)
2011-12-07 09:56:42 +01:00
Carlos Martín 3bb367bc10 onedb migrator: New migrator from 3.1.0 to 3.1.80 2011-12-05 20:04:55 +01:00
Tino Vazquez de5fda93e6 feature-#1020: Add ssh configuration file 2011-12-05 19:12:16 +01:00
Javi Fontan 547d0985ea fix a bug setting quota configuration
(cherry picked from commit d1054d465e)
2011-12-05 18:48:14 +01:00
Tino Vazquez 445c8029b3 feature-#1020: Add ssh support 2011-12-05 18:23:24 +01:00
Jaime Melis db18cbe829 Bump to version 3.1.80 2011-12-05 17:56:34 +01:00
Jaime Melis 6aca0412d2 feature #863: add a test for vlan tag and fix other tests 2011-12-05 16:59:31 +01:00
Jaime Melis d7853c4a00 feature #863: don't use exec_and_log for commands that may fail 2011-12-05 16:58:34 +01:00
Jaime Melis 908d5e137c feature #863: fix minor typo in xpath 2011-12-05 16:57:25 +01:00
Daniel Molina 57b13a845c Merge branch 'master' of git.opennebula.org:one 2011-12-05 15:29:56 +01:00
Daniel Molina 02f90f3333 Do not update userpool cache when the token expires 2011-12-05 15:29:22 +01:00
Hector Sanjuan b9b36fff2b Feature #1004: Do not replace template when updating. Replace only the LANG value. 2011-12-05 13:09:28 +01:00
Ruben S. Montero 93827b4c24 feature #863: VLAN drivers also sets firewall rules for VMs 2011-12-05 01:51:39 +01:00
Ruben S. Montero d1307b3349 Fix tests after be32ba5526 2011-12-05 01:12:22 +01:00
Ruben S. Montero 7d45a79ab4 Fix tests after be32ba5526 2011-12-05 00:12:43 +01:00
Daniel Molina 5028be8b1f feature #990: Add instance_type and collections methods to OCCI API(cherry picked from commit 36c045992c)
Conflicts:

	src/cloud/occi/etc/occi-server.conf
2011-12-04 22:39:59 +01:00
Ruben S. Montero 5c5e3df525 Removed option opts[:local] as always local_action are required 2011-12-04 20:45:22 +01:00
Ruben S. Montero c57e10154f Make auth drivers to use LocalAction instead of do_action wrapper 2011-12-04 20:44:38 +01:00
Ruben S. Montero 6c7bbe6d76 Merge branch 'feature-602'
Conflicts:
	src/vnm/test/VirtualNetworkPoolTest.cc
2011-12-04 19:58:51 +01:00