F #688: add new options to CLI (#3311)

* Add options to:
        * Remove header
        * Choose CSV separator
        * Not strip columns
        * Expand column size
        * Disable expand
        * Set column size

    * Add new operators to filter data

    * Change default configuration files sizes

    * Lint and clean the code

share/linters/.rubocop.yml

@@ -354,7 +354,6 @@ AllCops:
     - src/vnm_mad/remotes/lib/vlan.rb
     - src/vnm_mad/remotes/lib/address.rb
     - src/cli/command_parser.rb
-    - src/cli/cli_helper.rb
     - src/cli/one_helper.rb
     - src/cli/one_helper/onevmgroup_helper.rb
     - src/cli/one_helper/onemarket_helper.rb

src/cli/etc/oneacct.yaml

@@ -59,4 +59,4 @@
 - :CPU
 - :NETRX
 - :NETTX
-- :DISK
+- :DISK

src/cli/etc/oneacl.yaml

@@ -1,8 +1,9 @@
 ---
 :ID:
   :desc: To which resource owner the rule applies to
-  :size: 5
+  :size: 4
   :right: true
+  :adjust: true
 
 :USER:
   :desc: To which resource owner the rule applies to

src/cli/etc/onecluster.yaml

@@ -1,20 +1,22 @@
 ---
 :ID:
   :desc: ONE identifier for the Cluster
-  :size: 5
+  :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the Cluster
-  :size: 25
+  :size: 15
   :left: true
+  :expand: true
 
 :HOSTS:
   :desc: Number of Hosts
-  :size: 5
+  :size: 10
 
 :VNETS:
   :desc: Number of Networks
-  :size: 5
+  :size: 10
 
 :DATASTORES:
   :desc: Number of Datastores

src/cli/etc/onedatastore.yaml

@@ -2,34 +2,36 @@
 :ID:
   :desc: ONE identifier for the Datastore
   :size: 4
+  :adjust: true
 
 :USER:
   :desc: Username of the Datastore owner
-  :size: 10
+  :size: 8
   :left: true
 
 :GROUP:
   :desc: Group of the Datastore
-  :size: 10
+  :size: 8
   :left: true
 
 :NAME:
   :desc: Name of the Datastore
-  :size: 13
+  :size: 10
   :left: true
+  :expand: true
 
 :SIZE:
   :desc: Total Datastore size
-  :size: 10
+  :size: 6
 
 :AVAIL:
   :desc: Free Datastore size (%)
-  :size: 5
+  :size: 3
   :left: true
 
 :CLUSTERS:
   :desc: Cluster IDs
-  :size: 12
+  :size: 8
   :left: true
 
 :IMAGES:
@@ -67,4 +69,3 @@
 - :DS
 - :TM
 - :STAT
-

src/cli/etc/onegroup.yaml

@@ -2,11 +2,13 @@
 :ID:
   :desc: ONE identifier for the Group
   :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the Group
-  :size: 29
+  :size: 15
   :left: true
+  :expand: true
 
 :USERS:
   :desc: Number of Users in this group

src/cli/etc/onehost.yaml

@@ -2,15 +2,17 @@
 :ID:
   :desc: ONE identifier for Host
   :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the Host
   :size: 15
   :left: true
+  :expand: true
 
 :CLUSTER:
   :desc: Name of the Cluster
-  :size: 9
+  :size: 10
   :left: true
 
 :TVM:
@@ -67,7 +69,7 @@
 
 :STAT:
   :desc: Host status
-  :size: 6
+  :size: 4
   :left: true
 
 :default:

src/cli/etc/oneimage.yaml

@@ -2,21 +2,23 @@
 :ID:
   :desc: ONE identifier for the Image
   :size: 4
+  :adjust: true
 
 :USER:
   :desc: Username of the Image owner
-  :size: 10
+  :size: 8
   :left: true
 
 :GROUP:
   :desc: Group of the Image
-  :size: 10
+  :size: 8
   :left: true
 
 :NAME:
   :desc: Name of the Image
   :size: 15
   :left: true
+  :expand: true
 
 :DATASTORE:
   :desc: Name of the Datastore

src/cli/etc/onemarket.yaml

@@ -2,21 +2,23 @@
 :ID:
   :desc: ONE identifier for the Marketplace
   :size: 4
+  :adjust: true
 
 :USER:
   :desc: Username of the Marketplace owner
-  :size: 10
+  :size: 8
   :left: true
 
 :GROUP:
   :desc: Group of the Marketplace
-  :size: 10
+  :size: 8
   :left: true
 
 :NAME:
   :desc: Name of the Marketplace
-  :size: 30
+  :size: 15
   :left: true
+  :expand: true
 
 :SIZE:
   :desc: Marketplace total size
@@ -43,4 +45,4 @@
 - :AVAIL
 - :APPS
 - :MAD
-- :ZONE
+- :ZONE

src/cli/etc/onemarketapp.yaml

@@ -2,11 +2,13 @@
 :ID:
   :desc: ONE identifier for the MarketPlaceApp
   :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the MarketPlaceApp
-  :size: 25
+  :size: 20
   :left: true
+  :expand: true
 
 :VERSION:
   :desc: Version of the MarketPlaceApp
@@ -30,7 +32,7 @@
 
 :MARKET:
   :desc: Name of the MarketPlace
-  :size: 20
+  :size: 10
   :left: true
 
 :ZONE:
@@ -46,4 +48,4 @@
 - :TYPE
 - :REGTIME
 - :MARKET
-- :ZONE
+- :ZONE

src/cli/etc/oneprovision.yaml

@@ -5,7 +5,7 @@
 
 :NAME:
   :desc: Name of the Provision
-  :size: 25
+  :size: 15
   :left: true
 
 :CLUSTERS:

src/cli/etc/onesecgroup.yaml

@@ -2,20 +2,22 @@
 :ID:
   :desc: ONE identifier for the Security Group
   :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the Security Group
-  :size: 20
+  :size: 15
   :left: true
+  :expand: true
 
 :USER:
   :desc: Username of the Security Group owner
-  :size: 15
+  :size: 8
   :left: true
 
 :GROUP:
   :desc: Group of the Security Group
-  :size: 15
+  :size: 8
   :left: true
 
 :UPDATED:
@@ -23,14 +25,13 @@
   :size: 8
   :left: false
 
-
 :OUTDATED:
   :desc: Number of VMs with outdated rules
   :size: 8
   :left: false
 
 :ERROR:
-  :desc: Number of VMs that failed to update rules 
+  :desc: Number of VMs that failed to update rules
   :size: 8
   :left: false
 

src/cli/etc/oneshowback.yaml

@@ -2,10 +2,11 @@
 :UID:
   :desc: User ID
   :size: 4
+  :adjust: true
 
 :USER_NAME:
   :desc: User name
-  :size: 12
+  :size: 8
 
 :GID:
   :desc: Group ID
@@ -13,7 +14,7 @@
 
 :GROUP_NAME:
   :desc: Group name
-  :size: 12
+  :size: 8
 
 :VM_ID:
   :desc: Virtual Machine ID
@@ -21,7 +22,7 @@
 
 :VM_NAME:
   :desc: Virtual Machine name
-  :size: 12
+  :size: 15
 
 :MONTH:
   :desc: Month
@@ -47,4 +48,4 @@
 - :MONTH
 - :YEAR
 - :HOURS
-- :COST
+- :COST

src/cli/etc/onetemplate.yaml

@@ -2,20 +2,22 @@
 :ID:
   :desc: ONE identifier for the Template
   :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the Template
-  :size: 27
+  :size: 15
   :left: true
+  :expand: true
 
 :USER:
   :desc: Username of the Template owner
-  :size: 15
+  :size: 8
   :left: true
 
 :GROUP:
   :desc: Group of the Template
-  :size: 15
+  :size: 8
   :left: true
 
 :REGTIME:

src/cli/etc/oneuser.yaml

@@ -2,15 +2,17 @@
 :ID:
   :desc: ONE identifier for the User
   :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the User
   :size: 15
   :left: true
+  :expand: true
 
 :GROUP:
   :desc: Group of the User
-  :size: 10
+  :size: 8
   :left: true
 
 :AUTH:
@@ -20,15 +22,15 @@
 
 :VMS:
   :desc: Number of VMS
-  :size: 9
+  :size: 10
 
 :MEMORY:
   :desc: Total memory allocated to user VMs
-  :size: 17
+  :size: 10
 
 :CPU:
   :desc: Total CPU allocated to user VMs
-  :size: 11
+  :size: 10
 
 :PASSWORD:
   :desc: Password of the User
@@ -42,4 +44,3 @@
 - :VMS
 - :MEMORY
 - :CPU
-

src/cli/etc/onevdc.yaml

@@ -1,28 +1,30 @@
 ---
 :ID:
   :desc: ONE identifier for the VDC
-  :size: 5
+  :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the VDC
-  :size: 30
+  :size: 15
   :left: true
+  :expand: true
 
 :GROUPS:
   :desc: Number of Groups
-  :size: 6
+  :size: 8
 
 :CLUSTERS:
   :desc: Number of Clusters
-  :size: 8
+  :size: 10
 
 :HOSTS:
   :desc: Number of Hosts
-  :size: 5
+  :size: 10
 
 :VNETS:
   :desc: Number of Networks
-  :size: 5
+  :size: 10
 
 :DATASTORES:
   :desc: Number of Datastores
@@ -35,4 +37,4 @@
 - :CLUSTERS
 - :HOSTS
 - :VNETS
-- :DATASTORES
+- :DATASTORES

src/cli/etc/onevm.yaml

@@ -1,12 +1,14 @@
 ---
 :ID:
   :desc: ONE identifier for Virtual Machine
-  :size: 6
+  :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the Virtual Machine
   :size: 15
   :left: true
+  :expand: true
 
 :USER:
   :desc: Username of the Virtual Machine owner
@@ -34,6 +36,7 @@
   :desc: Host where the VM is running
   :size: 10
   :left: true
+  :expand: true
 
 :CLUSTER:
   :desc: Cluster where the VM is running

src/cli/etc/onevmgroup.yaml

@@ -2,11 +2,13 @@
 :ID:
   :desc: ONE identifier for the VM Group
   :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the VM Group
   :size: 15
   :left: true
+  :expand: true
 
 :USER:
   :desc: Username of the VM Group owner

src/cli/etc/onevnet.yaml

@@ -2,21 +2,23 @@
 :ID:
   :desc: ONE identifier for Virtual Network
   :size: 4
+  :adjust: true
 
 :USER:
   :desc: Username of the Virtual Network owner
-  :size: 15
+  :size: 8
   :left: true
 
 :GROUP:
   :desc: Group of the Virtual Network
-  :size: 12
+  :size: 8
   :left: true
 
 :NAME:
   :desc: Name of the Virtual Network
-  :size: 19
+  :size: 15
   :left: true
+  :expand: true
 
 :CLUSTERS:
   :desc: Cluster IDs
@@ -27,6 +29,7 @@
   :desc: Bridge associated to the Virtual Network
   :size: 8
   :left: true
+  :expand: true
 
 :LEASES:
   :desc: Number of this Virtual Networks given leases

src/cli/etc/onevntemplate.yaml

@@ -2,20 +2,22 @@
 :ID:
   :desc: ONE identifier for the Template
   :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the Template
-  :size: 27
+  :size: 15
   :left: true
+  :expand: true
 
 :USER:
   :desc: Username of the Template owner
-  :size: 15
+  :size: 8
   :left: true
 
 :GROUP:
   :desc: Group of the Template
-  :size: 15
+  :size: 8
   :left: true
 
 :REGTIME:

src/cli/etc/onevrouter.yaml

@@ -2,20 +2,22 @@
 :ID:
   :desc: ONE identifier for the Virtual Router
   :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the Virtual Router
-  :size: 27
+  :size: 15
   :left: true
+  :expand: true
 
 :USER:
   :desc: Username of the Virtual Router owner
-  :size: 15
+  :size: 8
   :left: true
 
 :GROUP:
   :desc: Group of the Virtual Router
-  :size: 15
+  :size: 8
   :left: true
 
 :default:

src/cli/etc/onezone.yaml

@@ -2,14 +2,17 @@
 :CURRENT:
   :desc: Active Zone
   :size: 1
+
 :ID:
   :desc: ONE identifier for the Zone
-  :size: 5
+  :size: 4
+  :adjust: true
 
 :NAME:
   :desc: Name of the Zone
-  :size: 25
+  :size: 15
   :left: true
+  :expand: true
 
 :ENDPOINT:
   :desc: Endpoint of the Zone
@@ -19,4 +22,4 @@
 - :CURRENT
 - :ID
 - :NAME
-- :ENDPOINT
+- :ENDPOINT

src/cli/one_helper.rb

@@ -624,7 +624,7 @@ EOT
                 # ------- Rest of the pages in the pool, piped to pager --------
                 current = size
 
-                options[:noheader] = true
+                options[:no_header] = true
 
                 loop do
                     rc = pool.get_page(size, current, false)

src/cli/one_helper/onesecgroup_helper.rb

@@ -157,7 +157,7 @@ class OneSecurityGroupHelper < OpenNebulaHelper::OneHelper
                 d["ICMPV6_TYPE"]
             end
 
-            column :NETWORK, "", :left, :donottruncate, :size=>35 do |d|
+            column :NETWORK, "", :left, :adjust, :size=>35 do |d|
                 network = ""
                 if(!d["NETWORK_ID"].nil? && d["NETWORK_ID"] != "")
                     network += "VNet " + d["NETWORK_ID"]
@@ -185,7 +185,7 @@ class OneSecurityGroupHelper < OpenNebulaHelper::OneHelper
                 network
             end
 
-            column :RANGE, "", :left, :donottruncate, :size=>16 do |d|
+            column :RANGE, "", :left, :adjust, :size=>16 do |d|
                 d["RANGE"]
             end
         end.show(rule_list, {})

src/cli/one_helper/onevm_helper.rb

@@ -371,7 +371,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 OpenNebulaHelper.period_to_str(dtime, false)
             end
 
-            column :IP, "VM IP addresses", :left, :donottruncate, :size=>15 do |d|
+            column :IP, "VM IP addresses", :left, :adjust, :size=>15 do |d|
                 OneVMHelper.ip_str(d)
             end
 
@@ -952,7 +952,7 @@ in the frontend machine.
                         end
                     end
 
-                    column :IP, "",:left, :donottruncate, :size=>15 do |d|
+                    column :IP, "",:left, :adjust, :size=>15 do |d|
                         d["IP"]
                     end
 
@@ -1037,7 +1037,7 @@ in the frontend machine.
                     d["NETWORK_ID"]
                 end
 
-                column :START, "", :left, :donottruncate, :size=>17 do |d|
+                column :START, "", :left, :adjust, :size=>17 do |d|
                     network = ""
 
                     if(!d["IP"].nil? && d["IP"] != "")
@@ -1049,11 +1049,11 @@ in the frontend machine.
                     network
                 end
 
-                column :SIZE, "", :left, :donottruncate, :size=>6 do |d|
+                column :SIZE, "", :left, :adjust, :size=>6 do |d|
                     d["SIZE"]
                 end
 
-                column :"   ", "", :left, :donottruncate, :size=>15 do |d|
+                column :"   ", "", :left, :adjust, :size=>15 do |d|
                     d["RANGE"]
                 end
 
@@ -1153,7 +1153,7 @@ in the frontend machine.
                     OpenNebulaHelper.time_to_str(d["DONE"], false) if !d.nil?
                 end
 
-                column :"MESSAGE", "", :left, :donottruncate, :size=>35 do |d|
+                column :"MESSAGE", "", :left, :adjust, :size=>35 do |d|
                     d["MESSAGE"] if !d.nil?
                 end
             end.show([vm_hash['VM']['USER_TEMPLATE']['SCHED_ACTION']].flatten, {})

src/cli/one_helper/onevnet_helper.rb

@@ -296,7 +296,6 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
 
         puts
         CLIHelper.print_header(str_h1 % ["LEASES"], false)
-
         ar_list = []
 
         if !vn_hash['VNET']['AR_POOL']['AR'].nil?
@@ -342,7 +341,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                     d["IP"]||"-"
             end
 
-            column :IP6, "", :donottruncate, :size=>26 do |d|
+            column :IP6, "", :adjust, :size=>26 do |d|
                     d["IP6"]||d["IP6_GLOBAL"]||"-"
             end
         end.show(leases, {})

src/cli/one_helper/onevrouter_helper.rb

@@ -203,7 +203,7 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
                 end
 
 
-                column :IP, "",:left, :donottruncate, :size=>15 do |d|
+                column :IP, "",:left, :adjust, :size=>15 do |d|
                     d["IP"]
                 end
             end.show(vm_nics,{})