smart_proxy_ipam 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99081e6b65f047761521c0baaff029fc1ce40e8a1e1b399be9ee88deb106479d
-  data.tar.gz: 9446d90c2358ad5e6759a2e3a25c720c00e926177f55278dd9f624ce098df7ab
+  metadata.gz: e010cf0ea2091a880899f37aef589b272ced50d132c67794b916609194a13865
+  data.tar.gz: 4551dc45e2357c13cb080e76794fa8ed8546fa9bcf4da2236b003ab7a52d18ee
 SHA512:
-  metadata.gz: 90416855e0de74c52d21787390029503640ebbe0b60854d6bc74265f8a3643bd2bd78c952fcfaa6548672715b4c635162ae6e799c210ec2d4589365d5f19921a
-  data.tar.gz: 4ab2f315c3722487d673ce0398d49a1cf2a9dace859e9eba900dc830c2042cd09d93ff0a49feed9fb6c0833a3c45933062a2c509ceb20ccb03659f62f1b123de
+  metadata.gz: ff9fd209a2e8f4a6ff345a6e19cdb8ddd9abef20bc6d95f9e9f97f5e6187d67f6bc0197768bff4e131dbe51670d917c845912cd45379f58e11fd9025a11c47bf
+  data.tar.gz: 4d5800bfe4c2c7705d652c9f589b7f90feeaf3203f3b540c755acfd1525d134e05b9035ab727fffdd0b1dadaf56f41ca2b9eceaddaca053a136b2a93ef5afeee

data/lib/smart_proxy_ipam/ipam_api.rb

@@ -44,9 +44,10 @@ module Proxy::Ipam
       content_type :json
 
       begin
-        validate_required_params!([:address, :prefix, :mac], params)
+        validate_required_params!([:address, :prefix], params)
 
-        mac = validate_mac!(params[:mac])
+        mac_param = params[:mac]
+        mac = validate_mac!(params[:mac]) unless mac_param.nil? || mac_param.empty?
         cidr = validate_cidr!(params[:address], params[:prefix])
         group_name = get_request_group(params)
 

data/lib/smart_proxy_ipam/ipam_helper.rb

@@ -72,7 +72,7 @@ module Proxy::Ipam::IpamHelper
     subnet_hash = ip_cache.get_cidr(group, cidr)
     next_ip = nil
 
-    if subnet_hash&.key?(mac.to_sym)
+    if mac && subnet_hash&.key?(mac.to_sym)
       next_ip = ip_cache.get_ip(group, cidr, mac)
     else
       new_ip = ip

data/lib/smart_proxy_ipam/ipam_validator.rb

@@ -39,7 +39,6 @@ module Proxy::Ipam::IpamValidator
   end
 
   def validate_mac!(mac)
-    raise Proxy::Validations::Error.new, ERRORS[:mac] if mac.nil? || mac.empty?
     unless mac.match(/^([0-9a-fA-F]{2}[:]){5}[0-9a-fA-F]{2}$/i)
       raise Proxy::Validations::Error.new, ERRORS[:bad_mac]
     end

data/lib/smart_proxy_ipam/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Ipam
-    VERSION = '0.1.3'.freeze
+    VERSION = '0.1.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ipam
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Christopher Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies: []
 description: Smart proxy plugin for integration with various External IPAM providers
 email: chrisjsmith001@gmail.com