foreman_gridscale 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d75f5b0099e48772d8f7f8bd579b5f848a7b675f
-  data.tar.gz: a47fb0300bd95935f28491d7b71c930d45b5e876
+  metadata.gz: 48a36cfbcfeb2d14c63616beaa15bf59254d1d39
+  data.tar.gz: 95893d8031c5e48708633bdd0341f02027f41fab
 SHA512:
-  metadata.gz: 65e8d889cf94d78649d524e67906a7707a1c6850669fd0e95aa4c782210525938388f34cd83d9494402720f9d234d3a9844a9ddbfcab603faf098af9986496a2
-  data.tar.gz: ea85ef605c72b975e0e0bec552a6d83fc30d15ac7d5c5db79276f5c444855bbc74ace34362159fdb20da8b043f78b6ef3bfa9f91923e521e5a2af44d91c0706e
+  metadata.gz: 0c9658f128848be3ba855ae279c113101fc3dee459c7608ac9e0d30f3075c0993d5d38813e118340d0239ce213c336a15a87d3d36dfcaa9f6c33260ea974ee32
+  data.tar.gz: d6abf31b951a52e6a0392c7685bfdf8bdac3a278a08463495f1fc5113085e40e9066b1af4ec68fbaf28a51c359eac62156b07e0ac5dd5e879c2a2d19637e5c2d

data/app/helpers/gridscale_images_helper.rb

@@ -9,7 +9,7 @@ module GridscaleImagesHelper
   def select_ipv4(f, compute_resource)
     addresses = Array.new
     compute_resource.ips.each do |ip|
-       if ip.relations['servers'].empty? and ip.relations['loadbalancers'].empty? and ip.family ==4
+       if ip.relations['servers'].empty? and ip.relations['loadbalancers'].empty? and ip.family ==4 and ip.failover = false
          addresses << ip
        end
      end
@@ -29,7 +29,7 @@ module GridscaleImagesHelper
   def select_ipv6(f, compute_resource)
     addresses = Array.new
     compute_resource.ips.each do |ip|
-      if ip.relations['servers'].empty? and ip.relations['loadbalancers'].empty? and ip.family ==6
+      if ip.relations['servers'].empty? and ip.relations['loadbalancers'].empty? and ip.family ==6 and ip.failover = false
         addresses << ip
       end
     end
@@ -119,6 +119,22 @@ module GridscaleImagesHelper
 
   end
 
+  def select_isoimage(f, compute_resource)
+    template_list = Array.new
+    compute_resource.isoimages.each do |isoimage|
+      template_list << isoimage
+    end
+
+    select_f(f,
+             :isoimage_uuid,
+             template_list,
+             :object_uuid,
+             :name,
+             { :include_blank => true },
+             { :label => 'Iso-image'})
+
+  end
+
   def gridscale_image_field(f)
     images = @compute_resource.available_templates
     images.each { |image| image.name = image.object_uuid if image.name.nil? }

data/app/models/foreman_gridscale/gridscale.rb

@@ -10,6 +10,9 @@ module ForemanGridscale
     validates :api_token, :user_uuid, :presence => true
     before_create :test_connection
 
+    def supports_update?
+      true
+    end
 
     def api_token
       attrs[:api_token]
@@ -126,6 +129,10 @@ module ForemanGridscale
       client.sshkeys
     end
 
+    def isoimages
+      client.isoimages
+    end
+
     def available_templates
       images = []
       collection = client.templates

data/app/views/compute_resources_vms/form/gridscale/_base.html.erb

@@ -1,6 +1,10 @@
 <%= number_f f, :cores, :label => _("Cores") , :required =>true%>
 <%= number_f f, :memory, :label => _("Memory in GB"), :required =>true%>
 <%= number_f f, :storage, :label => _("Storage in GB") %>
+
+<div id='isoimage_selection'>
+  <%=select_isoimage(f, compute_resource) %>
+</div>
 <div id='template_selection'>
   <%=select_template(f, compute_resource) %>
 </div>

data/app/views/compute_resources_vms/show/_gridscale.html.erb

@@ -13,7 +13,7 @@
 
     <tr>
 	<td>Console</td>
-	<td><a target="_blank" href="https://my.gridscale.io/js/UX/Helper/VNC/terminalModalStandalone.html?uuid=<%= @vm.object_uuid %>&path=api.gridscale.io">Open</a></td>
+	<td><a target="_blank" href="https://my.gridscale.io/Easy/js/UX/Helper/VNC/terminalModalStandalone.html?uuid=<%= @vm.object_uuid %>&name=<%= @vm.name %>&path=api.gridscale.io">Open</a></td>
     </tr>
   </table>
 </div>

data/lib/foreman_gridscale/version.rb

@@ -1,3 +1,3 @@
 module ForemanGridscale
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_gridscale
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Aldemuro Haris
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-31 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop