knife-vsphere 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96100d6e34a6a6442130066649b127edf06a0208bc41ce209dd5cdfb2cef2d99
-  data.tar.gz: f267bd172ade8faf65d9037f299b066af7157654114071fdc9f86b0b11982313
+  metadata.gz: 963e470ce7ce79b253d86c3a8a7dfdb99cbcd2a314167a68bd79f7faafdc00e8
+  data.tar.gz: c8e2b183b2eefcc7a62a9a62b549b5387e97c1c0906ee5db2aa5ab509829ee60
 SHA512:
-  metadata.gz: 2a3c3c90764c5a50a80e3e60aeb1a70aabf7a25b2b9b5112dfd6769414edd0bc878988425ca7cb55f5a0ccb28f8993402f1412b58fea11294fe79fa73d321951
-  data.tar.gz: 6bfbd4ca487ba2e64c690e3ab52ac0ab548b2824070bfec4100398e2bcfbc0b50c6b341b630c641903cd55e549074e5a88247dddf3ae544d9ada0691929f4d65
+  metadata.gz: 6a4df51fde73911aa6b30b805d6e6b6a2629e0aa34b5e38073ea924e3a483db2b99d8803132b5c5aca986d3c50386744de581292d18daefa6df8d8053cef04e7
+  data.tar.gz: f4529ff83bf1c39a888d5606c922a8e3b5dc8225bc8a1828b779f8a3e222f8703ec9f5a895a8bdad58c896b78512f9abca941bfbe5bb05b2f78af1281cb7a722

data/lib/chef/knife/vsphere_hosts_list.rb

@@ -8,7 +8,6 @@ class Chef::Knife::VsphereHostsList < Chef::Knife::BaseVsphereCommand
 
   deps do
     Chef::Knife::BaseVsphereCommand.load_deps
-    require "netaddr" unless defined?(NetAddr)
   end
 
   common_options

data/lib/chef/knife/vsphere_pool_query.rb

@@ -7,7 +7,6 @@ class Chef::Knife::VspherePoolQuery < Chef::Knife::BaseVsphereCommand
 
   deps do
     Chef::Knife::BaseVsphereCommand.load_deps
-    require "netaddr" unless defined?(NetAddr)
   end
 
   common_options

data/lib/chef/knife/vsphere_pool_show.rb

@@ -6,7 +6,6 @@ class Chef::Knife::VspherePoolShow < Chef::Knife::BaseVsphereCommand
 
   deps do
     Chef::Knife::BaseVsphereCommand.load_deps
-    require "netaddr" unless defined?(NetAddr)
   end
 
   common_options

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -16,7 +16,6 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   deps do
     Chef::Knife::BaseVsphereCommand.load_deps
     require "ipaddr" unless defined?(IPAddr)
-    require "netaddr" unless defined?(NetAddr)
     require "securerandom" unless defined?(SecureRandom)
     require "chef/json_compat"
 
@@ -742,18 +741,20 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     if ip.nil? || ip.casecmp("dhcp") == 0
       settings.ip = RbVmomi::VIM::CustomizationDhcpIpGenerator.new
     else
-      cidr_ip = NetAddr::CIDR.create(ip)
-      settings.ip = RbVmomi::VIM::CustomizationFixedIp(ipAddress: cidr_ip.ip)
-      settings.subnetMask = cidr_ip.netmask_ext
+      ip_addr = IPAddr.new(ip)
+      ip_string, _length = ip.split("/")
+      settings.ip = RbVmomi::VIM::CustomizationFixedIp(ipAddress: ip_string)
+      settings.subnetMask = ip_addr.netmask
 
       # TODO: want to confirm gw/ip are in same subnet?
       # Only set gateway on first IP.
       if config[:customization_ips].split(",").first == ip
         if gw.nil?
-          settings.gateway = [cidr_ip.network(Objectify: true).next_ip]
+          next_ip = IPAddr.new(ip_addr.to_i + 1, Socket::AF_INET).to_s
+          settings.gateway = [next_ip]
         else
-          gw_cidr = NetAddr::CIDR.create(gw)
-          settings.gateway = [gw_cidr.ip]
+          gw_string, _length = gw.split("/")
+          settings.gateway = [gw_string]
         end
       end
     end

data/lib/chef/knife/vsphere_vm_network_add.rb

@@ -24,10 +24,6 @@ class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
     description: "Adapter MAC address eg. AA:BB:CC:DD:EE:FF",
     required: false
 
-  deps do
-    require "netaddr" unless defined?(NetAddr)
-  end
-
   common_options
 
   def run

data/lib/knife-vsphere/version.rb

@@ -1,5 +1,5 @@
 # The main knife-vsphere module.
 module KnifeVsphere
   # The version of this gem.
-  VERSION = "5.1.0".freeze
+  VERSION = "5.2.0".freeze
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: netaddr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rbvmomi2
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="