Don't add bosh director ip if ip version do not match

If the bosh directors ip version does not match the ip version of the subnet range (ipv4 <-> ipv6), bosh will trigger a redeploy everytime it deploys the relevant deployment. I also added an intgration test for this use case.

Author: fmoehler

src/bosh-director/lib/bosh/director/deployment_plan/manual_network_subnet.rb

@@ -62,6 +62,9 @@ def self.parse(network_name, subnet_spec, availability_zones, managed = false)
 
           Config.director_ips&.each do |cidr|
             each_ip(cidr) do |ip|
+              if ip.ipv4? != range.ipv4?
+                next
+              end
               restricted_ips.add(ip)
             end
           end
@@ -157,8 +160,6 @@ def overlaps?(subnet)
       def is_reservable?(ip)
         restricted_ips.each do | restricted_ip |
           return false if restricted_ip.include?(ip)
-          rescue IPAddr::InvalidAddressError  # when ip versions are not the same
-          return false
         end
 
         range.include?(ip.to_range.first) && range.include?(ip.to_range.last)

src/spec/integration/global_networking/ip_reservations/allocating_dynamic_ips_using_two_networks_spec.rb

@@ -95,6 +95,31 @@ def make_network_spec(first_subnet, second_subnet)
           expect(instances.size).to eq(1)
           expect(instances.map(&:ips).flatten).to match_array(['192.168.1.2', '10.10.0.3'])
         end
+
+        it 'does not redeploy VM if no changes are done event if the networks have different address types', no_create_swap_delete: true do
+          first_subnet = SharedSupport::DeploymentManifestHelper.make_subnet(available_ips: 2, range: '192.168.1.0/24') # 1 for compilation
+          second_subnet = SharedSupport::DeploymentManifestHelper.make_subnet(available_ips: 1, range: '2001:db8::/120')
+
+          cloud_config_hash = SharedSupport::DeploymentManifestHelper.simple_cloud_config
+          cloud_config_hash['networks'] = make_network_spec(first_subnet, second_subnet)
+          cloud_config_hash['compilation']['network'] = 'first'
+          upload_cloud_config(cloud_config_hash: cloud_config_hash)
+
+          manifest_hash = SharedSupport::DeploymentManifestHelper.simple_manifest_with_instance_groups
+          manifest_hash['instance_groups'] = [instance_group_with_two_networks]
+          deploy_simple_manifest(manifest_hash: manifest_hash)
+
+          instances = director.instances
+          expect(instances.size).to eq(1)
+          expect(instances.map(&:ips).flatten).to match_array(['192.168.1.2', '2001:db8::2'])
+
+          output = deploy_simple_manifest(manifest_hash: manifest_hash)
+
+          expect(output).to_not match(/executing pre-stop/)
+          instances = director.instances
+          expect(instances.size).to eq(1)
+          expect(instances.map(&:ips).flatten).to match_array(['192.168.1.2', '2001:db8::2'])
+        end
       end
     end
   end