foreman_ipam 0.0.10 → 0.0.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ebddc00b89ef6ec0990b0a0849d150f0d439a6bc8dff4ee0c659a4bb4e4dc3b0
4
- data.tar.gz: 6415e702fe284e7d8918877a2d87a3b8b1069328a03c69d742577012a1b2e648
3
+ metadata.gz: 0c55538e48d175e816b53d10706a5279bd99c0d51d6a389a4e897844f4c841b2
4
+ data.tar.gz: f6131ec6a0c5ed2db1834c5670f8bab4e0cc7a1ec8dec9c29926b12360c6034a
5
5
  SHA512:
6
- metadata.gz: 37c9509fa1e036de8c75f6d68310a96e117fca361e4f98f08f32a6cc61e1b88de758d42fa081c480445366c88dc4fc5f12428370a4811c9027cd753bd3712a7f
7
- data.tar.gz: d56805a9b2253660ad67ccfc570add2a1837ee77cef057fa06b79203e9b3b2683dfa72987e7695eb4c6af44ab3c2a846a55b6e355ee357c314db48cd494d2302
6
+ metadata.gz: 5504492fd57853f8abe0530691a290b8ebb603de840dc97c8731b158c7cb99b2fdd3b25e9ae9a23b0498a60dbef4fae80d8a658af01c877d5e570e7ff780074f
7
+ data.tar.gz: 14567c9ea0add4e8e10a55fff634f258f8824f9884da20fc2bf03cbf474e852b35617c978370e418fbcaf36c104af11428d65f36b9b8f4f3882b6f3c75775d67
@@ -4,16 +4,16 @@ module ForemanIpam
4
4
  def ipam
5
5
  begin
6
6
  @response = Phpipam.proxy.get_sections
7
- rescue
8
- @response = nil
7
+ rescue => e
8
+ flash.now[:notice] = e.message
9
9
  end
10
10
  end
11
11
 
12
12
  def subnets
13
13
  begin
14
14
  @subnets = Phpipam.proxy.get_subnets_by_section(params[:section_name])
15
- rescue
16
- @subnets = nil
15
+ rescue => e
16
+ flash.now[:notice] = e.message
17
17
  end
18
18
  render :json => @subnets.to_json, :status => :ok
19
19
  end
@@ -1,9 +1,14 @@
1
1
  <h1>IPAM Integration Dashboard</h1>
2
2
 
3
- <% if @response.nil? %>
3
+ <% if !flash.empty? %>
4
4
  <div class="alert alert-warning ">
5
5
  <span class="pficon pficon-warning-triangle-o "></span>
6
- <span class="text"><%= _("Cannot connect to External IPAM.") %></span>
6
+ <span class="text"><%= _(flash.now[:notice]) %></span>
7
+ </div>
8
+ <% elsif @response['data'] && @response['data'].length == 0 %>
9
+ <div class="alert alert-warning ">
10
+ <span class="pficon pficon-warning-triangle-o "></span>
11
+ <span class="text"><%= _("No sections found in External IPAM.") %></span>
7
12
  </div>
8
13
  <% elsif @response['data'] && @response['data'].length > 0 %>
9
14
  <h2>phpIPAM</h2>
@@ -28,11 +33,6 @@
28
33
  <% end %>
29
34
  </tbody>
30
35
  </table>
31
- <% else %>
32
- <div class="alert alert-warning ">
33
- <span class="pficon pficon-warning-triangle-o "></span>
34
- <span class="text"><%= _("No sections found in External IPAM.") %></span>
35
- </div>
36
36
  <% end %>
37
37
 
38
38
  <div id="subnet_container"></div>
@@ -1,3 +1,3 @@
1
1
  module ForemanIpam
2
- VERSION = '0.0.10'.freeze
2
+ VERSION = '0.0.11'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_ipam
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.10
4
+ version: 0.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christopher Smith
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-12-18 00:00:00.000000000 Z
11
+ date: 2020-01-03 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Plugin for IPAM integration with various IPAM providers
14
14
  email:
@@ -28,7 +28,6 @@ files:
28
28
  - config/initializers/phpipam.rb
29
29
  - config/routes.rb
30
30
  - config/settings.yaml.example
31
- - db/seeds.d/01-add-external-ipam-feature.rb
32
31
  - lib/foreman_ipam.rb
33
32
  - lib/foreman_ipam/engine.rb
34
33
  - lib/foreman_ipam/phpipam.rb
@@ -1,2 +0,0 @@
1
-
2
- Feature.where(:name => 'externalipam').first_or_create