smart_proxy_ipam 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3812263cf984e604cf0b7272bf9519cf503ea883b46a353a6f1edbcaefe7eab
-  data.tar.gz: 11a128c3d83dc3f6c2b4c9157846076a351c4dc0ab82c4c7b332ddcb1a23349f
+  metadata.gz: 42b9945498eacd5e884248edc7770ac14fbda2b7315fd8f6997aa2fda7738323
+  data.tar.gz: 737a679b29622a526211670cbff2cf5e2a6e0b386f3ace537ce4ebc0a12b7e5b
 SHA512:
-  metadata.gz: 517e692d368b9febe9d8c34eba7b9e9e7e919714cf7d560d6df4483f28e0e8bb3f8ef485030cd68f08458a7c87dacb358e8a4aac1bd4882b95df0c696415587e
-  data.tar.gz: 5bb0c0a9bf0ce71d58d2fc234429568882d210436b21589acbc74d96a4bddcca6b6ccb4f4ae371f805368db9fa71bda6bc21c946a2ed00b52090ce7f2e5a7179
+  metadata.gz: '09f728a68de1da60906199cba9dada6d120ea31657f2369ba616b92c9a10dec3d3feba4e15051266af03e13e8d4be2d231841f17094b674d50fa5e2f630e0dfb'
+  data.tar.gz: bb3c04b61e6776dabda6c2e752b7376013045b247560887481bde4701bb4d2fbbaee8bc973e49b393b695ee16f72d17c8e297219b545609e8b07ea970c847bb4

data/README.md

@@ -15,10 +15,10 @@ for how to install Foreman plugins
 
 ## Usage
 
-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:
+Once plugin is installed, you can 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._
-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._
+1. Create a subnet in Foreman of IPAM type "External IPAM". Click on the `Proxy` tab and associate the subnet with the External 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 created 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
 
@@ -62,8 +62,8 @@ bundle exec smart-proxy start
 ```
 9. Navigate to Foreman UI at http://localhost:5000
 10. Add a Local Smart Proxy in the Foreman UI(Infrastructure => Smart Proxies)
-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
+11. Ensure that the `external_ipam` feature is present on the proxy(http://proxy_url/features)
+12. Create a Subnet, and associate the subnet to the `external_ipam` proxy
  
 ## Contributing
 

data/lib/smart_proxy_ipam/phpipam/phpipam_client.rb

@@ -13,14 +13,15 @@ module Proxy::Phpipam
     MAX_RETRIES = 5
     DEFAULT_CLEANUP_INTERVAL = 120  # 2 mins
     @@ip_cache = nil
+    @@timer_task = nil
 
     def initialize 
       @conf = Proxy::Ipam.get_config[:phpipam]
       @api_base = "#{@conf[:url]}/api/#{@conf[:user]}/"
       @token = nil
-      @m = Monitor.new
+      @@m = Monitor.new
       init_cache if @@ip_cache.nil?
-      start_cleanup_task
+      start_cleanup_task if @@timer_task.nil?
     end
 
     def get_subnet(cidr)
@@ -157,8 +158,8 @@ module Proxy::Phpipam
 
     def start_cleanup_task
       logger.info("Starting allocated ip address maintenance (used by get_next_ip call).")
-      @timer_task = Concurrent::TimerTask.new(:execution_interval => DEFAULT_CLEANUP_INTERVAL) { init_cache }
-      @timer_task.execute
+      @@timer_task = Concurrent::TimerTask.new(:execution_interval => DEFAULT_CLEANUP_INTERVAL) { init_cache }
+      @@timer_task.execute
     end
 
     private
@@ -176,14 +177,14 @@ module Proxy::Phpipam
     # }
     def init_cache
       logger.debug("Clearing ip cache.")
-      @m.synchronize do
+      @@m.synchronize do
         @@ip_cache = {}
       end
     end
 
     def add_ip_to_cache(ip, mac, cidr)
       logger.debug("Adding IP #{ip} to cache for subnet #{cidr}")
-      @m.synchronize do
+      @@m.synchronize do
         if @@ip_cache.key?(cidr.to_sym)
           @@ip_cache[cidr.to_sym][mac.to_sym] = ip.to_s
         else
@@ -193,7 +194,7 @@ module Proxy::Phpipam
     end
 
     # Called when next available IP from external IPAM has been cached by another user/host, but 
-    # not actually persisted in external IPAM. Try to increment the IP(MAX_RETRIES times), and 
+    # not actually persisted in external IPAM. Will increment the IP(MAX_RETRIES times), and 
     # see if it is available in external IPAM.
     def find_new_ip(subnet_id, ip, mac, cidr)
       found_ip = nil

data/lib/smart_proxy_ipam/version.rb

@@ -1,6 +1,6 @@
 
 module Proxy
   module Ipam
-    VERSION = '0.0.10'
+    VERSION = '0.0.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ipam
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Christopher Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies: []
 description: Smart proxy plugin for IPAM integration with various IPAM providers
 email: chrisjsmith001@gmail.com