wakame-vdc-webui 10.12.0 → 11.06.0

data/INSTALL-API.txt

@@ -0,0 +1,14 @@
+# Edit './config/initializers/proxy.rb'.
+
+# Configuration:
+#
+# config/initializers/proxy.rb
+
+# Start the nginx proxy server.
+> rake api:create_proxy_config
+> rake api:start_proxy
+
+# Start the auth server.
+> rackup -D -o localhost -p 8081 config-api.ru
+# or...
+> rake api:start_auth

data/Rakefile

@@ -21,6 +21,7 @@ task :gem do
     s.email = ['dev@axsh.net']
     s.name = 'wakame-vdc-webui'
     s.summary = "Datacenter management toolkit for IaaS Cloud: UI frontend"
+    s.description = ''
     s.required_ruby_version = '>= 1.8.7'
 
     s.files = Dir['app/**/*.{rb,erb}','lib/**/*.rb',
@@ -29,12 +30,15 @@ task :gem do
                   'lib/**/*.{rb,rake}', 'test/**/*.rb',
                   'vendor/plugins/**/*.*', 'tmp/',
                   'script/*', 'test/**/*.rb', 'doc/**/*.*'] +
-      %w(Rakefile config.ru README LICENSE NOTICE INSTALL.txt tmp)
+      %w(Rakefile config.ru LICENSE NOTICE INSTALL.txt INSTALL-API.txt tmp)
 
     s.add_dependency "rails", '3.0.0'
     s.add_dependency 'mysql','2.8.1'
     s.add_dependency 'sequel','3.15.0'
     s.add_dependency 'json','1.4.6'
+    s.add_dependency 'oauth','0.4.1'
+    s.add_dependency 'i18n', '0.4.2'
+    s.add_dependency 'nokogiri', '1.4.4'
   end
   
   File.open("#{spec.name}.gemspec", 'w'){|f| f.write(spec.to_ruby) }

data/app/api/config/environment.rb

@@ -0,0 +1,9 @@
+# Load the rails application
+require File.expand_path('../../../../config/application', __FILE__)
+
+# Initialize the rails application
+DcmgrGui::Application.initialize!
+
+$stdout.reopen(File.expand_path("log/auth_server.log", Rails.root) , "a")
+$stdout.sync = true
+$stderr.reopen($stdout)

data/app/controllers/accounts_controller.rb

@@ -10,6 +10,44 @@ class AccountsController < ApplicationController
   end
   
   def index
-    
+
+  end
+
+  def update_settings
+    account = params[:account]
+    if account
+      
+      setting_params = {
+        :time_zone => account[:time_zone],
+        :locale => account[:locale],
+      }
+
+      User.update_settings(@current_user.id, setting_params)
+    end
+    redirect_to :action => 'index'
+  end
+
+  def password
+    @error_message = ''
+    if request.get?
+      #nop
+    elsif request.post?
+      password =  params[:password]
+      new_password = params[:new_password]
+      confirm_password = params[:confirm_password]
+      unless new_password == confirm_password
+        @error_message = I18n.t('error_message.change_password1')
+        return true 
+      end
+
+      user = User.find(:uuid => @current_user.uuid, :password => User.encrypt_password(password))
+      if user
+        user.password = User.encrypt_password(new_password)
+        user.save
+        redirect_to :action => 'index'
+      else
+        @error_message = I18n.t('error_message.change_password2')
+      end
+    end
   end
 end

data/app/controllers/application_controller.rb

@@ -1,5 +1,77 @@
+# -*- coding: utf-8 -*-
+
 class ApplicationController < ActionController::Base
   protect_from_forgery
   include Authentication
   before_filter :login_required
-end
+  before_filter :set_locale
+  before_filter :set_application
+
+
+  def set_application
+    @site = DCMGR_GUI_SITE
+  end
+  
+  def dispatch(name, request)
+    begin 
+      super
+    rescue Sequel::DatabaseConnectionError => e
+      response.status = 500
+      response.body = 'Database connection faild.'
+    rescue ActiveResource::ConnectionError => e 
+      if is_dcmgr?(e)
+        response.status = e.response.code 
+        response.body = e.response.body
+        response['X-Vdc-Request-Id'] = e.response['X-Vdc-Request-Id']  
+      else
+        raise
+      end
+    end
+    to_a
+  end
+
+  def is_dcmgr?(response_data)
+    if response_data.response['X-Vdc-Request-Id']
+      true
+    else
+      false
+    end
+  end
+
+  def set_locale
+    language = params[:select_language] if params[:select_language]
+    if language
+      I18n.locale = language[:locale]
+      session[:locale] = I18n.locale
+    else
+      if session[:locale]
+        I18n.locale = session[:locale]
+      elsif @current_user
+        I18n.locale = @current_user.locale
+      else
+        I18n.locale = I18n.default_locale.to_s
+      end
+    end
+    
+    @locales = get_locales 
+    @locale = I18n.locale
+  end
+
+  def get_locales
+    locales = Array.new
+    locales.push(['English','en'])
+    locales.push(['日本語','ja'])
+    locales
+  end
+
+  private
+  def extract_locale_from_accept_language_header
+    if request.env['HTTP_ACCEPT_LANGUAGE'].nil?
+      nil
+    else
+      parsed_locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first
+      I18n.available_locales.include?(parsed_locale.to_sym) ? parsed_locale : I18n.default_locale.to_s
+    end
+  end
+
+end

data/app/controllers/instance_specs_controller.rb

@@ -0,0 +1,11 @@
+class InstanceSpecsController < ApplicationController
+  respond_to :json
+  
+  def index
+  end
+  
+  def show_instance_specs
+    instance_specs = DcmgrResource::InstanceSpec.list
+    respond_with(instance_specs[0], :to => [:json])
+  end
+end

data/app/controllers/instances_controller.rb

@@ -52,8 +52,12 @@ class InstancesController < ApplicationController
   end
   
   def total
-   total_resource = DcmgrResource::Instance.total_resource
-   render :json => total_resource
+   all_resource_count = DcmgrResource::Instance.total_resource
+   all_resources = DcmgrResource::Instance.find(:all,:params => {:start => 0, :limit => all_resource_count})
+   resources = all_resources[0].results
+   terminated_resource_count = DcmgrResource::Instance.get_resource_state_count(resources, 'terminated')
+   total = all_resource_count - terminated_resource_count
+   render :json => total
   end
   
-end
+end

data/app/controllers/{images_controller.rb → machine_images_controller.rb}

@@ -1,10 +1,9 @@
-class ImagesController < ApplicationController
+class MachineImagesController < ApplicationController
   respond_to :json
   
   def index
   end
   
-  # images/show/1.json
   def show
     image_id = params[:id]
     detail = DcmgrResource::Image.show(image_id)
@@ -25,4 +24,4 @@ class ImagesController < ApplicationController
    total_resource = DcmgrResource::Image.total_resource
    render :json => total_resource
   end
-end
+end

data/app/controllers/sessions_controller.rb

@@ -8,12 +8,15 @@ class SessionsController < ApplicationController
   
   def create
     user = User.authenticate(params[:login], params[:password])
+    @error_message = ''
+
     if user
       self.current_user = user
+      User.update_last_login(user.id)
       redirect_back_or_default('/', :notice => "Logged in successfully")
     else
-      # note_failed_signin
-      @login       = params[:login]
+      @error_message = I18n.t('error_message.sign_in')
+      @login = params[:login]
       render :action => 'new'
     end
   end
@@ -22,4 +25,4 @@ class SessionsController < ApplicationController
     logout_killing_session!
     redirect_back_or_default('/', :notice => "You have been logged out.")
   end
-end
+end

data/app/controllers/snapshots_controller.rb

@@ -7,14 +7,16 @@ class SnapshotsController < ApplicationController
 
   def create
     volume_ids = params[:ids]
-    response = []
+    destination = params[:destination]
+    res = []
     volume_ids.each do |volume_id|
       data = {
-        :volume_id => volume_id
+        :volume_id => volume_id,
+        :destination => destination
       }
-      response << DcmgrResource::VolumeSnapshot.create(data)
+      res << DcmgrResource::VolumeSnapshot.create(data)
     end
-    render :json => response
+    render :json => res
   end
 
   def destroy
@@ -42,7 +44,16 @@ class SnapshotsController < ApplicationController
   end
   
   def total
-   total_resource = DcmgrResource::VolumeSnapshot.total_resource
-   render :json => total_resource
+    all_resource_count = DcmgrResource::VolumeSnapshot.total_resource
+    all_resources = DcmgrResource::VolumeSnapshot.find(:all,:params => {:start => 0, :limit => all_resource_count})
+    resources = all_resources[0].results
+    deleted_resource_count = DcmgrResource::VolumeSnapshot.get_resource_state_count(resources, 'deleted')
+    total = all_resource_count - deleted_resource_count
+    render :json => total
+  end
+  
+  def upload_destination
+    destinations = DcmgrResource::VolumeSnapshot.upload_destination
+    render :json => destinations[0]
   end
 end

data/app/controllers/volumes_controller.rb

@@ -80,7 +80,11 @@ class VolumesController < ApplicationController
   end
   
   def total
-    total_resource = DcmgrResource::Volume.total_resource
-    render :json => total_resource
+    all_resource_count = DcmgrResource::Volume.total_resource
+    all_resources = DcmgrResource::Volume.find(:all,:params => {:start => 0, :limit => all_resource_count})
+    resources = all_resources[0].results
+    deleted_resource_count = DcmgrResource::Volume.get_resource_state_count(resources, 'deleted')
+    total = all_resource_count - deleted_resource_count
+    render :json => total
   end
 end

data/app/helpers/application_helper.rb

@@ -1,10 +1,10 @@
 module ApplicationHelper
   
-  def li_link_to_current(name, controller)
-    if current_page?(:controller => controller)
-      str = '<li class="current">' + link_to(name,controller) + '</li>'
+  def li_link_to_current(name, controller_name, action_name)
+    if current_page?(:controller => controller_name)
+      str = '<li class="current">' + link_to(name, {:controller => controller_name, :action => action_name}) + '</li>'
     else
-      str = '<li>' + link_to(name,controller) + '</li>'
+      str = '<li>' + link_to(name, {:controller => controller_name, :action => action_name}) + '</li>'
     end
     str.html_safe
   end
@@ -20,4 +20,8 @@ module ApplicationHelper
   def nl2br(text)
     text.gsub(/(<.*?>)/, '').gsub(/\n/, '<br />').html_safe
   end
-end
+
+  def user_last_login_at
+    @current_user.last_login_at.utc.iso8601
+  end
+end

data/app/helpers/machine_images_helper.rb

@@ -0,0 +1,2 @@
+module MachineImagesHelper
+end

data/app/models/account.rb

@@ -13,7 +13,8 @@ class Account < BaseNew
   
   inheritable_schema do
     primary_key :id, :type=>Integer
-    String :name
+    String :name, :null=>false
+    String :description, :default=>""
     Boolean :enable, :default=>true
     DateTime :deleted_at, :null=>true
     Boolean :is_deleted, :default=>false
@@ -23,11 +24,11 @@ class Account < BaseNew
   many_to_many :users,:join_table => :users_accounts
   
   def disable?
-    self.enabled == DISABLED
+    not self.enable
   end
 
   def enable?
-    self.enabled == ENABLED
+    self.enable
   end
 
   def to_hash_document
@@ -36,6 +37,23 @@ class Account < BaseNew
     h
   end
 
+  # Delete relations before setting an account to deleted
+  def before_destroy
+    relations = self.users
+    for ss in 0...relations.length do
+      self.remove_user(relations[0])		  
+    end
+    
+    super
+  end
+  
+  # override Sequel::Model#_delete not to delete rows but to set
+  # delete flags.
+  def _delete
+    self.deleted_at ||= Time.now
+    self.is_deleted = true
+    self.save
+  end
 
   # STI class variable setter, getter methods.
   class << self
@@ -53,7 +71,7 @@ class Account < BaseNew
     def uuid(uuid=nil)
       if uuid.is_a?(String)
         uuid = uuid.downcase
-        if uuid !~ /^[a-z0-9]{8}$/
+        unless self.check_trimmed_uuid_format(uuid)
           raise "Invalid syntax of uuid: #{uuid}"
         end
         default_values[:uuid] = uuid

data/app/models/base_new.rb

@@ -149,7 +149,12 @@ module Taggable
       if p_uuid and p_uuid =~ regex
         return p_uuid.sub(regex, '')
       end
-      raise InvalidUUIDError, "Invalid uuid or unsupported uuid: #{p_uuid} in #{self}"
+      raise "Invalid uuid or unsupported uuid: #{p_uuid} in #{self}"
+    end
+
+    # Checks the general uuid syntax
+    def check_trimmed_uuid_format(uuid)
+      uuid.match(/^[a-z0-9 ]*$/) && uuid.length <= 8
     end
 
     # Checks the uuid syntax if it is for the Taggable class.
@@ -245,6 +250,10 @@ class BaseNew < Sequel::Model
     s
   end
 
+  # Returns true if this Model has time stamps
+  def with_timestamps?
+    self.columns.include?(:created_at) && self.columns.include?(:updated_at)
+  end
 
   # Callback when the initial data is setup to the database.
   def self.install_data
@@ -308,4 +317,4 @@ class BaseNew < Sequel::Model
     }
   
   end
-end
+end

data/app/models/dcmgr_resource/base.rb

@@ -20,6 +20,19 @@ module DcmgrResource
       def set_debug(debug = true)
         @@debug = debug
       end
+
+      def get_resource_state_count(resources, state)
+        resource_count = 0
+        unless resources.empty?   
+          resources.each do |item|
+            if item.state == state
+              resource_count += 1;
+            end
+          end 
+        end
+        resource_count
+      end
+ 
     end
     
     ActiveResource::Connection.class_eval do 

data/app/models/dcmgr_resource/instance_spec.rb

@@ -0,0 +1,7 @@
+module DcmgrResource
+  class InstanceSpec < Base
+    def self.list(params = {})
+      self.find(:all,:params => params)
+    end
+  end
+end