opennebula-cli 4.10.2 → 4.11.80.beta

data/lib/one_helper/oneacl_helper.rb

@@ -44,7 +44,7 @@ private
     def self.resource_mask(str)
         resource_type=str.split("/")[0]
 
-        mask = "-----------"
+        mask = "-------------"
 
         resource_type.split("+").each{|type|
             case type
@@ -70,6 +70,10 @@ private
                     mask[9] = "O"
                 when "ZONE"
                     mask[10] = "Z"
+                when "SECGROUP"
+                    mask[11] = "S"
+                when "VDC"
+                    mask[12] = "v"
             end
         }
         mask
@@ -109,8 +113,8 @@ private
                 d['STRING'].split(" ")[0]
             end
 
-            column :RES_VHNIUTGDCOZ, "Resource to which the rule applies",
-                            :size => 15 do |d|
+            column :RES_VHNIUTGDCOZSv, "Resource to which the rule applies",
+                            :size => 17 do |d|
                OneAclHelper::resource_mask d['STRING'].split(" ")[1]
             end
 
@@ -127,7 +131,7 @@ private
                 OneAclHelper::right_mask d['STRING'].split(" ")[2]
             end
 
-            default :ID, :USER, :RES_VHNIUTGDCOZ, :RID, :OPE_UMAC, :ZONE
+            default :ID, :USER, :RES_VHNIUTGDCOZSv, :RID, :OPE_UMAC, :ZONE
         end
 
         table

data/lib/one_helper/onedatastore_helper.rb

@@ -82,15 +82,21 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
                 Datastore::SHORT_DATASTORE_TYPES[type]
             end
 
-            column :DS, "Datastore driver", :left, :size=>8 do |d|
+            column :DS, "Datastore driver", :left, :size=>7 do |d|
                 d["DS_MAD"]
             end
 
-            column :TM, "Transfer driver", :left, :size=>8 do |d|
+            column :TM, "Transfer driver", :left, :size=>7 do |d|
                 d["TM_MAD"]
             end
 
-            default :ID, :NAME, :SIZE, :AVAIL, :CLUSTER, :IMAGES, :TYPE, :DS, :TM
+            column :STAT, "State of the Datastore", :left, :size=>3 do |d|
+                state = Datastore::DATASTORE_STATES[d["STATE"].to_i]
+                Datastore::SHORT_DATASTORE_STATES[state]
+            end
+
+            default :ID, :NAME, :SIZE, :AVAIL, :CLUSTER, :IMAGES,
+                    :TYPE, :DS, :TM, :STAT
         end
 
         table
@@ -128,6 +134,7 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         puts str % ["TM_MAD",   datastore['TM_MAD']]
         puts str % ["BASE PATH",datastore['BASE_PATH']]
         puts str % ["DISK_TYPE",Image::DISK_TYPES[datastore['DISK_TYPE'].to_i]]
+        puts str % ["STATE",    datastore.state_str]
         puts
 
         CLIHelper.print_header(str_h1 % "DATASTORE CAPACITY", false)

data/lib/one_helper/onegroup_helper.rb

@@ -286,29 +286,23 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
         puts group.template_str
         puts
 
-        CLIHelper.print_header(str_h1 % "USERS", false)
-        CLIHelper.print_header("%-15s" % ["ID"])
-        group.user_ids.each do |uid|
-            puts "%-15s" % [uid]
-        end
-
-        group_hash = group.to_hash
+        admin_ids = group.admin_ids
 
-        providers = group_hash['GROUP']['RESOURCE_PROVIDER']
-        if(providers != nil)
-            puts
-            CLIHelper.print_header(str_h1 % "RESOURCE PROVIDERS", false)
+        CLIHelper::ShowTable.new(nil, self) do
+            column :"USER ID", "", :right, :size=>7 do |d|
+                d
+            end
 
-            CLIHelper::ShowTable.new(nil, self) do
-                column :"ZONE", "", :right, :size=>7 do |d|
-                    d['ZONE_ID']
+            column :"ADMIN", "", :left, :size=>5 do |d|
+                if (group.admin_ids.include?(d))
+                    "*"
+                else
+                    ""
                 end
+            end
+        end.show(group.user_ids, {})
 
-                column :"CLUSTER", "", :right, :size=>7 do |d|
-                    d['CLUSTER_ID'] == '10' ? 'ALL' : d['CLUSTER_ID']
-                end
-            end.show([providers].flatten, {})
-        end
+        group_hash = group.to_hash
 
         default_quotas = nil
 

data/lib/one_helper/onehost_helper.rb

@@ -223,6 +223,16 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                 next if host['CLUSTER_ID'].to_i != cluster_id
             end
 
+            vm_mad = host['VM_MAD'].downcase
+            remote_remotes = host['TEMPLATE/REMOTE_REMOTES']
+
+            # Skip this host from remote syncing unless:
+            # - the host is type "KVM"
+            # - the host is type "XEN"
+            # - the host has REMOTE_REMOTES defined in the template (useful
+            #   for custom defined VMM types)
+            next unless remote_remotes || vm_mad == "kvm" || vm_mad == "xen"
+
             host_version=host['TEMPLATE/VERSION']
 
             begin

data/lib/one_helper/onesecgroup_helper.rb

@@ -0,0 +1,155 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs        #
+#                                                                            #
+# 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 OneSecurityGroupHelper < OpenNebulaHelper::OneHelper
+    def self.rname
+        "SECURITY_GROUP"
+    end
+
+    def self.conf_file
+        "onesecgroup.yaml"
+    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 Security Group", :size=>4 do |d|
+                d["ID"]
+            end
+
+            column :NAME, "Name of the Security Group", :left, :size=>27 do |d|
+                d["NAME"]
+            end
+
+            column :USER, "Username of the Security Group owner", :left,
+                    :size=>15 do |d|
+                helper.user_name(d, options)
+            end
+
+            column :GROUP, "Group of the Security Group", :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::SecurityGroup.new_with_id(id, @client)
+        else
+            xml=OpenNebula::SecurityGroup.build_xml
+            OpenNebula::SecurityGroup.new(xml, @client)
+        end
+    end
+
+    def factory_pool(user_flag=-2)
+        OpenNebula::SecurityGroupPool.new(@client, user_flag)
+    end
+
+    def format_resource(secgroup, options = {})
+        str="%-15s: %-20s"
+        str_h1="%-80s"
+
+        CLIHelper.print_header(
+            str_h1 % "SECURITY GROUP #{secgroup['ID']} INFORMATION")
+        puts str % ["ID", secgroup.id.to_s]
+        puts str % ["NAME", secgroup.name]
+        puts str % ["USER", secgroup['UNAME']]
+        puts str % ["GROUP", secgroup['GNAME']]
+
+        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
+
+        ["OWNER", "GROUP", "OTHER"].each { |e|
+            mask = "---"
+            mask[0] = "u" if secgroup["PERMISSIONS/#{e}_U"] == "1"
+            mask[1] = "m" if secgroup["PERMISSIONS/#{e}_M"] == "1"
+            mask[2] = "a" if secgroup["PERMISSIONS/#{e}_A"] == "1"
+
+            puts str % [e,  mask]
+        }
+
+        puts
+
+        CLIHelper.print_header(str_h1 % ["RULES"], false)
+
+        if !secgroup.to_hash['SECURITY_GROUP']['TEMPLATE']['RULE'].nil?
+            rule_list = [secgroup.to_hash['SECURITY_GROUP']['TEMPLATE']['RULE']].flatten
+        end
+
+        CLIHelper::ShowTable.new(nil, self) do
+            column :TYPE, "", :left, :size=>8 do |d|
+                d["RULE_TYPE"]
+            end
+
+            column :PROTOCOL, "", :left, :size=>8 do |d|
+                d["PROTOCOL"]
+            end
+
+            column :ICMP_TYPE, "", :left, :size=>9 do |d|
+                d["ICMP_TYPE"]
+            end
+
+            column :NETWORK, "", :left, :donottruncate, :size=>35 do |d|
+                network = ""
+                if(!d["NETWORK_ID"].nil? && d["NETWORK_ID"] != "")
+                    network += "VNet " + d["NETWORK_ID"]
+                end
+
+                if(!d["SIZE"].nil? && d["SIZE"] != "")
+                    if(network != "")
+                        network += ": "
+                    end
+
+                    if(!d["IP"].nil? && d["IP"] != "")
+                        network += "Start: " + d["IP"] + ", "
+                    elsif(!d["MAC"] != undefined && d["MAC"] != "")
+                        network += "Start: " + d["MAC"] + ", "
+                    end
+
+                    network += "Size: " + d["SIZE"]
+                end
+
+                if(network == "")
+                    network = "Any"
+                end
+
+                network += " "
+                network
+            end
+
+            column :RANGE, "", :left, :donottruncate, :size=>16 do |d|
+                d["RANGE"]
+            end
+        end.show(rule_list, {})
+
+        while secgroup.has_elements?("/SECURITY_GROUP/TEMPLATE/RULE")
+            secgroup.delete_element("/SECURITY_GROUP/TEMPLATE/RULE")
+        end
+
+        puts
+
+        CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false)
+        puts secgroup.template_str
+    end
+end

data/lib/one_helper/onevdc_helper.rb

@@ -0,0 +1,144 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs        #
+#                                                                            #
+# 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 OneVdcHelper < OpenNebulaHelper::OneHelper
+
+    def self.rname
+        "VDC"
+    end
+
+    def self.conf_file
+        "onevdc.yaml"
+    end
+
+    def id_list_size(list)
+        case list
+        when NilClass
+            return 0
+        when Array
+            return list.size
+        when Hash
+            return 1
+        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 VDC", :size=>5 do |d|
+                d["ID"]
+            end
+
+            column :NAME, "Name of the VDC", :left, :size=>30 do |d|
+                d["NAME"]
+            end
+
+            column :GROUPS, "Number of Groups", :size=>6 do |d|
+                ids = d["GROUPS"]["ID"]
+                case ids
+                when String
+                    1
+                when Array
+                    ids.size
+                when NilClass
+                    0
+                end
+            end
+
+            column :CLUSTERS, "Number of Clusters", :size=>8 do |d|
+                @ext.id_list_size(d["CLUSTERS"]["CLUSTER"])
+            end
+
+            column :HOSTS, "Number of Hosts", :size=>5 do |d|
+                @ext.id_list_size(d["HOSTS"]["HOST"])
+            end
+
+            column :VNETS, "Number of Networks", :size=>5 do |d|
+                @ext.id_list_size(d["VNETS"]["VNET"])
+            end
+
+            column :DATASTORES, "Number of Datastores", :size=>10 do |d|
+                @ext.id_list_size(d["DATASTORES"]["DATASTORE"])
+            end
+
+            default :ID, :NAME, :GROUPS, :CLUSTERS, :HOSTS, :VNETS, :DATASTORES
+        end
+
+        table
+    end
+
+    private
+
+    def factory(id=nil)
+        if id
+            OpenNebula::Vdc.new_with_id(id, @client)
+        else
+            xml=OpenNebula::Vdc.build_xml
+            OpenNebula::Vdc.new(xml, @client)
+        end
+    end
+
+    def factory_pool(user_flag=-2)
+        OpenNebula::VdcPool.new(@client)
+    end
+
+    def format_resource(vdc, options = {})
+        str="%-18s: %-20s"
+        str_h1="%-80s"
+
+        CLIHelper.print_header(str_h1 % "VDC #{vdc['ID']} INFORMATION")
+        puts str % ["ID",   vdc.id.to_s]
+        puts str % ["NAME", vdc.name]
+
+        vdc_hash = vdc.to_hash
+
+        groups = vdc_hash['VDC']['GROUPS']['ID']
+        if(groups != nil)
+            puts
+
+            CLIHelper::ShowTable.new(nil, self) do
+                column :"GROUPS", "", :right, :size=>7 do |d|
+                    d
+                end
+            end.show([groups].flatten, {})
+        end
+
+        ['CLUSTER', 'HOST', 'DATASTORE', 'VNET'].each do |resource|
+            res_array = vdc_hash['VDC']["#{resource}S"][resource]
+            if(res_array != nil)
+                puts
+                CLIHelper.print_header(str_h1 % "#{resource}S", false)
+
+                CLIHelper::ShowTable.new(nil, self) do
+                    column :"ZONE", "", :right, :size=>7 do |d|
+                        d['ZONE_ID']
+                    end
+
+                    column :"#{resource}", "", :right, :size=>9 do |d|
+                        d["#{resource}_ID"] == Vdc::ALL_RESOURCES ? 'ALL' : d["#{resource}_ID"]
+                    end
+                end.show([res_array].flatten, {})
+            end
+        end
+
+        puts
+        CLIHelper.print_header(str_h1 % "VDC TEMPLATE", false)
+        puts vdc.template_str
+    end
+end

data/lib/one_helper/onevm_helper.rb

@@ -404,63 +404,24 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end if !options[:all]
         end
 
-        if vm.has_elements?("/VM/USER_TEMPLATE/HYPERVISOR")
-            vm_information = vm.to_hash['VM']
-            hybridvisor    = vm_information['USER_TEMPLATE']['HYPERVISOR'].to_s
-            isHybrid       = %w{vcenter ec2 azure softlayer}.include? hybridvisor
-
-            if isHybrid
-                vm_tmplt = vm_information['TEMPLATE']
-                nic =   {"NETWORK" => "-",
-                           "IP" => "-",
-                           "MAC"=> "-",
-                           "VLAN"=>"no",
-                           "BRIDGE"=>"-"}
+        sg_nics = []
 
-                case hybridvisor
-                    when "vcenter"
-                        nic["IP"] = vm_tmplt['GUEST_IP'] if vm_tmplt['GUEST_IP']
-                    when "ec2"
-                        nic["IP"] = vm_tmplt['IP_ADDRESS'] if vm_tmplt['IP_ADDRESS']
-                    when "azure"
-                        nic["IP"] = vm_tmplt['IPADDRESS'] if vm_tmplt['IPADDRESS']
-                    when "softlayer"
-                        nic["IP"] = vm_tmplt['PRIMARYIPADDRESS'] if vm_tmplt['PRIMARYIPADDRESS']
-                    else
-                        isHybrid = false
-                end
+        if (vm.has_elements?("/VM/TEMPLATE/NIC/SECURITY_GROUPS"))
+            sg_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten
+
+            sg_nics.each do |nic|
+                sg = nic["SECURITY_GROUPS"]
 
-                vm_nics = [nic]
+                if sg.nil?
+                    next
+                end
             end
         end
 
-        if vm.has_elements?("/VM/TEMPLATE/NIC") || vm_nics
+        if vm.has_elements?("/VM/TEMPLATE/NIC")
             puts
             CLIHelper.print_header(str_h1 % "VM NICS",false)
 
-            # vm_nics is defined for hybridvisors. If there are both IP from
-            # the hybridvisor and from OpenNebula nics check if the IP is the
-            # same as one of IPs generated by OpenNebula and show standard
-            # information. If it's a different IP show all the information.
-            #
-            # The template can already contain one NIC not controled by
-            # OpenNebula and we want to show also that info.
-            if vm_nics
-                if vm.has_elements?("/VM/TEMPLATE/NIC")
-                    nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten
-                    ips = nics.map {|n| n['IP'] }
-                    ip = vm_nics.first['IP']
-
-                    if ips.include? ip
-                        vm_nics = nics
-                    else
-                        vm_nics += nics
-                    end
-                end
-            else
-                vm_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten
-            end
-
             nic_default = {"NETWORK" => "-",
                            "IP" => "-",
                            "MAC"=> "-",
@@ -468,7 +429,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                            "BRIDGE"=>"-"}
 
             array_id = 0
-
+            vm_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten
             vm_nics.each {|nic|
 
                 next if nic.has_key?("CLI_DONE")
@@ -556,6 +517,88 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end if !options[:all]
         end
 
+        while vm.has_elements?("/VM/TEMPLATE/NIC")
+            vm.delete_element("/VM/TEMPLATE/NIC")
+        end if !options[:all]
+
+        if vm.has_elements?("/VM/TEMPLATE/SECURITY_GROUP_RULE")
+            puts
+            CLIHelper.print_header(str_h1 % "SECURITY",false)
+            puts
+
+            CLIHelper::ShowTable.new(nil, self) do
+                column :NIC_ID, "", :size=>6 do |d|
+                    d["NIC_ID"]
+                end
+
+                column :NETWORK, "", :left, :size=>25 do |d|
+                    d["NETWORK"]
+                end
+
+                column :SECURITY_GROUPS, "", :left, :size=>47 do |d|
+                    d["SECURITY_GROUPS"]
+                end
+            end.show(sg_nics,{})
+
+            puts
+
+            CLIHelper.print_header(str_h1 % "SECURITY GROUP   TYPE     PROTOCOL NETWORK                       RANGE          ",false)
+
+            CLIHelper::ShowTable.new(nil, self) do
+                column :ID, "", :size=>4 do |d|
+                    d["SECURITY_GROUP_ID"]
+                end
+
+                column :NAME, "", :left, :size=>11 do |d|
+                    d["SECURITY_GROUP_NAME"]
+                end
+
+                column :" ", "", :left, :size=>8 do |d|
+                    d["RULE_TYPE"]
+                end
+
+                column :"  ", "", :left, :size=>8 do |d|
+                    protocol = d["PROTOCOL"]
+
+                    if(protocol.upcase == "ICMP")
+                        icmp = d["ICMP_TYPE"].nil? ? "" : "-#{d["ICMP_TYPE"]}"
+                        protocol += icmp
+                    end
+
+                    protocol
+                end
+
+                column :VNET, "", :size=>4 do |d|
+                    d["NETWORK_ID"]
+                end
+
+                column :START, "", :left, :donottruncate, :size=>17 do |d|
+                    network = ""
+
+                    if(!d["IP"].nil? && d["IP"] != "")
+                        network = d["IP"]
+                    elsif(!d["MAC"].nil? && d["MAC"] != "")
+                        network = d["MAC"]
+                    end
+
+                    network
+                end
+
+                column :SIZE, "", :left, :donottruncate, :size=>6 do |d|
+                    d["SIZE"]
+                end
+
+                column :"   ", "", :left, :donottruncate, :size=>15 do |d|
+                    d["RANGE"]
+                end
+
+            end.show([vm.to_hash['VM']['TEMPLATE']['SECURITY_GROUP_RULE']].flatten, {})
+
+            while vm.has_elements?("/VM/TEMPLATE/SECURITY_GROUP_RULE")
+                vm.delete_element("/VM/TEMPLATE/SECURITY_GROUP_RULE")
+            end if !options[:all]
+        end
+
         if vm.has_elements?("/VM/TEMPLATE/SNAPSHOT")
             puts
             CLIHelper.print_header(str_h1 % "SNAPSHOTS",false)