foreman_one 0.2 → 0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2JkOWJjM2ViYjIxZGE3YjZjOTFjNTA4NjkxZmVkZTU2MDJjMjU5Nw==
-  data.tar.gz: !binary |-
-    MjMyOGUzZWE2YTI1MDdhMDIwOTIwZmQwNmM1MWZjYWRkMjZmMGUwOA==
+SHA1:
+  metadata.gz: df5b26c25658b73795a6879ca77d068b7a8a8086
+  data.tar.gz: 092656a76deeb1b126120ca5428c8ad6913acf87
 SHA512:
-  metadata.gz: !binary |-
-    ZDBhZjZkNmM3ZTQ3MTJiMjc3ZTQxNGM2NWMyOTAxZTY3MTUyOTc3MmM4NDBh
-    ZWZjYWFiMDRlN2Q5MWFlZDA3ZDc1NWFiZTc0OWFmNzQ3ZDExNTdlNGY1NjE5
-    NzgxZTQyMTY5YjIzMWU2ZmE4NjFjNjk3ZmZkYzE4Y2FiMDA5MWI=
-  data.tar.gz: !binary |-
-    MDQ2ZjllMWU0MDMxOWNlNmZlYWQ4ZjlmZWVjY2RiZWQwOTExYzFkNTMxMDBk
-    OWQ5MWM1YzJjMTk4Mzc1YmE1MTg3YWJkYzliYjU2NDQ2MjY4NmY4YmQ2ZDQ5
-    YWQwZGEzOGU2MTI2NjlkZTA3MzhhZDc4YWNkOWZhZjYxODdlNGU=
+  metadata.gz: cbeb50ae5d2575a571c8f6c106ae08951753ad924f496fea84c7e91532960e2f31634f84f7375239fbbc066672f133040e7cec3852dbf96715b8f2a210498368
+  data.tar.gz: 2973dd8006cd5b28012921f8760177f7b514c87365be61064c0c73f7b31ceed95c55f8c5c0d9830c081401e60c1552fb44c859c9cab81159db49d1def2a929c1

data/README.md

@@ -15,12 +15,15 @@ The gem name is "foreman_one".
 | Foreman Version | Plugin Version |
 | ---------------:| --------------:|
 | >=  1.5         | 0.1            |
+| >=  1.8         | 0.3            |
 
-## Latest code
+## Latest code (recommended)
 
-You can get the develop branch of the plugin by specifying your Gemfile in this way:
+To use foreman-one with newer Versions of TheForeman >=1.8 you should add the
+following lines to your Gemfile. 
 
-    gem 'foreman_one', :git => "https://github.com/netways/foreman-one.git"
+    gem 'foreman_one', :git => "https://github.com/theforeman/foreman-one.git"
+    gem "fog", :git => "https://github.com/netways/fog.git", :branch => "net-v1.33.0"
 
 # Copyright
 

data/app/models/concerns/fog_extensions/opennebula/server.rb

@@ -0,0 +1,29 @@
+module FogExtensions
+  module OpenNebula
+    module Server
+      extend ActiveSupport::Concern
+
+      include ActionView::Helpers::NumberHelper
+
+      def vminterfaces
+        interfaces
+      end
+
+      def select_nic(fog_nics, nic)
+        fog_nics.detect {|fn| fn.vnet == nic.compute_attributes['vnetid']} # grab any nic on the same network
+      end
+
+      def vminterfaces_attributes=(attributes)
+        true
+      end
+
+      def template_id
+        ""
+      end
+
+      def vm_description
+        _("%{cpus} CPUs and %{memory} memory") % {:cpus => cpu, :memory => number_to_human_size(memory.to_i)}
+      end
+    end
+  end
+end

data/app/models/foreman_one/one.rb

@@ -5,12 +5,12 @@ module ForemanOne
     validates :user, :password, :presence => true
     validates :url, :format => { :with => URI.regexp }
 
-    def provider_friendly_name
+    def self.provider_friendly_name
       "OpenNebula"
     end
 
     def provided_attributes
-      super.merge({ :mac => :vm_mac_address })
+      super.merge({ :mac => :mac })
     end
 
     def self.model_name
@@ -30,18 +30,17 @@ module ForemanOne
     end
 
     def interfaces
-      #client.interfaces rescue []
-      []
+      vm.interfaces
     end
+
     def vminterfaces
-      #client.interfaces rescue []
-      []
+      interfaces
     end
 
     def networks
       client.networks rescue []
     end
- 
+
 
     def flavors
       client.flavors
@@ -66,8 +65,8 @@ module ForemanOne
       vm.flavor.nic = [] unless vm.flavor.nic.is_a? Array
 
       #INTERFACES {"new_interfaces"=>{"vnetid"=>"0", "_delete"=>"", "model"=>"virtio"}, "new_1398239695352"=>{"vnetid"=>"2", "_delete"=>"", "model"=>"virtio"}, "new_1398239700415"=>{"vnetid"=>"2", "_delete"=>"", "model"=>"virtio"}, "new_1398239705632"=>{"vnetid"=>"0", "_delete"=>"", "model"=>"e1000"}}
-      logger.info "INTERFACES #{args[:vminterfaces_attributes].inspect}"
-      nics = args[:vminterfaces_attributes].values
+      logger.debug "NEW #{args[:interfaces_attributes].inspect}"
+      nics = args[:interfaces_attributes].values
       if nics.is_a? Array then
         nics.each do |nic|
           unless (nic["vnetid"].empty? || nic["model"].empty?)
@@ -76,10 +75,11 @@ module ForemanOne
         end
       end
 
-      logger.info "VM: #{vm.inspect}"
-      logger.info "FLAVOR: #{vm.flavor.inspect}"
-      logger.info "NIC: #{vm.flavor.nic.inspect}"
-      logger.info "FLAVORtos: #{vm.flavor.to_s}"
+      logger.debug "VM: #{vm.inspect}"
+      logger.debug "FLAVOR: #{vm.flavor.inspect}"
+      logger.debug "NIC: #{vm.flavor.nic.inspect}"
+      logger.debug "FLAVORto_s: #{vm.flavor.to_s}"
+
       vm.save
     rescue ::OpenNebula::Error => e
       logger.debug "OpenNebula error: #{e.message}\n " + e.backtrace.join("\n ")
@@ -115,13 +115,8 @@ module ForemanOne
       false
     end
 
-#    def associated_host(vm)
-#      Host.my_hosts.where(:ip => [vm.public_ip_address, vm.private_ip_address]).first
-#    end
-
     def associated_host(vm)
-      #Host.my_hosts.where(:mac => [vm.vm_mac_address]).first
-      Host.authorized(:view_hosts, Host).where(:mac => vm.vm_mac_address).first
+      associate_by("mac", vm.vm_mac_address)
     end
 
     def new_vminterface attr={}
@@ -135,13 +130,8 @@ module ForemanOne
       @client ||= ::Fog::Compute.new({:provider => 'OpenNebula', :opennebula_username => user, :opennebula_password => password, :opennebula_endpoint => url})
     end
 
-
     def vm_instance_defaults
-      super.merge(
-        :b0e => "foob0e",
-        :foob0e  => "b0e"
-      )
+      super
     end
-
   end
 end

data/app/views/compute_resources_vms/form/_one.html.erb

@@ -1,20 +1,4 @@
 <%= select_f f, :template_id, compute_resource.flavors, :id, :to_label, {}, :label => _('Templates') %>
-<%= selectable_f f, :vcpu, 1..8, { :include_blank => _("Template default")}, :label => _('VCPUs') %>
-<%= selectable_f f, :memory,[512, 1024, 2048, 4096] , { :include_blank => _("Template default")}, :class => "col-md-2", :label => _('Memory') %>
+<%= selectable_f f, :vcpu, 1..32, { :include_blank => _("Template default")}, :label => _('VCPUs') %>
+<%= selectable_f f, :memory,[512, 1024, 2048, 4096, 8192, 16384, 32768, 65536] , { :include_blank => _("Template default")}, :class => "col-md-2", :label => _('Memory') %>
 <%= select_f f, :gid, compute_resource.groups, :id, :to_label, { :include_blank => _("User default")}, :label => _('One Group') %>
-
-<!--NICS -->
-<div class="children_fields">
-  <%= new_child_fields_template(f, :vminterfaces, {
-      :object  => compute_resource.new_vminterface,
-      :partial => 'compute_resources_vms/form/one/network', :form_builder_attrs => { :compute_resource => compute_resource } }) %>
-  <%= field_set_tag "Virtual Network", :id => "network_vminterfaces", :title => _('Networks') do %>
-    <%= f.fields_for :vminterfaces do |i| %>
-      <%= render 'compute_resources_vms/form/one/network', :f => i, :compute_resource => compute_resource %>
-    <% end %>
-    <%= add_child_link '+ ' + _("Add Interface"), :vminterfaces, { :class => "info disable-unsupported", :title => _('add new network interface') } %>
-  <% end %>
-</div>
-
-
-

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

@@ -0,0 +1,5 @@
+<%= select_f f, :template_id, compute_resource.flavors, :id, :to_label, {}, :label => _('Templates') %>
+<%= selectable_f f, :vcpu, 1..8, { :include_blank => _("Template default")}, :label => _('VCPUs') %>
+<%= selectable_f f, :memory,[512, 1024, 2048, 4096] , { :include_blank => _("Template default")}, :class => "col-md-2", :label => _('Memory') %>
+<%= select_f f, :gid, compute_resource.groups, :id, :to_label, { :include_blank => _("User default")}, :label => _('One Group') %>
+

data/lib/foreman_one/engine.rb

@@ -1,6 +1,6 @@
 require 'fast_gettext'
 require 'gettext_i18n_rails'
-require 'fog'
+require 'fog/opennebula'
 
 module ForemanOne
   #Inherit from the Rails module of the parent app (Foreman), not the plugin.
@@ -16,11 +16,24 @@ module ForemanOne
 
     initializer 'foreman_one.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_one do
-        requires_foreman '> 1.4'
+        requires_foreman '>= 1.8'
         # Register OpenNebula compute resource in foreman
         compute_resource ForemanOne::One
       end
     end
 
+    config.to_prepare do
+      begin
+        # extend fog opennebula server/
+        require 'fog/opennebula/models/compute/server'
+        require File.expand_path('../../../app/models/concerns/fog_extensions/opennebula/server', __FILE__)
+
+        Fog::Compute::OpenNebula::Server.send(:include, ::FogExtensions::OpenNebula::Server)
+        ::HostsHelper.send(:include, ForemanOne::HostHelperExtensions)
+      rescue => e
+        puts "Foreman-One: skipping engine hook (#{e.to_s})"
+      end
+    end
+
   end
 end

data/lib/foreman_one/version.rb

@@ -1,3 +1,3 @@
 module ForemanOne
-  VERSION = "0.2"
+  VERSION = "0.4"
 end

metadata

@@ -1,55 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: foreman_one
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.4'
 platform: ruby
 authors:
 - NETWAYS Managed Services GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.23.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: opennebula
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
 description: Provision and manage OpenNebula VMs from Foreman
@@ -62,12 +48,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/models/concerns/fog_extensions/opennebula/server.rb
 - app/models/foreman_one/one.rb
 - app/views/compute_resources/form/_one.html.erb
 - app/views/compute_resources/show/_one.html.erb
 - app/views/compute_resources_vms/form/_one.html.erb
+- app/views/compute_resources_vms/form/one/_base.html.erb
 - app/views/compute_resources_vms/form/one/_network.html.erb
-- app/views/compute_resources_vms/form/one/_volume.html.erb
 - app/views/compute_resources_vms/index/_one.html.erb
 - app/views/compute_resources_vms/show/_one.html.erb
 - lib/foreman_one.rb
@@ -87,21 +74,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Provision and manage OpenNebula VMs from Foreman
 test_files:
 - test/test_helper.rb
 - test/foreman_one_test.rb
-has_rdoc: 

data/app/views/compute_resources_vms/form/one/_volume.html.erb

@@ -1,9 +0,0 @@
-<div class="fields">
-  <div class="form-group">
-  <%= selectable_f f, :pool_name, compute_resource.storage_pools.map(&:name), { }, :class => "col-md-2", :label => _("Storage pool") %>
-  <%= text_f f, :capacity, :class => "col-md-2", :label => _("Size (GB)"), :onchange => 'capacity_edit(this)' %>
-  <%= allocation_text_f f %>
-    <%= select_f f, :format_type, %w[RAW QCOW2],:downcase, :to_s, { }, :class => "col-md-2", :label => _("Type"),
-                   :help_inline => remove_child_link("X", f, { :method => :'_delete', :title => _('remove volume'), :class => 'label label-danger disable-unsupported' }) %>
-  </div>
-</div>