wakame-vdc-webui 11.06.0 → 11.12.0

data/app/views/volumes/index.html.erb

@@ -100,11 +100,6 @@ jQuery(function($){
 						<td class="title"><%= t("volumes.details.created_at") %>:</td>
 						<td colspan="7">${item.created_at}</td>
 					</tr>
-					<tr>
-						<td class="padcell"></td>
-						<td class="title"><%= t("volumes.details.updated_at") %>:</td>
-						<td colspan="7">${item.updated_at}</td>
-					</tr>
 				</table>
 			</div>
 			</script>

data/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 # require 'rails/all'
 # require "active_record/railtie"
 require "action_controller/railtie"
-require "action_mailer/railtie"
+#require "action_mailer/railtie"
 require "active_resource/railtie"
 require "rails/test_unit/railtie"
 

data/config/dcmgr_gui.yml

@@ -0,0 +1,8 @@
+development:
+  dcmgr_site: 'http://localhost:9001/'
+
+test:
+  dcmgr_site: 'http://localhost:9001/'
+
+production:
+  dcmgr_site: 'http://localhost:9001/'

data/{app/api/config/environment.rb → config/environment-auth.rb}

@@ -1,5 +1,5 @@
 # Load the rails application
-require File.expand_path('../../../../config/application', __FILE__)
+require File.join(File.dirname(__FILE__), 'application')
 
 # Initialize the rails application
 DcmgrGui::Application.initialize!

data/config/environments/development.rb

@@ -15,7 +15,7 @@ DcmgrGui::Application.configure do
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
+  #config.action_mailer.raise_delivery_errors = false
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log

data/config/environments/production.rb

@@ -1,49 +1,46 @@
 DcmgrGui::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
-  # The production environment is meant for finished, "live" apps.
-  # Code is not reloaded between requests
-  config.cache_classes = true
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = true 
 
-  # Full error reports are disabled and caching is turned on
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
-
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
-
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
-
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
-
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
 
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
-
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
-  # Enable serving of images, stylesheets, and javascripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable threaded mode
-  # config.threadsafe!
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = false 
+  config.action_view.debug_rjs             = false 
+  config.action_controller.perform_caching = true
 
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # Don't care if the mailer can't send
+  #config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+  
+  # Config authentication for WebAPI
+  # Setting proxy server
+  config.proxy_host = "127.0.0.1"
+  config.proxy_port = 8080
+  config.proxy_scheme = "http"
+  config.proxy_dcmgr_host = "127.0.0.1"
+  config.proxy_dcmgr_port = 9001
+  config.proxy_root_user = 'root'
+  config.proxy_nginx = '/opt/nginx/sbin/nginx'
+
+  # Setting authentication server
+  config.auth_host = "127.0.0.1"
+  config.auth_port = 3000
+  config.auth_root_user = 'root'
+
+  config.i18n.load_path += Dir[Rails.root.join('locales', '*.{rb,yml}').to_s]
+  config.i18n.default_locale = :en
+  #config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  
   config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
 end

data/config/environments/test.rb

@@ -23,7 +23,7 @@ DcmgrGui::Application.configure do
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
+  #config.action_mailer.delivery_method = :test
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,

data/config/initializers/site.rb

@@ -1,7 +1,7 @@
 DCMGR_GUI_SITE = {
   :title => 'Wakame UI',
   :meta => {
-    :keywords => 'あくしゅ,axsh,wakame',
+    :keywords => 'axsh,wakame',
     :description => 'Wakame UI'
   },
   :logo => 'Wakame Inexhaustible Supply of Cloud Fuel.'

data/config/locales/en.yml

@@ -20,6 +20,8 @@ en:
     attach: "Yes, Attach"
     detach: "Yes, Detach"
     launch: "Launch"
+    start: "Start"
+    stop: "Stop"
   selectmenu:
     select_action: "Select an Action"
     select_region: "Region: "
@@ -34,10 +36,10 @@ en:
   dialog:
     terminate_instances:
       header: "Terminate Instances"
-      message: "Are you sure you want to terminate this instance?"
+      message: "Are you sure you want to terminate those instances?"
     reboot_instances:
       header: "Reboot Instances"
-      message: "Are you sure you want to reboot this instance?"
+      message: "Are you sure you want to reboot those instances?"
     launch_instance:
       header: "Launch Instance"
       wmi_id: "WMI ID"
@@ -77,7 +79,6 @@ en:
     edit_security_group:
       header: "Edit Security Group"
     create_and_edit_security_group:
-      name: "Name"
       description: "Description"
       rule: "Rule"
     delete_security_group:
@@ -85,11 +86,16 @@ en:
       message: "Are you sure you want to delete the following security_group?"
     create_ssh_keypair:
       header: "Create SSH Key Pair"
-      keypair_name: "Key Pair Name"
       download_once: "Download Once"
     delete_ssh_keypair:
       header: "Delete SSH Key Pair"
       message: "Are you sure you want to delete the following key pair?"
+    start_instances:
+      header: "Start Instances"
+      message: "Are you sure you want to start those instances?"
+    stop_instances:
+      header: "Stop Instances"
+      message: "Are you sure you want to stop those instances?"
   login:
     sign_in: "Sign In"
     user: "User"
@@ -127,6 +133,8 @@ en:
       header: "Instance Actions"
       terminate: "Terminate"
       reboot: "Reboot"
+      start: "Start"
+      stop: "Stop"
     list:
       instance_id: "Instance ID"
       wmi_id: "WMI ID"
@@ -229,6 +237,7 @@ en:
       capacity: "Capacity"
       origin_volume_id: "OriginVolumeID"
       destination: "Destiantion"
+      backing_store: "BackingStore"
       status: "Status"
       created_at: "Created At"
       updated_at: "Updated At"
@@ -257,12 +266,12 @@ en:
       delete_security_group: "Delete Security Group"
       edit_security_group: "Edit"
     list:
-      name: "Name"
+      name: "Security Group ID"
       descriptions: "Description"
       action: "Action"
     details:
       header: "Details"
-      name: "Name"
+      name: "Security Group ID"
       description: "Description"
       created_at: "Created At"
       updated_at: "Updated At"
@@ -277,7 +286,7 @@ en:
       secret_access_key: "Secret Access Key"
     details:
       header: "Details"
-      name: "Name"
+      uuid: "UUID"
       fingerprint: "Fingerprint"
       created_at: "Created"
       updated_at: "Updated"

data/config/locales/ja.yml

@@ -19,6 +19,8 @@ ja:
     attach: "アタッチ"
     detach: "デタッチ"
     launch: "起動"
+    start: "再開"
+    stop: "一時停止"
   selectmenu:
     select_action: "アクション"
     select_region: "データセンタ: "
@@ -76,7 +78,6 @@ ja:
     edit_security_group:
       header: "セキュリティグループを編集"
     create_and_edit_security_group:
-      name: "セキュリティグループ名"
       description: "詳細"
       rule: "ルール"
     delete_security_group:
@@ -84,7 +85,6 @@ ja:
       message: "セキュリティーグループを削除します。よろしいですか？"
     create_ssh_keypair:
       header: "キーペアを作成"
-      keypair_name: "キーペア名"
       download_once: "1回限り"
     delete_ssh_keypair:
       header: "キーペアを削除"
@@ -126,6 +126,8 @@ ja:
       header: "アクション"
       terminate: "停止"
       reboot: "再起動"
+      start: "再開"
+      stop: "一時停止"
     list:
       instance_id: "インスタンスID"
       wmi_id: "WMI ID"
@@ -227,6 +229,7 @@ ja:
       capacity: "容量"
       origin_volume_id: "ボリューム元ID"
       destination: "保存先"
+      backing_store: "バッキングストア"
       status: "状態"
       created_at: "作成日"
       updated_at: "更新日"
@@ -260,7 +263,6 @@ ja:
       action: "アクション"
     details:
       header: "詳細"
-      name: "名前"
       description: "詳細"
       created_at: "作成日"
       updated_at: "更新日"
@@ -275,7 +277,7 @@ ja:
       secret_access_key: "シークレットキー"
     details:
       header: "詳細"
-      name: "名前"
+      uuid: "UUID"
       fingerprint: "フィンガープリント"
       created_at: "作成日"
       updated_at: "更新日"

data/config/routes.rb

@@ -57,6 +57,8 @@ DcmgrGui::Application.routes.draw do
   post   'instances/reboot' ,:to => 'instances#reboot'
   post   'instances' ,:to => 'instances#create'
   get    'instances/show/:id' ,:to => 'instances#show'
+  post   'instances/start' ,:to => 'instances#start'
+  post   'instances/stop' ,:to => 'instances#stop'
   
   #instance_specs
   get    'instance_specs/all' ,:to => 'instance_specs#show_instance_specs'
@@ -93,6 +95,7 @@ DcmgrGui::Application.routes.draw do
   #sessions
   get    'login' => 'sessions#new', :as => :login
   get    'logout' => 'sessions#destroy', :as => :logout
+  get    'sessions/information', :to  => 'sessions#information'
   resource :session, :only => [:new, :create, :destroy]
   
   #storage_pools

data/db/migrations/0001_origin.rb

@@ -0,0 +1,96 @@
+Sequel.migration do
+  up do
+    create_table(:accounts, :ignore_index_errors=>true) do
+      primary_key :id
+      String :uuid, :null=>false, :size=>8, :fixed=>true
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      String :name, :null=>false, :size=>255
+      String :description, :size=>255
+      TrueClass :enable, :default=>true
+      DateTime :deleted_at
+      TrueClass :is_deleted, :default=>false
+      
+      index [:uuid], :unique=>true, :name=>:uuid
+    end
+    
+    create_table(:authzs) do
+      primary_key :id
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      Integer :user_id, :null=>false
+      Integer :account_id, :null=>false
+      Integer :type_id, :null=>false
+    end
+    
+    create_table(:information) do
+      primary_key :id
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      String :title, :size=>255
+      String :link, :text=>true
+      String :description, :text=>true
+    end
+    
+    create_table(:oauth_consumers, :ignore_index_errors=>true) do
+      primary_key :id
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      String :key, :null=>false, :size=>40
+      String :secret, :null=>false, :size=>40
+      Integer :account_id, :null=>false
+      
+      index [:account_id], :unique=>true, :name=>:account_id
+      index [:key], :unique=>true
+    end
+    
+    create_table(:tag_mappings, :ignore_index_errors=>true) do
+      primary_key :id
+      Integer :tag_id, :null=>false
+      Integer :target_type
+      Integer :target_id, :null=>false
+      
+      index [:tag_id, :target_type, :target_id]
+    end
+    
+    create_table(:tags, :ignore_index_errors=>true) do
+      primary_key :id
+      String :uuid, :null=>false, :size=>8, :fixed=>true
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      Integer :account_id, :null=>false
+      Integer :owner_id, :null=>false
+      String :name, :null=>false, :size=>32, :fixed=>true
+      
+      index [:account_id]
+      index [:uuid], :unique=>true, :name=>:uuid
+    end
+    
+    create_table(:users, :ignore_index_errors=>true) do
+      primary_key :id
+      String :uuid, :null=>false, :size=>8, :fixed=>true
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      DateTime :last_login_at, :null=>false
+      String :name, :null=>false, :size=>200, :fixed=>true
+      String :login_id, :size=>255
+      String :password, :null=>false, :size=>255
+      String :primary_account_id, :size=>255
+      String :locale, :null=>false, :size=>255
+      String :time_zone, :null=>false, :size=>255
+      
+      index [:login_id], :unique=>true, :name=>:login_id
+      index [:uuid], :unique=>true, :name=>:uuid
+    end
+    
+    create_table(:users_accounts) do
+      primary_key :id
+      Integer :user_id, :null=>false
+      Integer :account_id, :null=>false
+    end
+  end
+  
+  down do
+    drop_table(:accounts, :authzs, :information, :oauth_consumers, :tag_mappings, :tags, :users, :users_accounts)
+  end
+end

data/lib/cli/account.rb

@@ -7,48 +7,11 @@ require 'yaml'
 module Cli
   class AccountCli < Base
     namespace :account
-    #M=Dcmgr::Models
-
-    #no_tasks {
-      #def before_task
-        ## Setup DB connections and load paths for dcmgr_gui
-        #root_dir = File.expand_path('../../../', __FILE__)
-        
-        ##get the database details
-        ##TODO:get this path in a less hard-coded way?
-        #content = File.new(File.expand_path('../../frontend/dcmgr_gui/config/database.yml', root_dir)).read
-        #settings = YAML::load content
-        
-        ##load the database variables
-        ##TODO: get environment from RAILS_ENV
-        #db_environment = 'development'
-        #db_adapter     = settings[db_environment]['adapter']
-        #db_host        = settings[db_environment]['host']
-        #db_name        = settings[db_environment]['database']
-        #db_user        = settings[db_environment]['user']
-        #db_pwd         = settings[db_environment]['password']
-        
-        ##Connect to the database
-        #url = "#{db_adapter}://#{db_host}/#{db_name}?user=#{db_user}&password=#{db_pwd}"
-        #db = Sequel.connect(url)
-        
-        ##load the cli environment
-        #$LOAD_PATH.unshift File.expand_path('../../frontend/dcmgr_gui/config', root_dir)
-        #$LOAD_PATH.unshift File.expand_path('../../frontend/dcmgr_gui/app/models', root_dir)
-        ##require 'account'
-        #require 'environment-cli'
-        
-        ##Associate the models with their respective database
-        #Account.db = db
-        #User.db = db
-      #end
-    #}
 
     desc "add [options]", "Create a new account."
-    method_option :name, :type => :string, :aliases => "-n", :required => true, :desc => "The name for the new account." #Maximum size: 255
+    method_option :name, :type => :string, :aliases => "-n", :required => true, :desc => "The name for the new account."
     method_option :uuid, :type => :string, :aliases => "-u", :desc => "The UUID for the new account."
     method_option :description, :type => :string, :aliases => "-d", :default => "", :desc => "The description for this account."
-    #method_option :verbose, :type => :boolean, :aliases => "-v", :desc => "Print feedback on what is happening."
     def add
       #Check if the data we got is valid
       if options[:name] != nil && options[:name].length > 255
@@ -58,24 +21,6 @@ module Cli
         raise "Account description can not be longer than 100 chracters."
       end
       
-      #Put them in the backend
-      #fields = {:description => options[:description], :enabled => M::Account::ENABLED}
-      #fields.merge!({:uuid => options[:uuid]}) unless options[:uuid].nil?
-      
-      #new_uuid = super(M::Account,fields)
-
-      ##This should never happen as long as the databases remain synchronized.
-      #begin
-        #raise "A uuid collision occurred. This means the account databases are not synchronized." if Account[new_uuid] != nil
-      #rescue
-        #M::Account[new_uuid].delete
-        #raise 
-      #end
-      
-      #Put them in the frontend
-      #super(Account,{:uuid => new_uuid,:name => options[:name],:description => options[:description]})
-      
-      #puts new_uuid
       fields = {:name => options[:name],:description => options[:description], :enable => Account::ENABLED}
       fields.merge!({:uuid => options[:uuid]}) unless options[:uuid].nil?
       puts super(Account,fields)
@@ -85,8 +30,7 @@ module Cli
     method_option :deleted, :type => :boolean, :default => false, :aliases => "-d", :desc => "Show deleted accounts."
     def show(uuid = nil)
       if uuid
-        #back_acc = M::Account[uuid] || raise(Thor::Error, "Unknown Account UUID: #{uuid}")
-        acc = Account[uuid] || raise(Thor::Error, "Unknown Account UUID: #{uuid}")
+        acc = Account[uuid] || UnknownUUIDError.raise(uuid)
         puts ERB.new(<<__END, nil, '-').result(binding)
 Account UUID:
 <%- if acc.class == Account -%>
@@ -135,22 +79,22 @@ __END
     end
     
     desc "modify UUID [options]", "Modify an existing account."    
-    method_option :name, :type => :string, :aliases => "-n", :desc => "The new name for the account." #Maximum size: 200    
+    method_option :name, :type => :string, :aliases => "-n", :desc => "The new name for the account."
     method_option :description, :type => :string, :aliases => "-d", :desc => "The new description for the account."
-    #method_option :verbose, :type => :boolean, :aliases => "-v", :desc => "Print feedback on what is happening."
     def modify(uuid)
       raise "Account name can not be longer than 255 characters." if options[:name] != nil && options[:name].length > 255
       raise "Description can not be longer than 100 characters." if options[:description] != nil && options[:description].length > 100
       super(Account,uuid,{:name => options[:name],:description => options[:description]})
-      #super(M::Account,uuid,{:description => options[:description]})
     end
     
     #TODO: show account to confirm deletion
     desc "del UUID [options]", "Deletes an existing account."    
     method_option :verbose, :type => :boolean, :aliases => "-v", :desc => "Print feedback on what is happening."
     def del(uuid)
+      to_do = Account[uuid]
+      Error.raise("Unknown frontend account UUID: #{uuid}", 100) if to_do == nil or to_do.is_deleted
+
       super(Account,uuid)
-      #super(M::Account,uuid)
       
       puts "Account #{uuid} has been deleted." if options[:verbose]
     end
@@ -160,19 +104,14 @@ __END
     def enable(uuid)
       to_enable = Account[uuid]
       Error.raise("Unknown frontend account UUID: #{uuid}", 100) if to_enable == nil or to_enable.is_deleted
-      #to_enable_back = M::Account[uuid] || Error.raise("Unknown backend account UUID: #{uuid}", 100)
       
-      if to_enable.enable?# && to_enable_back.enable?
+      if to_enable.enable?
         puts "Account #{uuid} is already enabled." if options[:verbose]
-      else      
+      else
         to_enable.enable = Account::ENABLED
         to_enable.updated_at = Time.now.utc.iso8601
-        to_enable.save   
-	        
-        #to_enable_back.enabled = Dcmgr::Models::Account::ENABLED
-        #to_enable_back.updated_at = Time.now.utc.iso8601
-        #to_enable_back.save
-	
+        to_enable.save
+
         puts "Account #{uuid} has been enabled." if options[:verbose]
       end
     end
@@ -182,19 +121,14 @@ __END
     def disable(uuid)
       to_disable = Account[uuid]
       UnknownUUIDError.raise(uuid) if to_disable == nil or to_disable.is_deleted
-      #to_disable_back = M::Account[uuid] || Error.raise("Unknown backend account UUID: #{uuid}", 100)
       
-      if to_disable.disable? #&& to_disable_back.disable?
+      if to_disable.disable?
         puts "Account #{id} is already disabled." if options[:verbose]
       else
         to_disable.enable = Account::DISABLED
         to_disable.updated_at = Time.now.utc.iso8601
         to_disable.save
         
-        #to_disable_back.enabled = M::Account::DISABLED
-        #to_disable_back.updated_at = Time.now.utc.iso8601
-        #to_disable_back.save
-        
         puts "Account #{uuid} has been disabled." if options[:verbose]
       end
     end
@@ -249,16 +183,37 @@ __END
       }
     end
     
-    #desc "quota UUID [options]","Set quota settings for an account."
-    #method_option :weight, :type => :numeric, :aliases => "-w", :desc => "The instance total weight to set this account's quota to."
-    #method_option :size, :type => :numeric, :aliases => "-s", :desc => "The volume total size to set this account's quota to."
-    #def quota(uuid)
-      #account = M::Account[uuid] || UnknownUUIDError.raise(uuid)
-      #account.quota.instance_total_weight = options[:weight] unless options[:weight].nil?
-      #account.quota.volume_total_size = options[:size] unless options[:size].nil?
-      #account.quota.updated_at = Time.now.utc.iso8601
-      #account.quota.save
-    #end
-    
+
+    desc "oauth UUID [options]", "Generate or show OAuth key and secret"
+    def oauth(uuid)
+      require 'oauth'
+      acc = Account[uuid]
+      Error.raise("Unknown frontend account UUID: #{uuid}", 100) if acc == nil or acc.is_deleted
+
+      oauth_token = OauthToken.new
+      oauth_token.generate_keys
+      oauth_consumer = OauthConsumer.find(:account_id => acc.id)
+      if oauth_consumer.nil?
+        oauth_consumer = OauthConsumer.create(
+                                              :key => oauth_token.token,
+                                              :secret => oauth_token.secret,
+                                              :account_id => acc.id
+                                              )
+      end
+
+      puts ERB.new(<<__END, nil, '-').result(binding)
+Account UUID:
+<%- if acc.class == Account -%>
+  <%= acc.canonical_uuid %>
+<%- else -%>
+  <%= Account.uuid_prefix%>-<%= acc.uuid %>
+<%- end -%>
+
+Consumer Key:
+  <%= oauth_consumer.key %>
+Consumer Secret:
+  <%= oauth_consumer.secret %>
+__END
+    end
   end
 end