deltacloud-core 1.1.1 → 1.1.2

data/lib/initialize.rb

@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless require_relatived by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# Deltacloud server initialization scripts:
+
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+# Initialize storage for mock and CIMI database
+require_relative './initializers/mock_initialize'
+
+# Configure available frontends
+require_relative './initializers/frontend_initialize'
+
+if Deltacloud::need_database?
+  require_relative './initializers/database_initialize'
+end

data/lib/initializers/database_initialize.rb

@@ -0,0 +1,76 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# Initialize the storage layer we use to persist some CIMI entities
+# and attributes.
+#
+# By default the database backend is sqlite3
+
+require 'sequel'
+require 'logger'
+
+require_relative '../db'
+
+# We want to enable validation plugin for all database models
+#
+Sequel::Model.plugin :validation_class_methods
+
+# Enable Sequel migrations extension
+Sequel.extension :migration
+
+# The default sqlite3 database can be overridden with the 'DATABASE_LOCATION'
+# environment variable.
+#
+# For more details about possible values see:
+# http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html
+#
+unless location = ENV['DATABASE_LOCATION']
+  if ENV['RACK_ENV'] == 'test'
+    if RUBY_PLATFORM=='java'
+      location = 'jdbc:sqlite::memory'
+    else
+      location = 'sqlite:/'
+    end
+  else
+    sequel_driver = (RUBY_PLATFORM=='java') ? 'jdbc:sqlite:' : 'sqlite://'
+    location = "#{sequel_driver}#{File.join(BASE_STORAGE_DIR, 'db.sqlite')}"
+  end
+end
+
+if RUBY_PLATFORM == 'java'
+  require 'jdbc/sqlite3'
+  Jdbc::SQLite3.load_driver
+end
+
+database = Deltacloud::initialize_database(location)
+
+# Detect if there are some pending migrations to run.
+# We don't actually run migrations during server startup, just print
+# a warning to console
+#
+
+DATABASE_MIGRATIONS_DIR = File.join(File.dirname(__FILE__), '..', '..', 'db', 'migrations')
+
+unless Sequel::Migrator.is_current?(database, DATABASE_MIGRATIONS_DIR)
+  # Do not exit when this intitializer is included from deltacloud-db-upgrade
+  # script
+  #
+  if ENV['RACK_ENV'] == 'test' || ENV['DB_UPGRADE']
+    Sequel::Migrator.apply(database, DATABASE_MIGRATIONS_DIR)
+  else
+    warn "WARNING: The database needs to be upgraded. Run: 'deltacloud-db-upgrade' command."
+    exit(1)
+  end
+end

data/lib/initializers/frontend_initialize.rb

@@ -0,0 +1,42 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless require_relatived by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# The default driver if the API_DRIVER environment variable is not set:
+ENV['API_DRIVER'] ||= 'mock'
+
+# The default frontend if the API_FRONTEND environment variable is not set:
+ENV['API_FRONTEND'] ||= 'deltacloud'
+
+require_relative './../deltacloud_rack'
+
+# This will configure the URL mapping, verions and different servers
+# that multiple frontends require. You might not need to change this :)
+Deltacloud::configure do |server|
+  server.root_url '/api'
+  server.version Deltacloud::API_VERSION
+  server.klass 'Deltacloud::API'
+end
+
+Deltacloud::configure(:cimi) do |server|
+  server.root_url '/cimi'
+  server.version Deltacloud::CIMI_API_VERSION
+  server.klass 'CIMI::API'
+end
+
+Deltacloud::configure(:ec2) do |server|
+  server.root_url '/ec2'
+  server.version '2012-04-01'
+  server.klass 'Deltacloud::EC2::API'
+end

data/lib/initializers/mock_initialize.rb

@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+require 'fileutils'
+
+# This will create the directory we use for storing Mock driver
+# data and also CIMI database file
+#
+
+# By default the location is /var/tmp/deltacloud-{USER}/
+#
+BASE_STORAGE_DIR = File.join('/', 'var', 'tmp', "deltacloud-#{ENV['USER']}")
+
+# The mock driver YAML files are stored in BASE_STORAGE_DIR/mock
+# You can overide this by setting 'DELTACLOUD_MOCK_STORAGE' environment variable
+#
+MOCK_STORAGE_DIR = ENV['DELTACLOUD_MOCK_STORAGE'] || File.join(BASE_STORAGE_DIR, 'mock')
+
+[BASE_STORAGE_DIR, MOCK_STORAGE_DIR].each do |p|
+  FileUtils.mkpath(p, :mode => 0750) unless File.directory?(p)
+end

data/lib/sinatra/rack_logger.rb

@@ -26,33 +26,40 @@ module Rack
   # rack.errors by default.
   class DeltacloudLogger
 
-    def self.log_path(path=nil)
-      @log_file ||= path
-    end
+    class << self
+      def log_path(path=nil)
+        @log_file ||= path
+      end
 
-    def self.verbose?
-      @verbose
-    end
+      def verbose?
+        @verbose
+      end
 
-    def self.verbose(v=nil)
-      @verbose ||= v
-    end
+      def verbose(v=nil)
+        @verbose ||= v
+      end
 
-    def self.setup(path, be_verbose=false)
-      verbose(be_verbose)
-      return self if path.nil?
-      dir = ::File.dirname(path)
-      if ::File.exists?(dir) and ::File.writable?(dir)
-        log_path(path)
-      else
-        warn "Warning: The log directory (#{dir}) is not writeable."
+      def setup(path, be_verbose=false)
+        verbose(be_verbose)
+        return self if path.nil?
+        dir = ::File.dirname(path)
+        if ::File.exists?(dir) and ::File.writable?(dir)
+          log_path(path)
+        else
+          warn "Warning: The log directory (#{dir}) is not writeable."
+        end
+        self
       end
-      self
-    end
 
-    def self.error(code, &block)
-      @logger ||= ::Logger.new(log_path || $stdout)
-      @logger.error(code, &block)
+      def logger
+        @logger ||= ::Logger.new(log_path || $stdout)
+      end
+
+      [:error, :warn, :info].each do |method_name|
+        define_method method_name do |msg, &block|
+          logger.send(method_name, msg, &block)
+        end
+      end
     end
 
     # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
@@ -62,10 +69,14 @@ module Rack
 
     VERBOSE_FORMAT = %{%s - %s [%s] "%s %s%s%s %s" %s %s %d %s %0.4f\n}
 
+    # If Deltacloud is started with the -L/--log option then
+    # we set logger to this file, otherwise use the default
+    # Sinatra logger facility
+    #
     def initialize(app, logger=nil)
       @app = app
-      unless self.class.log_path.nil?
-        @logger = ::Logger.new(self.class.log_path)
+      if self.class.log_path
+        @logger = self.class.logger
       else
         @logger = logger
       end

data/tests/cimi/collections/cloud_entry_point_test.rb

@@ -12,13 +12,7 @@ describe CIMI::Collections::CloudEntryPoint do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::CloudentrypointCollection::IndexOperation
-  end
-
-  it 'set the CIMI-Version header' do
-    get root_url
-    headers['CIMI-Specification-Version'].wont_be_nil
-    headers['CIMI-Specification-Version'].must_equal '1.0.0'
+    @collection.operation(:index).must_equal CIMI::Rabbit::CloudentrypointCollection::IndexOperation
   end
 
   it 'advertise CIMI collections in XML format' do

data/tests/cimi/collections/machine_images_test.rb

@@ -12,11 +12,11 @@ describe CIMI::Collections::MachineImages do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::MachineImagesCollection::IndexOperation
+    @collection.operation(:index).must_equal CIMI::Rabbit::MachineImagesCollection::IndexOperation
   end
 
   it 'has show operation' do
-    @collection.operation(:show).must_equal Sinatra::Rabbit::MachineImagesCollection::ShowOperation
+    @collection.operation(:show).must_equal CIMI::Rabbit::MachineImagesCollection::ShowOperation
   end
 
   it 'returns list of images in various formats with index operation' do

data/tests/cimi/collections/machine_templates_test.rb

@@ -0,0 +1,75 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+require 'minitest/autorun'
+require_relative './common.rb'
+
+describe CIMI::Collections::MachineTemplates do
+
+  before do
+    def app; run_frontend(:cimi) end
+    authorize 'mockuser', 'mockpassword'
+    @collection = CIMI::Collections.collection(:machine_images)
+  end
+
+  it 'should return bad request creating template with scrambled JSON' do
+    json_body = '{
+      "resourceURI": "http://schemas.dmtf.org/cimi/1/MachineTemplateCreate",
+      "name": "myMachineDemoTemplate",
+      "description": "My very loved machine template",
+      "machineConfig": { "href": "http://localhost:3001/cimi/machine_configurations/m1-xlarge" }
+      "machineImage": { "href": "http://localhost:3001/cimi/machine_images/img1" }
+    }'
+    header 'Content-Type', 'application/json'
+    header 'Accept', 'application/json'
+    post root_url('/machine_templates'), json_body
+    status.must_equal 400
+    json['code'].must_equal 400
+    json['message'].must_equal "Bad request (expected ',' or '}' in object at '\"machineImage\": { \"h'!)"
+  end
+
+  it 'should return validation error when missing required attribute in JSON' do
+    json_body = '{
+      "resourceURI": "http://schemas.dmtf.org/cimi/1/MachineTemplateCreate",
+      "name": "myMachineDemoTemplate",
+      "description": "My very loved machine template",
+      "machineConfig": { "href": "http://localhost:3001/cimi/machine_configurations/m1-xlarge" }
+    }'
+    header 'Content-Type', 'application/json'
+    header 'Accept', 'application/json'
+    post root_url('/machine_templates'), json_body
+    status.must_equal 400
+    json['message'].must_equal "Required attributes not set: machineImage"
+    json['error'].must_equal 'CIMI::Model::ValidationError'
+  end
+
+  it 'should return bad request creating template with scrambled XML' do
+    xml_body = '
+      <MachineTemplateCreate>
+        <name>myXmlTestMachineTemplate1</name>
+        <description>Description of my MachineTemplate</description>
+        operty key="test">value</property>
+        <machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-xlarge"/>
+        <machineImage href="http://localhost:3001/cimi/machine_images/img3"/>
+      </MachineTemplateCreate>'
+    header 'Content-Type', 'text/xml'
+    header 'Accept', 'text/xml'
+    post root_url('/machine_templates'), xml_body
+    status.must_equal 400
+    xml.at('/error/message').text.must_equal 'Bad Request'
+  end
+
+  it 'should return validation error when missing required attribute in XML' do
+    xml_body = '
+      <MachineTemplateCreate>
+        <name>myXmlTestMachineTemplate1</name>
+        <description>Description of my MachineTemplate</description>
+        <machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-xlarge"/>
+      </MachineTemplateCreate>'
+    header 'Content-Type', 'text/xml'
+    header 'Accept', 'text/xml'
+    post root_url('/machine_templates'), xml_body
+    status.must_equal 400
+    xml.at('/error/message').text.must_equal "Required attributes not set: machineImage"
+  end
+
+end

data/tests/cimi/collections/machines_test.rb

@@ -14,11 +14,11 @@ describe CIMI::Collections::Machines do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::MachinesCollection::IndexOperation
+    @collection.operation(:index).must_equal CIMI::Rabbit::MachinesCollection::IndexOperation
   end
 
   it 'has show operation' do
-    @collection.operation(:show).must_equal Sinatra::Rabbit::MachinesCollection::ShowOperation
+    @collection.operation(:show).must_equal CIMI::Rabbit::MachinesCollection::ShowOperation
   end
 
   it 'returns list of machines in various formats with index operation' do

data/tests/cimi/collections/system_templates_test.rb

@@ -0,0 +1,41 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+require 'minitest/autorun'
+require_relative './common.rb'
+
+describe CIMI::Collections::SystemTemplates do
+
+  before do
+    def app; run_frontend(:cimi) end
+    authorize 'mockuser', 'mockpassword'
+    @collection = CIMI::Collections.collection(:system_templates)
+  end
+
+  it 'has index operation' do
+    @collection.operation(:index).must_equal CIMI::Rabbit::SystemTemplatesCollection::IndexOperation
+  end
+
+  it 'has show operation' do
+    @collection.operation(:show).must_equal CIMI::Rabbit::SystemTemplatesCollection::ShowOperation
+  end
+
+  it 'returns list of system templates in various formats with index operation' do
+    formats.each do |format|
+      header 'Accept', format
+      get root_url + '/system_templates'
+      status.must_equal 200
+    end
+  end
+
+  it 'should allow to retrieve the single system template' do
+    get root_url '/system_templates/template1'
+    status.must_equal 200
+    xml.root.name.must_equal 'SystemTemplate'
+  end
+
+  it 'should not return non-existing system_template' do
+    get root_url '/system_templates/unknown-system_template'
+    status.must_equal 404
+  end
+
+end

data/tests/cimi/collections/systems_test.rb

@@ -0,0 +1,50 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+require 'minitest/autorun'
+require_relative './common.rb'
+
+describe CIMI::Collections::Systems do
+
+  before do
+    def app; run_frontend(:cimi) end
+    authorize 'mockuser', 'mockpassword'
+    @collection = CIMI::Collections.collection(:systems)
+  end
+
+  it 'has index operation' do
+    @collection.operation(:index).must_equal CIMI::Rabbit::SystemsCollection::IndexOperation
+  end
+
+  it 'has show operation' do
+    @collection.operation(:show).must_equal CIMI::Rabbit::SystemsCollection::ShowOperation
+  end
+
+  it 'returns list of systems in various formats with index operation' do
+    formats.each do |format|
+      header 'Accept', format
+      get root_url + '/systems'
+      status.must_equal 200
+    end
+  end
+
+  it 'should allow to retrieve the single system' do
+    get root_url '/systems/system1'
+    status.must_equal 200
+    xml.root.name.must_equal 'System'
+  end
+
+  it 'should have legal status' do
+    get root_url '/systems'
+    status.must_equal 200
+    (xml/'Collection/System').each do |s|
+      (s/'state').wont_be_empty
+      (s/'state').inner_text.must_equal 'STOPPED'
+    end
+  end
+
+  it 'should not return non-existing system' do
+    get root_url '/systems/unknown-system'
+    status.must_equal 404
+  end
+
+end