vagrant-openstack-provider 0.6.0 → 0.6.1

data/lib/vagrant-openstack-provider/command/openstack_command.rb

@@ -0,0 +1,16 @@
+require 'vagrant-openstack-provider/command/utils'
+require 'vagrant-openstack-provider/command/abstract_command'
+
+module VagrantPlugins
+  module Openstack
+    module Command
+      class OpenstackCommand < AbstractCommand
+        include VagrantPlugins::Openstack::Command::Utils
+
+        def before_cmd(_name, _argv, env)
+          VagrantPlugins::Openstack::Action::ConnectOpenstack.new(nil, env).call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openstack-provider/command/reset.rb

@@ -5,11 +5,10 @@ module VagrantPlugins
   module Openstack
     module Command
       class Reset < AbstractCommand
-        include VagrantPlugins::Openstack::Command::Utils
-
         def self.synopsis
           I18n.t('vagrant_openstack.command.reset')
         end
+
         def cmd(name, argv, env)
           fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
           FileUtils.remove_dir("#{env[:machine].data_dir}")

data/lib/vagrant-openstack-provider/command/subnet_list.rb

@@ -1,12 +1,9 @@
-require 'vagrant-openstack-provider/command/utils'
-require 'vagrant-openstack-provider/command/abstract_command'
+require 'vagrant-openstack-provider/command/openstack_command'
 
 module VagrantPlugins
   module Openstack
     module Command
-      class SubnetList < AbstractCommand
-        include VagrantPlugins::Openstack::Command::Utils
-
+      class SubnetList < OpenstackCommand
         def self.synopsis
           I18n.t('vagrant_openstack.command.subnet_list_synopsis')
         end

data/lib/vagrant-openstack-provider/command/volume_list.rb

@@ -1,15 +1,13 @@
-require 'vagrant-openstack-provider/command/utils'
-require 'vagrant-openstack-provider/command/abstract_command'
+require 'vagrant-openstack-provider/command/openstack_command'
 
 module VagrantPlugins
   module Openstack
     module Command
-      class VolumeList < AbstractCommand
-        include VagrantPlugins::Openstack::Command::Utils
-
+      class VolumeList < OpenstackCommand
         def self.synopsis
           I18n.t('vagrant_openstack.command.volume_list_synopsis')
         end
+
         def cmd(name, argv, env)
           fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
           volumes = env[:openstack_client].cinder.get_all_volumes(env)

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

@@ -1,5 +1,6 @@
 require 'vagrant'
 require 'colorize'
+require 'vagrant-openstack-provider/config/http'
 
 module VagrantPlugins
   module Openstack
@@ -160,6 +161,39 @@ module VagrantPlugins
       # @return [Boolean]
       attr_accessor :ssh_disabled
 
+      # Specify the endpoint_type to use : publicURL, adminURL, or internalURL (default is publicURL)
+      #
+      # @return [String]
+      attr_accessor :endpoint_type
+
+      #
+      # @return [Integer]
+      attr_accessor :server_create_timeout
+
+      #
+      # @return [Integer]
+      attr_accessor :server_active_timeout
+
+      #
+      # @return [Integer]
+      attr_accessor :server_stop_timeout
+
+      #
+      # @return [Integer]
+      attr_accessor :server_delete_timeout
+
+      #
+      # @return [Integer]
+      attr_accessor :stack_create_timeout
+
+      #
+      # @return [Integer]
+      attr_accessor :stack_delete_timeout
+
+      #
+      # @return [HttpConfig]
+      attr_accessor :http
+
       def initialize
         @password = UNSET_VALUE
         @openstack_compute_url = UNSET_VALUE
@@ -168,6 +202,7 @@ module VagrantPlugins
         @openstack_orchestration_url = UNSET_VALUE
         @openstack_image_url = UNSET_VALUE
         @openstack_auth_url = UNSET_VALUE
+        @endpoint_type = UNSET_VALUE
         @region = UNSET_VALUE
         @flavor = UNSET_VALUE
         @image = UNSET_VALUE
@@ -194,6 +229,13 @@ module VagrantPlugins
         @user_data = UNSET_VALUE
         @metadata = UNSET_VALUE
         @ssh_disabled = UNSET_VALUE
+        @server_create_timeout = UNSET_VALUE
+        @server_active_timeout = UNSET_VALUE
+        @server_stop_timeout = UNSET_VALUE
+        @server_delete_timeout = UNSET_VALUE
+        @stack_create_timeout = UNSET_VALUE
+        @stack_delete_timeout = UNSET_VALUE
+        @http = HttpConfig.new
       end
 
       def merge(other)
@@ -210,11 +252,16 @@ module VagrantPlugins
             # Let user inputs a string or an array for floating ip pool attribute
             obj.floating_ip_pool = [obj.floating_ip_pool].flatten if key.eql?(:@floating_ip_pool) && !obj.floating_ip_pool.nil?
 
+            # Let user inputs a string or an array for networks attribute
+            obj.networks = [obj.networks].flatten if key.eql?(:@networks) && !obj.networks.nil?
+
             # Don't set the value if it is the unset value, either.
             value = obj.instance_variable_get(key)
 
             if [:@networks, :@volumes, :@rsync_includes, :@ignore_files, :@floating_ip_pool, :@stacks].include? key
               result.instance_variable_set(key, value) unless value.empty?
+            elsif [:@http].include? key
+              result.instance_variable_set(key, instance_variable_get(key).merge(other.instance_variable_get(key))) if value != UNSET_VALUE
             else
               result.instance_variable_set(key, value) if value != UNSET_VALUE
             end
@@ -238,6 +285,7 @@ module VagrantPlugins
         @openstack_volume_url = nil if @openstack_volume_url == UNSET_VALUE
         @openstack_image_url = nil if @openstack_image_url == UNSET_VALUE
         @openstack_auth_url = nil if @openstack_auth_url == UNSET_VALUE
+        @endpoint_type = 'publicURL' if @endpoint_type == UNSET_VALUE
         @region = nil if @region == UNSET_VALUE
         @flavor = nil if @flavor == UNSET_VALUE
         @image = nil if @image == UNSET_VALUE
@@ -264,9 +312,16 @@ module VagrantPlugins
         # `config.ssh` values are used.
         @ssh_username = nil if @ssh_username == UNSET_VALUE
         @ssh_timeout = 180 if @ssh_timeout == UNSET_VALUE
+        @server_create_timeout = 200 if @server_create_timeout == UNSET_VALUE
+        @server_active_timeout = 200 if @server_active_timeout == UNSET_VALUE
+        @server_stop_timeout = 200 if @server_stop_timeout == UNSET_VALUE
+        @server_delete_timeout = 200 if @server_delete_timeout == UNSET_VALUE
+        @stack_create_timeout = 200 if @stack_create_timeout == UNSET_VALUE
+        @stack_delete_timeout = 200 if @stack_delete_timeout == UNSET_VALUE
         @networks = nil if @networks.empty?
         @volumes = nil if @volumes.empty?
         @stacks = nil if @stacks.empty?
+        @http.finalize!
       end
       # rubocop:enable Style/CyclomaticComplexity
 
@@ -277,8 +332,10 @@ module VagrantPlugins
       def validate(machine)
         errors = _detected_errors
 
-        errors << I18n.t('vagrant_openstack.config.password_required') unless @password
-        errors << I18n.t('vagrant_openstack.config.username_required') unless @username
+        errors << I18n.t('vagrant_openstack.config.password_required') if @password.nil? || @password.empty?
+        errors << I18n.t('vagrant_openstack.config.username_required') if @username.nil? || @username.empty?
+        errors << I18n.t('vagrant_openstack.config.tenant_name_required') if @tenant_name.nil? || @tenant_name.empty?
+        errors << I18n.t('vagrant_openstack.config.invalid_endpoint_type') unless  %w(publicURL adminURL internalURL).include?(@endpoint_type)
 
         validate_ssh_username(machine, errors)
         validate_stack_config(errors)

data/lib/vagrant-openstack-provider/config/http.rb

@@ -0,0 +1,39 @@
+module VagrantPlugins
+  module Openstack
+    class HttpConfig
+      UNSET_VALUE = Vagrant.plugin('2', :config).const_get(:UNSET_VALUE)
+
+      #
+      # @return [Integer]
+      attr_accessor :open_timeout
+
+      #
+      # @return [Integer]
+      attr_accessor :read_timeout
+
+      def initialize
+        @open_timeout = UNSET_VALUE
+        @read_timeout = UNSET_VALUE
+      end
+
+      def finalize!
+        @open_timeout = 60 if @open_timeout == UNSET_VALUE
+        @read_timeout = 30 if @read_timeout == UNSET_VALUE
+      end
+
+      def merge(other)
+        result = self.class.new
+
+        [self, other].each do |obj|
+          obj.instance_variables.each do |key|
+            next if key.to_s.start_with?('@__')
+
+            value = obj.instance_variable_get(key)
+            result.instance_variable_set(key, value) if value != UNSET_VALUE
+          end
+        end
+        result
+      end
+    end
+  end
+end

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

@@ -275,17 +275,21 @@ module VagrantPlugins
         { id: volume_id, device: device }
       end
 
-      # This method finds a matching _thing_ in a collection of
-      # _things_. This works matching if the ID or NAME equals to
-      # `name`. Or, if `name` is a regexp, a partial match is chosen
+      # This method finds any matching _thing_ from a list of names
+      # in a collection of _things_. The first to match is the returned
+      # one. Names in list can be a regexp, a partial match is chosen
       # as well.
-      def find_matching(collection, name)
-        collection.each do |single|
-          return single if single.id == name
-          return single if single.name == name
-          return single if name.is_a?(Regexp) && name =~ single.name
+
+      def find_matching(collection, name_or_names)
+        name_or_names = [name_or_names] if name_or_names.class != Array
+        name_or_names.each do |name|
+          collection.each do |single|
+            return single if single.id == name
+            return single if single.name == name
+            return single if name.is_a?(Regexp) && name =~ single.name
+          end
         end
-        @logger.error "Element '#{name}' not found in collection #{collection}"
+        @logger.error "No element of '#{name_or_names}' found in collection #{collection}"
         nil
       end
     end

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

@@ -6,15 +6,20 @@ module VagrantPlugins
       end
 
       def get_ip_address(env)
-        return env[:machine].provider_config.floating_ip unless env[:machine].provider_config.floating_ip.nil?
-        details = env[:openstack_client].nova.get_server_details(env, env[:machine].id)
-        details['addresses'].each do |network|
-          network[1].each do |network_detail|
+        addresses = env[:openstack_client].nova.get_server_details(env, env[:machine].id)['addresses']
+        addresses.each do |_, network|
+          network.each do |network_detail|
             return network_detail['addr'] if network_detail['OS-EXT-IPS:type'] == 'floating'
           end
         end
-        return details['addresses'].first[1][0]['addr'] if details['addresses'].size >= 1 && details['addresses'].first[1].size >= 1
-        fail Errors::UnableToResolveIP
+        fail Errors::UnableToResolveIP if addresses.size == 0
+        if addresses.size == 1
+          net_addresses = addresses.first[1]
+        else
+          net_addresses = addresses[env[:machine].provider_config.networks[0]]
+        end
+        fail Errors::UnableToResolveIP if net_addresses.size == 0
+        net_addresses[0]['addr']
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Openstack
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
   end
 end

data/locales/en.yml

@@ -89,6 +89,8 @@ en:
         A password is required.
       username_required: |-
         A username is required.
+      tenant_name_required: |-
+        A tenant name is required.
       invalid_uri: |-
         The value for %{key} is not a valid URI: %{uri}
       invalid_stack: |-
@@ -98,6 +100,8 @@ en:
           name: 'mystack',
           template: '/path/to/heat_template.yml',
         }]
+      invalid_endpoint_type: |-
+        endpoint_type must be publicURL, adminURL or internalURL (if not provided, default is publicURL)
       metadata_must_be_hash: |-
         Metadata must be a hash.
       keypair_name_required: |-

data/spec/vagrant-openstack-provider/action/connect_openstack_spec.rb

@@ -22,12 +22,13 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
       config.stub(:username) { 'username' }
       config.stub(:password) { 'password' }
       config.stub(:region) { nil }
+      config.stub(:endpoint_type) { 'publicURL' }
     end
   end
 
   let(:neutron) do
     double.tap do |neutron|
-      neutron.stub(:get_api_version_list).with(anything) do
+      neutron.stub(:get_api_version_list).with(anything, anything) do
         [
           {
             'status' => 'CURRENT',
@@ -44,9 +45,28 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
     end
   end
 
+  let(:neutron_admin_url) do
+    double.tap do |neutron|
+      neutron.stub(:get_api_version_list).with(anything, anything) do
+        [
+          {
+            'status' => 'CURRENT',
+            'id' => 'v2.0',
+            'links' => [
+              {
+                'href' => 'http://neutron/v2.0/admin',
+                'rel' => 'self'
+              }
+            ]
+          }
+        ]
+      end
+    end
+  end
+
   let(:neutron_france) do
     double.tap do |neutron|
-      neutron.stub(:get_api_version_list).with(anything) do
+      neutron.stub(:get_api_version_list).with(anything, anything) do
         [
           {
             'status' => 'CURRENT',
@@ -82,6 +102,25 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
     end
   end
 
+  let(:glance_admin_url) do
+    double.tap do |glance|
+      glance.stub(:get_api_version_list).with(anything) do
+        [
+          {
+            'status' => 'CURRENT',
+            'id' => 'v2.1',
+            'links' => [
+              {
+                'href' => 'http://glance/v2.0/admin',
+                'rel' => 'self'
+              }
+            ]
+          }
+        ]
+      end
+    end
+  end
+
   let(:glance_v1) do
     double.tap do |glance|
       glance.stub(:get_api_version_list).with(anything) do
@@ -317,8 +356,191 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
       end
     end
 
+    describe 'endpoint_type' do
+      context 'with adminURL specified' do
+        it 'read service catalog and stores endpoints URL in session' do
+          catalog = [
+            {
+              'endpoints' => [
+                {
+                  'publicURL' => 'http://nova/v2/projectId',
+                  'adminURL' => 'http://nova/v2/projectId/admin',
+                  'id' => '1'
+                }
+              ],
+              'type' => 'compute',
+              'name' => 'nova'
+            },
+            {
+              'endpoints' => [
+                {
+                  'publicURL' => 'http://neutron',
+                  'adminURL' => 'http://neutron/admin',
+                  'id' => '2'
+                }
+              ],
+              'type' => 'network',
+              'name' => 'neutron'
+            },
+            {
+              'endpoints' => [
+                {
+                  'publicURL' => 'http://cinder/v2/projectId',
+                  'adminURL' => 'http://cinder/v2/projectId/admin',
+                  'id' => '2'
+                }
+              ],
+              'type' => 'volume',
+              'name' => 'cinder'
+            },
+            {
+              'endpoints' => [
+                {
+                  'publicURL' => 'http://glance',
+                  'adminURL' => 'http://glance/admin',
+                  'id' => '2'
+                }
+              ],
+              'type' => 'image',
+              'name' => 'glance'
+            }
+          ]
+
+          double.tap do |keystone|
+            keystone.stub(:authenticate).with(anything) { catalog }
+            env[:openstack_client].stub(:keystone) { keystone }
+          end
+          env[:openstack_client].stub(:neutron)  { neutron_admin_url }
+          env[:openstack_client].stub(:glance)   { glance_admin_url }
+          config.stub(:endpoint_type) { 'adminURL' }
+
+          @action.call(env)
+
+          expect(env[:openstack_client].session.endpoints)
+          .to eq(compute: 'http://nova/v2/projectId/admin',
+                 network: 'http://neutron/v2.0/admin',
+                 volume:  'http://cinder/v2/projectId/admin',
+                 image:   'http://glance/v2.0/admin')
+        end
+      end
+    end
+
+    describe 'endpoint_type' do
+      context 'with internalURL specified' do
+        it 'read service catalog and stores endpoints URL in session' do
+          catalog = [
+            {
+              'endpoints' => [
+                {
+                  'publicURL' => 'http://nova/v2/projectId',
+                  'adminURL' => 'http://nova/v2/projectId/admin',
+                  'internalURL' => 'http://nova/v2/projectId/internal',
+                  'id' => '1'
+                }
+              ],
+              'type' => 'compute',
+              'name' => 'nova'
+            },
+            {
+              'endpoints' => [
+                {
+                  'publicURL' => 'http://cinder/v2/projectId',
+                  'adminURL' => 'http://cinder/v2/projectId/admin',
+                  'internalURL' => 'http://cinder/v2/projectId/internal',
+                  'id' => '2'
+                }
+              ],
+              'type' => 'volume',
+              'name' => 'cinder'
+            }
+          ]
+
+          double.tap do |keystone|
+            keystone.stub(:authenticate).with(anything) { catalog }
+            env[:openstack_client].stub(:keystone) { keystone }
+          end
+          config.stub(:endpoint_type) { 'internalURL' }
+
+          @action.call(env)
+
+          expect(env[:openstack_client].session.endpoints)
+          .to eq(compute: 'http://nova/v2/projectId/internal',
+                 volume:  'http://cinder/v2/projectId/internal')
+        end
+      end
+    end
+
+    describe 'endpoint_type' do
+      context 'with publicURL specified' do
+        it 'read service catalog and stores endpoints URL in session' do
+          catalog = [
+            {
+              'endpoints' => [
+                {
+                  'publicURL' => 'http://nova/v2/projectId',
+                  'adminURL' => 'http://nova/v2/projectId/admin',
+                  'id' => '1'
+                }
+              ],
+              'type' => 'compute',
+              'name' => 'nova'
+            },
+            {
+              'endpoints' => [
+                {
+                  'publicURL' => 'http://neutron',
+                  'adminURL' => 'http://neutron/admin',
+                  'id' => '2'
+                }
+              ],
+              'type' => 'network',
+              'name' => 'neutron'
+            },
+            {
+              'endpoints' => [
+                {
+                  'publicURL' => 'http://cinder/v2/projectId',
+                  'adminURL' => 'http://cinder/v2/projectId/admin',
+                  'id' => '2'
+                }
+              ],
+              'type' => 'volume',
+              'name' => 'cinder'
+            },
+            {
+              'endpoints' => [
+                {
+                  'publicURL' => 'http://glance',
+                  'adminURL' => 'http://glance/admin',
+                  'id' => '2'
+                }
+              ],
+              'type' => 'image',
+              'name' => 'glance'
+            }
+          ]
+
+          double.tap do |keystone|
+            keystone.stub(:authenticate).with(anything) { catalog }
+            env[:openstack_client].stub(:keystone) { keystone }
+          end
+          env[:openstack_client].stub(:neutron)  { neutron }
+          env[:openstack_client].stub(:glance)   { glance }
+          config.stub(:endpoint_type) { 'publicURL' }
+
+          @action.call(env)
+
+          expect(env[:openstack_client].session.endpoints)
+          .to eq(compute: 'http://nova/v2/projectId',
+                 network: 'http://neutron/v2.0',
+                 volume:  'http://cinder/v2/projectId',
+                 image:   'http://glance/v2.0')
+        end
+      end
+    end
+
     context 'with glance v1 only' do
-      it 'read service catalog and stores endpoints URL in session', :focus do
+      it 'read service catalog and stores endpoints URL in session' do
         catalog = [
           {
             'endpoints' => [
@@ -384,7 +606,7 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
 
       let(:neutron) do
         double.tap do |neutron|
-          neutron.stub(:get_api_version_list).with(anything) do
+          neutron.stub(:get_api_version_list).with(anything, anything) do
             [
               {
                 'status' => 'CURRENT',