opennebula-cli 5.6.2 → 5.7.80.pre

data/lib/one_helper/onevnet_helper.rb

@@ -96,33 +96,33 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
 #        :description => "Number of addresses to reserve"
 #    }
 
-    GATEWAY = [
+    GATEWAY = {
         :name       => "gateway",
         :large      => "--gateway ip",
         :format     => String,
         :description=> "IP of the gateway"
-    ]
+    }
 
-    NETMASK = [
+    NETMASK = {
         :name       => "netmask",
         :large      => "--netmask mask",
         :format     => String,
         :description=> "Netmask in dot notation"
-    ]
+    }
 
-    VN_MAD = [
+    VN_MAD = {
         :name       => "vn_mad",
         :large      => "--vn_mad mad",
         :format     => String,
         :description=> "Use this driver for the network"
-    ]
+    }
 
-    VLAN_ID = [
+    VLAN_ID = {
         :name       => "vlanid",
         :large      => "--vlanid id",
         :format     => String,
         :description=> "VLAN ID assigned"
-    ]
+    }
 
     ADDAR_OPTIONS = [
         SIZE, MAC, IP, IP6, IP6_GLOBAL, IP6_ULA, GATEWAY, NETMASK, VN_MAD,
@@ -361,4 +361,16 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
             end
         end
     end
+
+    def self.add_ar_options_used?(options)
+        # Get the template options names as symbols. options hash
+        # uses symbols
+        add_ar_options=OneVNetHelper::ADDAR_OPTIONS.map do |o|
+            o[:name].to_sym
+        end
+
+        # Check if one at least one of the template options is
+        # in options hash
+        (add_ar_options-options.keys)!=add_ar_options
+    end
 end

data/lib/one_helper/onevntemplate_helper.rb

@@ -0,0 +1,104 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2018, 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'
+require 'one_helper/onetemplate_helper'
+require 'base64'
+
+class OneVNTemplateHelper < OneTemplateHelper
+    VN_NAME={
+        :name  => "name",
+        :large => "--name name",
+        :format => String,
+        :description =>  <<-EOT.strip
+Name of the new VN TEMPLATE. When instantiating
+                               multiple VNs you can use the \"%i\" wildcard to produce
+                               different names such as vm-0, vm-1...
+EOT
+    }
+
+    MULTIPLE={
+        :name  => "multiple",
+        :short => "-m x",
+        :large => "--multiple x",
+        :format => Integer,
+        :description => "Instance multiple VNs"
+    }
+
+    EXTENDED={
+        :name => "extended",
+        :large => "--extended",
+        :description => "Process the template and included extended "+
+                        "information"
+    }
+
+    def self.rname
+        "VNTEMPLATE"
+    end
+
+    def self.conf_file
+        "onevntemplate.yaml"
+    end
+
+    INT_EXP = /^-?\d+$/
+    FLOAT_EXP = /^-?\d+(\.\d+)?$/
+
+    private
+
+    def factory(id=nil)
+        if id
+            OpenNebula::VNTemplate.new_with_id(id, @client)
+        else
+            xml=OpenNebula::VNTemplate.build_xml
+            OpenNebula::VNTemplate.new(xml, @client)
+        end
+    end
+
+    def factory_pool(user_flag=-2)
+        OpenNebula::VNTemplatePool.new(@client, user_flag)
+    end
+
+    def format_resource(template, options = {})
+        str="%-15s: %-20s"
+        str_h1="%-80s"
+
+        CLIHelper.print_header(
+            str_h1 % "TEMPLATE #{template['ID']} INFORMATION")
+        puts str % ["ID", template.id.to_s]
+        puts str % ["NAME", template.name]
+        puts str % ["USER", template['UNAME']]
+        puts str % ["GROUP", template['GNAME']]
+        puts str % ["LOCK", OpenNebulaHelper.level_lock_to_str(template['LOCK/LOCKED'])]
+        puts str % ["REGISTER TIME",
+            OpenNebulaHelper.time_to_str(template['REGTIME'])]
+        puts
+
+        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
+
+        ["OWNER", "GROUP", "OTHER"].each { |e|
+            mask = "---"
+            mask[0] = "u" if template["PERMISSIONS/#{e}_U"] == "1"
+            mask[1] = "m" if template["PERMISSIONS/#{e}_M"] == "1"
+            mask[2] = "a" if template["PERMISSIONS/#{e}_A"] == "1"
+
+            puts str % [e,  mask]
+        }
+        puts
+
+        CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false)
+        puts template.template_str
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.6.2
+  version: 5.7.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.2
+        version: 5.7.80.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.2
+        version: 5.7.80.pre
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -47,6 +47,7 @@ executables:
 - onevm
 - onevmgroup
 - onevnet
+- onevntemplate
 - onevrouter
 - onezone
 extensions: []
@@ -72,6 +73,7 @@ files:
 - bin/onevm
 - bin/onevmgroup
 - bin/onevnet
+- bin/onevntemplate
 - bin/onevrouter
 - bin/onezone
 - lib/cli_helper.rb
@@ -95,6 +97,7 @@ files:
 - lib/one_helper/onevm_helper.rb
 - lib/one_helper/onevmgroup_helper.rb
 - lib/one_helper/onevnet_helper.rb
+- lib/one_helper/onevntemplate_helper.rb
 - lib/one_helper/onevrouter_helper.rb
 - lib/one_helper/onezone_helper.rb
 - NOTICE
@@ -114,9 +117,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1