foreman_ipam 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6797d82ac9313e2bd3b3d9e0046be15bee50e7e0cf51862914e4b075a97b69e5
-  data.tar.gz: cf896c8815cfe2ce8d45905df096a40098856bde35fc931b6f4ae8f62fe8deab
+  metadata.gz: 2f31c5336e7af5c2bbd55e985c0ed650882bebbe7fde5a3f8db6b8a3a09bc0e8
+  data.tar.gz: 113734549fb60d8757154856f0ba060ea5444de7548efc0613764f62ad75e443
 SHA512:
-  metadata.gz: a6392cdc2dc829d6a3d95b2c07fe249eb4577d3101dcbb5e733b20eed7d7fbc67cc4c51c257b24dda96ff25c96d70fe6bd3c1b97561b37d395953ebc2db858e7
-  data.tar.gz: 8156d9c6003b273e6da8b2e6f76104d631f0856528bf854d62e725a8af7510fda78ad49a346cc50289f6da4f98b7e17125a49510acc0386668ea04ef96723e21
+  metadata.gz: f9116369232448ab4a74bfebff5b84024bf738953a18a9673c463abee542bbef33623cb8586575b0ec2eb0e4db553b58ee2e64a32cf6e54e0e7109bef510a953
+  data.tar.gz: 034a3883b57626c0925878e874e07605a83b7dc2220ad3fc577e81f1eda910c4a530174ca24773f20365c2f0b248c2e8d4300637c39901ce41cb1762381901bc

data/app/controllers/foreman_ipam/dashboard_controller.rb

@@ -2,11 +2,19 @@
 module ForemanIpam
   class DashboardController < ::DashboardController
     def ipam
-      @response = Phpipam.proxy.get_sections
+      begin
+        @response = Phpipam.proxy.get_sections
+      rescue
+        @response = nil
+      end 
     end
 
     def subnets
-      @subnets = Phpipam.proxy.get_subnets_by_section(params[:section_name])
+      begin
+        @subnets = Phpipam.proxy.get_subnets_by_section(params[:section_name])
+      rescue
+        @subnets = nil
+      end
       render :json => @subnets.to_json, :status => :ok
     end
   end

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

@@ -1,6 +1,11 @@
 <h1>IPAM Integration Dashboard</h1>
 
-<% if @response['data'] && @response['data'].length > 0 %>
+<% if @response.nil? %>
+  <div class="alert alert-warning ">
+    <span class="pficon pficon-warning-triangle-o "></span>
+    <span class="text"><%= _("Cannot connect to External IPAM.") %></span>
+  </div>
+<% elsif @response['data'] && @response['data'].length > 0 %>
   <h2>phpIPAM</h2>
   <h3>Sections:</h3>
   <table class="<%= table_css_classes 'table-fixed' %>">
@@ -41,20 +46,31 @@
       type: "GET", url: "/ipam/phpipam/subnets",
       data: {"section_name": encodeURI(section_name)},
       success: function(data) {
-        if (data.message === 'No subnets found') 
-          subnet_container.innerHTML += data.message;
-        else 
-          displaySubnets(data);
+        if (!data) {
+          subnet_container.innerHTML += 'Cannot connect to External IPAM';
+        }
+        else {
+          if (data.message === 'No subnets found') 
+            subnet_container.innerHTML += data.message;
+          else 
+            displaySubnets(data);
+        }
       }
     });
   }
 
   function displaySubnets(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 />
-    `;
+
+    if (subnets['data'].length == 0) {
+      subnet_container.innerHTML += "<div class='col-md-2'><strong>No Subnets</strong></div>"
+    }
+    else {
+      subnet_container.innerHTML += `
+        <div class='col-md-2'><strong>Subnet</strong></div>
+        <div class='col-md-6'><strong>Description</strong></strong></div><br />
+      `;
+    }
 
     subnets['data'].forEach(function(item) {
       subnet_container.innerHTML += `

data/lib/foreman_ipam/version.rb

@@ -1,3 +1,3 @@
 module ForemanIpam
-  VERSION = '0.0.8'.freeze
+  VERSION = '0.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ipam
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Christopher Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for IPAM integration with various IPAM providers
 email: