bosh-director 1.3160.0 → 1.3163.0

data/lib/bosh/director/models.rb

@@ -8,7 +8,10 @@ require 'bosh/director/models/deployment_problem'
 require 'bosh/director/models/deployment_property'
 require 'bosh/director/models/director_attribute'
 require 'bosh/director/models/instance'
+require 'bosh/director/models/ip_address'
 require 'bosh/director/models/log_bundle'
+require 'bosh/director/models/orphan_disk'
+require 'bosh/director/models/orphan_snapshot'
 require 'bosh/director/models/package'
 require 'bosh/director/models/release'
 require 'bosh/director/models/release_version'

data/lib/bosh/director/models/compiled_package.rb

@@ -37,10 +37,10 @@ module Bosh::Director::Models
       package.version
     end
 
-    def self.generate_build_number(package, stemcell)
+    def self.generate_build_number(package_model, stemcell_model)
       attrs = {
-        :package_id => package.id,
-        :stemcell_id => stemcell.id
+        :package_id => package_model.id,
+        :stemcell_id => stemcell_model.id
       }
 
       filter(attrs).max(:build).to_i + 1

data/lib/bosh/director/models/deployment.rb

@@ -6,6 +6,7 @@ module Bosh::Director::Models
     many_to_many :release_versions
     one_to_many  :job_instances, :class => "Bosh::Director::Models::Instance"
     one_to_many  :vms
+    one_to_many  :instances
     one_to_many  :properties, :class => "Bosh::Director::Models::DeploymentProperty"
     one_to_many  :problems, :class => "Bosh::Director::Models::DeploymentProblem"
     many_to_one  :cloud_config
@@ -15,6 +16,15 @@ module Bosh::Director::Models
       validates_unique :name
       validates_format VALID_ID, :name
     end
+
+    def link_spec
+      result = self.link_spec_json
+      result ? Yajl::Parser.parse(result) : {}
+    end
+
+    def link_spec=(data)
+      self.link_spec_json = Yajl::Encoder.encode(data)
+    end
   end
 
   Deployment.plugin :association_dependencies

data/lib/bosh/director/models/instance.rb

@@ -1,16 +1,20 @@
+require 'securerandom'
+
 module Bosh::Director::Models
   class Instance < Sequel::Model(Bosh::Director::Config.db)
     many_to_one :deployment
     many_to_one :vm
     one_to_many :persistent_disks
     one_to_many :rendered_templates_archives
+    one_to_many :ip_addresses
+    many_to_many :templates
 
     def validate
       validates_presence [:deployment_id, :job, :index, :state]
       validates_unique [:deployment_id, :job, :index]
       validates_unique [:vm_id] if vm_id
       validates_integer :index
-      validates_includes ["started", "stopped", "detached"], :state
+      validates_includes %w(started stopped detached), :state
     end
 
     def persistent_disk
@@ -36,5 +40,77 @@ module Bosh::Director::Models
         stale_archives
       end
     end
+
+    def cloud_properties_hash
+      if cloud_properties.nil?
+        spec['vm_type']['cloud_properties']
+      else
+        JSON.parse(cloud_properties)
+      end
+    end
+
+    def cloud_properties_hash=(hash)
+      self.cloud_properties = JSON.dump(hash)
+    end
+
+    def dns_record_names
+      return nil if dns_records.nil?
+
+      JSON.parse(dns_records)
+    end
+
+    def dns_record_names=(list)
+      self.dns_records = JSON.dump(list)
+    end
+
+    def to_s
+      "#{self.job}/#{self.uuid} (#{self.index})"
+    end
+
+    def spec
+      return nil if spec_json.nil?
+
+      result = Yajl::Parser.parse(spec_json)
+      if result['resource_pool'].nil?
+        result
+      else
+        if result['vm_type'].nil?
+          result['vm_type'] = {
+            'name' => result['resource_pool']['name'],
+            'cloud_properties' => result['resource_pool']['cloud_properties']
+          }
+        end
+
+        if result['resource_pool']['stemcell'] && result['stemcell'].nil?
+          result['stemcell'] = result['resource_pool']['stemcell']
+          result['stemcell']['alias'] = result['resource_pool']['name']
+        end
+
+        result.delete('resource_pool')
+
+        result
+      end
+    end
+
+    def spec=(spec)
+      self.spec_json = Yajl::Encoder.encode(spec)
+    end
+
+    def bind_to_vm_model(vm)
+      self.vm = vm
+    end
+
+    def env
+      if vm
+        @env = vm.env
+      else
+        @env = {}
+      end
+      @env
+    end
   end
+
+  Instance.plugin :association_dependencies
+  Instance.add_association_dependencies :ip_addresses => :destroy
+  Instance.add_association_dependencies :templates => :nullify
 end

data/lib/bosh/director/models/ip_address.rb

@@ -0,0 +1,26 @@
+module Bosh::Director::Models
+  class IpAddress < Sequel::Model(Bosh::Director::Config.db)
+    many_to_one :instance
+
+    def validate
+      validates_presence :instance_id
+      validates_presence :task_id
+      validates_presence :address
+      validates_unique :address
+    end
+
+    def before_create
+      self.created_at ||= Time.now
+    end
+
+    def info
+      instance_info = "#{self.instance.deployment.name}.#{self.instance.job}/#{self.instance.index}"
+      formatted_ip = NetAddr::CIDR.create(self.address).ip
+      "#{instance_info} - #{self.network_name} - #{formatted_ip} (#{type})"
+    end
+
+    def type
+      self.static ? 'static' : 'dynamic'
+    end
+  end
+end

data/lib/bosh/director/models/orphan_disk.rb

@@ -0,0 +1,23 @@
+module Bosh::Director::Models
+  class OrphanDisk < Sequel::Model(Bosh::Director::Config.db)
+    one_to_many :orphan_snapshots
+
+    def validate
+      validates_presence [:disk_cid, :deployment_name, :instance_name]
+      validates_unique [:disk_cid]
+    end
+
+    def before_create
+      self.created_at ||= Time.now
+    end
+
+    def cloud_properties
+      result = self.cloud_properties_json
+      result ? Yajl::Parser.parse(result) : {}
+    end
+
+    def cloud_properties=(cloud_properties)
+      self.cloud_properties_json = Yajl::Encoder.encode(cloud_properties)
+    end
+  end
+end

data/lib/bosh/director/models/orphan_snapshot.rb

@@ -0,0 +1,14 @@
+module Bosh::Director::Models
+  class OrphanSnapshot < Sequel::Model(Bosh::Director::Config.db)
+    many_to_one :orphan_disk
+
+    def validate
+      validates_presence [:snapshot_cid, :snapshot_created_at]
+      validates_unique [:snapshot_cid]
+    end
+
+    def before_create
+      self.created_at ||= Time.now
+    end
+  end
+end

data/lib/bosh/director/models/template.rb

@@ -10,33 +10,56 @@ module Bosh::Director::Models
     end
 
     def package_names
-      result = self.package_names_json
-      result ? Yajl::Parser.parse(result) : nil
+      object_or_nil(self.package_names_json)
     end
 
     def package_names=(packages)
-      self.package_names_json = Yajl::Encoder.encode(packages)
+      self.package_names_json = json_encode(packages)
     end
 
     def logs=(logs_spec)
-      self.logs_json = Yajl::Encoder.encode(logs_spec)
+      self.logs_json = json_encode(logs_spec)
     end
 
     def logs
-      result = self.logs_json
-      result ? Yajl::Parser.parse(result) : nil
+      object_or_nil(self.logs_json)
     end
 
     # @param [Object] property_spec Property spec from job spec
     def properties=(property_spec)
-      self.properties_json = Yajl::Encoder.encode(property_spec)
+      self.properties_json = json_encode(property_spec)
     end
 
     # @return [Hash] Template properties (as provided in job spec)
     # @return [nil] if no properties have been defined in job spec
     def properties
-      result = self.properties_json
-      result ? Yajl::Parser.parse(result) : nil
+      object_or_nil(self.properties_json)
+    end
+
+    def requires=(requires_spec)
+      self.requires_json = json_encode(requires_spec)
+    end
+
+    def requires
+      object_or_nil(self.requires_json)
+    end
+
+    def provides=(provides_spec)
+      self.provides_json = json_encode(provides_spec)
+    end
+
+    def provides
+      object_or_nil(self.provides_json)
+    end
+
+    private
+
+    def object_or_nil(value)
+      value ? Yajl::Parser.parse(value) : nil
+    end
+
+    def json_encode(value)
+      Yajl::Encoder.encode(value)
     end
   end
 end

data/lib/bosh/director/models/vm.rb

@@ -6,16 +6,10 @@ module Bosh::Director::Models
     def validate
       validates_presence [:deployment_id, :agent_id]
       validates_unique :agent_id
-
-    end
-
-    def apply_spec
-      return nil if apply_spec_json.nil?
-      Yajl::Parser.parse(apply_spec_json)
     end
 
-    def apply_spec=(spec)
-      self.apply_spec_json = Yajl::Encoder.encode(spec)
+    def vm_exists?
+      !(cid.nil? || cid.empty?)
     end
 
     # @param [Hash] env_hash Environment hash
@@ -38,4 +32,7 @@ module Bosh::Director::Models
       self.credentials_json = Yajl::Encoder.encode(spec)
     end
   end
+
+  Vm.plugin :association_dependencies
+  Vm.add_association_dependencies :instance => :nullify
 end

data/lib/bosh/director/network_reservation.rb

@@ -1,130 +1,100 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
-  ##
-  # Network resolution, either existing or one to be fulfilled by {Network}
   class NetworkReservation
     include IpUtil
 
-    STATIC = :static
-    DYNAMIC = :dynamic
+    attr_reader :ip, :instance, :network, :type
 
-    USED = :used
-    CAPACITY = :capacity
-    WRONG_TYPE = :wrong_type
+    def initialize(instance, network)
+      @instance = instance
+      @network = network
+      @ip = nil
+      @reserved = false
+    end
 
-    # @return [Integer, nil] ip
-    attr_accessor :ip
+    def resolve_network(network)
+      @network = network
+    end
 
-    # @return [Symbol, nil] type
-    attr_accessor :type
+    def reserved?
+      @reserved
+    end
 
-    # @return [Boolean] reserved
-    attr_accessor :reserved
+    def mark_reserved
+      @reserved = true
+    end
 
-    # @return [Symbol, nil] reservation error
-    attr_accessor :error
+    def static?
+      type == :static
+    end
 
-    def self.new_dynamic(ip = nil)
-      new(:type => NetworkReservation::DYNAMIC, :ip => ip)
+    def dynamic?
+      type == :dynamic
     end
 
-    def self.new_static(ip = nil)
-      new(:type => NetworkReservation::STATIC, :ip => ip)
+    private
+
+    def formatted_ip
+      @ip.nil? ? nil : ip_to_netaddr(@ip).ip
     end
+  end
 
-    ##
-    # Creates a new network reservation
-    # @param [Hash] options the options to create the reservation from
-    # @option options [Integer, String, NetAddr::CIDR] :ip reservation ip
-    # @option options [Symbol] :type reservation type
-    def initialize(options = {})
-      @ip = options[:ip]
-      @type = options[:type]
-      @reserved = false
-      @error = nil
+  class ExistingNetworkReservation < NetworkReservation
+    attr_reader :network_type
 
-      @ip = ip_to_i(@ip) if @ip
+    def initialize(instance, network, ip, network_type)
+      super(instance, network)
+      @ip = ip_to_i(ip) if ip
+      @network_type = network_type
     end
 
-    ##
-    # @return [Boolean] returns true if this is a static reservation
-    def static?
-      @type == STATIC
+    def resolve_type(type)
+      @type = type
     end
 
-    ##
-    # @return [Boolean] returns true if this is a dynamic reservation
-    def dynamic?
-      @type == DYNAMIC
+    def desc
+      "existing reservation#{@ip.nil? ? '' : " with IP '#{formatted_ip}' for instance #{@instance}"}"
     end
 
-    ##
-    # @return [Boolean] returns true if this reservation was fulfilled
-    def reserved?
-      !!@reserved
-    end
-
-    ##
-    # Tries to take the provided reservation if it meets the requirements
-    # @return [void]
-    def take(other)
-      if other.reserved?
-        if @type == other.type
-          if dynamic? || (static? && @ip == other.ip)
-            @ip = other.ip
-            @reserved = true
-          end
-        end
-      end
+    def to_s
+      "{ip=#{formatted_ip}, network=#{@network.name}, instance=#{@instance}, reserved=#{reserved?}, type=#{type}}"
     end
+  end
 
-    ##
-    # Handles network reservation error and re-raises the proper exception
-    # @param [String] origin Whoever tried to take the reservation
-    # @raise [NetworkReservationAlreadyInUse]
-    # @raise [NetworkReservationWrongType]
-    # @raise [NetworkReservationNotEnoughCapacity]
-    # @raise [NetworkReservationError]
-    # @return void
-    def handle_error(origin)
-      if static?
-        case @error
-          when NetworkReservation::USED
-            raise NetworkReservationAlreadyInUse,
-                  "#{origin} asked for a static IP #{formatted_ip} " +
-                  "but it's already reserved/in use"
-          when NetworkReservation::WRONG_TYPE
-            raise NetworkReservationWrongType,
-                  "#{origin} asked for a static IP #{formatted_ip} " +
-                  "but it's in the dynamic pool"
-          else
-            raise NetworkReservationError,
-                  "#{origin} failed to reserve static IP " +
-                  "#{formatted_ip}: #{@error}"
-        end
-      else
-        case @error
-          when NetworkReservation::CAPACITY
-            raise NetworkReservationNotEnoughCapacity,
-                  "#{origin} asked for a dynamic IP " +
-                  "but there were no more available"
-          else
-            raise NetworkReservationError,
-                  "#{origin} failed to reserve dynamic IP " +
-                  "#{formatted_ip}: #{@error}"
-        end
-      end
+  class DesiredNetworkReservation < NetworkReservation
+    def self.new_dynamic(instance, network)
+      new(instance, network, nil, :dynamic)
     end
 
-    def to_s
-      "{type=#{@type}, ip=#{formatted_ip.inspect}}"
+    def self.new_static(instance, network, ip)
+      new(instance, network, ip, :static)
     end
 
-    private
+    def initialize(instance, network, ip, type)
+      @instance = instance
+      @network = network
+      @ip = ip_to_i(ip) if ip
+      @type = type
+    end
 
-    def formatted_ip
-      @ip.nil? ? nil : ip_to_netaddr(@ip).ip
+    def resolve_ip(ip)
+      @ip = ip_to_i(ip)
+    end
+
+    def resolve_type(type)
+      if @type != type
+        raise NetworkReservationWrongType,
+          "IP '#{formatted_ip}' on network '#{@network.name}' does not belong to #{@type} pool"
+      end
+
+      @type = type
+    end
+
+    def desc
+      "#{type} reservation with IP '#{formatted_ip}' for instance #{@instance}"
+    end
+
+    def to_s
+      "{type=#{type}, ip=#{formatted_ip}, network=#{@network.name}, instance=#{@instance}}"
     end
   end
 end