foreman_ovm 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 973693d8259f7c0fff9eca33599dd4485e00e042
-  data.tar.gz: 5001dafbd11c69e806072baee1fafcdbe5c598b5
+  metadata.gz: c8cdbae31238b11a968f5995d06bc37042c891de
+  data.tar.gz: 228ae0087106a7ba4ddeffc5ed2d672c4b4d64e4
 SHA512:
-  metadata.gz: f7908eda7094e040de1d1e0fcdbdcb3c2b89f86c2b325c2a228bb6647a8c63113ab118fe5d04109e759e1367f221de6f1271499ccd58b0981c0f55d9c6ef89c5
-  data.tar.gz: c0b3665f6af39fc386d4b46e67e70754df6cd836eb80da0cb6eac2661cc54742f12f8688371637a4fae7ef2c07ded94081ce280b9d428336f49caf89bf5c2283
+  metadata.gz: a61f28d032cfdbd4f02db849713a33646f251c2a48cfea7a079fc3f6d449d80a5c32d8fb753bed6204a99851b0cd19408f23d369d3bed3a2b01a96cd21e9c4ba
+  data.tar.gz: 6058f4d4d74d2ac97fcbe9ab643f35b228e499a619507e3462b2ba4c0eed8c05599463011b2da0edc65f01e59574b41435f21c93bdb512c9e75b9fc0f4bfe0eb

data/README.md

@@ -55,7 +55,7 @@ To verify that the installation was successful, go to Foreman, top bar **Adminis
 
 | Foreman Version | Plugin Version |
 | --------------- | --------------:|
-| >= 1.13.0       | ~> 0.0.1       |
+| >= 1.13.0       | ~> 0.0.2       |
 
 ## Configuration
 

data/app/models/concerns/fog_extensions/{ovm → oracle}/server.rb

@@ -1,5 +1,5 @@
 module FogExtensions
-  module Ovm
+  module Oracle
     module Server
       extend ActiveSupport::Concern
 

data/app/models/foreman_ovm/ovm.rb

@@ -1,12 +1,15 @@
 module ForemanOvm
   class Ovm < ComputeResource
+    #alias_attribute :api_key, :password
     #alias_attribute :api_key, :password
     #alias_attribute :region, :url
 
-    has_one :key_pair, :foreign_key => :compute_resource_id, :dependent => :destroy
-    delegate :flavors, :to => :client
-
-    validates :username, :presence => true
+    #has_one :key_pair, :foreign_key => :compute_resource_id, :dependent => :destroy
+    #delegate :flavors, :to => :client
+   
+     
+    validates :url, :format => { :with => URI.regexp }, :presence => true
+    validates :user, :presence => true
     validates :password, :presence => true
     before_create :test_connection
 
@@ -26,18 +29,18 @@ module ForemanOvm
     end
 
     def capabilities
-      [:image]
+      [:build, :image]
     end
 
     def find_vm_by_uuid(uuid)
       client.servers.get(uuid)
-    rescue Fog::Compute::Ovm::Error
+    rescue Fog::Compute::Oracle::Error
       raise(ActiveRecord::RecordNotFound)
     end
 
     def create_vm(args = {})
-      args["ssh_keys"] = [ssh_key] if ssh_key
-      args['image'] = args['image_id']
+      #args["ssh_keys"] = [ssh_key] if ssh_key
+      #args['image'] = args['image_id']
       super(args)
     rescue Fog::Errors::Error => e
       logger.error "Unhandled Ovm error: #{e.class}:#{e.message}\n " + e.backtrace.join("\n ")
@@ -53,14 +56,14 @@ module ForemanOvm
       images
     end
 
-    def regions
-      return [] if api_key.blank?
-      client.regions
-    end
+    #def regions
+    #  return [] if api_key.blank?
+    #  client.regions
+    #end
 
     def test_connection(options = {})
       super
-      errors[:password].empty? && regions.count
+      errors[:password].empty? && errors[:user].empty? && errors[:url].empty? && hypervisor
     rescue Excon::Errors::Unauthorized => e
       errors[:base] << e.response.body
     rescue Fog::Errors::Error => e
@@ -95,15 +98,19 @@ module ForemanOvm
     rescue Excon::Errors::Unauthorized => e
       errors[:base] << e.response.body
     end
+	
+    def hypervisor
+      client.hosts.first
+    end
 
     private
 
     def client
       @client ||= Fog::Compute.new(
-        :provider => "Ovm",
-        :version => 'V1',
-        :username => username,
-        :password => password
+        :provider => "Oracle",
+	:oracle_url	  => url,
+        :oracle_username => user,
+        :oracle_password => password
       )
     end
 
@@ -113,47 +120,5 @@ module ForemanOvm
       )
     end
 
-/*
-    # Creates a new key pair for each new Ovm compute resource
-    # After creating the key, it uploads it to Ovm
-    def setup_key_pair
-      public_key, private_key = generate_key
-      key_name = "foreman-#{id}#{Foreman.uuid}"
-      client.create_ssh_key key_name, public_key
-      KeyPair.create! :name => key_name, :compute_resource_id => id, :secret => private_key
-    rescue => e
-      logger.warn "failed to generate key pair"
-      logger.error e.message
-      logger.error e.backtrace.join("\n")
-      destroy_key_pair
-      raise
-    end
-
-    def destroy_key_pair
-      return unless key_pair
-      logger.info "removing DigitalOcean key #{key_pair.name}"
-      client.destroy_ssh_key(ssh_key.id) if ssh_key
-      key_pair.destroy
-      true
-    rescue => e
-      logger.warn "failed to delete key pair from DigitalOcean, you might need to cleanup manually : #{e}"
-    end
-
-    def ssh_key
-      @ssh_key ||= begin
-        key = client.list_ssh_keys.data[:body]["ssh_keys"].find { |i| i["name"] == key_pair.name }
-        key['id'] if key.present?
-      end
-    end
-
-    def generate_key
-      key = OpenSSL::PKey::RSA.new 2048
-      type = key.ssh_type
-      data = [key.to_blob].pack('m0')
-
-      openssh_format_public_key = "#{type} #{data}"
-      [openssh_format_public_key, key.to_pem]
-    end
-*/
   end
 end

data/app/views/compute_resources/form/_ovm.html.erb

@@ -1,12 +1,10 @@
+<%= text_f f, :url, :size => "col-md-8", :help_block => _("e.g. https://ovmm.example.com:7002") %>
+<%= text_f f, :user %>
 <%= password_f f, :password, :label => _("Password"), :unset => unset_password? %>
-<% regions = f.object.regions rescue [] %>
 
-<div id='region_selection'>
-  <%= selectable_f(f, :region, regions.map(&:slug), {},
-    :label => _('Default Region'), :disabled => regions.empty?,
-    :help_inline => link_to_function(
-      regions.empty? ? _("Load Regions") : _("Test Connection"), "testConnection(this)",
-      :class => "btn + #{regions.empty? ? "btn-default" : "btn-success"}",
-      :'data-url' => test_connection_compute_resources_path) +
-     hidden_spinner('', :id => 'test_connection_indicator').html_safe) %>
-</div>
+<% authenticated = f.object.authenticate! rescue false %>
+<%= link_to_function _("Test Connection"), "testConnection(this)",
+                    :class => "btn + #{authenticated ? "btn-success" : "btn-default"}",
+                    :'data-url' => test_connection_compute_resources_path %>
+
+<%= spinner('', :id => 'test_connection_indicator', :class => 'hide') %>

data/app/views/compute_resources/show/_ovm.html.erb

@@ -1,4 +1,4 @@
 <tr>
-  <td><%= _("Default Region") %></td>
-  <td><%= @compute_resource.default_region_name %></td>
+  <td><%= _("URL") %></td>
+  <td><%= @compute_resource.default_rrsource.url %></td>
 </tr>

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

@@ -1,7 +1,5 @@
+<%= text_f f, :name if show_vm_name? %>
 <%= select_f f, :size, compute_resource.flavors, :slug, :slug, {}, {:label => _('Flavor')}  %>
 <div id='image_selection'>
   <%= select_image(f, compute_resource) %>
 </div>
-<div id='region_selection'>
-  <%= select_region(f, compute_resource) %>
-</div>

data/app/views/compute_resources_vms/index/_ovm.html.erb

@@ -4,8 +4,11 @@
       <th><%= _('Name') %></th>
       <th><%= _('Image') %></th>
       <th><%= _('Type') %></th>
-      <th><%= _('Region') %></th>
-      <th><%= _('State') %></th>
+      <th><%= _('CPUs') %></th>
+      <th><%= _('Memory') %></th>
+      <th><%= _('Status') %></th>
+      <th><%= _('Power') %></th>
+      <th><%= _('Actions') %></th>
       <th></th>
     </tr>
   </thead>
@@ -14,8 +17,10 @@
       <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity).merge(:auth_object => @compute_resource, :authorizer => authorizer) %></td>
       <td><%= vm.image['slug'] if vm.image.present? %></td>
       <td><%= vm.size['slug'] %></td>
-      <td><%= vm.region['slug'] %></td>
-      <td> <span <%= vm_power_class(vm.ready?) %>> <%= vm_state(vm) %></span> </td>
+      <td><%= vm.cores %></td>
+      <td> <%= number_to_human_size vm.memory %> </td>
+      <td> <%= vm.attributes['status'] %> </td>
+      <td>  <span <%= vm_power_class(vm.ready?) %>> <%= vm_state(vm) %></span> </td>
       <td>
         <%= action_buttons(
                 vm_power_action(vm, authorizer),

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

@@ -2,12 +2,12 @@
 <div class='col-md-12'>
   <table class="table table-bordered table-striped">
     <tr><th colspan="2">Properties</th></tr>
-    <%= prop :public_ip_address %>
-    <%= prop :private_ip_address %>
-    <%= prop :state %>
+    <%= prop :name %>
+    <%= prop :ip_address %>
+    <%= prop :cores %>
+    <%= prop :memory %>
+    <%= prop :identity %>
     <%= prop :created_at, 'Created' %>
     <%= prop :image_name, 'Image' if @vm.image.present? %>
-    <%= prop :flavor_name, "Type (flavor)" %>
-    <%= prop :region_name, "Region" %>
   </table>
 </div>

data/app/views/images/form/_ovm.html.erb

@@ -2,5 +2,6 @@
   :username,
   :value => @image.username || "root",
   :help_inline => _("The user that is used to ssh into the instance, normally cloud-user, ec2-user, ubuntu, root etc") %>
+<%= password_f f, :password, :help_inline => _("Password to authenticate with - used for SSH finish step.") %>
 <%= ovm_image_field(f) %>
 <%= checkbox_f f, :user_data, :help_inline => _("Does this image support user data input (e.g. via cloud-init)?") %>

data/lib/foreman_ovm/engine.rb

@@ -18,7 +18,7 @@ module ForemanOvm
       Foreman::Plugin.register :foreman_ovm do
         requires_foreman '>= 1.13'
         compute_resource ForemanOvm::Ovm
-        parameter_filter ComputeResource, :username, :password, :uri
+        parameter_filter ComputeResource, :username, :password, :url
       end
     end
 
@@ -27,21 +27,21 @@ module ForemanOvm
     end
 
     config.to_prepare do
-      require 'xlab-si/fog-oracle'
+      require 'fog/oracle'
       #require 'fog/digitalocean/compute_v2'
       #require 'fog/digitalocean/models/compute_v2/image'
       #require 'fog/digitalocean/models/compute_v2/server'
       require File.expand_path(
-        '../../../app/models/concerns/fog_extensions/ovm/server',
+        '../../../app/models/concerns/fog_extensions/oracle/server',
         __FILE__)
       require File.expand_path(
-        '../../../app/models/concerns/fog_extensions/ovm/image',
+        '../../../app/models/concerns/fog_extensions/oracle/image',
         __FILE__)
 
-      Fog::Compute::Ovm::Image.send :include,
-        FogExtensions::Ovm::Image
-      Fog::Compute::Ovm::Server.send :include,
-        FogExtensions::Ovm::Server
+      #Fog::Compute::Oracle::Image.send :include,
+      #  FogExtensions::Oracle::Image
+      Fog::Compute::Oracle.send :include,
+        FogExtensions::Oracle
       ::Host::Managed.send :include,
         ForemanOvm::Concerns::HostManagedExtensions
     end

data/lib/foreman_ovm/version.rb

@@ -1,3 +1,3 @@
 module ForemanOvm
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ovm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Matthew Wilmott
@@ -34,8 +34,8 @@ files:
 - LICENSE
 - README.md
 - app/helpers/ovm_images_helper.rb
-- app/models/concerns/fog_extensions/ovm/image.rb
-- app/models/concerns/fog_extensions/ovm/server.rb
+- app/models/concerns/fog_extensions/oracle/image.rb
+- app/models/concerns/fog_extensions/oracle/server.rb
 - app/models/foreman_ovm/concerns/host_managed_extensions.rb
 - app/models/foreman_ovm/ovm.rb
 - app/views/api/v1/compute_resources/ovm.json