bug #3018: change onevnet parameters to match help

src/cli/one_helper/onevnet_helper.rb

@@ -19,68 +19,68 @@ require 'one_helper/onevm_helper'
 
 class OneVNetHelper < OpenNebulaHelper::OneHelper
     AR = {
-        :name => "ar_id",
+        :name => "address_range",
         :short => "-a ar_id",
         :large => "--address_range ar_id",
         :format => Integer,
         :description => "ID of the address range"
     }
 
-    AR_MAC = {
+    MAC = {
         :name => "mac",
         :short => "-m mac",
-        :large => "--address_range_mac mac",
+        :large => "--mac mac",
         :format => String,
         :description => "First MAC address in : notation"
     }
 
-    AR_IP = {
+    IP = {
         :name => "ip",
         :short => "-i ip",
-        :large => "--address_range_ip ip",
+        :large => "--ip ip",
         :format => String,
         :description => "First IP address in . notation"
     }
 
-    AR_SIZE = {
+    SIZE = {
         :name => "size",
         :short => "-s size",
-        :large => "--address_range_size size",
+        :large => "--size size",
         :format => String,
-        :description => "Number of addresses in the range"
+        :description => "Number of addresses"
     }
 
-    AR_IP6_GLOBAL = {
+    IP6_GLOBAL = {
         :name => "ip6_global",
         :short => "-g ip6_pref",
-        :large => "--address_range_ip6g ip6_pref",
+        :large => "--ip6_global ip6_pref",
         :format => String,
         :description => "IP6 global prefix"
     }
 
-    AR_IP6_ULA = {
+    IP6_ULA = {
         :name => "ip6_ula",
         :short => "-u ip6_pref",
-        :large => "--address_range_ip6u ip6_pref",
+        :large => "--ip6_ula ip6_pref",
         :format => String,
         :description => "IP6 ula prefix"
     }
 
-    R_NAME = {
-        :name => "rname",
+    NAME = {
+        :name => "name",
         :short => "-n reservation name",
         :large => "--name reservation name",
         :format => String,
         :description => "Name of the address reservation"
     }
 
-    R_SIZE = {
-        :name => "rsize",
-        :short => "-s reservation size",
-        :large => "--size reservation size",
-        :format => String,
-        :description => "Number of addresses to reserve"
-    }
+#    R_SIZE = {
+#        :name => "rsize",
+#        :short => "-s reservation size",
+#        :large => "--size reservation size",
+#        :format => String,
+#        :description => "Number of addresses to reserve"
+#    }
 
     def self.rname
         "VNET"

src/cli/onevnet

@@ -112,9 +112,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Adds an address range to the Virtual Network
     EOT
 
-    command :addar, addar_desc, :vnetid, :options=>STD_OPTIONS + [OneVNetHelper::AR_SIZE,
-        OneVNetHelper::AR_MAC, OneVNetHelper::AR_IP, OneVNetHelper::AR_IP6_GLOBAL,
-        OneVNetHelper::AR_IP6_ULA ] do
+    command :addar, addar_desc, :vnetid, :options=>STD_OPTIONS + [OneVNetHelper::SIZE,
+        OneVNetHelper::MAC, OneVNetHelper::IP, OneVNetHelper::IP6_GLOBAL,
+        OneVNetHelper::IP6_ULA ] do
         helper.perform_action(args[0],options,"lease added") do |vn|
             ar = "AR = [ "
 
@@ -204,8 +204,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :reserve, reserve_desc, :vnetid, [:vnetid, nil],
-        :options=>STD_OPTIONS + [OneVNetHelper::AR, OneVNetHelper::R_NAME,
-            OneVNetHelper::R_SIZE, OneVNetHelper::AR_MAC, OneVNetHelper::AR_IP] do
+        :options=>STD_OPTIONS + [OneVNetHelper::AR, OneVNetHelper::NAME,
+            OneVNetHelper::SIZE, OneVNetHelper::MAC, OneVNetHelper::IP] do
         helper.perform_action(args[0],options,"reservation made") do |vn|
             rsize = options[:rsize] || -1
             rname = options[:rname] || -1