wakame-vdc-dcmgr 10.12.0 → 11.06.0

data/lib/dcmgr/rubygems.rb

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+begin
+  require 'rubygems'
+  require 'bundler/setup'
+rescue Exception => e
+end

data/lib/dcmgr/storage_service.rb

@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+
+module Dcmgr
+  class StorageService
+
+    @snapshot_repository_config = nil
+    
+    def initialize(provider, access_key, secret_key)
+      @account = {}
+      @account[:provider] = provider.upcase
+      @account[:access_key] = access_key
+      @account[:secret_key] = secret_key
+    end
+    
+    def self.snapshot_repository_config
+      if @snapshot_repository_config.nil?
+        config_file = YAML.load_file(File.join(File.expand_path(DCMGR_ROOT), 'config', 'snapshot_repository.yml'))
+        @snapshot_repository_config = config_file
+      else
+        @snapshot_repository_config
+      end
+    end
+
+    def self.has_driver?(driver)
+      %w(S3 IIJGIO).include? driver.upcase
+    end
+    
+    def bucket(name)
+      case @account[:provider]
+        when 'S3'
+          @driver = Dcmgr::Drivers::S3Storage.new(name)
+        when 'IIJGIO'
+          @driver = Dcmgr::Drivers::IIJGIOStorage.new(name)
+      else
+        raise "#{@account[:provider]} is not a recognized storage provider"
+      end
+
+      @driver.setenv('SERVICE', @account[:provider].downcase)
+      @driver.setenv('ACCESS_KEY_ID', @account[:access_key])
+      @driver.setenv('SECRET_ACCESS_KEY', @account[:secret_key])
+      @driver
+    end
+
+    def self.repository(repository_address)
+      if repository_address.nil?
+        return {} 
+      end
+      tmp = repository_address.split(',')
+      destination_key = tmp[0]
+      dest = destination_key.match(/^([a-z0-9_]+)@([a-z0-9_-]+):([a-z0-9_-]+):([a-z0-9_\-\/]+)(snap-[a-z0-9]+\.zsnap)+$/)
+      if dest.nil?
+        raise "Invalid format: #{repository_address}"
+      end 
+          
+      h = { 
+        :destination => dest[1],
+        :driver => dest[2],
+        :bucket => dest[3],
+        :path => dest[4],
+        :filename => dest[5],
+        :access_key => tmp[1],
+        :secret_key => tmp[2],
+      }   
+    end 
+
+    def self.repository_address(destination_key)
+      format = '%s,%s,%s'
+      config_data = self.snapshot_repository_config
+      destination = destination_key.split('@')[0]
+      
+      if destination == 'local'
+        config = {:access_key => '', :secret_key => ''}
+      else
+        config = config_data[destination]
+      end
+      
+      sprintf(format, *[destination_key, config["access_key"], config["secret_key"]])
+    end
+
+    def self.destination_key(account_id, destination, store_path, filename)
+      format = '%s@%s:%s:%s'
+      if destination == 'local'
+        config = {
+          "driver" => "local",
+          "bucket" => "none"
+        }
+      else
+        config_data = snapshot_repository_config
+        config = config_data[destination]
+        if config.nil?
+          raise "Destination isn't exists"
+        end
+        store_path = "snapshots/#{account_id}/"
+      end
+      sprintf(format, *[destination, config["driver"], config["bucket"], File.join(store_path, filename)])
+    end
+  end
+end

data/lib/dcmgr/tags.rb

@@ -32,7 +32,7 @@ module Dcmgr::Tags
   
   class HostPool < Models::Tag
     def accept_mapping?(to)
-      to.is_a?(Dcmgr::Models::HostNode)
+      to.is_a?(Dcmgr::Models::HostPool)
     end
 
     def pick(spec)
@@ -48,7 +48,7 @@ module Dcmgr::Tags
   
   class StoragePool < Models::Tag
     def accept_mapping?(to)
-      to.is_a?(Dcmgr::Models::StorageNode)
+      to.is_a?(Dcmgr::Models::StoragePool)
     end
   end
 end

data/lib/dcmgr/version.rb

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+module Dcmgr
+  VERSION_MAJOR="11.06"
+  VERSION_MINOR=0
+
+  VERSION="#{VERSION_MAJOR}.#{VERSION_MINOR}"
+end

data/lib/ext/time.rb

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+require 'time'
+
+class Time
+  def to_json(*args)
+    self.utc.iso8601.to_s.to_json(*args)
+  end
+end

data/lib/sinatra/respond_to.rb

@@ -41,6 +41,9 @@ module Sinatra
       #
       # and the format will automatically be available in <tt>format</tt>
       app.before do
+
+        response['Content-Type'] = '' 
+        
         # Let through sinatra image urls in development
         next if self.class.development? && request.path_info =~ %r{/__sinatra__/.*?.png}
 

data/lib/sinatra/sequel_transaction.rb

@@ -5,17 +5,32 @@ require 'sequel'
 
 module Sinatra
   # wrap routed request with sequel transaction block.
+  # note: this is NOT thread safe. please ensure not to be used in the
+  # multi-threaded apps.
   module SequelTransaction
     module Helpers
+      # TODO: abstract database connection. it means that do not use
+      # Sequel::DATABASE.first where to get the connection.
+      
+      public
+      # commit manually before return from the request block
+      def commit_transaction
+        db = Sequel::DATABASES.first
+        db << db.__send__(:commit_transaction_sql)
+      end
+      
       private
       def route_eval(&block)
+        
         db = Sequel::DATABASES.first
-
-        ret = nil
-        db.transaction do
-          ret = instance_eval(&block)
+        begin
+          db.transaction do
+             super(&block)
+          end
+        rescue Sequel::DatabaseError, Sequel::DatabaseConnectionError => e
+          db.disconnect
+          raise e
         end
-        throw :halt, ret
       end
     end
 

data/web/api/config.ru

@@ -1,20 +1,16 @@
 # -*- coding: utf-8 -*-
 
-begin
-  require 'rubygems'
-  require 'bundler'
-  Bundler.setup(:default, :dcmgr)
-rescue ::Exception => e
-end
-$:.unshift "#{File.dirname(__FILE__)}/../../lib"
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
 
+require 'dcmgr/rubygems'
 require 'dcmgr'
 
-if File.exists?('../../config/dcmgr.conf')
-  Dcmgr.configure('../../config/dcmgr.conf')
-else
-  raise "Could not find the config/dcmgr.conf configuration file."
-end
-Dcmgr.run_initializers
+Dcmgr.configure(File.expand_path('../../../config/dcmgr.conf', __FILE__))
 
+use Dcmgr::Rack::RunInitializer, lambda {
+  Dcmgr.run_initializers
+}, lambda {
+  next if Isono::NodeModules::DataStore.disconnected? == false
+  Dcmgr.run_initializers('sequel')
+}
 run Dcmgr::Endpoints::CoreAPI.new

data/web/metadata/config.ru

@@ -1,20 +1,17 @@
 # -*- coding: utf-8 -*-
 
-begin
-  require 'rubygems'
-  require 'bundler'
-  Bundler.setup(:default, :dcmgr)
-rescue ::Exception => e
-end
-$:.unshift "#{File.dirname(__FILE__)}/../../lib"
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
 
+require 'dcmgr/rubygems'
 require 'dcmgr'
 
-if File.exists?('../../config/dcmgr.conf')
-  Dcmgr.configure('../../config/dcmgr.conf')
-else
-  raise "Could not find the config/dcmgr.conf configuration file."
-end
-Dcmgr.run_initializers
+Dcmgr.configure(File.expand_path('../../../config/dcmgr.conf', __FILE__))
+
+use Dcmgr::Rack::RunInitializer, lambda {
+  Dcmgr.run_initializers
+}, lambda {
+  next if Isono::NodeModules::DataStore.disconnected? == false
+  Dcmgr.run_initializers('sequel')
+}
 
 run Dcmgr::Endpoints::Metadata.new

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wakame-vdc-dcmgr
 version: !ruby/object:Gem::Version 
+  hash: 95
   prerelease: false
   segments: 
-  - 10
-  - 12
+  - 11
+  - 6
   - 0
-  version: 10.12.0
+  version: 11.06.0
 platform: ruby
 authors: 
 - axsh Ltd.
@@ -14,214 +15,223 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 +09:00
+date: 2011-06-30 00:00:00 +09:00
 default_executable: collector
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: isono
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
-    - - <
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 2
-        version: "0.2"
+        - 3
+        version: 0.2.3
   requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: eventmachine
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 10
-        version: 0.12.10
-  requirement: *id002
+  name: isono
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: log4r
-  type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  requirement: *id002
+  type: :runtime
+  name: log4r
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: extlib
-  type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 37
         segments: 
         - 0
         - 9
         - 15
         version: 0.9.15
-  requirement: *id004
+  requirement: *id003
+  type: :runtime
+  name: extlib
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: configuration
-  type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id004
+  type: :runtime
+  name: configuration
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: statemachine
-  type: :runtime
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 1
         - 1
         version: 1.1.1
-  requirement: *id006
+  requirement: *id005
+  type: :runtime
+  name: statemachine
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: ruby-hmac
-  type: :runtime
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id007
+  requirement: *id006
+  type: :runtime
+  name: ruby-hmac
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: ipaddress
-  type: :runtime
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
         - 0
         version: 0.7.0
-  requirement: *id008
+  requirement: *id007
+  type: :runtime
+  name: ipaddress
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rack
-  type: :runtime
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 2
         - 1
         version: 1.2.1
-  requirement: *id009
+  requirement: *id008
+  type: :runtime
+  name: rack
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: sinatra
-  type: :runtime
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
-        - 0
-        version: "1.0"
-  requirement: *id010
+        - 2
+        - 1
+        version: 1.2.1
+  requirement: *id009
+  type: :runtime
+  name: sinatra
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: json
-  type: :runtime
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 2
         - 0
         version: 1.2.0
-  requirement: *id011
+  requirement: *id010
+  type: :runtime
+  name: json
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: sequel
-  type: :runtime
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 83
         segments: 
         - 3
-        - 16
+        - 21
         - 0
-        version: 3.16.0
-  requirement: *id012
+        version: 3.21.0
+  requirement: *id011
+  type: :runtime
+  name: sequel
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: mysql
-  type: :runtime
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 45
         segments: 
         - 2
         - 8
         - 1
         version: 2.8.1
-  requirement: *id013
+  requirement: *id012
+  type: :runtime
+  name: mysql
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bacon
-  type: :development
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id014
+  requirement: *id013
+  type: :development
+  name: bacon
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
-  type: :development
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id015
+  requirement: *id014
+  type: :development
+  name: rake
 description: ""
 email: 
 - dev@axsh.net
@@ -233,61 +243,89 @@ extra_rdoc_files: []
 
 files: 
 - config/path_resolver.rb
-- config/initializers/isono.rb
 - config/initializers/passenger.rb
+- config/initializers/isono.rb
 - config/initializers/sequel.rb
 - lib/dcmgr.rb
 - lib/sinatra/accept_media_types.rb
+- lib/sinatra/url_for.rb
 - lib/sinatra/sequel_transaction.rb
 - lib/sinatra/static_assets.rb
+- lib/sinatra/rabbit.rb
 - lib/sinatra/respond_to.rb
 - lib/sinatra/lazy_auth.rb
-- lib/sinatra/rabbit.rb
-- lib/sinatra/url_for.rb
-- lib/dcmgr/web/base.rb
-- lib/dcmgr/logger.rb
-- lib/dcmgr/helpers/cli_helper.rb
+- lib/dcmgr/rack/request_logger.rb
+- lib/dcmgr/rack/run_initializer.rb
+- lib/dcmgr/stm/snapshot_context.rb
+- lib/dcmgr/stm/volume_context.rb
+- lib/dcmgr/stm/instance.rb
+- lib/dcmgr/version.rb
 - lib/dcmgr/scheduler/find_random.rb
 - lib/dcmgr/scheduler/find_last.rb
-- lib/dcmgr/node_modules/instance_ha.rb
-- lib/dcmgr/node_modules/sta_collector.rb
-- lib/dcmgr/node_modules/hva_collector.rb
-- lib/dcmgr/endpoints/errors.rb
-- lib/dcmgr/endpoints/core_api.rb
+- lib/dcmgr/scheduler.rb
 - lib/dcmgr/endpoints/metadata.rb
+- lib/dcmgr/endpoints/errors.rb
 - lib/dcmgr/endpoints/core_api_mock.rb
-- lib/dcmgr/stm/instance.rb
-- lib/dcmgr/stm/snapshot_context.rb
-- lib/dcmgr/stm/volume_context.rb
-- lib/dcmgr/models/frontend_system.rb
+- lib/dcmgr/endpoints/core_api.rb
+- lib/dcmgr/tags.rb
+- lib/dcmgr/models/ip_lease.rb
+- lib/dcmgr/models/instance_netfilter_group.rb
+- lib/dcmgr/models/volume_snapshot.rb
 - lib/dcmgr/models/storage_pool.rb
+- lib/dcmgr/models/netfilter_rule.rb
+- lib/dcmgr/models/tag_mapping.rb
+- lib/dcmgr/models/instance_spec.rb
+- lib/dcmgr/models/host_pool.rb
 - lib/dcmgr/models/instance_nic.rb
-- lib/dcmgr/models/image.rb
-- lib/dcmgr/models/base.rb
 - lib/dcmgr/models/mac_lease.rb
-- lib/dcmgr/models/hostname_lease.rb
-- lib/dcmgr/models/volume_snapshot.rb
-- lib/dcmgr/models/instance_spec.rb
+- lib/dcmgr/models/vlan_lease.rb
+- lib/dcmgr/models/base_new.rb
+- lib/dcmgr/models/account.rb
+- lib/dcmgr/models/frontend_system.rb
+- lib/dcmgr/models/image.rb
 - lib/dcmgr/models/instance.rb
 - lib/dcmgr/models/volume.rb
+- lib/dcmgr/models/netfilter_group.rb
+- lib/dcmgr/models/tag.rb
 - lib/dcmgr/models/account_resource.rb
-- lib/dcmgr/models/vlan_lease.rb
-- lib/dcmgr/models/physical_host.rb
+- lib/dcmgr/models/hostname_lease.rb
 - lib/dcmgr/models/network.rb
-- lib/dcmgr/models/ip_lease.rb
-- lib/dcmgr/models/host_pool.rb
-- lib/dcmgr/models/ssh_key_pair.rb
-- lib/dcmgr/models/history.rb
 - lib/dcmgr/models/request_log.rb
-- lib/dcmgr/models/tag.rb
-- lib/dcmgr/models/base_new.rb
-- lib/dcmgr/models/tag_mapping.rb
-- lib/dcmgr/models/instance_netfilter_group.rb
-- lib/dcmgr/models/account.rb
-- lib/dcmgr/models/netfilter_group.rb
-- lib/dcmgr/models/netfilter_rule.rb
-- lib/dcmgr/tags.rb
-- lib/dcmgr/scheduler.rb
+- lib/dcmgr/models/base.rb
+- lib/dcmgr/models/quota.rb
+- lib/dcmgr/models/history.rb
+- lib/dcmgr/models/ssh_key_pair.rb
+- lib/dcmgr/logger.rb
+- lib/dcmgr/drivers/lxc.rb
+- lib/dcmgr/drivers/iijgio_storage.rb
+- lib/dcmgr/drivers/s3_storage.rb
+- lib/dcmgr/drivers/snapshot_storage.rb
+- lib/dcmgr/drivers/hypervisor.rb
+- lib/dcmgr/drivers/kvm.rb
+- lib/dcmgr/rubygems.rb
+- lib/dcmgr/storage_service.rb
+- lib/dcmgr/rpc/hva_handler.rb
+- lib/dcmgr/messaging_client.rb
+- lib/dcmgr/helpers/nic_helper.rb
+- lib/dcmgr/helpers/cli_helper.rb
+- lib/dcmgr/node_modules/hva_collector.rb
+- lib/dcmgr/node_modules/instance_ha.rb
+- lib/dcmgr/node_modules/sta_collector.rb
+- lib/dcmgr/node_modules/instance_monitor.rb
+- lib/dcmgr/node_modules/service_netfilter.rb
+- lib/dcmgr/cli/vlan.rb
+- lib/dcmgr/cli/storage.rb
+- lib/dcmgr/cli/spec.rb
+- lib/dcmgr/cli/errors.rb
+- lib/dcmgr/cli/host.rb
+- lib/dcmgr/cli/image.rb
+- lib/dcmgr/cli/tag.rb
+- lib/dcmgr/cli/keypair.rb
+- lib/dcmgr/cli/network.rb
+- lib/dcmgr/cli/base.rb
+- lib/dcmgr/cli/quota.rb
+- lib/dcmgr/cli/group.rb
+- lib/ext/time.rb
 - web/api/public/index.html
 - web/metadata/public/index.html
 - Rakefile
@@ -307,25 +345,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Datacenter management toolkit for IaaS Cloud: datacenter manager and support modules"