lib/dcmgr.rb in wakame-vdc-dcmgr-10.12.0 vs lib/dcmgr.rb in wakame-vdc-dcmgr-11.06.0

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 
+require 'dcmgr/version'
+require 'ext/time'
+
 module Dcmgr
-  VERSION='10.12.0'
 
   class << self
     def conf
       @conf
     end
@@ -26,12 +28,20 @@
       end
 
       self
     end
 
-    def run_initializers()
+    def run_initializers(*files)
       raise "Complete the configuration prior to run_initializers()." if @conf.nil?
+
+      @files ||= []
+      if files.length == 0
+        @files << "*"
+      else
+      	@files = files
+      end
+      
       initializer_hooks.each { |n|
         n.call
       }
     end
 
@@ -40,43 +50,48 @@
       if blk
         @initializer_hooks << blk
       end
       @initializer_hooks
     end
-
   end
 
   initializer_hooks {
     Dcmgr.class_eval {
-      DCMGR_ROOT = ENV['DCMGR_ROOT'] || File.expand_path('../../', __FILE__)
+      unless defined?(DCMGR_ROOT)
+        DCMGR_ROOT = ENV['DCMGR_ROOT'] || File.expand_path('../../', __FILE__)
+      end
     }
   }
   
   # Add conf/initializers/*.rb loader 
   initializer_hooks {
     initializers_root = File.expand_path('config/initializers', DCMGR_ROOT) 
-    
-    if File.directory?(initializers_root)
-      Dir.glob("#{initializers_root}/*.rb") { |f|
-        ::Kernel.load(f)
-      }
-    end
+
+    @files.each { |file|  
+      if File.directory?(initializers_root)
+        Dir.glob("#{initializers_root}/#{file}.rb") { |f|
+          ::Kernel.load(f)
+        }
+      end
+    }
   }
   
   autoload :Logger, 'dcmgr/logger'
   
   module Models
+    class InvalidUUIDError < StandardError; end
+    class UUIDPrefixDuplication < StandardError; end
     autoload :Base, 'dcmgr/models/base'
 
     CREATE_TABLE_CLASSES=[:Account,:Tag,:TagMapping,:FrontendSystem,
                           :Image,:HostPool,:RequestLog,:Instance,
                           :NetfilterGroup, :NetfilterRule,
                           :StoragePool,:Volume,:VolumeSnapshot,
                           :InstanceNetfilterGroup,
                           :InstanceSpec, :InstanceNic, :Network, :IpLease,
                           :SshKeyPair, :History, :HostnameLease, :MacLease,
-                          :VlanLease,
+                          :VlanLease, :Quota
                          ].freeze
     autoload :BaseNew, 'dcmgr/models/base_new'
     autoload :Account, 'dcmgr/models/account'
     autoload :Tag, 'dcmgr/models/tag'
     autoload :TagMapping, 'dcmgr/models/tag_mapping'
@@ -99,10 +114,11 @@
     autoload :SshKeyPair, 'dcmgr/models/ssh_key_pair'
     autoload :History, 'dcmgr/models/history'
     autoload :HostnameLease, 'dcmgr/models/hostname_lease'
     autoload :MacLease, 'dcmgr/models/mac_lease'
     autoload :VlanLease, 'dcmgr/models/vlan_lease'
+    autoload :Quota, 'dcmgr/models/quota'
   end
 
   module Endpoints
     autoload :CoreAPI, 'dcmgr/endpoints/core_api'
     autoload :Metadata, 'dcmgr/endpoints/metadata'
@@ -110,19 +126,62 @@
 
   module NodeModules
     autoload :StaCollector, 'dcmgr/node_modules/sta_collector'
     autoload :HvaCollector, 'dcmgr/node_modules/hva_collector'
     autoload :InstanceHA, 'dcmgr/node_modules/instance_ha'
+    autoload :ServiceNetfilter, 'dcmgr/node_modules/service_netfilter'
+    autoload :InstanceMonitor, 'dcmgr/node_modules/instance_monitor'
   end
 
   module Stm
     autoload :VolumeContext, 'dcmgr/stm/volume_context'
     autoload :SnapshotContext, 'dcmgr/stm/snapshot_context'
     autoload :Instance, 'dcmgr/stm/instance'
   end
 
   module Helpers
     autoload :CliHelper, 'dcmgr/helpers/cli_helper'
+    autoload :NicHelper, 'dcmgr/helpers/nic_helper'
   end
 
   autoload :Tags, 'dcmgr/tags'
+
+  module Cli
+    require 'dcmgr/cli/errors'
+
+    autoload :Base, 'dcmgr/cli/base'
+    autoload :Network, 'dcmgr/cli/network'
+    autoload :Host, 'dcmgr/cli/host'
+    autoload :Storage, 'dcmgr/cli/storage'
+    autoload :AccountCli, 'dcmgr/cli/account'
+    autoload :UsersCli, 'dcmgr/cli/user'
+    autoload :Vlan, 'dcmgr/cli/vlan'
+    autoload :Image, 'dcmgr/cli/image'
+    autoload :KeyPair, 'dcmgr/cli/keypair'
+    autoload :Group, 'dcmgr/cli/group'
+    autoload :Spec, 'dcmgr/cli/spec'
+    autoload :Tag, 'dcmgr/cli/tag'
+    autoload :Quota, 'dcmgr/cli/quota'
+  end
+
+  module Rpc
+    autoload :HvaHandler, 'dcmgr/rpc/hva_handler'
+    autoload :KvmHelper, 'dcmgr/rpc/hva_handler'
+  end
+
+  # namespace for custom Rack HTTP middleware.
+  module Rack
+    autoload :RequestLogger, 'dcmgr/rack/request_logger'
+    autoload :RunInitializer, 'dcmgr/rack/run_initializer'
+  end
+  
+  module Drivers
+    autoload :SnapshotStorage, 'dcmgr/drivers/snapshot_storage'
+    autoload :S3Storage, 'dcmgr/drivers/s3_storage'
+    autoload :IIJGIOStorage, 'dcmgr/drivers/iijgio_storage'
+    autoload :Hypervisor, 'dcmgr/drivers/hypervisor'
+    autoload :Kvm , 'dcmgr/drivers/kvm'
+    autoload :Lxc , 'dcmgr/drivers/lxc'
+  end
+  
+  autoload :StorageService, 'dcmgr/storage_service'
 end