Revert "remove framework/runtime"

This reverts commit 2ea74b8.

Author: Alex Suraci & Matthew Boedicker

bin/document_api

@@ -20,6 +20,8 @@ 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,10 @@
+---
+name: "myframework"
+runtimes:
+  - node:
+      default: true
+  - node06:
+      default: false
+detection:
+  - "*.js": '.'
+disabled: true

config/frameworks/node.yml

@@ -0,0 +1,9 @@
+---
+name: "node"
+runtimes:
+  - node:
+      default: true
+  - node06:
+      default: false
+detection:
+  - "*.js": '.'

config/frameworks/sinatra.yml

@@ -0,0 +1,18 @@
+---
+name: "sinatra"
+runtimes:
+  - ruby18:
+      default: true
+      environment:
+       bundle_gemfile:
+  - ruby19:
+      environment:
+       bundle_gemfile:
+  - myruntime:
+       default: false
+detection:
+  - "*.rb": "require\\s+'sinatra'|require\\s+\"sinatra\"" # .rb files in the root dir containing a require?
+  - "config.ru": false # use rack if it detects a config.ru
+  - "config/environment.rb": false # and config/environment.rb must not exist
+
+# vim: filetype=yaml

config/frameworks/spring.yml

@@ -0,0 +1,9 @@
+---
+name: "spring"
+runtimes:
+  - "java":
+      default: true
+detection:
+  - "*.war": true # TODO - this thinks everything with an XML file is Spring
+
+# vim: filetype=yaml

config/frameworks/standalone.yml

@@ -0,0 +1,23 @@
+---
+name: "standalone"
+runtimes:
+  - python2:
+      default: false
+  - java:
+      default: false
+  - node:
+      default: false
+  - node06:
+      default: false
+  - erlangR14B02:
+      default: false
+  - php:
+      default: false
+  - ruby18:
+      environment:
+        bundle_gemfile:
+  - ruby19:
+      environment:
+        bundle_gemfile:
+
+# vim: filetype=yaml

config/runtimes.yml

@@ -0,0 +1,41 @@
+---
+python2:
+      version: "2.6.5"
+      description: "Python 2.6.5"
+      executable: python
+java:
+      description: "Java 6"
+      version: "1.6"
+      executable: "java"
+node:
+      version: "0.4.12"
+      description: "Node.js"
+      executable: node
+node06:
+      version: "0.6.8"
+      description: "Node.js"
+      executable: node
+erlangR14B02:
+      version: "R14B02"
+      description: "Erlang R14B02"
+      executable: /var/vcap/runtimes/erlang-R14B02/bin/erl
+php:
+      description: "PHP 5"
+      version: "5.3"
+      executable: "php"
+ruby18:
+      version: "1.8.7"
+      description: "Ruby 1.8.7"
+      executable: "/usr/bin/ruby"
+      bundler: "bundle"
+      environment:
+        bundle_gemfile:
+ruby19:
+      version: "1.9.2"
+      description: "Ruby 1.9.2"
+      executable: "ruby"
+      bundler: "bundle"
+myruntime:
+      version: "1.0"
+      description: "My Runtime"
+      disabled: true

db/migrations/20130323005501_remove_framework_and_runtime.rb

@@ -15,6 +15,8 @@ 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 => {}
@@ -35,7 +37,7 @@ module VCAP::CloudController
       to_many    :routes
     end
 
-    query_parameters :name, :space_guid, :organization_guid
+    query_parameters :name, :space_guid, :organization_guid, :framework_guid, :runtime_guid
 
     def self.translate_validation_exception(e, attributes)
       space_and_name_errors = e.errors.on([:space_id, :name])

lib/cloud_controller/api/app.rb

@@ -20,6 +20,8 @@ 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)

lib/cloud_controller/api/app_summary.rb

@@ -0,0 +1,28 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+module VCAP::CloudController
+  rest_controller :Framework do
+    permissions_required do
+      full Permissions::CFAdmin
+      read Permissions::Authenticated
+    end
+
+    define_attributes do
+      attribute  :name,           String
+      attribute  :description,    String
+      attribute  :internal_info,  Hash
+      to_many    :apps
+    end
+
+    query_parameters :name, :app_guid
+
+    def self.translate_validation_exception(e, attributes)
+      name_errors = e.errors.on(:name)
+      if name_errors && name_errors.include?(:unique)
+        Errors::FrameworkNameTaken.new(attributes["name"])
+      else
+        Errors::FrameworkInvalid.new(e.errors.full_messages)
+      end
+    end
+  end
+end

lib/cloud_controller/api/framework.rb

@@ -0,0 +1,31 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+module VCAP::CloudController
+  rest_controller :Runtime do
+    permissions_required do
+      full Permissions::CFAdmin
+      read Permissions::Authenticated
+    end
+
+    define_attributes do
+      attribute :name,           String
+      attribute :description,    String
+      attribute  :internal_info, Hash
+
+      # version was really a v1 concept, but the yeti tests expect it
+      attribute :version,        String, :exclude_in => [:create, :update]
+      to_many   :apps,           :default => []
+    end
+
+    query_parameters :name, :app_guid
+
+    def self.translate_validation_exception(e, attributes)
+      name_errors = e.errors.on(:name)
+      if name_errors && name_errors.include?(:unique)
+        Errors::RuntimeNameTaken.new(attributes["name"])
+      else
+        Errors::RuntimeInvalid.new(e.errors.full_messages)
+      end
+    end
+  end
+end

lib/cloud_controller/api/runtime.rb

@@ -49,6 +49,8 @@ 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

lib/cloud_controller/api/space_summary.rb

@@ -195,6 +195,13 @@ 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,
 

lib/cloud_controller/app_stager.rb

@@ -46,6 +46,7 @@ class VCAP::CloudController::Config < VCAP::Config
         optional(:staging_manifests) => String,
       },
 
+      optional(:runtimes_file) => String,
       optional(:stacks_file) => String,
 
       :db => {
@@ -167,6 +168,7 @@ 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] ||= {}

lib/cloud_controller/config.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.stack.name)
+          dea_id = dea_pool.find_dea(app.memory, app.runtime.name, app.stack.name)
           if dea_id
             dea_publish("#{dea_id}.start", msg.merge(message_override))
           else
@@ -313,6 +313,11 @@ 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/dea/dea_client.rb

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

lib/cloud_controller/dea/dea_pool.rb

@@ -129,6 +129,10 @@ 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,
@@ -211,6 +215,21 @@ 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
 
@@ -273,6 +292,16 @@ 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/legacy_api/legacy_apps.rb

@@ -10,6 +10,8 @@ class BulkResponse < JsonMessage
         {
           "id"              => String,
           "instances"       => Integer,
+          "framework"       => String,
+          "runtime"         => String,
           # FIXME: find the enum for this
           "state"           => String,
           "memory"          => Integer,
@@ -94,6 +96,8 @@ 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