fog-gridscale 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 255110f078a60e7dcad1b1e202591cb9bc9f47ec
-  data.tar.gz: 48d2a079388fd559d21c32f8b44d203d7f016b44
+  metadata.gz: 858e47525db8ef2cb9c67dfb032cd1bce2ba9a0b
+  data.tar.gz: '0018efdb58fdf79e0576f8cfa1d88346d05a287d'
 SHA512:
-  metadata.gz: 60faca06f642ce0f608b54a64d44efea710599caf155ce4227b7dc2b0f1e307f5aa273d1fe6d0655ac43632898d4ba545c30390326a1cd08f8fb81b24374aa55
-  data.tar.gz: c80298500e39fefd13c1dd6bd69bec8aea999ea59c81289aca86f173cd1cc6ff22f564e52110654b4fa3445e447cdb4417ace40d29d6d375a6b61a0d8f3e1ae1
+  metadata.gz: c1f4bc889ddbd7b421d6049cc184ea3b5763eb7de29eac21251f4c552b195ed0666b7df0248ebaf6df3e819aaf1be23936e5606bfc67b2a519362b168cebd154
+  data.tar.gz: be867a1dbd9e9aebb4e78a6b40f54f59ee6018a0c367e73a7860934c1e40a0773e5abb1076ba3a01d9f9b9bb73153cca3c422440170c9fb163a2619faf7e7570

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [v0.1.3]
+
+- fixed empty sshkey handler for storage with private template creation in
+server add
+- Allowed creating host to choose isoimage which available in gridscale user account
+
 ## [v0.1.2]
 
 - Commented out publishing protection in gemfile.

data/lib/fog/compute/gridscale/models/server.rb

@@ -48,6 +48,7 @@ module Fog
         attribute :sshkey_uuid
         attribute :ip4_add_in
         attribute :ip6_add_in
+        attribute :isoimage_uuid
 
 
         def cpu
@@ -123,6 +124,10 @@ module Fog
             options[:sshkey_uuid] = sshkey_uuid
           end
 
+          if attributes[:isoimage_uuid]
+            options[:isoimage_uuid] = isoimage_uuid
+          end
+
           data = service.server_create(name, cores, memory, options)
           merge_attributes(data.body['server'])
         end

data/lib/fog/compute/gridscale/requests/server_create.rb

@@ -9,6 +9,7 @@ module Fog
           storage = options[:storage]
           template_uuid = options[:template_uuid]
           sshkey_uuid = options[:sshkey_uuid]
+          isoimage_uuid = options[:isoimage_uuid]
           if options[:location_uuid]
             location_uuid = options[:location_uuid]
           else
@@ -16,13 +17,12 @@ module Fog
           end
 
 
-          relations = {
-              :isoimages => [],
-          }
+          relations = {}
 
           networks = []
           storages = []
           ipaddrs = []
+          isoimages = []
           bootable_set = false
           if interfaces_attributes != nil
             interfaces_attributes.each do |key, value|
@@ -45,23 +45,32 @@ module Fog
 
             end
           end
-
+          if sshkey_uuid == ""
+            sshkey_uuid = nil
+          end
           if storage != nil && storage > 0
             if template_uuid !=nil
               storages << {"create"=>{"name"=>"#{name} Storage", "capacity"=>storage, "location_uuid"=>location_uuid,"storage_type"=>"storage","template"=>{"template_uuid"=> template_uuid }} , "relation"=>{"bootdevice"=>true}}
+
               if sshkey_uuid != nil
                 storages = []
                 storages << {"create"=>{"name"=>"#{name} Storage", "capacity"=>storage, "location_uuid"=>location_uuid,"storage_type"=>"storage","template"=>{"template_uuid"=> template_uuid, "sshkeys" => [sshkey_uuid] }} , "relation"=>{"bootdevice"=>true}}
-                # print
+              else
+                storages = []
+                storages << {"create"=>{"name"=>"#{name} Storage", "capacity"=>storage, "location_uuid"=>location_uuid,"storage_type"=>"storage","template"=>{"template_uuid"=> template_uuid}} , "relation"=>{"bootdevice"=>true}}
               end
             else
               storages << {"create"=>{"name"=>"#{name} Storage", "capacity"=>storage, "location_uuid"=>location_uuid,"storage_type"=>"storage"}, "relation"=>{"bootdevice"=>true}}
             end
           end
-
+          if isoimage_uuid != nil && isoimage_uuid != ""
+            isoimages = []
+            isoimages << {"isoimage_uuid" => isoimage_uuid}
+          end
           relations[:networks] = networks
           relations[:storages] = storages
           relations[:public_ips] = ipaddrs
+          relations[:isoimages] = isoimages
 
           create_options = {
               :name   => name,

data/lib/fog/gridscale/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Gridscale
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-gridscale
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - aldemuro haris
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler