opennebula 6.4.5 → 6.5.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34ad5b5d6ddf88c8d92248d3c321d7e6891609fbc83776ef6d0a71ea6e634977
-  data.tar.gz: 2efb015748722ee63a336106a59b1306b0382049cdeb44ef86eee11a957f7379
+  metadata.gz: 5cb427e39e8e2f581076e069b21c0da24b5e82dac56e29b0e7017c7e419b3a31
+  data.tar.gz: 59203c99872a0065565a336a0bc814f5f7f9acd15a79bcdf3e1df9c92f3b5209
 SHA512:
-  metadata.gz: f3a43640e13e4a9e73e2b3efc8ae5da0793b50a56b8655a855e4b42820869515d602a7fd3ede1ace8f8996d64cbb78b82461c5f90466256498538d9f048e70c6
-  data.tar.gz: 54c3b592674fdca5ed5836aac7b32336fd4a1970dc2b816ad0236c622133559f136fc545b4be56a26f3fee847572c4f30970d5cd8ba44fdc92af0d4e53484403
+  metadata.gz: c20a43d2ade283e63fda2143c9fb8fc2d88f7191e81f75f17219d0d625c99f587f6aea2517dfde44d1dd65aea08c65fa349518045a58df2f912d3d7bc5afb197
+  data.tar.gz: 7e4f2365737cf9746b91834ff0af8cb01ff7dc198b5f143686d483f6c9aa927df6cbac4e4226682ce599c5afea85be716e2cb21dc2144986e288f8f2f33e5bbb

data/lib/ActionManager.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- */
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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                                                   */

data/lib/CommandManager.rb

@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems
+# Copyright 2002-2022, 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
@@ -212,19 +212,22 @@ end
 # Executes commands in a remote machine ussing ssh. See documentation
 # for GenericCommand
 class SSHCommand < GenericCommand
-    attr_accessor :host
+
+    attr_accessor :host, :ssh_opts
 
     # Creates a command and runs it
-    def self.run(command, host, logger=nil, stdin=nil, timeout=nil)
-        cmd=self.new(command, host, logger, stdin, timeout)
+    def self.run(command, host, logger=nil, stdin=nil, timeout=nil, ssh_opts='')
+        cmd=self.new(command, host, logger, stdin, timeout, ssh_opts)
         cmd.run
         cmd
     end
 
     # This one takes another parameter. +host+ is the machine
     # where the command is going to be executed
-    def initialize(command, host, logger=nil, stdin=nil, timeout=nil)
+    def initialize(command, host, logger=nil, stdin=nil, timeout=nil, ssh_opts='')
         @host=host
+        @ssh_opts = ssh_opts
+
         super(command, logger, stdin, timeout)
     end
 
@@ -232,10 +235,10 @@ private
 
     def execute
         if @stdin
-            capture3_timeout("ssh #{@host} #{@command}",
+            capture3_timeout("ssh #{@ssh_opts} #{@host} #{@command}",
                             :pgroup => true, :stdin_data => @stdin)
         else
-            capture3_timeout("ssh -n #{@host} #{@command}",
+            capture3_timeout("ssh -n #{@ssh_opts} #{@host} #{@command}",
                             :pgroup => true)
         end
     end

data/lib/DriverExecHelper.rb

@@ -1,6 +1,6 @@
 # rubocop:disable Naming/FileName
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -189,7 +189,7 @@ module DriverExecHelper
                 cfg=file.read
             end
 
-            cfg.split("\n").each do |line|
+            cfg.split(/\n/).each do |line|
                 m=line.match(/^([^=]+)=(.*)$/)
 
                 next unless m

data/lib/OpenNebulaDriver.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #

data/lib/VirtualMachineDriver.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -53,7 +53,9 @@ class VirtualMachineDriver < OpenNebulaDriver
         :resize_disk => "RESIZEDISK",
         :update_sg   => "UPDATESG",
         :update_conf => "UPDATECONF",
-        :resize      => "RESIZE"
+        :resize      => "RESIZE",
+        :backup      => "BACKUP",
+        :update_nic   => "UPDATENIC"
     }
 
     POLL_ATTRIBUTE = OpenNebula::VirtualMachine::Driver::POLL_ATTRIBUTE
@@ -76,23 +78,23 @@ class VirtualMachineDriver < OpenNebulaDriver
 
         super(directory, @options)
 
-        @hosts   = Array.new
-
-        register_action(ACTION[:deploy].to_sym,      method("deploy"))
-        register_action(ACTION[:shutdown].to_sym,    method("shutdown"))
-        register_action(ACTION[:reboot].to_sym,      method("reboot"))
-        register_action(ACTION[:reset].to_sym,       method("reset"))
-        register_action(ACTION[:cancel].to_sym,      method("cancel"))
-        register_action(ACTION[:save].to_sym,        method("save"))
-        register_action(ACTION[:restore].to_sym,     method("restore"))
-        register_action(ACTION[:migrate].to_sym,     method("migrate"))
-        register_action(ACTION[:poll].to_sym,        method("poll"))
+        @hosts = Array.new
+
+        register_action(ACTION[:deploy].to_sym, method("deploy"))
+        register_action(ACTION[:shutdown].to_sym, method("shutdown"))
+        register_action(ACTION[:reboot].to_sym, method("reboot"))
+        register_action(ACTION[:reset].to_sym, method("reset"))
+        register_action(ACTION[:cancel].to_sym, method("cancel"))
+        register_action(ACTION[:save].to_sym, method("save"))
+        register_action(ACTION[:restore].to_sym, method("restore"))
+        register_action(ACTION[:migrate].to_sym, method("migrate"))
+        register_action(ACTION[:poll].to_sym, method("poll"))
         register_action(ACTION[:attach_disk].to_sym, method("attach_disk"))
         register_action(ACTION[:detach_disk].to_sym, method("detach_disk"))
         register_action(ACTION[:snapshot_create].to_sym, method("snapshot_create"))
         register_action(ACTION[:snapshot_revert].to_sym, method("snapshot_revert"))
         register_action(ACTION[:snapshot_delete].to_sym, method("snapshot_delete"))
-        register_action(ACTION[:cleanup].to_sym,    method("cleanup"))
+        register_action(ACTION[:cleanup].to_sym, method("cleanup"))
         register_action(ACTION[:attach_nic].to_sym, method("attach_nic"))
         register_action(ACTION[:detach_nic].to_sym, method("detach_nic"))
         register_action(ACTION[:disk_snapshot_create].to_sym, method("disk_snapshot_create"))
@@ -100,6 +102,8 @@ class VirtualMachineDriver < OpenNebulaDriver
         register_action(ACTION[:update_sg].to_sym, method("update_sg"))
         register_action(ACTION[:update_conf].to_sym, method("update_conf"))
         register_action(ACTION[:resize].to_sym, method("resize"))
+        register_action(ACTION[:backup].to_sym, method("backup"))
+        register_action(ACTION[:update_nic].to_sym, method("update_nic"))
     end
 
     # Decodes the encoded XML driver message received from the core
@@ -234,6 +238,16 @@ class VirtualMachineDriver < OpenNebulaDriver
         send_message(ACTION[:resize],RESULT[:failure],id,error)
     end
 
+    def backup(id, drv_message)
+        error = "Action not implemented by driver #{self.class}"
+        send_message(ACTION[:backup],RESULT[:failure],id,error)
+    end
+
+    def update_nic(id, drv_message)
+        error = "Action not implemented by driver #{self.class}"
+        send_message(ACTION[:update_nic],RESULT[:failure],id,error)
+    end
+
 private
 
     # Interface to handle the pending events from the ActionManager Interface

data/lib/cloud/CloudClient.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.4.5'
+    VERSION = '6.5.80'
 
     # #########################################################################
     # Default location for the authentication file
@@ -229,7 +229,7 @@ module CloudCLI
     def version_text
         version=<<EOT
 OpenNebula #{CloudClient::VERSION}
-Copyright 2002-2023, OpenNebula Project, OpenNebula Systems
+Copyright 2002-2022, 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

data/lib/datacenter.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -929,26 +929,30 @@ module VCenterDriver
             spec.configSpec.maxMtu = mtu
 
             # The DVS must be created in the networkFolder of the datacenter
-            dvs_creation_task = @item
-                                .networkFolder
-                                .CreateDVS_Task(
-                                    :spec => spec
-                                )
-            dvs_creation_task.wait_for_completion
-
-            # If task finished successfuly we rename the uplink portgroup
-            dvs = nil
-            if dvs_creation_task.info.state == 'success'
-                dvs = dvs_creation_task.info.result
-                dvs
-                    .config
-                    .uplinkPortgroup[0]
-                    .Rename_Task(
-                        :newName => "#{switch_name}-uplink-pg"
-                    ).wait_for_completion
-            else
-                raise "The Distributed vSwitch #{switch_name} \
-                could not be created. "
+            begin
+                dvs_creation_task = @item
+                                    .networkFolder
+                                    .CreateDVS_Task(
+                                        :spec => spec
+                                    )
+                dvs_creation_task.wait_for_completion
+
+                # If task finished successfuly we rename the uplink portgroup
+                dvs = nil
+                if dvs_creation_task.info.state == 'success'
+                    dvs = dvs_creation_task.info.result
+                    dvs
+                        .config
+                        .uplinkPortgroup[0]
+                        .Rename_Task(
+                            :newName => "#{switch_name}-uplink-pg"
+                        ).wait_for_completion
+                else
+                    raise "The Distributed vSwitch #{switch_name} \
+                    could not be created. "
+                end
+            rescue StandardError => e
+                raise e
             end
 
             @net_rollback << {

data/lib/datastore.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -743,9 +743,9 @@ module VCenterDriver
                         image_path = ''
 
                         # Skip not relevant files
-                        next unless ['FloppyImageFileInfo',
-                                     'IsoImageFileInfo',
-                                     'VmDiskFileInfo'].include? image.class.to_s
+                        next unless %w[FloppyImageFileInfo
+                                       IsoImageFileInfo
+                                       VmDiskFileInfo].include? image.class.to_s
 
                         # Get image path and name
                         image_path << folderpath << image.path

data/lib/distributed_firewall.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #

data/lib/file_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -109,7 +109,7 @@ module VCenterDriver
         def self.needs_unpack?(file_path)
             type = get_type(file_path)
             type.gsub!(%r{^application/(x-)?}, '')
-            ['bzip2', 'gzip', 'tar'].include?(type)
+            %w[bzip2 gzip tar].include?(type)
         end
 
         def self.vcenter_file_info(file_path)

data/lib/host.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -233,7 +233,7 @@ module VCenterDriver
             end
 
             nxs_type = @one_item['TEMPLATE/NSX_TYPE']
-            return unless nxs_type == NSXDriver::NSXConstants::NSXT
+            unless nxs_type == NSXDriver::NSXConstants::NSXT; return; end
 
             # URL to test a connection
             url = '/api/v1/transport-zones'
@@ -352,7 +352,7 @@ module VCenterDriver
             str_info << 'USEDMEMORY='  << (total_mem - free_mem).to_s << "\n"
 
             # DRS enabled
-            str_info << 'VCENTER_DRS=' << drs_enabled.to_s << "\n"
+            str_info << 'VCENTER_DRS='  << drs_enabled.to_s << "\n"
 
             # HA enabled
             str_info << 'VCENTER_HA=' << ha_enabled.to_s << "\n"

data/lib/logical_port.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #

data/lib/logical_switch.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #

data/lib/memoize.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #

data/lib/models/role.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -32,26 +32,26 @@ module OpenNebula
         attr_reader :service
 
         # Actions that can be performed on the VMs of a given Role
-        SCHEDULE_ACTIONS = [
-            'terminate',
-            'terminate-hard',
-            'undeploy',
-            'undeploy-hard',
-            'hold',
-            'release',
-            'stop',
-            'suspend',
-            'resume',
-            'reboot',
-            'reboot-hard',
-            'poweroff',
-            'poweroff-hard',
-            'snapshot-create',
-            'snapshot-revert',
-            'snapshot-delete',
-            'disk-snapshot-create',
-            'disk-snapshot-revert',
-            'disk-snapshot-delete'
+        SCHEDULE_ACTIONS = %w[
+            terminate
+            terminate-hard
+            undeploy
+            undeploy-hard
+            hold
+            release
+            stop
+            suspend
+            resume
+            reboot
+            reboot-hard
+            poweroff
+            poweroff-hard
+            snapshot-create
+            snapshot-revert
+            snapshot-delete
+            disk-snapshot-create
+            disk-snapshot-revert
+            disk-snapshot-delete
         ]
 
         STATE = {
@@ -69,52 +69,52 @@ module OpenNebula
             'HOLD'               => 11
         }
 
-        STATE_STR = [
-            'PENDING',
-            'DEPLOYING',
-            'RUNNING',
-            'UNDEPLOYING',
-            'WARNING',
-            'DONE',
-            'FAILED_UNDEPLOYING',
-            'FAILED_DEPLOYING',
-            'SCALING',
-            'FAILED_SCALING',
-            'COOLDOWN',
-            'HOLD'
+        STATE_STR = %w[
+            PENDING
+            DEPLOYING
+            RUNNING
+            UNDEPLOYING
+            WARNING
+            DONE
+            FAILED_UNDEPLOYING
+            FAILED_DEPLOYING
+            SCALING
+            FAILED_SCALING
+            COOLDOWN
+            HOLD
         ]
 
-        RECOVER_DEPLOY_STATES = [
-            'FAILED_DEPLOYING',
-            'DEPLOYING',
-            'PENDING'
+        RECOVER_DEPLOY_STATES = %w[
+            FAILED_DEPLOYING
+            DEPLOYING
+            PENDING
         ]
 
-        RECOVER_UNDEPLOY_STATES = [
-            'FAILED_UNDEPLOYING',
-            'UNDEPLOYING'
+        RECOVER_UNDEPLOY_STATES = %w[
+            FAILED_UNDEPLOYING
+            UNDEPLOYING
         ]
 
-        RECOVER_SCALE_STATES = [
-            'FAILED_SCALING',
-            'SCALING'
+        RECOVER_SCALE_STATES = %w[
+            FAILED_SCALING
+            SCALING
         ]
 
-        VM_FAILURE_STATES = [
-            'BOOT_FAILURE',
-            'BOOT_MIGRATE_FAILURE',
-            'PROLOG_MIGRATE_FAILURE',
-            'PROLOG_FAILURE',
-            'EPILOG_FAILURE',
-            'EPILOG_STOP_FAILURE',
-            'EPILOG_UNDEPLOY_FAILURE',
-            'PROLOG_MIGRATE_POWEROFF_FAILURE',
-            'PROLOG_MIGRATE_SUSPEND_FAILURE',
-            'PROLOG_MIGRATE_UNKNOWN_FAILURE',
-            'BOOT_UNDEPLOY_FAILURE',
-            'BOOT_STOPPED_FAILURE',
-            'PROLOG_RESUME_FAILURE',
-            'PROLOG_UNDEPLOY_FAILURE'
+        VM_FAILURE_STATES = %w[
+            BOOT_FAILURE
+            BOOT_MIGRATE_FAILURE
+            PROLOG_MIGRATE_FAILURE
+            PROLOG_FAILURE
+            EPILOG_FAILURE
+            EPILOG_STOP_FAILURE
+            EPILOG_UNDEPLOY_FAILURE
+            PROLOG_MIGRATE_POWEROFF_FAILURE
+            PROLOG_MIGRATE_SUSPEND_FAILURE
+            PROLOG_MIGRATE_UNKNOWN_FAILURE
+            BOOT_UNDEPLOY_FAILURE
+            BOOT_STOPPED_FAILURE
+            PROLOG_RESUME_FAILURE
+            PROLOG_UNDEPLOY_FAILURE
         ]
 
         SCALE_WAYS = {
@@ -129,17 +129,17 @@ module OpenNebula
         # parents: this has only sense in deploy operation
         # state: this is internal information managed by OneFlow server
         # vm_template: this will affect scale operation
-        IMMUTABLE_ATTRS = [
-            'cardinality',
-            'last_vmname',
-            'nodes',
-            'parents',
-            'state',
-            'vm_template'
+        IMMUTABLE_ATTRS = %w[
+            cardinality
+            last_vmname
+            nodes
+            parents
+            state
+            vm_template
         ]
 
         # VM information to save in document
-        VM_INFO = ['ID', 'UID', 'GID', 'UNAME', 'GNAME', 'NAME']
+        VM_INFO = %w[ID UID GID UNAME GNAME NAME]
 
         LOG_COMP = 'ROL'
 
@@ -455,6 +455,9 @@ module OpenNebula
             extra_template << "\nSERVICE_ID = #{@service.id}"
             extra_template << "\nROLE_NAME = \"#{@body['name']}\""
 
+            # Evaluate attributes with parent roles
+            evaluate(extra_template)
+
             n_nodes.times do
                 vm_name = @@vm_name_template
                           .gsub('$SERVICE_ID', @service.id.to_s)
@@ -1122,7 +1125,7 @@ module OpenNebula
             # Min is a hard limit, if the current cardinality + adjustment does
             # not reach it, the difference is added
 
-            max = [cardinality, max_cardinality.to_i].max
+            max = [cardinality, max_cardinality.to_i].max()
             # min = [cardinality(), min_cardinality.to_i].min()
             min = min_cardinality.to_i
 
@@ -1168,6 +1171,49 @@ module OpenNebula
             new_cardinality
         end
 
+        # Evaluate rules that references to parent roles
+        #
+        # @param template [String] Role template with $ to replace
+        def evaluate(template)
+            client = service.client
+
+            template.scan(/\$\{(.*?)\}/).flatten.each do |value|
+                s_value = value.split('.') # 0 -> parent, 1..N -> XPATH
+
+                # If parent not found, instead of error, replace it by blank
+                unless parents.include?(s_value[0])
+                    template.gsub!("${#{value}}", '')
+                    next
+                end
+
+                found   = false
+                p_nodes = service.roles[s_value[0]].nodes
+                xpath   = "//#{s_value[1..-1].join('/').upcase}"
+
+                # Iterate over parent nodes to find the XPATH on their template
+                p_nodes.each do |node|
+                    id = node['deploy_id']
+                    vm = OpenNebula::VirtualMachine.new_with_id(id, client)
+
+                    # If error continue searching in other nodes
+                    next if OpenNebula.is_error?(vm.info)
+
+                    next unless vm[xpath]
+
+                    template.gsub!("${#{value}}", vm[xpath])
+
+                    # If found, continue with next expression
+                    found = true
+                    break
+                end
+
+                next if found
+
+                # If value not found, replace it by blank to avoid issues
+                template.gsub!("${#{value}}", '')
+            end
+        end
+
     end
 
 end