Merge branch 'main' of github.com:cloudfoundry/bosh into HEAD

Author: git

config/blobs.yml

@@ -34,7 +34,7 @@ s3cli/s3cli-0.0.396-linux-amd64:
   size: 16185266
   object_id: 1c03e773-9aee-4f74-56cd-2e3168dd9bb0
   sha: sha256:2cf363d5bc7413acc9618e89d41f1cfdd35ef39f0182eb3ff7e5605f91a5af31
-verify-multidigest/verify-multidigest-0.0.597-linux-amd64:
-  size: 4304299
-  object_id: d3f88bbc-2b2d-4817-49bb-e208d2abd197
-  sha: sha256:d6fbff648a44c6ab740980e3229c606b8001cb2a419acb335c4adba716eb759f
+verify-multidigest/verify-multidigest-0.0.599-linux-amd64:
+  size: 4303703
+  object_id: 950e4577-1061-4dcf-4047-4561b9a511b7
+  sha: sha256:5ae178386262f8cf69a2b7fb312f455ce1fcc5022836c9649883aa0885ea3381

src/bosh-director/spec/unit/bosh/director/deployment_plan/ip_provider/ip_repo_spec.rb

@@ -290,12 +290,12 @@ def save_ip(ip)
           end
 
           it 'clears similar ips with smaller prefix' do
-            network_spec['subnets'].first['reserved'] = ['192.168.1.0 - 192.168.1.12']
+            network_spec['subnets'].first['reserved'] = ['192.168.1.2 - 192.168.1.31']
             network_spec['subnets'].first['range'] = '192.168.1.0/24'
-            save_ip(cidr_ip('192.168.1.8'))
+            save_ip(cidr_ip('192.168.1.20'))
 
             ip_address = ip_repo.allocate_dynamic_ip(reservation, subnet)
-            expected_ip_address = cidr_ip('192.168.1.13')
+            expected_ip_address = cidr_ip('192.168.1.32')
             expect(ip_address).to eq(expected_ip_address)
           end
         end

src/bosh-director/spec/unit/bosh/director/deployment_plan/manual_network_subnet_spec.rb

@@ -32,28 +32,36 @@ def make_managed_subnet(properties, availability_zones)
     end
 
     it 'should create a subnet spec with restricted_ips in cidr format' do
-      allow(Bosh::Director::Config).to receive(:director_ips).and_return([to_ipaddr('10.0.3.11').to_s])
+      allow(Bosh::Director::Config).to receive(:director_ips).and_return([to_ipaddr('10.0.3.150').to_s])
 
       subnet = make_subnet(
         {
           'dns' => ['10.0.0.2'],
           'gateway' => '10.0.3.1',
           'range' => '10.0.3.0/24',
           'reserved' => [
-           '10.0.3.0 - 10.0.3.35',
-           '10.0.3.242 - 10.0.3.255']
+           '10.0.3.64 - 10.0.3.99',
+           '10.0.3.200 - 10.0.3.215']
         },
         [],
       )
 
-      expected_restricted_ips = Set.new([to_ipaddr('10.0.3.0/27'), to_ipaddr('10.0.3.32/30'), to_ipaddr('10.0.3.242/31'), to_ipaddr('10.0.3.244/30'), to_ipaddr('10.0.3.248/29') ])
+      expected_restricted_ips = Set.new([
+        to_ipaddr('10.0.3.0/32'),
+        to_ipaddr('10.0.3.1/32'),
+        to_ipaddr('10.0.3.255/32'),
+        to_ipaddr('10.0.3.150/32'),
+        to_ipaddr('10.0.3.64/27'),
+        to_ipaddr('10.0.3.96/30'),
+        to_ipaddr('10.0.3.200/29'),
+        to_ipaddr('10.0.3.208/29'),
+      ])
 
       expect(subnet.range.to_s).to eq('10.0.3.0/24')
       expect(subnet.netmask).to eq('255.255.255.0')
       expect(subnet.gateway).to eq('10.0.3.1')
       expect(subnet.dns).to eq(['10.0.0.2'])
       expect(subnet.restricted_ips).to eq(expected_restricted_ips)
-
     end
 
     it 'should create valid subnet spec for managed networks' do