fog-scaleway 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b2994d73da388c40b6d946002f2f353be48e729
-  data.tar.gz: c93b69bf568fd17acd1a245df2592f29ec657d78
+  metadata.gz: db12bf5472f63d0a82967f353364b030d692aa52
+  data.tar.gz: 0b9b420db0de3ae446a3a8b849de10cc06ed7bec
 SHA512:
-  metadata.gz: 274dcd37918039e53cda8b9fdef4f4e4f06a8a0775212039528320d205188a8c7247118335c39378b217cc885627607da7c792e2ca33fb7fb5824a9ffef533a9
-  data.tar.gz: 2c99fcf8985b593c74aeab7011936751c352bc5d771e52ea16e8d47c6831a57e2f1eb643b990aac302dcb64d1b30d9f26c211b54b6be5926a18bd89da4de99f8
+  metadata.gz: c7c53503be5dbea85781e6d2a4ac210fb7e95c533c0fa1a721736cc38e0ac9e5b5c9224bed40d5b9c4f8a288c1a5fad7be2d46e70f0a975e07555c6871db913e
+  data.tar.gz: 548432aeeaa06b08871bade39ba2561a47f4c17b09ec6d298ae51405b42d62e45ec498d4db3d0bc72ab90e58ac7829f1b028b2fc42de07e22509009b02fdd1aa

data/Rakefile

@@ -21,4 +21,4 @@ task test: ['test:units', 'test:integration']
 
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:test, :rubocop]
+task default: %i[test rubocop]

data/fog-scaleway.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fog/scaleway/version'

data/lib/fog/scaleway/compute.rb

@@ -37,6 +37,8 @@ module Fog
       collection :bootscripts
       model      :task
       collection :tasks
+      model      :product_server
+      collection :product_servers
 
       request_path 'fog/scaleway/requests/compute'
 
@@ -106,6 +108,9 @@ module Fog
       request :list_containers
       request :get_container
 
+      # Products
+      request :list_product_servers
+
       # Dashboard
       request :get_dashboard
 
@@ -209,6 +214,48 @@ module Fog
           'public' => true
         }].freeze
 
+        PRODUCTS = {
+          'servers' => {
+            'VC1S' => {
+              'volumes_constraint' => {
+                'min_size' => nil,
+                'max_size' => 50_000_000_000
+              },
+              'network' => {
+                'interfaces' => [{
+                  'internal_bandwidth' => nil,
+                  'internet_bandwidth' => 209_715_200
+                }],
+                'sum_internal_bandwidth' => nil,
+                'sum_internet_bandwidth' => 209_715_200,
+                'ipv6_support' => true
+              },
+              'ncpus' => 2,
+              'ram' => 2_147_483_648,
+              'alt_names' => ['X64-2GB'],
+              'baremetal' => false,
+              'arch' => 'x86_64'
+            },
+            'C1' => {
+              'volumes_constraint' => nil,
+              'network' => {
+                'interfaces' => [{
+                  'internal_bandwidth' => 1_073_741_824,
+                  'internet_bandwidth' => 209_715_200
+                }],
+                'sum_internal_bandwidth' => 1_073_741_824,
+                'sum_internet_bandwidth' => 209_715_200,
+                'ipv6_support' => false
+              },
+              'ncpus' => 4,
+              'ram' => 2_147_483_648,
+              'alt_names' => [],
+              'baremetal' => true,
+              'arch' => 'arm'
+            }
+          }
+        }.freeze
+
         def self.data
           @data ||= Hash.new do |hash, token|
             hash[token] = {
@@ -225,7 +272,7 @@ module Fog
               end],
               tasks: {},
               containers: {},
-              server_actions: Hash.new(%w(poweron poweroff reboot terminate))
+              server_actions: Hash.new(%w[poweron poweroff reboot terminate])
             }
           end
         end
@@ -248,6 +295,10 @@ module Fog
           data[type][id] || raise_unknown_resource(id)
         end
 
+        def lookup_product_server(name)
+          PRODUCTS['servers'].find { |n, s| n == name || s['alt_names'].include?(name) }
+        end
+
         def default_security_group
           data[:security_groups].values.find { |s| s['organization_default'] }
         end

data/lib/fog/scaleway/models/compute/product_server.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Scaleway
+    class Compute
+      class ProductServer < Fog::Model
+        identity :name
+
+        attribute :volumes_constraint
+        attribute :network
+        attribute :ncpus
+        attribute :ram
+        attribute :alt_names
+        attribute :baremetal
+        attribute :arch
+      end
+    end
+  end
+end

data/lib/fog/scaleway/models/compute/product_servers.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Scaleway
+    class Compute
+      class ProductServers < Fog::Collection
+        model Fog::Scaleway::Compute::ProductServer
+
+        def all
+          product_servers = service.list_product_servers.body['servers'] || {}
+          product_servers = product_servers.map do |name, product_server|
+            product_server.merge(name: name)
+          end
+          load(product_servers)
+        end
+
+        def get(name)
+          product_servers = service.list_product_servers.body['servers'] || {}
+          name, product_server = product_servers.find do |n, s|
+            n == name || s['alt_names'].include?(name)
+          end
+          new(product_server.merge(name: name)) if product_server
+        end
+      end
+    end
+  end
+end

data/lib/fog/scaleway/requests/account/update_user.rb

@@ -16,7 +16,7 @@ module Fog
 
           user = lookup(:users, user_id)
 
-          %w(firstname lastname).each do |attr|
+          %w[firstname lastname].each do |attr|
             user[attr] = options[attr] if options.key?(attr)
           end
 

data/lib/fog/scaleway/requests/compute/create_server.rb

@@ -31,6 +31,14 @@ module Fog
 
           image = lookup(:images, body['image'])
 
+          commercial_type, product_server = lookup_product_server(body.fetch('commercial_type', 'VC1S'))
+          raise_invalid_request_error('Validation Error') unless commercial_type
+
+          unless image['arch'] == product_server['arch']
+            message = "Image '#{image['id']}' arch is not '#{product_server['arch']}'"
+            raise_invalid_request_error(message)
+          end
+
           creation_date = now
 
           volumes = {}
@@ -69,12 +77,17 @@ module Fog
             }
           end
 
-          dynamic_ip_required = !public_ip && body.fetch('dynamic_ip_required', true)
-
           default_bootscript_id = image['default_bootscript']['id']
           bootscript_id = body.fetch('bootscript', default_bootscript_id)
           bootscript = lookup(:bootscripts, bootscript_id)
 
+          dynamic_ip_required = !public_ip && body.fetch('dynamic_ip_required', true)
+
+          enable_ipv6 = body.fetch('enable_ipv6', false)
+          if enable_ipv6 && !product_server['network']['ipv6_support']
+            raise_invalid_request_error("Cannot enable ipv6 on #{commercial_type}")
+          end
+
           if body['security_group']
             security_group = lookup(:security_groups, body['security_group'])
           else
@@ -85,10 +98,10 @@ module Fog
           server = {
             'arch' => image['arch'],
             'bootscript' => bootscript,
-            'commercial_type' => body.fetch('commercial_type', 'C1'),
+            'commercial_type' => commercial_type,
             'creation_date' => creation_date,
             'dynamic_ip_required' => dynamic_ip_required,
-            'enable_ipv6' => body.fetch('enable_ipv6', false),
+            'enable_ipv6' => enable_ipv6,
             'extra_networks' => [],
             'hostname' => body['name'],
             'id' => Fog::UUID.uuid,

data/lib/fog/scaleway/requests/compute/execute_server_action.rb

@@ -33,6 +33,26 @@ module Fog
               raise_invalid_request_error('server should be stopped')
             end
 
+            total_volume_size = server['volumes'].values.map { |v| v['size'] }.reduce(&:+)
+            commercial_type, product_server = lookup_product_server(server['commercial_type'])
+            # rubocop:disable Metrics/BlockNesting
+            if (constraint = product_server['volumes_constraint'])
+              min_size = constraint['min_size'] || -Float::INFINITY
+              max_size = constraint['max_size'] || Float::INFINITY
+              if total_volume_size < min_size || total_volume_size > max_size
+                message = "The total volume size of #{commercial_type} instances must be "
+                message << if min_size == -Float::INFINITY
+                             "equal or below #{max_size / 10**9}GB"
+                           elsif max_size == Float::INFINITY
+                             "equal or above #{min_size / 10**9}GB"
+                           else
+                             "between #{min_size / 10**9}GB and #{max_size / 10**9}GB"
+                           end
+                raise_invalid_request_error(message)
+              end
+            end
+            # rubocop:enable Metrics/BlockNesting
+
             task['description'] = 'server_batch_poweron'
 
             server['ipv6'] = create_ipv6 if server['enable_ipv6']

data/lib/fog/scaleway/requests/compute/list_product_servers.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Scaleway
+    class Compute
+      class Real
+        def list_product_servers
+          get('/products/servers')
+        end
+      end
+
+      class Mock
+        def list_product_servers
+          response(status: 200, body: { 'servers' => PRODUCTS['servers'] })
+        end
+      end
+    end
+  end
+end

data/lib/fog/scaleway/requests/compute/update_server.rb

@@ -19,6 +19,12 @@ module Fog
                          lookup(:bootscripts, body['bootscript'])
                        end
 
+          _, product_server = lookup_product_server(server['commercial_type'])
+
+          if body['enable_ipv6'] && !product_server['network']['ipv6_support']
+            raise_invalid_request_error("Cannot enable ipv6 on #{commercial_type}")
+          end
+
           volumes = {}
           body['volumes'].each do |index, volume|
             volume = lookup(:volumes, volume['id'])

data/lib/fog/scaleway/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Scaleway
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-scaleway
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Satoshi Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,6 +186,8 @@ files:
 - lib/fog/scaleway/models/compute/images.rb
 - lib/fog/scaleway/models/compute/ip.rb
 - lib/fog/scaleway/models/compute/ips.rb
+- lib/fog/scaleway/models/compute/product_server.rb
+- lib/fog/scaleway/models/compute/product_servers.rb
 - lib/fog/scaleway/models/compute/security_group.rb
 - lib/fog/scaleway/models/compute/security_group_rule.rb
 - lib/fog/scaleway/models/compute/security_group_rules.rb
@@ -243,6 +245,7 @@ files:
 - lib/fog/scaleway/requests/compute/list_containers.rb
 - lib/fog/scaleway/requests/compute/list_images.rb
 - lib/fog/scaleway/requests/compute/list_ips.rb
+- lib/fog/scaleway/requests/compute/list_product_servers.rb
 - lib/fog/scaleway/requests/compute/list_security_group_rules.rb
 - lib/fog/scaleway/requests/compute/list_security_groups.rb
 - lib/fog/scaleway/requests/compute/list_server_actions.rb