foreman_m2 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a45c96c1764aa4113b86ee1ab5f72ad9c8e57e2a
-  data.tar.gz: ee4cd3e255d92ccedbf8c211e8a177940cd73fc2
+  metadata.gz: 7eda017018d40b73148d7b05aaee1dc6c25eddd0
+  data.tar.gz: 5b7ba80ac06e7e0105031645a0991bc4d9c255b7
 SHA512:
-  metadata.gz: 5416e32ad493c6b64a0faf170ed4572810fbedd6ccde955f1de8af61d9d9e36b20cb0636ab8ad2c6b558c4968cf7c7c700fe162066626f60b232345b92d8995e
-  data.tar.gz: 306d823848be93bd604888ffa2be3a35dcf1c5889248173e2ae329a2f2ccbade678aab50ba68d897b493025d5627a7d4059790386b125e4215128eac9df60820
+  metadata.gz: a5000806742bad5274e479a175e8d653f9228cc1009ec57c8ba6b99b05f5275f7523e0ea59fbe9090696bac621c5c0eb80176897635294fcf6cb5dc6b8b344d8
+  data.tar.gz: ebf511961c43ff7603e4f0b55fc51bdecf2cf9536e0f508ebce488a5b9dc18ef8d65958ee11fc6cc2c39d821daa971a9f25f4d66a472863c28b468b558850a0b

data/README.md

@@ -1,11 +1,12 @@
 # Foreman M2
 
-The Foreman M2 plugin introduces M2 functionality into Foreman.  This is currently in-progress.  Related: https://github.com/Izhmash/smart_proxy_m2
+The Foreman M2 plugin introduces M2 functionality into Foreman.  This is currently in-progress.  Related: https://github.com/ianballou/smart_proxy_m2
 
 ## Pre-requirements
 
 - TFTP & DHCP servers
 - Smart-Proxy plugin that has M2 among its capabilities (see link above)
+- Note: In 0.0.1, ensure that the M2 smart proxy is called "proxy_m2".  This will be addressed in the next release.
 - Working M2 installation with images imported to the M2 project in use
 
 ## Installation
@@ -22,9 +23,15 @@ for how to install Foreman plugins
 
 ## TODO
 
+- Query for M2 smart proxy by some method other than its name
+  - Fix will be out in next release
 - Testing
 - Disk management interface in Foreman
 
+## Known issues
+- SSH orchestration attempts after host creation sometimes delay the generation of PXE boot files if there aren't enough server workers
+  - Try 5 workers
+
 ## Contributing
 
 Fork and send a Pull Request. Thanks!

data/app/controllers/foreman_m2/hosts_controller.rb

@@ -10,7 +10,7 @@ module ForemanM2
     def new_action
       # automatically renders view/foreman_m2/hosts/new_action
 
-      proxy = SmartProxy.find_by name: 'proxy_m2'
+      proxy = ::ProxyAPI::M2.new(url: SmartProxy.with_features('M2').first.url)
       proxyAPI = ::ProxyAPI::M2.new(url: proxy.url)
       @response = proxyAPI.get_images(:project => 'ian')
       @snaps = proxyAPI.get_snapshots(:project => 'ian')

data/app/models/foreman_m2/m2.rb

@@ -9,9 +9,8 @@ module ForemanM2
     end
 
     def available_images
-      proxy = SmartProxy.find_by name: 'proxy_m2'
+      proxy = SmartProxy.find_by url: self.url
       proxyAPI = ::ProxyAPI::M2.new(url: proxy.url)
-      # proxy = ::ProxyAPI::M2.new(url: url)
       proxyAPI.get_images([])
     end
 

data/app/overrides/remove_vm_tab.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => 'hosts/_form',
+                     :name => 'remove_vm_tab',
+                     :remove => 'li#compute_resource_tab')
+                       #'erb[loud]:contains("select_f"):contains(":ptable_id")')

data/lib/foreman_m2/version.rb

@@ -1,3 +1,3 @@
 module ForemanM2
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

data/test/factories/compute_resources.rb

@@ -0,0 +1,10 @@
+FactoryBot.modify do
+  factory :compute_resource do
+    trait :m2 do
+      provider 'M2'
+      url 'http://127.0.0.1:1234'
+    end
+
+    #factory :m2_cr, :class => ForemanM2::M2, :traits => [:m2]
+  end
+end

data/test/unit/foreman_m2_test.rb

@@ -5,7 +5,12 @@ class ForemanM2Test < ActiveSupport::TestCase
     User.current = User.find_by login: 'admin'
   end
 
-  test 'the truth' do
-    assert true
+  test 'truth' do
+    assert_kind_of Module, ForemanM2
+  end
+
+  test 'proxy url saved in CR' do
+    m2 = FactoryBot.create(:compute_resource, :m2)
+    assert m2.url == 'http://127.0.0.1:1234'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_m2
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ian Ballou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -74,6 +74,7 @@ files:
 - app/models/foreman_m2/m2.rb
 - app/overrides/give_ids.rb
 - app/overrides/hybrid_js.rb
+- app/overrides/remove_vm_tab.rb
 - app/overrides/update_media_selection.rb
 - app/views/compute_resources/edit/_m2.html.erb
 - app/views/compute_resources/form/_m2.html.erb
@@ -103,6 +104,7 @@ files:
 - locale/en/foreman_m2.po
 - locale/foreman_m2.pot
 - locale/gemspec.rb
+- test/factories/compute_resources.rb
 - test/factories/foreman_m2_factories.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_m2_test.rb
@@ -134,3 +136,4 @@ test_files:
 - test/test_plugin_helper.rb
 - test/unit/foreman_m2_test.rb
 - test/factories/foreman_m2_factories.rb
+- test/factories/compute_resources.rb