Revert 'Revert "remove framework/runtime"'

This reverts commit f5a7698.

Author: Alex Suraci & Bleicke

bin/document_api

@@ -20,8 +20,6 @@ module Docs
         VCAP::CloudController::User,
         VCAP::CloudController::Space,
         VCAP::CloudController::App,
-        VCAP::CloudController::Runtime,
-        VCAP::CloudController::Framework,
         VCAP::CloudController::Service,
         VCAP::CloudController::ServicePlan,
         VCAP::CloudController::ServiceInstance,

config/frameworks/myframework.yml

@@ -0,0 +1,13 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+Sequel.migration do
+  change do
+    alter_table :apps do
+      drop_column :framework_id
+      drop_column :runtime_id
+    end
+
+    drop_table :frameworks
+    drop_table :runtimes
+  end
+end

config/frameworks/node.yml

@@ -15,8 +15,6 @@ module VCAP::CloudController
       attribute  :production,          Message::Boolean,    :default => false
 
       to_one     :space
-      to_one     :runtime,             :optional_in => :create
-      to_one     :framework,           :optional_in => :create
       to_one     :stack,               :optional_in => :create
 
       attribute  :environment_json,    Hash,       :default => {}
@@ -37,7 +35,7 @@ module VCAP::CloudController
       to_many    :routes
     end
 
-    query_parameters :name, :space_guid, :organization_guid, :framework_guid, :runtime_guid
+    query_parameters :name, :space_guid, :organization_guid
 
     def self.translate_validation_exception(e, attributes)
       space_and_name_errors = e.errors.on([:space_id, :name])

config/frameworks/sinatra.yml

@@ -20,8 +20,6 @@ def summary(id)
         :guid => app.guid,
         :name => app.name,
         :routes => app.routes.map(&:as_summary_json),
-        :framework => app.framework.to_hash.merge(:guid => app.framework.guid),
-        :runtime => app.runtime.to_hash.merge(:guid => app.runtime.guid),
         :running_instances => app.running_instances,
         :services => app.service_instances.map(&:as_summary_json),
         :available_domains => app.space.domains.map(&:as_summary_json)

config/frameworks/spring.yml

@@ -49,8 +49,6 @@ def app_summary(app)
         :urls => app.routes.map(&:fqdn),
         :routes => app.routes.map(&:as_summary_json),
         :service_count => app.service_bindings_dataset.count,
-        :framework => { :name => app.framework.name },
-        :runtime => { :name => app.runtime.name },
         :running_instances => 0,
       }.merge(app.to_hash)
     end

config/frameworks/standalone.yml

@@ -195,13 +195,6 @@ def destroy_upload_handle
     def staging_task_properties(app)
       {
         :services    => app.service_bindings.map { |sb| service_binding_to_staging_request(sb) },
-        :framework      => app.framework.name,
-        :framework_info => app.framework.internal_info,
-
-        :runtime        => app.runtime.name,
-        :runtime_info   => app.runtime.internal_info.merge(
-          :name => app.runtime.name
-        ),
 
         :buildpack => app.buildpack,
 

config/runtimes.yml

@@ -46,7 +46,6 @@ class VCAP::CloudController::Config < VCAP::Config
         optional(:staging_manifests) => String,
       },
 
-      optional(:runtimes_file) => String,
       optional(:stacks_file) => String,
 
       :db => {
@@ -168,7 +167,6 @@ def self.config_dir
   private
 
   def self.merge_defaults(config)
-    config[:runtimes_file] ||= File.join(config_dir, "runtimes.yml")
     config[:stacks_file] ||= File.join(config_dir, "stacks.yml")
 
     config[:directories] ||= {}

db/migrations/20130323005501_remove_framework_and_runtime.rb

@@ -225,7 +225,7 @@ def start_instances_with_message(app, indices, message_override)
 
         indices.each do |idx|
           msg[:index] = idx
-          dea_id = dea_pool.find_dea(app.memory, app.runtime.name, app.stack.name)
+          dea_id = dea_pool.find_dea(app.memory, app.stack.name)
           if dea_id
             dea_publish("#{dea_id}.start", msg.merge(message_override))
           else
@@ -313,11 +313,6 @@ def start_app_message(app)
           :droplet => app.guid,
           :name => app.name,
           :uris => app.uris,
-          :runtime => app.runtime.name,
-          :runtime_info => app.runtime.internal_info.merge(
-            :name => app.runtime.name
-          ),
-          :framework => app.framework.name,
           :prod => app.production,
           :sha1 => app.droplet_hash,
           :executableFile => "deprecated",

lib/cloud_controller/api/app.rb

@@ -29,13 +29,13 @@ def process_advertise_message(msg)
       end
     end
 
-    def find_dea(mem, runtime, stack)
+    def find_dea(mem, stack)
       mutex.synchronize do
         @deas.keys.shuffle.each do |id|
           dea = @deas[id]
           if dea_expired?(dea)
             @deas.delete(id)
-          elsif dea_meets_needs?(dea, mem, runtime, stack)
+          elsif dea_meets_needs?(dea, mem, stack)
             return id
           end
         end
@@ -49,17 +49,12 @@ def dea_expired?(dea)
       (Time.now.to_i - dea[:last_update].to_i) > ADVERTISEMENT_EXPIRATION
     end
 
-    def dea_meets_needs?(dea, mem, runtime, stack)
+    def dea_meets_needs?(dea, mem, stack)
       stats = dea[:advertisement]
 
-      has_runtime = stats[:runtimes].nil? || stats[:runtimes].include?(runtime)
       has_stack = stats[:stacks].include?(stack)
 
-      if stats[:available_memory] >= mem
-        has_runtime && has_stack
-      else
-        false
-      end
+      (stats[:available_memory] >= mem) && has_stack
     end
 
     def mutex

lib/cloud_controller/api/app_summary.rb

@@ -129,10 +129,6 @@ def instances(name)
     def legacy_app_encoding(app)
       {
         :name => app.name,
-        :staging => {
-          :model => app.framework.name,
-          :stack => app.runtime.name,
-        },
         :uris => app.uris,
         :instances => app.instances,
         :runningInstances => app.running_instances,
@@ -215,21 +211,6 @@ def translate_legacy_create_json(hash)
       end
 
       if staging = hash["staging"]
-        framework = nil
-        if framework_name = staging["framework"] || staging["model"]
-          framework = Models::Framework.find(:name => framework_name)
-          raise FrameworkInvalid.new(framework_name) unless framework
-          req[:framework_guid] = framework.guid
-        end
-
-        runtime_name = staging["runtime"] || staging["stack"]
-        runtime_name ||= default_runtime_for_framework(framework)
-        if runtime_name
-          runtime = Models::Runtime.find(:name => runtime_name)
-          raise RuntimeInvalid.new(runtime_name) unless runtime
-          req[:runtime_guid] = runtime.guid
-        end
-
         req[:command] = staging["command"] if staging["command"]
       end
 
@@ -292,16 +273,6 @@ def around_translate(old_json, &translate)
       Yajl::Encoder.encode(translated)
     end
 
-    def default_runtime_for_framework(framework)
-      return unless framework
-      framework.internal_info["runtimes"].each do |runtime|
-        runtime.each do |runtime_name, runtime_info|
-          return runtime_name if runtime_info["default"] == true
-        end
-      end
-      nil
-    end
-
     def self.setup_routes
       get    "/apps",                                      :enumerate
       post   "/apps",                                      :create

lib/cloud_controller/api/framework.rb

@@ -10,8 +10,6 @@ class BulkResponse < JsonMessage
         {
           "id"              => String,
           "instances"       => Integer,
-          "framework"       => String,
-          "runtime"         => String,
           # FIXME: find the enum for this
           "state"           => String,
           "memory"          => Integer,
@@ -96,8 +94,6 @@ def bulk_apps
         end
         hash["id"] = app.guid
         hash["updated_at"] = app.updated_at || app.created_at
-        hash["runtime"] = app.runtime.name
-        hash["framework"] = app.framework.name
         apps[app.guid] = hash
         id_for_next_token = app.id
       end