opennebula-cli 4.14.2 → 4.90.0.beta1

data/lib/one_helper/onevm_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -84,6 +84,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         }
     }
 
+    IP={
+        :name => "ip",
+        :short => "-i ip",
+        :large => "--ip ip",
+        :format => String,
+        :description => "IP address for the new NIC"
+    }
+
     FILE = {
         :name   => "file",
         :short  => "-f file",
@@ -131,12 +139,6 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :description=> "Does not communicate with the guest OS"
     }
 
-    RECREATE = {
-        :name       => "recreate",
-        :large      => "--recreate",
-        :description=> "Resubmits a fresh VM"
-    }
-
     def self.rname
         "VM"
     end
@@ -170,16 +172,11 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         end
 
         vm_nics.each do |nic|
-            if nic.has_key?("IP")
-                ips.push(nic["IP"])
-            end
-
-            if nic.has_key?("IP6_GLOBAL")
-                ips.push(nic["IP6_GLOBAL"])
-            end
-
-            if nic.has_key?("IP6_ULA")
-                ips.push(nic["IP6_ULA"])
+            ["IP", "IP6_GLOBAL", "IP6_ULA",
+             "VROUTER_IP", "VROUTER_IP6_GLOBAL", "VROUTER_IP6_ULA"].each do |attr|
+                if nic.has_key?(attr)
+                    ips.push(nic[attr])
+                end
             end
         end
 
@@ -333,6 +330,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :PROLOG_MIGRATE_FAILURE          => :migrate,
         :PROLOG_MIGRATE_POWEROFF_FAILURE => :migrate,
         :PROLOG_MIGRATE_SUSPEND_FAILURE  => :migrate,
+        :PROLOG_MIGRATE_UNKNOWN_FAILURE  => :migrate,
         :PROLOG_FAILURE                  => :prolog,
         :PROLOG_RESUME_FAILURE           => :resume,
         :PROLOG_UNDEPLOY_FAILURE         => :resume,
@@ -517,6 +515,8 @@ in the frontend machine.
             OpenNebulaHelper.time_to_str(vm['/VM/ETIME'])]
         value=vm['DEPLOY_ID']
         puts str % ["DEPLOY ID", value=="" ? "-" : value]
+        value=vm['TEMPLATE/VROUTER_ID']
+        puts str % ["VIRTUAL ROUTER ID", value] if value
 
         puts
 
@@ -724,7 +724,6 @@ in the frontend machine.
             nic_default = {"NETWORK" => "-",
                            "IP" => "-",
                            "MAC"=> "-",
-                           "VLAN"=>"no",
                            "BRIDGE"=>"-"}
 
             shown_ips = []
@@ -735,37 +734,31 @@ in the frontend machine.
 
                 next if nic.has_key?("CLI_DONE")
 
-                if nic.has_key?("IP6_LINK")
-                    shown_ips << nic["IP6_LINK"]
-
-                    ip6_link = {"IP"           => nic.delete("IP6_LINK"),
-                                "CLI_DONE"     => true,
-                                "DOUBLE_ENTRY" => true}
-                    vm_nics.insert(array_id+1,ip6_link)
+                ["IP6_LINK", "IP6_ULA", "IP6_GLOBAL"].each do |attr|
+                    if nic.has_key?(attr)
+                        shown_ips << nic[attr]
 
-                    array_id += 1
-                end
-
-                if nic.has_key?("IP6_ULA")
-                    shown_ips << nic["IP6_ULA"]
-
-                    ip6_link = {"IP"           => nic.delete("IP6_ULA"),
-                                "CLI_DONE"     => true,
-                                "DOUBLE_ENTRY" => true}
-                    vm_nics.insert(array_id+1,ip6_link)
+                        ipstr = {"IP"           => nic.delete(attr),
+                                 "CLI_DONE"     => true,
+                                 "DOUBLE_ENTRY" => true}
+                        vm_nics.insert(array_id+1,ipstr)
 
-                    array_id += 1
+                        array_id += 1
+                    end
                 end
 
-                if nic.has_key?("IP6_GLOBAL")
-                    shown_ips << nic["IP6_GLOBAL"]
+                ["VROUTER_IP", "VROUTER_IP6_LINK",
+                 "VROUTER_IP6_ULA", "VROUTER_IP6_GLOBAL"].each do |attr|
+                    if nic.has_key?(attr)
+                        shown_ips << nic[attr]
 
-                    ip6_link = {"IP"           => nic.delete("IP6_GLOBAL"),
-                                "CLI_DONE"     => true,
-                                "DOUBLE_ENTRY" => true}
-                    vm_nics.insert(array_id+1,ip6_link)
+                        ipstr = {"IP"           => nic.delete(attr) + " (VRouter)",
+                                 "CLI_DONE"     => true,
+                                 "DOUBLE_ENTRY" => true}
+                        vm_nics.insert(array_id+1,ipstr)
 
-                    array_id += 1
+                        array_id += 1
+                    end
                 end
 
                 shown_ips << nic["IP"] if nic.has_key?("IP")
@@ -782,8 +775,7 @@ in the frontend machine.
                     "NIC_ID"        => "-",
                     "IP"            => ip,
                     "NETWORK"       => "Additional IP",
-                    "BRIDGE"        => "-",
-                    "VLAN"          => "-"
+                    "BRIDGE"        => "-"
                 }
             end
 
@@ -804,14 +796,6 @@ in the frontend machine.
                     end
                 end
 
-                column :VLAN, "", :size=>4 do |d|
-                    if d["DOUBLE_ENTRY"]
-                        ""
-                    else
-                        d["VLAN"].downcase
-                    end
-                end
-
                 column :BRIDGE, "", :left, :size=>12 do |d|
                     if d["DOUBLE_ENTRY"]
                         ""

data/lib/one_helper/onevnet_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -102,10 +102,11 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         :description=> "Netmask in dot notation"
     ]
 
-    VLAN = [
-        :name       => "vlan",
-        :large      => "--vlan",
-        :description=> "Use network isolation"
+    VN_MAD = [
+        :name       => "vn_mad",
+        :large      => "--vn_mad mad",
+        :format     => String,
+        :description=> "Use this driver for the network"
     ]
 
     VLAN_ID = [
@@ -116,7 +117,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
     ]
 
     ADDAR_OPTIONS = [
-        SIZE, MAC, IP, IP6_GLOBAL, IP6_ULA, GATEWAY, NETMASK, VLAN, VLAN_ID ]
+        SIZE, MAC, IP, IP6_GLOBAL, IP6_ULA, GATEWAY, NETMASK, VN_MAD, VLAN_ID ]
 
     def self.rname
         "VNET"
@@ -149,8 +150,8 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                 d["NAME"]
             end
 
-            column :CLUSTER, "Name of the Cluster", :left, :size=>10 do |d|
-                OpenNebulaHelper.cluster_str(d["CLUSTER"])
+            column :CLUSTERS, "Cluster IDs", :left, :size=>10 do |d|
+                OpenNebulaHelper.clusters_str(d["CLUSTERS"]["ID"])
             end
 
             column :BRIDGE, "Bridge associated to the Virtual Network", :left,
@@ -163,7 +164,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                 d["USED_LEASES"]
             end
 
-            default :ID, :USER, :GROUP, :NAME, :CLUSTER, :BRIDGE, :LEASES
+            default :ID, :USER, :GROUP, :NAME, :CLUSTERS, :BRIDGE, :LEASES
         end
 
         table
@@ -209,9 +210,10 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         puts str % ["NAME", vn['NAME']]
         puts str % ["USER", vn['UNAME']]
         puts str % ["GROUP", vn['GNAME']]
-        puts str % ["CLUSTER", OpenNebulaHelper.cluster_str(vn['CLUSTER'])]
+        puts str % ["CLUSTERS",
+            OpenNebulaHelper.clusters_str(vn.retrieve_elements("CLUSTERS/ID"))]
         puts str % ["BRIDGE", vn["BRIDGE"]]
-        puts str % ["VLAN", OpenNebulaHelper.boolean_to_str(vn['VLAN'])]
+        puts str % ["VN_MAD", vn['VN_MAD']] if !vn['VN_MAD'].empty?
         puts str % ["PHYSICAL DEVICE", vn["PHYDEV"]] if !vn["PHYDEV"].empty?
         puts str % ["VLAN ID", vn["VLAN_ID"]] if !vn["VLAN_ID"].empty?
         puts str % ["USED LEASES", vn['USED_LEASES']]
@@ -251,6 +253,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
             str="%-15s: %-20s"
             puts str % ["SIZE", ar["SIZE"]]
             puts str % ["LEASES", ar["USED_LEASES"]]
+            puts str % ["VN_MAD", ar["VN_MAD"]] if ar["VN_MAD"]
             puts
 
             format = "%-10s %34s %34s"
@@ -308,6 +311,8 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                     "V:#{d['VM']}"
                 elsif d['VNET']
                     "N:#{d['VNET']}"
+                elsif d['VROUTER']
+                    "R:#{d['VROUTER']}"
                 end
             end
 
@@ -324,6 +329,13 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
             end
         end.show(leases, {})
 
+        puts
+
+        CLIHelper.print_header("%-15s" % "VIRTUAL ROUTERS")
+        vn.vrouter_ids.each do |id|
+            puts "%-15s" % [id]
+        end
+
         if options[:show_ar]
             ar_list.each do |ar_id|
                 puts

data/lib/one_helper/onevrouter_helper.rb

@@ -0,0 +1,221 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+require 'one_helper'
+
+class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
+
+    ALL_TEMPLATE = {
+        :name       => "all",
+        :large      => "--all",
+        :description => "Show all template data"
+    }
+
+    def self.rname
+        "VROUTER"
+    end
+
+    def self.conf_file
+        "onevrouter.yaml"
+    end
+
+    def show_resource(id, options)
+        resource = retrieve_resource(id)
+
+        if !options[:extended].nil?
+            rc = resource.info(options[:extended])
+        else
+            rc = resource.info
+        end
+
+        return -1, rc.message if OpenNebula.is_error?(rc)
+
+        if options[:xml]
+            return 0, resource.to_xml(true)
+        else
+            format_resource(resource, options)
+            return 0
+        end
+    end
+
+    def format_pool(options)
+        config_file = self.class.table_conf
+
+        table = CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, "ONE identifier for the Virtual Router", :size=>4 do |d|
+                d["ID"]
+            end
+
+            column :NAME, "Name of the Virtual Router", :left, :size=>27 do |d|
+                d["NAME"]
+            end
+
+            column :USER, "Username of the Virtual Router owner", :left,
+                    :size=>15 do |d|
+                helper.user_name(d, options)
+            end
+
+            column :GROUP, "Group of the Virtual Router", :left, :size=>15 do |d|
+                helper.group_name(d, options)
+            end
+
+            default :ID, :USER, :GROUP, :NAME
+        end
+
+        table
+    end
+
+    private
+
+    def factory(id=nil)
+        if id
+            OpenNebula::VirtualRouter.new_with_id(id, @client)
+        else
+            xml=OpenNebula::VirtualRouter.build_xml
+            OpenNebula::VirtualRouter.new(xml, @client)
+        end
+    end
+
+    def factory_pool(user_flag=-2)
+        OpenNebula::VirtualRouterPool.new(@client, user_flag)
+    end
+
+    def format_resource(obj, options = {})
+        str="%-15s: %-20s"
+        str_h1="%-80s"
+
+        CLIHelper.print_header(
+            str_h1 % "VIRTUAL ROUTER #{obj['ID']} INFORMATION")
+        puts str % ["ID", obj.id.to_s]
+        puts str % ["NAME", obj.name]
+        puts str % ["USER", obj['UNAME']]
+        puts str % ["GROUP", obj['GNAME']]
+        puts
+
+        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
+
+        ["OWNER", "GROUP", "OTHER"].each { |e|
+            mask = "---"
+            mask[0] = "u" if obj["PERMISSIONS/#{e}_U"] == "1"
+            mask[1] = "m" if obj["PERMISSIONS/#{e}_M"] == "1"
+            mask[2] = "a" if obj["PERMISSIONS/#{e}_A"] == "1"
+
+            puts str % [e,  mask]
+        }
+
+        if obj.has_elements?("/VROUTER/TEMPLATE/NIC")
+            puts
+            CLIHelper.print_header(str_h1 % "VIRTUAL ROUTER NICS",false)
+
+            nic_default = {"NETWORK" => "-",
+                           "IP" => "-"}
+
+            array_id = 0
+            vm_nics = [obj.to_hash['VROUTER']['TEMPLATE']['NIC']].flatten.compact
+            vm_nics.each {|nic|
+
+                next if nic.has_key?("CLI_DONE")
+
+                floating = (nic.has_key?("FLOATING_IP") && nic["FLOATING_IP"].upcase() == "YES" )
+
+                if floating
+                    if nic.has_key?("IP6_LINK")
+                        ip6_link = {"IP"           => nic.delete("IP6_LINK"),
+                                    "CLI_DONE"     => true,
+                                    "DOUBLE_ENTRY" => true}
+                        vm_nics.insert(array_id+1,ip6_link)
+
+                        array_id += 1
+                    end
+
+                    if nic.has_key?("IP6_ULA")
+                        ip6_link = {"IP"           => nic.delete("IP6_ULA"),
+                                    "CLI_DONE"     => true,
+                                    "DOUBLE_ENTRY" => true}
+                        vm_nics.insert(array_id+1,ip6_link)
+
+                        array_id += 1
+                    end
+
+                    if nic.has_key?("IP6_GLOBAL")
+                        ip6_link = {"IP"           => nic.delete("IP6_GLOBAL"),
+                                    "CLI_DONE"     => true,
+                                    "DOUBLE_ENTRY" => true}
+                        vm_nics.insert(array_id+1,ip6_link)
+
+                        array_id += 1
+                    end
+                else
+                    nic.delete("IP")
+                end
+
+                nic.merge!(nic_default) {|k,v1,v2| v1}
+                array_id += 1
+            }
+
+            CLIHelper::ShowTable.new(nil, self) do
+                column :ID, "", :size=>3 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        d["NIC_ID"]
+                    end
+                end
+
+                column :NETWORK, "", :left, :size=>20 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        d["NETWORK"]
+                    end
+                end
+
+                column :MANAGEMENT, "", :left, :size=>10 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        if !d["VROUTER_MANAGEMENT"].nil?
+                            d["VROUTER_MANAGEMENT"]
+                        else
+                            "NO"
+                        end
+                    end
+                end
+
+
+                column :IP, "",:left, :donottruncate, :size=>15 do |d|
+                    d["IP"]
+                end
+            end.show(vm_nics,{})
+        end
+
+        while obj.has_elements?("/VROUTER/TEMPLATE/NIC")
+            obj.delete_element("/VROUTER/TEMPLATE/NIC")
+        end if !options[:all]
+
+        puts
+
+        CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false)
+        puts obj.template_str
+
+        puts
+
+        CLIHelper.print_header("%-15s" % "VIRTUAL MACHINES")
+        obj.vm_ids.each do |id|
+            puts "%-15s" % [id]
+        end
+    end
+end

data/lib/one_helper/onezone_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #