Whitespace cleanup

This commit is contained in:
Javi Fontan committed 2015-07-01 15:18:28 -04:00
1 parent fc831b7c99
commit 4b08d76fbf
290 files changed
+1618 -1618

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
---
---
:VID:
:desc: Virtual Machine ID
:size: 4
+8 -8
View File
@@ -1,8 +1,8 @@
---
---
:ID:
:desc: To which resource owner the rule applies to
:size: 5
:right: true
:right: true
:USER:
:desc: To which resource owner the rule applies to
@@ -13,12 +13,12 @@
:desc: Which resource the rule applies to
:size: 17
:RID:
:RID:
:desc: Resource ID
:size: 5
:right: true
:ZONE:
:ZONE:
:desc: Zone ID
:size: 5
:right: true
@@ -28,10 +28,10 @@
:size: 8
:right: true
:default:
:default:
- :ID
- :USER
- :USER
- :RES_VHNIUTGDCOZSv
- :RID
- :RID
- :OPE_UMAC
- :ZONE
- :ZONE
+4 -4
View File
@@ -1,9 +1,9 @@
---
:ID:
---
:ID:
:desc: ONE identifier for the Cluster
:size: 5
:NAME:
:NAME:
:desc: Name of the Cluster
:size: 25
:left: true
@@ -17,7 +17,7 @@
:size: 5
:DATASTORES:
:desc: Number of Datastores
:desc: Number of Datastores
:size: 10
:default:
+4 -4
View File
@@ -1,9 +1,9 @@
---
:ID:
---
:ID:
:desc: ONE identifier for the Group
:size: 4
:NAME:
:NAME:
:desc: Name of the Group
:size: 29
:left: true
@@ -12,7 +12,7 @@
:desc: Number of Users in this group
:size: 5
:VMS:
:VMS:
:desc: Number of VMS
:size: 9
+12 -12
View File
@@ -1,19 +1,19 @@
---
:ID:
---
:ID:
:desc: ONE identifier for Host
:size: 4
:NAME:
:NAME:
:desc: Name of the Host
:size: 15
:left: true
:CLUSTER:
:CLUSTER:
:desc: Name of the Cluster
:size: 9
:left: true
:RVM:
:RVM:
:desc: Number of Virtual Machines running
:size: 3
@@ -21,27 +21,27 @@
:desc: Number of Virtual Machine zombies
:size: 3
:TCPU:
:TCPU:
:desc: Total CPU percentage
:size: 4
:FCPU:
:FCPU:
:desc: Free CPU percentage
:size: 4
:ACPU:
:ACPU:
:desc: Available cpu percentage (not reserved by VMs)
:size: 4
:TMEM:
:TMEM:
:desc: Total Memory
:size: 7
:FMEM:
:FMEM:
:desc: Free Memory
:size: 7
:AMEM:
:AMEM:
:desc: Available Memory (not reserved by VMs)
:size: 7
@@ -61,7 +61,7 @@
:desc: Real MEM
:size: 18
:STAT:
:STAT:
:desc: Host status
:size: 6
:left: true
+12 -12
View File
@@ -1,51 +1,51 @@
---
:ID:
---
:ID:
:desc: ONE identifier for the Image
:size: 4
:USER:
:USER:
:desc: Username of the Virtual Machine owner
:size: 10
:left: true
:GROUP:
:GROUP:
:desc: Group of the Virtual Machine
:size: 10
:left: true
:NAME:
:NAME:
:desc: Name of the Image
:size: 15
:left: true
:DATASTORE:
:DATASTORE:
:desc: Name of the Datastore
:size: 10
:left: true
:SIZE:
:SIZE:
:desc: Size of the Image
:size: 7
:TYPE:
:TYPE:
:desc: Type of the Image
:size: 4
:left: true
:REGTIME:
:REGTIME:
:desc: Registration time of the Image
:size: 15
:PERSISTENT:
:PERSISTENT:
:desc: Whether the Image is persistent or not
:size: 3
:STAT:
:STAT:
:desc: State of the Image
:size: 4
:left: true
:RVMS:
:RVMS:
:desc: Number of VMs currently running from this Image
:size: 4
+5 -5
View File
@@ -1,19 +1,19 @@
---
:ID:
---
:ID:
:desc: ONE identifier for the Security Group
:size: 4
:NAME:
:NAME:
:desc: Name of the Security Group
:size: 27
:left: true
:USER:
:USER:
:desc: Username of the Security Group owner
:size: 15
:left: true
:GROUP:
:GROUP:
:desc: Group of the Security Group
:size: 15
:left: true
+1 -1
View File
@@ -1,4 +1,4 @@
---
---
:UID:
:desc: User ID
:size: 4
+6 -6
View File
@@ -1,24 +1,24 @@
---
:ID:
---
:ID:
:desc: ONE identifier for the Template
:size: 4
:NAME:
:NAME:
:desc: Name of the Template
:size: 27
:left: true
:USER:
:USER:
:desc: Username of the Template owner
:size: 15
:left: true
:GROUP:
:GROUP:
:desc: Group of the Template
:size: 15
:left: true
:REGTIME:
:REGTIME:
:desc: Registration time of the Template
:size: 15
+7 -7
View File
@@ -1,24 +1,24 @@
---
:ID:
---
:ID:
:desc: ONE identifier for the User
:size: 4
:NAME:
:NAME:
:desc: Name of the User
:size: 15
:left: true
:GROUP:
:GROUP:
:desc: Group of the User
:size: 10
:left: true
:AUTH:
:AUTH:
:desc: Auth driver of the User
:size: 8
:left: true
:VMS:
:VMS:
:desc: Number of VMS
:size: 9
@@ -30,7 +30,7 @@
:desc: Total CPU allocated to user VMs
:size: 11
:PASSWORD:
:PASSWORD:
:desc: Password of the User
:size: 50
+3 -3
View File
@@ -1,9 +1,9 @@
---
:ID:
---
:ID:
:desc: ONE identifier for the VDC
:size: 5
:NAME:
:NAME:
:desc: Name of the VDC
:size: 30
:left: true
+11 -11
View File
@@ -1,36 +1,36 @@
---
:ID:
---
:ID:
:desc: ONE identifier for Virtual Machine
:size: 6
:NAME:
:NAME:
:desc: Name of the Virtual Machine
:size: 15
:left: true
:USER:
:USER:
:desc: Username of the Virtual Machine owner
:size: 8
:left: true
:GROUP:
:GROUP:
:desc: Group of the Virtual Machine
:size: 8
:left: true
:STAT:
:STAT:
:desc: Actual status
:size: 4
:UCPU:
:UCPU:
:desc: CPU percentage used by the VM
:size: 4
:UMEM:
:UMEM:
:desc: Memory used by the VM
:size: 7
:HOST:
:HOST:
:desc: Host where the VM is running
:size: 10
:left: true
@@ -40,7 +40,7 @@
:size: 10
:left: true
:TIME:
:TIME:
:desc: Time since the VM was submitted
:size: 10
@@ -49,7 +49,7 @@
:left: true
:size: 15
:default:
:default:
- :ID
- :USER
- :GROUP
+8 -8
View File
@@ -1,34 +1,34 @@
---
:ID:
---
:ID:
:desc: ONE identifier for Virtual Network
:size: 4
:USER:
:USER:
:desc: Username of the Virtual Network owner
:size: 15
:left: true
:GROUP:
:GROUP:
:desc: Group of the Virtual Network
:size: 12
:left: true
:NAME:
:NAME:
:desc: Name of the Virtual Network
:size: 19
:left: true
:CLUSTER:
:CLUSTER:
:desc: Name of the Cluster
:size: 10
:left: true
:BRIDGE:
:BRIDGE:
:desc: Bridge associated to the Virtual Network
:size: 8
:left: true
:LEASES:
:LEASES:
:desc: Number of this Virtual Networks given leases
:size: 6
+3 -3
View File
@@ -1,12 +1,12 @@
---
---
:CURRENT:
:desc: Active Zone
:size: 1
:ID:
:ID:
:desc: ONE identifier for the Zone
:size: 5
:NAME:
:NAME:
:desc: Name of the Zone
:size: 25
:left: true
+3 -3
View File
@@ -74,7 +74,7 @@ class OneQuotaHelper
# Edits the quota template of a resource
# @param [XMLElement] resource to get the current info from
# @param [String] path to the new contents. If nil a editor will be
# @param [String] path to the new contents. If nil a editor will be
# used
# @param [True|False] is_default To change the help text
# @return [String] contents of the new quotas
@@ -122,7 +122,7 @@ class OneQuotaHelper
# Retrieves a clean quota template, without any existing resource
# information
# @param path [String] path to the new contents. If nil a editor will be
# @param path [String] path to the new contents. If nil a editor will be
# used
# @return [String] contents of the new quotas
def self.get_batch_quota(path)
@@ -159,7 +159,7 @@ class OneQuotaHelper
# Edits the quota template of a resource, adding the quotas set in str
# @param resource [PoolElement] to get the current info from
# @param str [String] quota template, created by get_batch_quota()
# @return [String, OpenNebula::Error] merged contents of the new quotas on
# @return [String, OpenNebula::Error] merged contents of the new quotas on
# success, Error if the user info could not be retrieved
def self.merge_quota(resource, str)
rc = resource.info
+5 -5
View File
@@ -31,7 +31,7 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
table = CLIHelper::ShowTable.new(config_file, self) do
column :CURRENT, "Active Zone", :size=>1 do |d|
"*" if helper.client.one_endpoint.strip ==
"*" if helper.client.one_endpoint.strip ==
d["TEMPLATE"]['ENDPOINT'].strip
end
@@ -45,7 +45,7 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
column :ENDPOINT, "Endpoint of the Zone", :left, :size=>45 do |d|
d["TEMPLATE"]['ENDPOINT']
end
end
default :CURRENT, :ID, :NAME, :ENDPOINT
end
@@ -62,14 +62,14 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
end
if !zone['TEMPLATE/ENDPOINT']
return -1, "No Endpoint defined for Zone #{zone_id}"
return -1, "No Endpoint defined for Zone #{zone_id}"
end
File.open(ENV['HOME']+"/.one/one_endpoint", 'w'){|f|
File.open(ENV['HOME']+"/.one/one_endpoint", 'w'){|f|
f.puts zone['TEMPLATE/ENDPOINT']
}
puts "Endpoint changed to \"#{zone['TEMPLATE/ENDPOINT']}\" in " <<
puts "Endpoint changed to \"#{zone['TEMPLATE/ENDPOINT']}\" in " <<
"#{ENV['HOME']}/.one/one_endpoint"
return 0
end
+1 -1
View File
@@ -33,7 +33,7 @@ require 'one_helper/oneacl_helper'
cmd = CommandParser::CmdParser.new(ARGV) do
usage "`oneacl` <command> [<args>] [<options>]"
version OpenNebulaHelper::ONE_VERSION
helper = OneAclHelper.new
before_proc do
+2 -2
View File
@@ -348,14 +348,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
::OpenNebula::Template.build_xml, vc.one)
vnet_template = n[:one] + ar_str
rc = one_vn.allocate(vnet_template)
if ::OpenNebula.is_error?(rc)
STDOUT.puts " Error creating virtual network: " +
" #{rc.message}\n"
else
STDOUT.puts " OpenNebula virtual network " +
STDOUT.puts " OpenNebula virtual network " +
"#{one_vn.id} created with size #{size}!\n"
end
}