vagrant-openstack-illuin-provider 0.12.0

data/example_box/metadata.json

@@ -0,0 +1,3 @@
+{
+    "provider": "openstack_illuin"
+}

data/functional_tests/Vagrantfile

@@ -0,0 +1,58 @@
+require 'vagrant-openstack-provider'
+
+Vagrant.configure('2') do |config|
+
+  config.vm.box = 'openstack'
+  config.vm.box_url = 'https://github.com/ggiamarchi/vagrant-openstack/raw/master/source/dummy.box'
+  config.vm.boot_timeout = ENV['OS_SSH_TIMEOUT'].to_i
+
+  config.ssh.private_key_path = ENV['OS_KEYPAIR_PRIVATE_KEY']
+  config.ssh.pty = true
+  config.ssh.shell = ENV['OS_SSH_SHELL']
+
+  config.vm.provider :openstack do |os|
+    os.username               = ENV['OS_USERNAME']
+    os.password               = ENV['OS_PASSWORD']
+    os.openstack_auth_url     = ENV['OS_AUTH_URL']
+    os.openstack_compute_url  = ENV['OS_COMPUTE_URL']
+    os.openstack_network_url  = ENV['OS_NETWORK_URL']
+    os.tenant_name            = ENV['OS_TENANT_NAME']
+    os.sync_method            = ENV['OS_SYNC_METHOD']
+    os.flavor                 = ENV['OS_FLAVOR']
+    os.image                  = ENV['OS_IMAGE']
+    os.ssh_username           = ENV['OS_SSH_USERNAME']
+    os.keypair_name           = ENV['OS_KEYPAIR_NAME']
+    os.floating_ip_pool       = ENV['OS_FLOATING_IP_POOL']
+  end
+
+  config.vm.define 'test-basic' do |test|
+    test.vm.provider :openstack do |os|
+      os.floating_ip      = ENV['OS_FLOATING_IP']
+      os.floating_ip_pool = nil
+    end
+    test.vm.provision 'shell', inline: 'echo "SUCCESS" > /tmp/test_shell_provision'
+  end
+
+  config.vm.define 'test-floating-ip-pool' do |test|
+    test.vm.provider :openstack do |os|
+      os.floating_ip      = nil
+      os.floating_ip_pool = ENV['OS_FLOATING_IP_POOL']
+    end
+    test.vm.provision 'shell', inline: 'echo "SUCCESS" > /tmp/test_shell_provision'
+  end
+
+  config.vm.define 'test-ssh-public-key-path' do |test|
+    test.vm.provider :openstack do |os|
+      os.keypair_name     = nil
+      os.public_key_path  = ENV['OS_PUBLIC_KEY_PATH']
+    end
+    test.vm.provision 'shell', inline: 'echo "SUCCESS" > /tmp/test_shell_provision'
+  end
+
+  config.vm.define 'test-availabilty-zone' do |test|
+    test.vm.provider :openstack do |os|
+      os.availability_zone = ENV['OS_AZ']
+    end
+    test.vm.provision 'shell', inline: 'echo "SUCCESS" > /tmp/test_shell_provision'
+  end
+end

data/functional_tests/keys/vagrant-openstack

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEArKPKCXfOr8pjInYeDfGOfKC5JS8jWGgf5OqD0SlvRpdWEKa6
+KR6gDL6rVVFU4z7T5lECzeCp+P4uXwYhqXM4TodEccjPkMLDgR5jt+Fd9ixtlVYR
+Gj5vuAv1a7gk4zVr4M82oOKnTriTqTrFGZL3YG3XyxKftoTZyDWsI4nAbfMoup/e
+d54zHY6gApgDGBg+XlJz5Ai4AJT2YtCwWyu4v/zuDcEtMBDbioI8jpWkKTycFMDw
+W8f5Cwxe3bMCw9sasC6+FUI97ac5itvnE6/LZvcftYjXQF0oakz3ujZ0/gN0rhpe
+pswU2ODSkXWxOMBYS0PXZz9N2r3jzGXa5h1EfwIDAQABAoIBACGaL7TwENa+edU3
+UFo+bhFr5x2Js0N94NdZnhaUDgibZDERgqKGR3izk/2jOvaQQAZQNk+ELxE7yCLO
+uraUqpz+TyAmieAPSKZVF+uufe9wblPm0KVfCbe0/CvfR67BsyGqs2NVOmNkIbmK
+qtpzdJrcRmhMU7He4dTKPZsdMMs1esmWK3+uGgtfQTSaCi7rTxsCMn+Ob+lxvfvG
+QS2Ehb63jyb+8L8PyRqnunK9iBpdhuLHN8tGeDzmrCVz/ziRenslfXq1Ng7pxhUQ
+gyXWjlMoRibt9bcsSt1LcaqZMAeiiRnyUlaqyvtkhSb+yzZyHQZs90DgxRVH40Ya
+ebq9FcECgYEA5eXApNgi2iLDWMIGISO9uPDxzR5i4aDjIyHGv1uos/hWwJiX864K
+N23WLLna2LyIAZaEzUi76cPReFza7lxDtl/OeRDgf7yCPWZdH9OhyAeAtVVOu4eN
+iX5dee/GW5Mmu5xBUXo4z0TETqbey1fWHeJNqaA5W9mWkBKrKnT2aIcCgYEAwD3F
+/yUb8fS/Tj02oh2qb3clIwEIgdh6C38/d2J1OduICVzLoMhq0nZnZ1zMPNtLA/g2
+TjZ70EY1VyDAOWaIo+FGU/HIuLsP2jWKvDSKhJUx/oBBPWpCxqBZefoQhKZLkbmO
+Tw+SrUBQM7r8pL/5ptocW0HDwjL8Sbs4KfSWWkkCgYBSLuPDChDLcgnrPND8H86+
+wkNuVCJ9DgqkkHqABcA1Nd2tU99eGSVF01nw+y+ksyDbkHdA+3NRidLj+C27b/g0
+xeMFnGbkwvq8AE/iBMGcxDHaoPhYSYjrUeUQpgp+ygfaoW0oN0z/q1GR3E1g27GL
+VU72CHT4xLvyHPpbXxyHGQKBgAXO1/iJanq45j664rerJccQVnLkSRmDLMzEH2q/
+8sK4uzdtMkm9RFzvbthUmWcNSQrpqNpcEwmL1Xi4aJZTXrV0zOckWugZ3rS9AWAG
+RlkTGNuTjGUKnNHbblidEXqwe3//lykUU14gn0uwzok7s5My68BmEEABwlWH7n52
+AUThAoGBANwwj2WKKu6l66fyQPFZu0cJTfjhiZt1WH17mHAAtL2TpLnDJiPZYbzJ
+8WRqCWrww+IVq1yxBS6LhAGMuHTfxFWZGKSPxf9jOM87RKJbPkiBDHoFXznjkjsn
+tXk6jmn+6bCmwkgfzVypN3GTyEMhVgQPMJNqlMO9Op5ZAAKuyi31
+-----END RSA PRIVATE KEY-----

data/functional_tests/keys/vagrant-openstack.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCso8oJd86vymMidh4N8Y58oLklLyNYaB/k6oPRKW9Gl1YQpropHqAMvqtVUVTjPtPmUQLN4Kn4/i5fBiGpczhOh0RxyM+QwsOBHmO34V32LG2VVhEaPm+4C/VruCTjNWvgzzag4qdOuJOpOsUZkvdgbdfLEp+2hNnINawjicBt8yi6n953njMdjqACmAMYGD5eUnPkCLgAlPZi0LBbK7i//O4NwS0wENuKgjyOlaQpPJwUwPBbx/kLDF7dswLD2xqwLr4VQj3tpzmK2+cTr8tm9x+1iNdAXShqTPe6NnT+A3SuGl6mzBTY4NKRdbE4wFhLQ9dnP03avePMZdrmHUR/ julienvey@MacBook-Air-de-Julien.local

data/functional_tests/run_tests.sh

@@ -0,0 +1,142 @@
+#!/bin/bash
+
+export VAGRANT_OPENSTACK_LOG=debug
+
+export OS_SSH_TIMEOUT=600
+export OS_SYNC_METHOD=none
+export OS_SSH_SHELL=bash
+export OS_SSH_USERNAME=
+export OS_SERVER_NAME=
+export OS_IMAGE=
+
+ERROR_STATE=0
+
+cat > /tmp/images_with_ssh_user <<EOL
+ubuntu-12.04_x86_64_HWE;stack
+ubuntu-14.04_x86_64_LVM;stack
+debian7_x86_64_LVM;stack
+centos65_x86_64_LVM;stack
+EOL
+
+cat > /tmp/vagrant_machines <<EOL
+test-basic
+test-floating-ip-pool
+test-ssh-public-key-path
+test-availabilty-zone
+EOL
+
+#
+# $1 - Log level
+# $2 - Action (e.g. UP, SSH, DESTROY)
+# $* - Text
+#
+function log() {
+    [ $# -lt 3 ] && echo "Logger error..." >&2 && exit 1
+    level=$1   ; shift
+    action=$1  ; shift
+    printf "$(date '+%Y-%m-%d %H:%M:%S') | %10s | %10s | %s\n" "${level}" "${action}" "$*" | tee -a test.log
+}
+
+#
+# $1 - Action (e.g. UP, SSH, DESTROY)
+# $* - Text
+#
+function logInfo() {
+    action=$1
+    shift
+    log INFO "${action}" "$*"
+}
+
+#
+# $1 - Action (e.g. UP, SSH, DESTROY)
+# $* - Text
+#
+function logError() {
+    action=$1
+    shift
+    log ERROR "${action}" "$*"
+    ERROR_STATE=1
+}
+
+#
+# $1 - Action (e.g. UP, SSH, DESTROY)
+# $* - Text
+#
+function logSuccess() {
+    action=$1
+    shift
+    log SUCCESS "${action}" "$*"
+}
+
+runSingleTest() {
+    if [ -d ".vagrant" ]; then
+      rm -rf .vagrant
+    fi
+    machine=${1}
+
+    testSummary="${OS_SERVER_NAME} - ${OS_IMAGE} - ${OS_SSH_USERNAME}"
+
+    logInfo 'START' "${testSummary}"
+
+    bundle exec vagrant up "${machine}" --provider openstack 2>&1 | tee -a "${OS_SERVER_NAME}_up.log"
+    if [ "${PIPESTATUS[0]}" -ne 0 ] ; then
+        logError 'UP' "${testSummary}"
+    else
+        logSuccess 'UP' "${testSummary}"
+        bundle exec vagrant ssh "${machine}" -c "cat /tmp/test_shell_provision" 2>&1 | tee -a "${OS_SERVER_NAME}_ssh.log"
+        if [ "${PIPESTATUS[0]}" -ne 0 ] ; then
+            logError 'SSH' "${testSummary}"
+        else
+            logSuccess 'SSH' "${testSummary}"
+        fi
+    fi
+
+    bundle exec vagrant destroy "${machine}" 2>&1 | tee -a "${OS_SERVER_NAME}_destroy.log"
+    if [ "${PIPESTATUS[0]}" -ne 0 ] ; then
+        logError 'DESTROY' "${testSummary}"
+    else
+        logSuccess 'DESTROY' "${testSummary}"
+    fi
+
+    logInfo 'END' "${testSummary}"
+
+}
+
+#
+# $1 - Instance name prefix
+# $2 - Floating IP tu use
+#
+function runAllTests() {
+    ip=${1}
+    i=1
+    rm -f test.log "${name}_*.log"
+    touch test.log
+    nbTests=$(wc -l < /tmp/images_with_ssh_user)
+    for (( i=1 ; i<=nbTests ; i++ )) ; do
+      #TODO(vagrant status does not support providers, see https://github.com/mitchellh/vagrant/issues/4173)
+      #for machine in $(bundle exec vagrant status | tail -n +8 | head -n -4 | awk '{print $1}') ; do
+      while IFS= read -r machine
+      do
+        currentTest=$(head -n ${i} < /tmp/images_with_ssh_user | tail -n 1)
+        export OS_SERVER_NAME="${machine}_${i}"
+        export OS_IMAGE=$(echo "${currentTest}" | cut -f1 -d";")
+        export OS_FLOATING_IP="${ip}"
+        export OS_SSH_USERNAME=$(echo "${currentTest}" | cut -f2 -d";")
+        runSingleTest "${machine}"
+      done < /tmp/vagrant_machines
+    done
+}
+
+runAllTests "${OS_FLOATING_IP}"
+
+echo ''
+echo '################################################################################################'
+echo '# Report summary                                                                               #'
+echo '################################################################################################'
+echo ''
+cat test.log
+echo ''
+echo '################################################################################################'
+echo ''
+
+exit ${ERROR_STATE}

data/lib/vagrant-openstack-illuin-provider.rb

@@ -0,0 +1,29 @@
+require 'pathname'
+
+require 'vagrant-openstack-illuin-provider/plugin'
+require 'vagrant-openstack-illuin-provider/logging'
+
+module VagrantPlugins
+  module Openstack
+    lib_path = Pathname.new(File.expand_path('../vagrant-openstack-illuin-provider', __FILE__))
+    autoload :Errors, lib_path.join('errors')
+
+    # This initializes the i18n load path so that the plugin-specific
+    # translations work.
+    def self.init_i18n
+      I18n.load_path << File.expand_path('locales/en.yml', source_root)
+      I18n.reload!
+    end
+
+    def self.init_logging
+      Logging.init
+    end
+
+    # This returns the path to the source of this plugin.
+    #
+    # @return [Pathname]
+    def self.source_root
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+    end
+  end
+end

data/lib/vagrant-openstack-illuin-provider/action.rb

@@ -0,0 +1,344 @@
+require 'pathname'
+
+require 'vagrant/action/builder'
+
+module VagrantPlugins
+  module Openstack
+    module Action
+      # Include the built-in modules so we can use them as top-level things.
+      include Vagrant::Action::Builtin
+
+      # This action is called to destroy the remote machine.
+      def self.action_destroy
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use(ProvisionerCleanup, :before)
+              b2.use SnapshotCleanup if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0')
+              b2.use DeleteServer
+              b2.use DeleteStack
+            end
+          end
+        end
+      end
+
+      # This action is called when `vagrant provision` is called.
+      def self.action_provision
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              if env[:machine].provider_config.meta_args_support
+                b2.use ProvisionWrapper
+              else
+                b2.use Provision
+              end
+              if env[:machine].provider_config.use_legacy_synced_folders
+                env[:machine].ui.warn I18n.t('vagrant_openstack.config.sync_folders_deprecated')
+                b2.use SyncFolders
+              else
+                # Standard Vagrant implementation.
+                b2.use SyncedFolders
+              end
+            end
+          end
+        end
+      end
+
+      # This action is called to read the SSH info of the machine. The
+      # resulting state is expected to be put into the `:machine_ssh_info`
+      # key.
+      def self.action_read_ssh_info
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use ReadSSHInfo
+        end
+      end
+
+      # This action is called to read the state of the machine. The
+      # resulting state is expected to be put into the `:machine_state_id`
+      # key.
+      def self.action_read_state
+        new_builder.tap do |b|
+          b.use HandleBox
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use ReadState
+        end
+      end
+
+      def self.action_ssh
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use SSHExec
+            end
+          end
+        end
+      end
+
+      def self.action_ssh_run
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use SSHRun
+            end
+          end
+        end
+      end
+
+      def self.action_up
+        new_builder.tap do |b|
+          b.use HandleBox
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+
+          b.use Call, ReadState do |env, b2|
+            case env[:machine_state_id]
+            when :not_created
+              ssh_disabled = env[:machine].provider_config.ssh_disabled
+              unless ssh_disabled
+                if env[:machine].provider_config.meta_args_support
+                  b2.use ProvisionWrapper
+                else
+                  b2.use Provision
+                end
+              end
+
+              if env[:machine].provider_config.use_legacy_synced_folders
+                env[:machine].ui.warn I18n.t('vagrant_openstack.config.sync_folders_deprecated')
+                b2.use SyncFolders
+              else
+                # Standard Vagrant implementation.
+                b2.use SyncedFolders
+              end
+
+              b2.use CreateStack
+              b2.use CreateServer
+              b2.use Message, I18n.t('vagrant_openstack.ssh_disabled_provisioning') if ssh_disabled
+              unless ssh_disabled
+                # Handle legacy ssh_timeout option
+                timeout = env[:machine].provider_config.ssh_timeout
+                unless timeout.nil?
+                  env[:machine].ui.warn I18n.t('vagrant_openstack.config.ssh_timeout_deprecated')
+                  env[:machine].config.vm.boot_timeout = timeout
+                end
+
+                b2.use WaitForCommunicator
+              end
+            when :shutoff
+              b2.use StartServer
+            when :suspended
+              b2.use Resume
+            else
+              b2.use Message, I18n.t('vagrant_openstack.already_created')
+            end
+          end
+        end
+      end
+
+      def self.action_halt
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use StopServer
+            end
+          end
+        end
+      end
+
+      # This is the action that is primarily responsible for suspending
+      # the virtual machine.
+      # Vm cannot be suspended when the machine_state_id is not "active" (typically a task is ongoing)
+      def self.action_suspend
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            case env[:machine_state_id]
+            when :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            when :suspended
+              b2.use Message, I18n.t('vagrant_openstack.already_suspended')
+            when :active
+              b2.use Suspend
+            else
+              b2.use Message, I18n.t('vagrant_openstack.ongoing_task')
+            end
+          end
+        end
+      end
+
+      # This is the action that is primarily responsible for resuming
+      # suspended machines.
+      # Vm cannot be resumed when the machine_state_id is not suspended.
+      def self.action_resume
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            case env[:machine_state_id]
+            when :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            when :suspended
+              b2.use Resume
+            else
+              b2.use Message, I18n.t('vagrant_openstack.not_suspended')
+            end
+          end
+        end
+      end
+
+      def self.action_reload
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            case env[:machine_state_id]
+            when :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            when :suspended
+              b2.use Resume
+              b2.use WaitForServerToBeActive
+              b2.use StopServer
+              b2.use WaitForServerToStop
+              b2.use StartServer
+            when :shutoff
+              b2.use StartServer
+            else
+              b2.use StopServer
+              b2.use WaitForServerToStop
+              b2.use StartServer
+            end
+          end
+        end
+      end
+
+      # TODO: Remove the if guard when Vagrant 1.8.0 is the minimum version.
+      # rubocop:disable IndentationWidth
+      if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0')
+      def self.action_snapshot_delete
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, IsState, :not_created do |env, b2|
+            if env[:result]
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use SnapshotDelete
+            end
+          end
+        end
+      end
+
+      def self.action_snapshot_list
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, IsState, :not_created do |env, b2|
+            if env[:result]
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use SnapshotList
+            end
+          end
+        end
+      end
+
+      def self.action_snapshot_restore
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, IsState, :not_created do |env, b2|
+            if env[:result]
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+              next
+            end
+
+            b2.use SnapshotRestore
+            b2.use WaitForServerToBeActive
+            b2.use WaitForCommunicator
+
+            b2.use Call, IsEnvSet, :snapshot_delete do |env2, b3|
+              # Used by vagrant push/pop
+              b3.use action_snapshot_delete if env2[:result]
+            end
+
+            b2.use action_provision
+          end
+        end
+      end
+
+      def self.action_snapshot_save
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, IsState, :not_created do |env, b2|
+            if env[:result]
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use SnapshotSave
+            end
+          end
+        end
+      end
+      end # Vagrant > 1.8.0 guard
+      # rubocop:enable IndentationWidth
+
+      # The autoload farm
+      action_root = Pathname.new(File.expand_path('../action', __FILE__))
+      autoload :Message, action_root.join('message')
+      autoload :ConnectOpenstack, action_root.join('connect_openstack')
+      autoload :CreateServer, action_root.join('create_server')
+      autoload :CreateStack, action_root.join('create_stack')
+      autoload :DeleteStack, action_root.join('delete_stack')
+      autoload :DeleteServer, action_root.join('delete_server')
+      autoload :StopServer, action_root.join('stop_server')
+      autoload :StartServer, action_root.join('start_server')
+      autoload :ReadSSHInfo, action_root.join('read_ssh_info')
+      autoload :ReadState, action_root.join('read_state')
+      autoload :SyncFolders, action_root.join('sync_folders')
+      autoload :Suspend, action_root.join('suspend')
+      autoload :Resume, action_root.join('resume')
+      autoload :ProvisionWrapper, action_root.join('provision')
+      autoload :WaitForServerToStop, action_root.join('wait_stop')
+      autoload :WaitForServerToBeActive, action_root.join('wait_active')
+      # TODO: Remove the if guard when Vagrant 1.8.0 is the minimum version.
+      # rubocop:disable IndentationWidth
+      if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0')
+      autoload :SnapshotCleanup, action_root.join('snapshot_cleanup')
+      autoload :SnapshotDelete, action_root.join('snapshot_delete')
+      autoload :SnapshotList, action_root.join('snapshot_list')
+      autoload :SnapshotRestore, action_root.join('snapshot_restore')
+      autoload :SnapshotSave, action_root.join('snapshot_save')
+      end
+      # rubocop:enable IndentationWidth
+
+      private
+
+      def self.new_builder
+        Vagrant::Action::Builder.new
+      end
+    end
+  end
+end