bosh-director 1.3160.0 → 1.3163.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3160.0
+  version: 1.3163.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -639,9 +639,22 @@ files:
 - db/migrations/director/20150224193313_use_larger_text_types.rb
 - db/migrations/director/20150331002413_add_cloud_configs.rb
 - db/migrations/director/20150401184803_add_cloud_config_to_deployments.rb
+- db/migrations/director/20150513225143_ip_addresses.rb
 - db/migrations/director/20150611193110_add_trusted_certs_sha1_to_vms.rb
 - db/migrations/director/20150619135210_add_os_name_and_version_to_stemcells.rb
+- db/migrations/director/20150702004608_add_links.rb
+- db/migrations/director/20150708231924_add_link_spec.rb
 - db/migrations/director/20150716170926_allow_null_on_blobstore_id_and_sha1_on_package.rb
+- db/migrations/director/20150724183256_add_debugging_to_ip_addresses.rb
+- db/migrations/director/20150730225029_add_uuid_to_instances.rb
+- db/migrations/director/20150803215805_add_availabililty_zone_and_cloud_properties_to_instances.rb
+- db/migrations/director/20150804211419_add_compilation_flag_to_instance.rb
+- db/migrations/director/20150918003455_add_bootstrap_node_to_instance.rb
+- db/migrations/director/20151008232214_add_dns_records.rb
+- db/migrations/director/20151015172551_add_orphan_disks_and_snapshots.rb
+- db/migrations/director/20151030222853_add_templates_to_instance.rb
+- db/migrations/director/20151031001039_add_spec_to_instance.rb
+- db/migrations/director/20151109190602_rename_orphan_columns.rb
 - db/migrations/dns/20120123234908_initial.rb
 - lib/bosh/director.rb
 - lib/bosh/director/agent_client.rb
@@ -652,8 +665,10 @@ files:
 - lib/bosh/director/api/cloud_config_manager.rb
 - lib/bosh/director/api/controllers/backups_controller.rb
 - lib/bosh/director/api/controllers/base_controller.rb
+- lib/bosh/director/api/controllers/cleanup_controller.rb
 - lib/bosh/director/api/controllers/cloud_configs_controller.rb
 - lib/bosh/director/api/controllers/deployments_controller.rb
+- lib/bosh/director/api/controllers/disks_controller.rb
 - lib/bosh/director/api/controllers/info_controller.rb
 - lib/bosh/director/api/controllers/locks_controller.rb
 - lib/bosh/director/api/controllers/packages_controller.rb
@@ -708,32 +723,75 @@ files:
 - lib/bosh/director/db_backup/adapter/postgres.rb
 - lib/bosh/director/db_backup/adapter/sqlite.rb
 - lib/bosh/director/db_backup/error.rb
+- lib/bosh/director/deployment_deleter.rb
 - lib/bosh/director/deployment_plan.rb
+- lib/bosh/director/deployment_plan/agent_state_migrator.rb
 - lib/bosh/director/deployment_plan/assembler.rb
+- lib/bosh/director/deployment_plan/availability_zone.rb
 - lib/bosh/director/deployment_plan/cloud_manifest_parser.rb
 - lib/bosh/director/deployment_plan/compilation_config.rb
+- lib/bosh/director/deployment_plan/compilation_instance_pool.rb
 - lib/bosh/director/deployment_plan/compiled_package.rb
 - lib/bosh/director/deployment_plan/deployment_repo.rb
 - lib/bosh/director/deployment_plan/deployment_spec_parser.rb
-- lib/bosh/director/deployment_plan/disk_pool.rb
-- lib/bosh/director/deployment_plan/dns_binder.rb
+- lib/bosh/director/deployment_plan/deployment_validator.rb
+- lib/bosh/director/deployment_plan/desired_instance.rb
+- lib/bosh/director/deployment_plan/disk_type.rb
 - lib/bosh/director/deployment_plan/dynamic_network.rb
+- lib/bosh/director/deployment_plan/dynamic_network_subnet.rb
+- lib/bosh/director/deployment_plan/env.rb
+- lib/bosh/director/deployment_plan/global_network_resolver.rb
 - lib/bosh/director/deployment_plan/instance.rb
-- lib/bosh/director/deployment_plan/instance_vm_binder.rb
+- lib/bosh/director/deployment_plan/instance_network_reservations.rb
+- lib/bosh/director/deployment_plan/instance_plan.rb
+- lib/bosh/director/deployment_plan/instance_plan_factory.rb
+- lib/bosh/director/deployment_plan/instance_plan_sorter.rb
+- lib/bosh/director/deployment_plan/instance_planner.rb
+- lib/bosh/director/deployment_plan/instance_repository.rb
+- lib/bosh/director/deployment_plan/instance_spec.rb
+- lib/bosh/director/deployment_plan/ip_provider/database_ip_repo.rb
+- lib/bosh/director/deployment_plan/ip_provider/in_memory_ip_repo.rb
+- lib/bosh/director/deployment_plan/ip_provider/ip_provider.rb
+- lib/bosh/director/deployment_plan/ip_provider/ip_provider_factory.rb
 - lib/bosh/director/deployment_plan/job.rb
+- lib/bosh/director/deployment_plan/job_availability_zone_parser.rb
+- lib/bosh/director/deployment_plan/job_migrator.rb
+- lib/bosh/director/deployment_plan/job_network.rb
+- lib/bosh/director/deployment_plan/job_network_parser.rb
 - lib/bosh/director/deployment_plan/job_spec_parser.rb
+- lib/bosh/director/deployment_plan/links/link.rb
+- lib/bosh/director/deployment_plan/links/link_lookup.rb
+- lib/bosh/director/deployment_plan/links/link_path.rb
+- lib/bosh/director/deployment_plan/links/links_resolver.rb
+- lib/bosh/director/deployment_plan/links/template_link.rb
 - lib/bosh/director/deployment_plan/manifest_migrator.rb
+- lib/bosh/director/deployment_plan/manifest_validator.rb
 - lib/bosh/director/deployment_plan/manual_network.rb
+- lib/bosh/director/deployment_plan/manual_network_subnet.rb
 - lib/bosh/director/deployment_plan/multi_job_updater.rb
 - lib/bosh/director/deployment_plan/network.rb
-- lib/bosh/director/deployment_plan/network_subnet.rb
+- lib/bosh/director/deployment_plan/network_planner.rb
+- lib/bosh/director/deployment_plan/network_planner/plan.rb
+- lib/bosh/director/deployment_plan/network_planner/planner.rb
+- lib/bosh/director/deployment_plan/network_planner/reservation_reconciler.rb
+- lib/bosh/director/deployment_plan/network_planner/vip_static_ips_planner.rb
+- lib/bosh/director/deployment_plan/network_settings.rb
 - lib/bosh/director/deployment_plan/notifier.rb
 - lib/bosh/director/deployment_plan/options/skip_drain.rb
+- lib/bosh/director/deployment_plan/package_validator.rb
+- lib/bosh/director/deployment_plan/placement_planner.rb
+- lib/bosh/director/deployment_plan/placement_planner/availability_zone_picker.rb
+- lib/bosh/director/deployment_plan/placement_planner/bruteforce_ip_allocation.rb
+- lib/bosh/director/deployment_plan/placement_planner/index_assigner.rb
+- lib/bosh/director/deployment_plan/placement_planner/networks_to_static_ips.rb
+- lib/bosh/director/deployment_plan/placement_planner/placed_desired_instances.rb
+- lib/bosh/director/deployment_plan/placement_planner/plan.rb
+- lib/bosh/director/deployment_plan/placement_planner/static_ips_availability_zone_picker.rb
+- lib/bosh/director/deployment_plan/placement_planner/unplaced_existing_instances.rb
 - lib/bosh/director/deployment_plan/planner.rb
 - lib/bosh/director/deployment_plan/planner_factory.rb
 - lib/bosh/director/deployment_plan/release_version.rb
 - lib/bosh/director/deployment_plan/resource_pool.rb
-- lib/bosh/director/deployment_plan/resource_pools.rb
 - lib/bosh/director/deployment_plan/stemcell.rb
 - lib/bosh/director/deployment_plan/steps/package_compile_step.rb
 - lib/bosh/director/deployment_plan/steps/update_step.rb
@@ -741,7 +799,12 @@ files:
 - lib/bosh/director/deployment_plan/update_config.rb
 - lib/bosh/director/deployment_plan/vip_network.rb
 - lib/bosh/director/deployment_plan/vm.rb
-- lib/bosh/director/dns_helper.rb
+- lib/bosh/director/deployment_plan/vm_type.rb
+- lib/bosh/director/disk_manager.rb
+- lib/bosh/director/dns/canonicalizer.rb
+- lib/bosh/director/dns/dns_manager.rb
+- lib/bosh/director/dns/local_dns_repo.rb
+- lib/bosh/director/dns/powerdns.rb
 - lib/bosh/director/download_helper.rb
 - lib/bosh/director/duration.rb
 - lib/bosh/director/encryption_helper.rb
@@ -749,16 +812,16 @@ files:
 - lib/bosh/director/errand/job_manager.rb
 - lib/bosh/director/errand/result.rb
 - lib/bosh/director/errand/runner.rb
+- lib/bosh/director/error_ignorer.rb
 - lib/bosh/director/errors.rb
 - lib/bosh/director/event_log.rb
 - lib/bosh/director/ext.rb
 - lib/bosh/director/hash_string_vals.rb
 - lib/bosh/director/instance_deleter.rb
+- lib/bosh/director/instance_reuser.rb
 - lib/bosh/director/instance_updater.rb
-- lib/bosh/director/instance_updater/network_updater.rb
 - lib/bosh/director/instance_updater/preparer.rb
-- lib/bosh/director/instance_updater/stopper.rb
-- lib/bosh/director/instance_updater/vm_updater.rb
+- lib/bosh/director/instance_updater/state_applier.rb
 - lib/bosh/director/ip_util.rb
 - lib/bosh/director/job_queue.rb
 - lib/bosh/director/job_renderer.rb
@@ -767,20 +830,34 @@ files:
 - lib/bosh/director/job_updater_factory.rb
 - lib/bosh/director/jobs/backup.rb
 - lib/bosh/director/jobs/base_job.rb
+- lib/bosh/director/jobs/cleanup_artifacts.rb
 - lib/bosh/director/jobs/cloud_check/apply_resolutions.rb
 - lib/bosh/director/jobs/cloud_check/scan.rb
 - lib/bosh/director/jobs/cloud_check/scan_and_fix.rb
 - lib/bosh/director/jobs/create_snapshot.rb
 - lib/bosh/director/jobs/delete_deployment.rb
 - lib/bosh/director/jobs/delete_deployment_snapshots.rb
+- lib/bosh/director/jobs/delete_orphan_disks.rb
 - lib/bosh/director/jobs/delete_release.rb
 - lib/bosh/director/jobs/delete_snapshots.rb
 - lib/bosh/director/jobs/delete_stemcell.rb
 - lib/bosh/director/jobs/export_release.rb
 - lib/bosh/director/jobs/fetch_logs.rb
+- lib/bosh/director/jobs/helpers.rb
+- lib/bosh/director/jobs/helpers/blob_deleter.rb
+- lib/bosh/director/jobs/helpers/compiled_package_deleter.rb
+- lib/bosh/director/jobs/helpers/name_version_release_deleter.rb
+- lib/bosh/director/jobs/helpers/package_deleter.rb
+- lib/bosh/director/jobs/helpers/release_deleter.rb
+- lib/bosh/director/jobs/helpers/release_version_deleter.rb
+- lib/bosh/director/jobs/helpers/releases_to_delete_picker.rb
+- lib/bosh/director/jobs/helpers/stemcell_deleter.rb
+- lib/bosh/director/jobs/helpers/stemcells_to_delete_picker.rb
+- lib/bosh/director/jobs/helpers/template_deleter.rb
 - lib/bosh/director/jobs/release/release_job.rb
 - lib/bosh/director/jobs/run_errand.rb
 - lib/bosh/director/jobs/scheduled_backup.rb
+- lib/bosh/director/jobs/scheduled_orphan_cleanup.rb
 - lib/bosh/director/jobs/snapshot_deployment.rb
 - lib/bosh/director/jobs/snapshot_deployments.rb
 - lib/bosh/director/jobs/snapshot_self.rb
@@ -805,7 +882,10 @@ files:
 - lib/bosh/director/models/dns/record.rb
 - lib/bosh/director/models/helpers/model_helper.rb
 - lib/bosh/director/models/instance.rb
+- lib/bosh/director/models/ip_address.rb
 - lib/bosh/director/models/log_bundle.rb
+- lib/bosh/director/models/orphan_disk.rb
+- lib/bosh/director/models/orphan_snapshot.rb
 - lib/bosh/director/models/package.rb
 - lib/bosh/director/models/persistent_disk.rb
 - lib/bosh/director/models/release.rb
@@ -825,8 +905,6 @@ files:
 - lib/bosh/director/problem_handlers/missing_disk.rb
 - lib/bosh/director/problem_handlers/missing_vm.rb
 - lib/bosh/director/problem_handlers/mount_info_mismatch.rb
-- lib/bosh/director/problem_handlers/out_of_sync_vm.rb
-- lib/bosh/director/problem_handlers/unbound_instance_vm.rb
 - lib/bosh/director/problem_handlers/unresponsive_agent.rb
 - lib/bosh/director/problem_resolver.rb
 - lib/bosh/director/problem_scanner/disk_scan_stage.rb
@@ -834,18 +912,20 @@ files:
 - lib/bosh/director/problem_scanner/scanner.rb
 - lib/bosh/director/problem_scanner/vm_scan_stage.rb
 - lib/bosh/director/rendered_job_templates_cleaner.rb
-- lib/bosh/director/resource_pool_updater.rb
 - lib/bosh/director/scheduler.rb
 - lib/bosh/director/sequel.rb
 - lib/bosh/director/stale_file_killer.rb
+- lib/bosh/director/stopper.rb
+- lib/bosh/director/tagged_logger.rb
 - lib/bosh/director/task_result_file.rb
 - lib/bosh/director/thread_pool.rb
+- lib/bosh/director/transactor.rb
 - lib/bosh/director/validation_helper.rb
 - lib/bosh/director/version.rb
 - lib/bosh/director/vm_creator.rb
-- lib/bosh/director/vm_data.rb
+- lib/bosh/director/vm_deleter.rb
 - lib/bosh/director/vm_metadata_updater.rb
-- lib/bosh/director/vm_reuser.rb
+- lib/bosh/director/vm_recreator.rb
 - lib/cloud/dummy.rb
 homepage: https://github.com/cloudfoundry/bosh
 licenses:

data/lib/bosh/director/deployment_plan/dns_binder.rb

@@ -1,45 +0,0 @@
-module Bosh::Director
-  class DeploymentPlan::DnsBinder
-    include DnsHelper
-
-    def initialize(deployment)
-      @deployment = deployment
-      @config = Config
-    end
-
-    def bind_deployment
-      return unless @config.dns_enabled?
-
-      domain = Models::Dns::Domain.find_or_create(
-        :name => dns_domain_name,
-        :type => 'NATIVE',
-      )
-      @deployment.dns_domain = domain
-
-      soa_record = Models::Dns::Record.find_or_create(
-        :domain_id => domain.id,
-        :name => dns_domain_name,
-        :type => 'SOA',
-      )
-      soa_record.content = SOA
-      soa_record.ttl = 300
-      soa_record.save
-
-      # add NS record
-      Models::Dns::Record.find_or_create(
-        :domain_id => domain.id,
-        :name => dns_domain_name,
-        :type =>'NS', :ttl => TTL_4H,
-        :content => dns_ns_record,
-      )
-
-      # add A record for name server
-      Models::Dns::Record.find_or_create(
-        :domain_id => domain.id,
-        :name => dns_ns_record,
-        :type =>'A', :ttl => TTL_4H,
-        :content => @config.dns['address'],
-      )
-    end
-  end
-end

data/lib/bosh/director/deployment_plan/instance_vm_binder.rb

@@ -1,37 +0,0 @@
-module Bosh::Director
-  class DeploymentPlan::InstanceVmBinder
-    def initialize(event_log)
-      @event_log = event_log
-    end
-
-    # @param [Array<DeploymentPlan::Instance>]
-    #   instances All instances to consider for binding to a VM
-    def bind_instance_vms(instances)
-      unbound_instances = []
-
-      instances.each do |instance|
-        # Don't allocate resource pool VMs to instances in detached state
-        next if instance.state == 'detached'
-
-        # Skip bound instances
-        next if instance.model.vm
-
-        unbound_instances << instance
-      end
-
-      return if unbound_instances.empty?
-
-      @event_log.begin_stage('Binding instance VMs', unbound_instances.size)
-
-      ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
-        unbound_instances.each do |instance|
-          pool.process do
-            @event_log.track("#{instance.job.name}/#{instance.index}") do
-              instance.apply_partial_vm_state
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/bosh/director/deployment_plan/network_subnet.rb

@@ -1,166 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh::Director
-  module DeploymentPlan
-    class NetworkSubnet
-      include DnsHelper
-      include IpUtil
-      include ValidationHelper
-
-      # @return [DeploymentPlan::Network] Network this subnet belongs to
-      attr_reader :network
-
-      # @return [NetAddr::CIDR] Subnet range
-      attr_reader :range
-
-      # @return [NetAddr::CIDR] Subnet gateway IP address
-      attr_reader :gateway
-
-      # @return [Array<String>] Subnet DNS IP addresses
-      attr_reader :dns
-
-      # @return [Hash] Subnet cloud properties (VLAN etc.)
-      attr_reader :cloud_properties
-
-      # @return [String] Subnet netmask
-      attr_reader :netmask
-
-      # @param [DeploymentPlan::Network] network Network
-      # @param [Hash] subnet_spec Raw subnet spec from deployment manifest
-      def initialize(network, subnet_spec)
-        @network = network
-
-        range_property = safe_property(subnet_spec, "range", :class => String)
-        @range = NetAddr::CIDR.create(range_property)
-
-        if @range.size <= 1
-          raise NetworkInvalidRange,
-                "Invalid network range `#{range_property}', " +
-                "should include at least 2 IPs"
-        end
-
-        @netmask = @range.wildcard_mask
-        network_id = @range.network(:Objectify => true)
-        broadcast = @range.broadcast(:Objectify => true)
-
-        ignore_missing_gateway = Bosh::Director::Config.ignore_missing_gateway
-        gateway_property = safe_property(subnet_spec, "gateway", class: String, optional: ignore_missing_gateway)
-        if gateway_property
-          @gateway = NetAddr::CIDR.create(gateway_property)
-          unless @gateway.size == 1
-            invalid_gateway("must be a single IP")
-          end
-          unless @range.contains?(@gateway)
-            invalid_gateway("must be inside the range")
-          end
-          if @gateway == network_id
-            invalid_gateway("can't be the network id")
-          end
-          if @gateway == broadcast
-            invalid_gateway("can't be the broadcast IP")
-          end
-        end
-
-        @dns = dns_servers(@network.name, subnet_spec)
-
-        @cloud_properties = safe_property(subnet_spec, "cloud_properties", class: Hash, default: {})
-
-        @available_dynamic_ips = Set.new
-        @available_static_ips = Set.new
-
-        first_ip = @range.first(:Objectify => true)
-        last_ip = @range.last(:Objectify => true)
-
-        (first_ip.to_i .. last_ip.to_i).each do |ip|
-          @available_dynamic_ips << ip
-        end
-
-        @available_dynamic_ips.delete(@gateway.to_i) if @gateway
-        @available_dynamic_ips.delete(network_id.to_i)
-        @available_dynamic_ips.delete(broadcast.to_i)
-
-        reserved_ips = safe_property(subnet_spec, "reserved", :optional => true)
-        static_ips = safe_property(subnet_spec, "static", :optional => true)
-
-        each_ip(reserved_ips) do |ip|
-          unless @available_dynamic_ips.delete?(ip)
-            raise NetworkReservedIpOutOfRange,
-                  "Reserved IP `#{format_ip(ip)}' is out of " +
-                  "network `#{@network.name}' range"
-          end
-        end
-
-        each_ip(static_ips) do |ip|
-          unless @available_dynamic_ips.delete?(ip)
-            raise NetworkStaticIpOutOfRange,
-                  "Static IP `#{format_ip(ip)}' is out of " +
-                  "network `#{@network.name}' range"
-          end
-          @available_static_ips.add(ip)
-        end
-
-        # Keeping track of initial pools to understand
-        # where to release no longer needed IPs
-        @dynamic_ip_pool = @available_dynamic_ips.dup
-        @static_ip_pool = @available_static_ips.dup
-      end
-
-      def overlaps?(subnet)
-        @range == subnet.range ||
-          @range.contains?(subnet.range) ||
-          subnet.range.contains?(@range)
-      end
-
-      def reserve_ip(ip)
-        ip = ip.to_i
-        if @available_static_ips.delete?(ip)
-          :static
-        elsif @available_dynamic_ips.delete?(ip)
-          :dynamic
-        else
-          nil
-        end
-      end
-
-      def release_ip(ip)
-        ip = ip.to_i
-        if @dynamic_ip_pool.include?(ip)
-          @available_dynamic_ips.add(ip)
-        elsif @static_ip_pool.include?(ip)
-          @available_static_ips.add(ip)
-        else
-          raise NetworkReservationIpNotOwned,
-                "Can't release IP `#{format_ip(ip)}' " +
-                "back to `#{@network.name}' network: " +
-                "it's' neither in dynamic nor in static pool"
-        end
-      end
-
-      def allocate_dynamic_ip
-        ip = @available_dynamic_ips.first
-        if ip
-          @available_dynamic_ips.delete(ip)
-        end
-        ip
-      end
-
-      def dynamic_ips_count
-        @available_dynamic_ips.size
-      end
-
-      def static_ips_count
-        @available_static_ips.size
-      end
-
-      private
-
-      # @param [String] reason
-      # @raise NetworkInvalidGateway
-      def invalid_gateway(reason)
-        raise NetworkInvalidGateway,
-              "Invalid gateway for network `#{@network.name}': #{reason}"
-      end
-
-    end
-  end
-end