wakame-vdc-webui 11.06.0 → 11.12.0

data/Rakefile

@@ -12,7 +12,7 @@ desc "build gem packages"
 task :gem do
   require 'rubygems'
   require 'rake/gempackagetask'
-  require 'dcmgr'
+  require 'dcmgr/version'
   
   spec = Gem::Specification.new do |s|
     s.platform = Gem::Platform::RUBY
@@ -20,8 +20,8 @@ task :gem do
     s.authors = ['axsh Ltd.']
     s.email = ['dev@axsh.net']
     s.name = 'wakame-vdc-webui'
-    s.summary = "Datacenter management toolkit for IaaS Cloud: UI frontend"
-    s.description = ''
+    s.summary = "Wakame-VDC: UI frontend"
+    s.description = 'Datacenter Hypervisor'
     s.required_ruby_version = '>= 1.8.7'
 
     s.files = Dir['app/**/*.{rb,erb}','lib/**/*.rb',
@@ -32,13 +32,13 @@ task :gem do
                   'script/*', 'test/**/*.rb', 'doc/**/*.*'] +
       %w(Rakefile config.ru LICENSE NOTICE INSTALL.txt INSTALL-API.txt tmp)
 
-    s.add_dependency "rails", '3.0.0'
+    s.add_dependency "rails", '3.0.11'
     s.add_dependency 'mysql','2.8.1'
-    s.add_dependency 'sequel','3.15.0'
-    s.add_dependency 'json','1.4.6'
+    s.add_dependency 'sequel','3.27.0'
+    s.add_dependency 'json','1.6.3'
     s.add_dependency 'oauth','0.4.1'
-    s.add_dependency 'i18n', '0.4.2'
     s.add_dependency 'nokogiri', '1.4.4'
+    s.add_dependency 'thor', '0.14.6'
   end
   
   File.open("#{spec.name}.gemspec", 'w'){|f| f.write(spec.to_ruby) }

data/app/controllers/application_controller.rb

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 
 class ApplicationController < ActionController::Base
-  protect_from_forgery
+  # disable reqeust forgery check since some pages are missing to set
+  # the token on using POST.
+  #protect_from_forgery
   include Authentication
   before_filter :login_required
   before_filter :set_locale
@@ -10,6 +12,7 @@ class ApplicationController < ActionController::Base
 
   def set_application
     @site = DCMGR_GUI_SITE
+    true
   end
   
   def dispatch(name, request)
@@ -55,6 +58,7 @@ class ApplicationController < ActionController::Base
     
     @locales = get_locales 
     @locale = I18n.locale
+    true
   end
 
   def get_locales

data/app/controllers/dialog_controller.rb

@@ -9,7 +9,7 @@ class DialogController < ApplicationController
   end
 
   def attach_volume
-    @volume_id = params[:ids][0]
+    @volume_ids = params[:ids]
   end
   
   def detach_volume
@@ -45,7 +45,6 @@ class DialogController < ApplicationController
   end
   
   def create_security_group
-    @uuid = ''
     @description = ''
     @rule = ''
     render :create_and_edit_security_group
@@ -53,17 +52,15 @@ class DialogController < ApplicationController
   
   def delete_security_group
     @uuid = params[:ids][0]
-    @netfilter_group = DcmgrResource::NetfilterGroup.show(@uuid)
-    @name = @netfilter_group['name']
+    @security_group = DcmgrResource::SecurityGroup.show(@uuid)
   end
   
   def edit_security_group
     @uuid = params[:ids][0]
-    @netfilter_group = DcmgrResource::NetfilterGroup.show(@uuid)
+    @security_group = DcmgrResource::SecurityGroup.show(@uuid)
     
-    @name = @netfilter_group['name'] 
-    @description =  @netfilter_group["description"]
-    @rule = @netfilter_group["rule"]
+    @description =  @security_group["description"]
+    @rule = @security_group["rule"]
     render :create_and_edit_security_group
   end
   

data/app/controllers/instances_controller.rb

@@ -11,7 +11,7 @@ class InstancesController < ApplicationController
       :host_pool_id => params[:host_pool_id],
       :host_name => params[:host_name],
       :user_data => params[:user_data],
-      :nf_group => params[:nf_group],
+      :security_groups => params[:security_groups],
       :ssh_key => params[:ssh_key]
     }
     instance = DcmgrResource::Instance.create(params)
@@ -35,20 +35,38 @@ class InstancesController < ApplicationController
   
   def terminate
     instance_ids = params[:ids]
-    response = []
+    res = []
     instance_ids.each do |instance_id|
-      response << DcmgrResource::Instance.destroy(instance_id)
+      res << DcmgrResource::Instance.destroy(instance_id)
     end
-    render :json => response
+    render :json => res
   end
   
   def reboot
     instance_ids = params[:ids]
-    response = []
+    res = []
     instance_ids.each do |instance_id|
-      response << DcmgrResource::Instance.reboot(instance_id)
+      res << DcmgrResource::Instance.reboot(instance_id)
     end
-    render :json => response
+    render :json => res
+  end
+
+  def start
+    instance_ids = params[:ids]
+    res = []
+    instance_ids.each do |instance_id|
+      res << DcmgrResource::Instance.start(instance_id)
+    end
+    render :json => res
+  end
+
+  def stop
+    instance_ids = params[:ids]
+    res = []
+    instance_ids.each do |instance_id|
+      res << DcmgrResource::Instance.stop(instance_id)
+    end
+    render :json => res
   end
   
   def total

data/app/controllers/keypairs_controller.rb

@@ -27,12 +27,11 @@ class KeypairsController < ApplicationController
   
   def create_ssh_keypair
     data = {
-      :name => params[:name],
       :download_once => params[:download_once]
     }
     
-    @filename = params[:name] + ".pem"
     @ssh_key_pair = DcmgrResource::SshKeyPair.create(data)
+    @filename = @ssh_key_pair.uuid + ".pem"
     
     send_data(@ssh_key_pair.private_key,{
               :filename => @filename,
@@ -54,7 +53,7 @@ class KeypairsController < ApplicationController
   def prk_download
     uuid = params[:id]
     @ssh_key_pair = DcmgrResource::SshKeyPair.show(uuid)
-    @filename = @ssh_key_pair['name'] + ".pem"
+    @filename = @ssh_key_pair['uuid'] + ".pem"
     send_data(@ssh_key_pair['private_key'],{
               :filename => @filename,
               :type => 'application/pgp-encrypted',

data/app/controllers/security_groups_controller.rb

@@ -10,31 +10,30 @@ class SecurityGroupsController < ApplicationController
       :start => params[:start].to_i - 1,
       :limit => params[:limit]
     }
-    @netfilter_group = DcmgrResource::NetfilterGroup.list(data)
-    respond_with(@netfilter_group[0],:to => [:json])
+    @security_group = DcmgrResource::SecurityGroup.list(data)
+    respond_with(@security_group[0],:to => [:json])
   end
   
   # security_groups/detail/s-000001.json
   def show
     uuid = params[:id]
-    @netfilter_group = DcmgrResource::NetfilterGroup.show(uuid)
-    respond_with(@netfilter_group,:to => [:json])
+    @security_group = DcmgrResource::SecurityGroup.show(uuid)
+    respond_with(@security_group,:to => [:json])
   end
 
   def create
     data = {
-      :name => params[:name],
       :description => params[:description],
       :rule => params[:rule]
     }
-    @netfilter_group = DcmgrResource::NetfilterGroup.create(data)
-    render :json => @netfilter_group
+    @security_group = DcmgrResource::SecurityGroup.create(data)
+    render :json => @security_group
   end
   
   def destroy
     uuid = params[:id]
-    @netfilter_group = DcmgrResource::NetfilterGroup.destroy(uuid)
-    render :json => @netfilter_group    
+    @security_group = DcmgrResource::SecurityGroup.destroy(uuid)
+    render :json => @security_group    
   end
   
   def update
@@ -43,17 +42,17 @@ class SecurityGroupsController < ApplicationController
       :description => params[:description],
       :rule => params[:rule]
     }
-    @netfilter_group = DcmgrResource::NetfilterGroup.update(uuid,data)
-    render :json => @netfilter_group    
+    @security_group = DcmgrResource::SecurityGroup.update(uuid,data)
+    render :json => @security_group    
   end
   
   def show_groups
-    @netfilter_group = DcmgrResource::NetfilterGroup.list
-    respond_with(@netfilter_group[0],:to => [:json])
+    @security_group = DcmgrResource::SecurityGroup.list
+    respond_with(@security_group[0],:to => [:json])
   end
   
   def total
-   total_resource = DcmgrResource::NetfilterGroup.total_resource
+   total_resource = DcmgrResource::SecurityGroup.total_resource
    render :json => total_resource
   end
-end
+end

data/app/controllers/sessions_controller.rb

@@ -6,6 +6,10 @@ class SessionsController < ApplicationController
     @user =  User.new
   end
   
+  def information
+    render :layout => false
+  end
+
   def create
     user = User.authenticate(params[:login], params[:password])
     @error_message = ''

data/app/controllers/snapshots_controller.rb

@@ -21,11 +21,11 @@ class SnapshotsController < ApplicationController
 
   def destroy
     snapshot_ids = params[:ids]
-    response = []
+    res = []
     snapshot_ids.each do |snapshot_id|
-      response << DcmgrResource::VolumeSnapshot.delete(snapshot_id)
+      res << DcmgrResource::VolumeSnapshot.delete(snapshot_id)
     end
-    render :json => response
+    render :json => res
   end
 
   def list

data/app/controllers/volumes_controller.rb

@@ -8,14 +8,14 @@ class VolumesController < ApplicationController
   def create
     snapshot_ids = params[:ids]
     if snapshot_ids
-      response = []
+      res = []
       snapshot_ids.each do |snapshot_id|
         data = {
           :snapshot_id => snapshot_id
         }
-        response << DcmgrResource::Volume.create(data)
+        res << DcmgrResource::Volume.create(data)
       end
-      render :json => response
+      render :json => res
     else
       # Convert to MB
       size = case params[:unit]
@@ -40,11 +40,11 @@ class VolumesController < ApplicationController
   
   def destroy
     volume_ids = params[:ids]
-    response = []
+    res = []
     volume_ids.each do |volume_id|
-      response << DcmgrResource::Volume.destroy(volume_id)
+      res << DcmgrResource::Volume.destroy(volume_id)
     end
-    render :json => response
+    render :json => res
   end
   
   def list
@@ -64,19 +64,25 @@ class VolumesController < ApplicationController
   end
 
   def attach
-    volume_id = params[:volume_id]
     instance_id = params[:instance_id]
-    response = DcmgrResource::Volume.attach(volume_id, instance_id)
-    render :json => response
+    volume_ids = params[:volume_ids]
+    res = []
+    volume_ids.each do |volume_id|
+      data = {
+        :volume_id => volume_id
+      }
+      res << DcmgrResource::Volume.attach(volume_id, instance_id)
+    end
+    render :json => res
   end
 
   def detach
     volume_ids = params[:ids]
-    response = []
+    res = []
     volume_ids.each do |volume_id|
-      response << DcmgrResource::Volume.detach(volume_id)
+      res << DcmgrResource::Volume.detach(volume_id)
     end
-    render :json => response
+    render :json => res
   end
   
   def total

data/app/models/dcmgr_resource/instance.rb

@@ -15,8 +15,8 @@ module DcmgrResource
       instance.host_pool_id = params[:host_pool_id]
       instance.host_name = params[:host_name]
       instance.user_data = params[:user_data]
-      instance.nf_group = params[:nf_group]
-      instance.ssh_key = params[:ssh_key]
+      instance.security_groups = params[:security_groups]
+      instance.ssh_key_id = params[:ssh_key]
       instance.save
       instance
     end
@@ -32,6 +32,22 @@ module DcmgrResource
       self.collection_name = @collection
       result.body
     end
+
+    def self.start(instance_id)
+      @collection ||= self.collection_name
+      self.collection_name = File.join(@collection,instance_id)
+      result = self.put(:start)
+      self.collection_name = @collection
+      result.body
+    end
+
+    def self.stop(instance_id)
+      @collection ||= self.collection_name
+      self.collection_name = File.join(@collection,instance_id)
+      result = self.put(:stop)
+      self.collection_name = @collection
+      result.body
+    end
     
   end
 end

data/app/models/dcmgr_resource/security_group.rb

@@ -0,0 +1,38 @@
+module DcmgrResource
+  class SecurityGroup < Base
+
+    def self.create(params)
+      security_group = self.new
+      security_group.description = params[:description]
+      security_group.rule = params[:rule]
+      security_group.save
+      security_group
+    end
+
+    # workaround for the bug:
+    #  the value of the key "rule" is encoded to JSON wrongly by
+    #  ActiveSupport::JSON encoder.
+    #  "{\"security_group\":{\"description\":\"\",\"rule\":[[null,[],null]]}}"
+    #  So it has to use the encoder from JSON library.
+    def to_json(options={})
+      require 'json'
+      {'security_group'=>@attributes}.to_json
+    end
+
+    def self.list(params = {})
+     self.find(:all,:params => params)
+    end
+
+    def self.show(uuid)
+      self.get(uuid)
+    end
+              
+    def self.update(uuid,params)
+      self.put(uuid,params).body
+    end
+    
+    def self.destroy(uuid)
+      self.delete(uuid).body
+    end      
+  end
+end

data/app/models/dcmgr_resource/ssh_key_pair.rb

@@ -11,7 +11,6 @@ module DcmgrResource
     
     def self.create(params)
       ssh_key_pair = self.new
-      ssh_key_pair.name = params[:name]
       ssh_key_pair.download_once = params[:download_once]
       ssh_key_pair.save
       ssh_key_pair

data/app/views/dialog/attach_volume.html.erb

@@ -1,13 +1,9 @@
 <div id="attach_volume_dialog">
-  <table>
-    <tr>
-      <td><%= t("dialog.attach_volume.volume_id") %>:</td>
-      <td id="view_volume_id"><%= @volume_id %></td>
-      <input id="volume_id" type="hidden" value="<%= @volume_id %>">
-    </tr>
-    <tr>
-      <td><%= t("dialog.attach_volume.instance_id") %>:</td>
-      <td><input id="instance_id" type="text" value=""></td>
-    </tr>
-  </table>
+<p><%= t("dialog.attach_volume.instance_id") %>: <input id="instance_id" type="text" value=""></p>
+<br />
+<ul id="attach_volumes">
+  <% @volume_ids.each do |volume_id| %>
+    <li><%= volume_id %></li>
+  <% end %>
+</ul>
 </div>

data/app/views/dialog/create_and_edit_security_group.html.erb

@@ -5,27 +5,25 @@
 	}
 </style>
 <div id="create_security_group_dialog">
-		<div id="security_group_name_field">
-    <p><%= t("dialog.create_and_edit_security_group.name") %></p>
-    <% if @name %>
-        <input type="text" id="security_group_name" size="20" value="<%= @name %>" disabled>
-			<% else %>
-				<input type="text" id="security_group_name" size="20">
-			<% end %>
-			<input type="hidden" id="security_group_id" value="<%= @uuid %>">
-    </div>
+  <div id="security_group_name_field">
+    <%- if @uuid -%>
+    <p>
+    UUID: <%= @uuid %>
+    </p>
+    <%- end -%>
+    <input type="hidden" id="security_group_id" value="<%= @uuid %>">
     <div id="security_group_description_field">
     <p>
       <%= t("dialog.create_and_edit_security_group.description") %>
     </p> 
-		  <input type="text" id="security_group_description" size="43" value="<%= @description %>">
+    <input type="text" id="security_group_description" size="43" value="<%= @description %>">
     </div>
     <div id="security_group_rule_field">
     <p>
       <%= t("dialog.create_and_edit_security_group.rule") %> [<span rel="#rule_help" id="security_group_help" title="Rule Help" style="color:red">?</span>]
     </p>
     </div>
-			<textarea id="security_group_rule" rows="10" cols="10" style="width:442px;height:320px" ><%= @rule %></textarea>
+    <textarea id="security_group_rule" rows="10" cols="10" style="width:442px;height:320px" ><%= @rule %></textarea>
   <div id="rule_help">
   <pre>
 SYNOPSIS
@@ -58,7 +56,7 @@ PARAMETERS
     ex. a-trustedx:default
 
   source cidr:
-    ex. 0.0.0.0/0, 192.168.0.0/24
+    ex. 0.0.0.0/0, ip4:192.0.2.0/24
 
    </pre> 
   </div>