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
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
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
Javi Fontan
547d0985ea
fix a bug setting quota configuration
...
(cherry picked from commit d1054d465e )
2011-12-05 18:48:14 +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
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
Ruben S. Montero
ed564472f6
feature #602 : Moved size to get the default if needed
2011-12-04 19:44:50 +01:00
Ruben S. Montero
87e855ed9f
Merge branch 'feature-863'
...
Conflicts:
src/rm/RequestManagerVirtualMachine.cc
src/sunstone/etc/sunstone-server.conf
2011-12-04 16:40:27 +01:00
Hector Sanjuan
4e7d39f6b0
Minor GUI style fixes
...
Derivated from vendor update
(cherry picked from commit 0a7492772a )
2011-12-04 16:08:05 +01:00
Carlos Martín
be32ba5526
Improve xml consistency, all elements are written even if they are empty
2011-12-02 19:53:52 +01:00
Jaime Melis
7a91010a1b
Merge branch 'feature-863' of git.opennebula.org:one into feature-863
2011-12-02 19:08:43 +01:00
Jaime Melis
913374f022
feature #863 : fix tests with vlan=yes
2011-12-02 19:08:11 +01:00
Daniel Molina
487ec888b5
Delete delta_token_expiration parameter from Cloud conf files
2011-12-02 18:33:11 +01:00
Daniel Molina
8239c283d3
Fix STORAGE quota for save_as
2011-12-02 18:31:19 +01:00
Ruben S. Montero
3874271a69
Merge branch 'master' into feature-863
...
Conflicts:
install.sh
src/cli/one_helper/onevnet_helper.rb
src/mad/ruby/ActionManager.rb
2011-12-02 18:13:39 +01:00
Ruben S. Montero
f167578f6e
Merge branch 'feature-863' of git.opennebula.org:one into feature-863
...
Conflicts:
src/vnm_mad/remotes/test/OpenNebulaNetwork_spec.rb
2011-12-02 18:11:37 +01:00
Ruben S. Montero
7c0841f7e8
Merge branch 'feature-863' of git.opennebula.org:one into feature-863
2011-12-02 17:51:49 +01:00
Ruben S. Montero
d0c3ef099c
bug: fixes show of history records with some XML parsers
2011-12-02 17:46:51 +01:00
Tino Vazquez
012219a220
Merge branch 'feature-863' of git.opennebula.org:one into feature-863
2011-12-02 17:35:40 +01:00
Ruben S. Montero
0af9a21e04
Merge branch 'feature-863' of git.opennebula.org:one into feature-863
2011-12-02 17:09:28 +01:00
Jaime Melis
cb1c13c4b7
feature #863 : fix tests
2011-12-02 16:59:51 +01:00
Tino Vazquez
6a9ac5ae0d
feature-#863: ÃChange arguments for onehost create to ensure compatiblity
2011-12-02 12:44:11 +01:00
Carlos Martín
5f7cea8083
Feature #602 #863 : Add VLAN tag to vnets and VM NIC attribute
...
(cherry picked from commit cdf1231f81 )
Conflicts:
src/cli/one_helper/onevnet_helper.rb
src/vnm/test/VirtualNetworkPoolTest.cc
2011-12-02 12:43:29 +01:00
Jaime Melis
7a11688738
feature #863 : Remove the filtering functionality, just rely on the VLAN=yes option.
2011-12-02 12:37:09 +01:00
Carlos Martín
cdf1231f81
Feature #602 #863 : Add VLAN tag to vnets and VM NIC attribute
2011-12-02 12:23:21 +01:00
Carlos Martín
bc91bfce52
Merge branch 'master' into feature-602
2011-12-02 02:48:00 -08:00
Ruben S. Montero
bae7cc9b9c
feature #863 : Get unit tests for VNET drivers run again. (Still needs fix)
2011-12-02 00:19:09 +01:00
Ruben S. Montero
a4e880d932
feature #863 : Fixes use od scripts_common for exec_and_log
2011-12-02 00:07:53 +01:00
Ruben S. Montero
22899b7139
feature #863 : Moved fw driver to standard pre-post-clean plugins.
2011-12-02 00:07:16 +01:00
Ruben S. Montero
cb5837ec8e
feature #863 : Fix dest_host bug
2011-12-01 20:10:02 +01:00
Ruben S. Montero
1467190510
feature #863 : Solves minor bugs
2011-12-01 19:29:46 +01:00
Daniel Molina
b0baf862db
Fix typo in onevnet chgrp
2011-12-01 18:35:01 +01:00