1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00

3368 Commits

Author SHA1 Message Date
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 be32ba5526058084c00bc3c80469076ec1a9e6db 2011-12-05 01:12:22 +01:00
Ruben S. Montero
7d45a79ab4 Fix tests after be32ba5526058084c00bc3c80469076ec1a9e6db 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 36c045992c761b6c66db56fd09e56bdf79bec4d9)
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 0a7492772a90208bb3eb4c8ad50d80efbbe2e5b1)
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
Jaime Melis
8649233487 feature 863: fix install.sh 2011-12-02 17:37:52 +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 cdf1231f819814b3e98b5c5747dd34b78203846d)

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
8117ca4b77 Bug: Fixed wrong method name for VM migrate 2011-12-01 21:58:29 +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
Daniel Molina
f040e1a6af Merge branch 'master' of git.opennebula.org:one 2011-12-01 18:06:32 +01:00
Daniel Molina
d3a88ab53b bug #923: Use Image SIZE attribute for STORAGE resources 2011-12-01 18:05:31 +01:00
Daniel Molina
dfb7efc4cf bug #1011: Update user_pool_cache in Sunstone when logging 2011-12-01 18:02:49 +01:00
Carlos Martín
536d69b5ab Feature #602: Change onevnet show format to separate used, free and 'on hold' leases 2011-12-01 07:50:37 -08:00
Hector Sanjuan
e5c4aeaba2 Minor fixes to GUIs style.
(cherry picked from commit bd2d5b557c3b973652e8760447a958a576450b53)
2011-11-30 23:04:10 +01:00
Ruben S. Montero
5414c03028 feature #863: added comments, simpler log messages. Now the main action info is the one returned to OpenNebula core 2011-11-30 22:56:52 +01:00
Ruben S. Montero
b2c04d65cd feature #863: Removed uneeded copyright comments 2011-11-30 22:56:30 +01:00
Carlos Martín
48f83532a2 Feature VMWARE: Remove duplicated files from install.sh 2011-11-30 05:50:27 -08:00
Carlos Martín
f2c4e97083 Add PHYDEV and VLAN_ID attributes to the onevnet show output 2011-11-30 13:20:23 +01:00
Carlos Martín
f0efbf09b6 Feature #602: Add VNet hold and release methods in Java OCA 2011-11-30 13:19:15 +01:00
Carlos Martín
a173e7bd75 Feature #602: onevnet release returns error if a Lease is not used, this achieves the same behaviour for fixed and ranged networks 2011-11-30 12:43:36 +01:00
Carlos Martín
ee6888567a Feature #602: Add tests for range definition 2011-11-30 11:41:41 +01:00
Hector Sanjuan
a59859ce98 OZones GUI: Style fixes after vendor update 2011-11-30 11:40:01 +01:00
Javi Fontan
ab10f16d50 feature #863: added a configurable action system and changed some actions to use it 2011-11-29 19:44:42 +01:00
Javi Fontan
09fe832399 feature #863: fix some bugs introduced with library changes 2011-11-29 19:44:41 +01:00