smart_proxy_ipam 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f64f77c875cf2954bfe2d9fb2e1c56e1848e402ec8259959382771da8cd7158b
-  data.tar.gz: a4e3900fd2ad8a2ec16e9ab3887dd6412ce567b16f7cdb98278407c80add8e9c
+  metadata.gz: be6ae52f679c0d7be23248d26f179a730d0157569a07a050c72c45db0aeec2eb
+  data.tar.gz: 5a1dbe01a004a626b8e0ece2cfee6b362a96184df6ca37e2245e11986c8f6140
 SHA512:
-  metadata.gz: 3608be9d60dda80356bdf9e9c59f79cf0edcd1c69210cb7c10aa818237ec85e1485e8fd12d2ee1c1d527ca3ab926d1090ef20c2a6bc4faf8f2c4b262f86df44c
-  data.tar.gz: a99d59aab8ce7b3f1a1b6d4b90e861fef90435c9071e0b42d3f7863834a660050d8e96af471473b4e6f0a0b8db8b1f1d212502e01ac80073e79a1542d731fff6
+  metadata.gz: d85452528e492750756f1d3c0347301c2d80749f85229713d9ea2f56eb70c5edf72935d40877f2f486767d354a1fea70dfe0a618e32bf0674aed755de8235450
+  data.tar.gz: e6155d1c91673dbaba336d90280862f4ae220ec2d46079300557ce6ee6826b572ec2e8fca6bf13914e9d28a51b2ab1734648ef9f599ea724f8f006ccd715a484

data/lib/smart_proxy_ipam/phpipam/phpipam_api.rb

@@ -12,7 +12,7 @@ module Proxy::Phpipam
 
     get '/providers' do
       content_type :json
-      {ipam_providers: ['phpIPAM']}.to_json
+      {:ipam_providers => ['phpIPAM']}.to_json
     end
 
     # Gets the next available IP address based on a given subnet
@@ -22,7 +22,7 @@ module Proxy::Phpipam
     # Examples: 
     #   Response if success: 
     #     {"cidr":"100.20.20.0/24","next_ip":"100.20.20.11"}
-    #   Response if error:   
+    #   Response if :error =>   
     #     {"error":"The specified subnet does not exist in phpIPAM."}
     get '/next_ip' do
       content_type :json
@@ -31,26 +31,26 @@ module Proxy::Phpipam
         cidr = params[:cidr]
 
         if not cidr
-          return {error: "A 'cidr' parameter for the subnet must be provided(e.g. 100.10.10.0/24)"}.to_json
+          return {:error => "A 'cidr' parameter for the subnet must be provided(e.g. 100.10.10.0/24)"}.to_json
         end
 
         phpipam_client = PhpipamClient.new
         response = phpipam_client.get_subnet(cidr)
 
         if response['message'] && response['message'].downcase == "no subnets found"
-          return {error: "The specified subnet does not exist in External IPAM."}.to_json
+          return {:error => "The specified subnet does not exist in External IPAM."}.to_json
         end
   
         subnet_id = JSON.parse(response)[0]['id']
         response = phpipam_client.get_next_ip(subnet_id)
 
         if response['message'] && response['message'].downcase == "no free addresses found"
-          return {error: "There are no more free addresses in subnet #{cidr}"}.to_json
+          return {:error => "There are no more free addresses in subnet #{cidr}"}.to_json
         end
 
         {cidr: cidr, next_ip: response['data']}.to_json
       rescue Errno::ECONNREFUSED
-        return {error: "Unable to connect to External IPAM server"}.to_json
+        return {:error => "Unable to connect to External IPAM server"}.to_json
       end
     end
 
@@ -80,14 +80,14 @@ module Proxy::Phpipam
         cidr = params[:cidr]
 
         if not cidr
-          return {error: "A 'cidr' parameter for the subnet must be provided(e.g. 100.10.10.0/24)"}.to_json
+          return {:error => "A 'cidr' parameter for the subnet must be provided(e.g. 100.10.10.0/24)"}.to_json
         end
 
         phpipam_client = PhpipamClient.new
         subnet = phpipam_client.get_subnet(cidr)
         subnet.to_json
       rescue Errno::ECONNREFUSED
-        return {error: "Unable to connect to External IPAM server"}.to_json
+        return {:error => "Unable to connect to External IPAM server"}.to_json
       end
     end
 
@@ -101,7 +101,7 @@ module Proxy::Phpipam
     #      "permissions":"[]","strictMode":"1","subnetOrdering":"default","order":null,
     #      "editDate":"2019-04-19 21:49:55","showVLAN":"1","showVRF":"1","showSupernetOnly":"1","DNS":null}]
     #   ]
-    #   Response if error:   
+    #   Response if :error =>   
     #     {"error":"Unable to connect to phpIPAM server"}
     get '/sections' do
       content_type :json
@@ -111,7 +111,7 @@ module Proxy::Phpipam
         sections = phpipam_client.get_sections
         sections.to_json
       rescue Errno::ECONNREFUSED
-        return {error: "Unable to connect to External IPAM server"}.to_json
+        return {:error => "Unable to connect to External IPAM server"}.to_json
       end
     end
 
@@ -168,7 +168,7 @@ module Proxy::Phpipam
     #       ],
     #       "time":0.012
     #     }
-    #   Response if error:   
+    #   Response if :error =>   
     #     {"error":"Unable to connect to phpIPAM server"}
     get '/sections/:section_id/subnets' do
       content_type :json 
@@ -177,14 +177,14 @@ module Proxy::Phpipam
         section_id = params[:section_id]
         
         if not section_id
-          return {error: "A 'section_id' must be provided"}.to_json
+          return {:error => "A 'section_id' must be provided"}.to_json
         end
 
         phpipam_client = PhpipamClient.new
         subnets = phpipam_client.get_subnets(section_id)
         subnets.to_json
       rescue Errno::ECONNREFUSED
-        return {error: "Unable to connect to External IPAM server"}.to_json
+        return {:error => "Unable to connect to External IPAM server"}.to_json
       end
     end
 
@@ -205,20 +205,20 @@ module Proxy::Phpipam
         cidr = params[:cidr]
         ip = params[:ip]
 
-        return {error: "Missing 'cidr' parameter. A CIDR IPv4 address must be provided(e.g. 100.10.10.0/24)"}.to_json if not cidr
-        return {error: "Missing 'ip' parameter. An IPv4 address must be provided(e.g. 100.10.10.22)"}.to_json if not ip
+        return {:error => "Missing 'cidr' parameter. A CIDR IPv4 address must be provided(e.g. 100.10.10.0/24)"}.to_json if not cidr
+        return {:error => "Missing 'ip' parameter. An IPv4 address must be provided(e.g. 100.10.10.22)"}.to_json if not ip
 
         phpipam_client = PhpipamClient.new
         subnet = phpipam_client.get_subnet(cidr)
 
         if subnet['message'] && subnet['message'].downcase == "no subnets found"
-          return {error: "The specified subnet does not exist in External IPAM."}.to_json
+          return {:error => "The specified subnet does not exist in External IPAM."}.to_json
         end
 
         subnet_id = JSON.parse(subnet)[0]['id']
         phpipam_client.ip_exists(ip, subnet_id)
       rescue Errno::ECONNREFUSED
-        return {error: "Unable to connect to External IPAM server"}.to_json
+        return {:error => "Unable to connect to External IPAM server"}.to_json
       end
     end
 
@@ -231,7 +231,7 @@ module Proxy::Phpipam
     # Examples:
     #   Response if success: 
     #     {"message":"IP 100.10.10.123 added to subnet 100.10.10.0/24 successfully."}
-    #   Response if error:   
+    #   Response if :error =>   
     #     {"error":"The specified subnet does not exist in phpIPAM."}
     post '/add_ip_to_subnet' do
       content_type :json
@@ -240,23 +240,23 @@ module Proxy::Phpipam
         cidr = params[:cidr]
         ip = params[:ip]
 
-        return {error: "Missing 'cidr' parameter. A CIDR IPv4 address must be provided(e.g. 100.10.10.0/24)"}.to_json if not cidr
-        return {error: "Missing 'ip' parameter. An IPv4 address must be provided(e.g. 100.10.10.22)"}.to_json if not ip
+        return {:error => "Missing 'cidr' parameter. A CIDR IPv4 address must be provided(e.g. 100.10.10.0/24)"}.to_json if not cidr
+        return {:error => "Missing 'ip' parameter. An IPv4 address must be provided(e.g. 100.10.10.22)"}.to_json if not ip
 
         phpipam_client = PhpipamClient.new
         response = phpipam_client.get_subnet(cidr)
 
         if response['message'] && response['message'].downcase == "no subnets found"
-          return {error: "The specified subnet does not exist in External IPAM."}.to_json
+          return {:error => "The specified subnet does not exist in External IPAM."}.to_json
         end
 
         subnet_id = JSON.parse(response)[0]['id']
 
         phpipam_client.add_ip_to_subnet(ip, subnet_id, 'Address auto added by Foreman')
 
-        {message: "IP #{ip} added to subnet #{cidr} successfully."}.to_json
+        {:message => "IP #{ip} added to subnet #{cidr} successfully."}.to_json
       rescue Errno::ECONNREFUSED
-        return {error: "Unable to connect to External IPAM server"}.to_json
+        return {:error => "Unable to connect to External IPAM server"}.to_json
       end
     end
 
@@ -268,7 +268,7 @@ module Proxy::Phpipam
     # Example:
     #   Response if success: 
     #     {"code": 200, "success": true, "message": "Address deleted", "time": 0.017}
-    #   Response if error:   
+    #   Response if :error =>   
     #     {"code": 404, "success": 0, "message": "Address does not exist", "time": 0.008}
     post '/delete_ip_from_subnet' do
       content_type :json
@@ -277,23 +277,23 @@ module Proxy::Phpipam
         cidr = params[:cidr]
         ip = params[:ip]
 
-        return {error: "Missing 'cidr' parameter. A CIDR IPv4 address must be provided(e.g. 100.10.10.0/24)"}.to_json if not cidr
-        return {error: "Missing 'ip' parameter. An IPv4 address must be provided(e.g. 100.10.10.22)"}.to_json if not ip
+        return {:error => "Missing 'cidr' parameter. A CIDR IPv4 address must be provided(e.g. 100.10.10.0/24)"}.to_json if not cidr
+        return {:error => "Missing 'ip' parameter. An IPv4 address must be provided(e.g. 100.10.10.22)"}.to_json if not ip
 
         phpipam_client = PhpipamClient.new
         response = phpipam_client.get_subnet(cidr)
 
         if response['message'] && response['message'].downcase == "no subnets found"
-          return {error: "The specified subnet does not exist in External IPAM."}.to_json
+          return {:error => "The specified subnet does not exist in External IPAM."}.to_json
         end
 
         subnet_id = JSON.parse(response)[0]['id']
 
         phpipam_client.delete_ip_from_subnet(ip, subnet_id)
 
-        {message: "IP #{ip} deleted from subnet #{cidr} successfully."}.to_json
+        {:message => "IP #{ip} deleted from subnet #{cidr} successfully."}.to_json
       rescue Errno::ECONNREFUSED
-        return {error: "Unable to connect to External IPAM server"}.to_json
+        return {:error => "Unable to connect to External IPAM server"}.to_json
       end
     end
 

data/lib/smart_proxy_ipam/phpipam/phpipam_client.rb

@@ -9,7 +9,11 @@ module Proxy::Phpipam
   class PhpipamClient
     def initialize 
       conf = Proxy::Ipam.get_config[:phpipam]
-      @phpipam_config = {url: conf[:url], user: conf[:user], password: conf[:password]}
+      @phpipam_config = {
+        :url => conf[:url], 
+        :user => conf[:user], 
+        :password => conf[:password]
+      }
       @api_base = "#{conf[:url]}/api/#{conf[:user]}/"
       @token = nil
     end
@@ -25,7 +29,7 @@ module Proxy::Phpipam
 
       if subnets
         if subnets['message'] && subnets['message'].downcase == 'no subnets found'
-          return {"message": "no subnets found"}.to_json
+          return {:message => "no subnets found"}.to_json
         else 
           # Only return the relevant fields to Foreman
           subnets['data'].each do |subnet|
@@ -43,7 +47,7 @@ module Proxy::Phpipam
     end
 
     def add_ip_to_subnet(ip, subnet_id, desc)
-      data = {'subnetId': subnet_id, 'ip': ip, 'description': desc}
+      data = {:subnetId => subnet_id, :ip => ip, :description => desc}
       post('addresses/', data) 
     end
 
@@ -91,14 +95,14 @@ module Proxy::Phpipam
       # the ip existence on an empty subnet returns a malformed response from phpIPAM, containing
       # HTML in the JSON response.
       if usage['data']['used'] == "0"
-        return {ip: ip, exists: false}.to_json
+        return {:ip => ip, :exists => false}.to_json
       else 
         response = get("subnets/#{subnet_id.to_s}/addresses/#{ip}/")
     
         if response && response['message'] && response['message'].downcase == 'no addresses found'
-          return {ip: ip, exists: false}.to_json
+          return {:ip => ip, :exists => false}.to_json
         else 
-          return {ip: ip, exists: true}.to_json
+          return {:ip => ip, :exists => true}.to_json
         end
       end
     end

data/lib/smart_proxy_ipam/version.rb

@@ -1,6 +1,6 @@
 
 module Proxy
   module Ipam
-    VERSION = '0.0.5'
+    VERSION = '0.0.7'
   end
 end

metadata

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