foreman_ipam 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b12a3de2a8d9e148cb6fedac4b79ce58e57f2089fdcc2b3d135fb5e5ccdc0b
-  data.tar.gz: e1eb1ef87928567b1e80701d9076b38120976365a8893b6d94d71ae466d13af8
+  metadata.gz: 1e739306ec83e70eb58edf95e5e86f7cba5a2c39cf66249f5d644763d5149b1c
+  data.tar.gz: fedbe687ef3cf81a41f2450266b06c9891b08b14c66dde80fe175a1698df2906
 SHA512:
-  metadata.gz: fa119451554b2c14c7d7da6e275a9490dce9d7623653865a4c56480848368bc68f1345f70ccf75642920a023c303dbb42353ef6deb83bbc24209522931f324b3
-  data.tar.gz: f6778feba3af472be59d878a3a3559bd8640c9b489d62c36ed06f73d22992f71081e53da3837dc27f424b9b48e748200f16606dfe370c00ed137165b528eb9cd
+  metadata.gz: 2f7a1eebfc19ffb3c85fc085f34feef61c9949811c5f2edf492408c44e69056a30098fda685bd129a2d30ac12b0a94793bf09c8493d841957c62b21abf2d25cf
+  data.tar.gz: 2b363b2c2edca37cc29698da4d905e353c1bba49f30320dd511c7fb484d4e49d9149d2ea51fd27dc3e1a0ac79d79999f329159782d8562c2a703b4b589d7f776

data/README.md

@@ -1,11 +1,11 @@
 # foreman_ipam
 
-Foreman plugin for IPAM integration with 
+Foreman plugin for IPAM integration with various IPAM providers.
 
-Supported Providers: 
+Currently supported Providers: 
 1. [phpIPAM](https://phpipam.net/). 
 
-Provides a basic UI for viewing phpIPAM sections, subnets and allocated IP addresses. Also allows for  obtaining of the next available IPv4 address for a given subnet(via [IPAM Smart Proxy Plugin](https://github.com/grizzthedj/smart_proxy_ipam)).
+Provides a basic Dashboard for viewing phpIPAM sections and subnets. Also allows for obtaining of the next available IPv4 address for a given subnet(via [IPAM Smart Proxy Plugin](https://github.com/grizzthedj/smart_proxy_ipam)).
 
 ## Installation
 
@@ -16,7 +16,7 @@ for how to install Foreman plugins.
 
 Once plugin is installed, you can look at the phpIPAM Dashboard(at Infrastructure --> phpIPAM Dashboard), for a simple view of sections, subnets etc. and/or use phpIPAM to get the next available IP address for a subnet:
 
-1. Create a subnet in Foreman of IPAM type "phpIPAM". Click on the `Proxy` tab and associate the subnet with the phpIPAM proxy. _NOTE: This subnet must actually exist in phpIPAM. There is no phpIPAM integration on the subnet creation at this time._
+1. Create a subnet in Foreman of IPAM type "IPAM". Click on the `Proxy` tab and associate the subnet with the IPAM proxy. _NOTE: This subnet must actually exist in phpIPAM. There is no phpIPAM integration on the subnet creation at this time._
 2. Create a host in Foreman. When adding/editing interfaces, select the above subnet, and the next available IP(pulled from phpIPAM) for the selected subnet will be displayed in the IPv4 address field. _NOTE: This is not supported for IPv6._
 
 ## Local development
@@ -64,6 +64,14 @@ bundle exec smart-proxy start
 11. Ensure that the `phpipam` feature is present on the proxy(http://proxy_url/features)
 12. Create a Subnet, and associate the subnet to the `phpipam` proxy
 
+## Run tests
+
+From the Foreman core, run ...
+
+```
+bundle exec rails test:foreman_ipam
+```
+
 ## TODO
 
 - Support for ip ranges

data/Rakefile

@@ -20,8 +20,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -35,13 +33,13 @@ end
 
 task default: :test
 
-begin
-  require 'rubocop/rake_task'
-  RuboCop::RakeTask.new
-rescue => _
-  puts 'Rubocop not loaded.'
-end
+# begin
+#   require 'rubocop/rake_task'
+#   RuboCop::RakeTask.new
+# rescue => _
+#   puts 'Rubocop not loaded.'
+# end
 
-task :default do
-  Rake::Task['rubocop'].execute
-end
+# task :default do
+#   Rake::Task['rubocop'].execute
+# end

data/app/controllers/foreman_ipam/dashboard_controller.rb

@@ -2,13 +2,12 @@
 module ForemanIpam
   class DashboardController < ::DashboardController
     def ipam
-      @response = PhpipamClient.proxy.get_sections
+      @response = Phpipam.proxy.get_sections
     end
 
     def subnets
-      @subnets = PhpipamClient.proxy.get_subnets(params[:section_id])
+      @subnets = Phpipam.proxy.get_subnets(params[:section_id])
       render :json => @subnets.to_json, :status => :ok
     end
   end
 end
-

data/app/helpers/concerns/foreman_ipam/dashboard_helper_extensions.rb

@@ -2,12 +2,12 @@ module ForemanIpam
   module DashboardHelperExtensions
     extend ActiveSupport::Concern
 
-    included do
-      # execute callbacks
-    end
+    # included do
+    #   # execute callbacks
+    # end
 
-    # create or overwrite instance methods...
-    def instance_method_name
-    end
+    # # create or overwrite instance methods...
+    # def instance_method_name
+    # end
   end
 end

data/app/models/concerns/foreman_ipam/dashboard_extensions.rb

@@ -2,18 +2,18 @@ module ForemanIpam
   module DashboardExtensions
     extend ActiveSupport::Concern
 
-    included do
-      # execute callbacks
-    end
+  #   included do
+  #     # execute callbacks
+  #   end
 
-    # create or overwrite instance methods...
-    def instance_method_name
-    end
+  #   # create or overwrite instance methods...
+  #   def instance_method_name
+  #   end
 
-    module ClassMethods
-      # create or overwrite class methods...
-      def class_method_name
-      end
-    end
+  #   module ClassMethods
+  #     # create or overwrite class methods...
+  #     def class_method_name
+  #     end
+  #   end
   end
 end

data/app/views/foreman_ipam/dashboard/ipam.html.erb

@@ -1,6 +1,6 @@
 <h1>IPAM Integration Dashboard</h1>
 
-<% if @response %>
+<% if @response && @response.length > 0 %>
   <h2>phpIPAM</h2>
   <h3>Sections:</h3>
   <table class="<%= table_css_classes 'table-fixed' %>">
@@ -26,7 +26,7 @@
 <% else %>
   <div class="alert alert-warning ">
     <span class="pficon pficon-warning-triangle-o "></span>
-    <span class="text"><%= _("No sections found in the phpIPAM instance.") %></span>
+    <span class="text"><%= _("No sections found in the External IPAM instance.") %></span>
   </div>
 <% end %>
 
@@ -50,7 +50,7 @@
   }
 
   function displaySubnets(data) {
-    var subnets = data['data'];
+    var subnets = data;
     subnet_container.innerHTML += `
       <div class='col-md-2'><strong>Subnet</strong></div>
       <div class='col-md-6'><strong>Description</strong></strong></div><br />

data/config/initializers/phpipam.rb

@@ -1 +1 @@
-require_relative '../../lib/foreman_ipam/phpipam_client'
+require_relative '../../lib/foreman_ipam/phpipam'

data/lib/foreman_ipam/{phpipam_client.rb → phpipam.rb}

@@ -1,6 +1,5 @@
-
 module ForemanIpam
-  class PhpipamClient
+  class Phpipam
     def self.proxy
       external_ipam_proxy = SmartProxy.with_features('external_ipam').first
       ProxyAPI::ExternalIpam.new({:url => external_ipam_proxy[:url]})

data/lib/foreman_ipam/version.rb

@@ -1,3 +1,3 @@
 module ForemanIpam
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

data/test/factories/foreman_ipam_factories.rb

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :host do
-    name 'foreman_ipam'
-  end
+  # factory :host do
+  #   name 'foreman_ipam'
+  # end
 end

data/test/unit/foreman_ipam_test.rb

@@ -0,0 +1,8 @@
+require 'test_plugin_helper'
+
+class ForemanIpamTest < ActiveSupport::TestCase
+  test 'ensure proxy responds correctly to has_feature?' do
+    proxy = FactoryBot.build(:ipam_smart_proxy)
+    assert proxy.has_feature?('External IPAM')
+  end
+end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ipam
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Christopher Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  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: rdoc
-  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'
+date: 2019-07-10 00:00:00.000000000 Z
+dependencies: []
 description: Plugin for IPAM integration with various IPAM providers
 email:
 - chrisjsmith001@gmail.com
@@ -59,7 +31,7 @@ files:
 - db/seeds.d/01-add-external-ipam-feature.rb
 - lib/foreman_ipam.rb
 - lib/foreman_ipam/engine.rb
-- lib/foreman_ipam/phpipam_client.rb
+- lib/foreman_ipam/phpipam.rb
 - lib/foreman_ipam/version.rb
 - lib/tasks/foreman_ipam_tasks.rake
 - locale/Makefile
@@ -68,8 +40,8 @@ files:
 - locale/gemspec.rb
 - test/factories/foreman_ipam_factories.rb
 - test/test_plugin_helper.rb
-- test/unit/foreman_phpipam_test.rb
-homepage: https://github.com/grizzthedj
+- test/unit/foreman_ipam_test.rb
+homepage: https://github.com/grizzthedj/foreman_ipam
 licenses:
 - GPL-3.0
 metadata: {}
@@ -94,6 +66,6 @@ signing_key:
 specification_version: 4
 summary: Plugin for IPAM integration with various IPAM providers
 test_files:
-- test/unit/foreman_phpipam_test.rb
+- test/unit/foreman_ipam_test.rb
 - test/factories/foreman_ipam_factories.rb
 - test/test_plugin_helper.rb

data/test/unit/foreman_phpipam_test.rb

@@ -1,11 +0,0 @@
-require 'test_plugin_helper'
-
-class ForemanIpamTest < ActiveSupport::TestCase
-  setup do
-    User.current = User.find_by_login 'admin'
-  end
-
-  test 'the truth' do
-    assert true
-  end
-end