archipel-api 3 → 4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 027c7f37fbabd9081fbd5232d9ad976e036b923b
-  data.tar.gz: 1ed8f3692c9ed43f49214dcfc29708244b2dc1d7
+  metadata.gz: 475d4a92a09d54d426ca4a446c4aad744e40df33
+  data.tar.gz: 622401326c20d369a4689a5d018db531604c2407
 SHA512:
-  metadata.gz: e20c1dc3a83ef3c8c4edba618d4f2b80c7c7d750512d12ed04972903ab4a90afa3e0d9a52d5ecf308db4f0844c485403b4796fa976a90d3f8317e0d9ee2bacc6
-  data.tar.gz: a2c40450ff293b858dba791d5aa4bc2f6a962e14d1525aae321be6ace6f87de6738dbf5faf941cc1a665d1e82b665bb9f146d9cd7228310fd499ade36f6f6df2
+  metadata.gz: 39a0875d3a497ccab74d9a7e37e35d796da10da408ad17b983893018d4a425c1fdec0fdedc2efcc3b8c445828a26e6b6494e093d35c6dd5701ebb789bfd34f92
+  data.tar.gz: abe4a90afbc1095f02f3dd7b0756bfe0b00a16a7739ed80b353d98da272045da21c293daa1899a429fa63103d53f07d31e289a40662a560214bc0bb69270438b

data/lib/archipel/api/internal/version.rb

@@ -1,7 +1,7 @@
 module Archipel
   module Api
     module Internal
-      VERSION = '3'
+      VERSION = '4'
     end
   end
 end

data/lib/archipel/api/internal/vm_xml_messages.rb

@@ -50,10 +50,27 @@ class Archipel::Api::Internal::VmXmlMessages
         enabled_permissions: [], disabled_permissions: disabled
   end
 
+  def info jid
+    render 'info', jid: jid, uuid: uuid_from_jid(jid)
+  end
+
+  def autostart jid, new_state
+    render 'autostart', jid: jid, uuid: uuid_from_jid(jid),
+        new_state: new_state
+  end
+
   def start jid
     render 'start', jid: jid, uuid: uuid_from_jid(jid)
   end
 
+  def stop jid
+    render 'stop', jid: jid, uuid: uuid_from_jid(jid)
+  end
+
+  def force_stop jid
+    render 'force_stop', jid: jid, uuid: uuid_from_jid(jid)
+  end
+
   def xml jid
     render 'xml', jid: jid, uuid: uuid_from_jid(jid)
   end

data/lib/archipel/api/internal/xml/vm/autostart.xml.erb

@@ -0,0 +1,3 @@
+<query xmlns="archipel:vm:control">
+  <%= tag :archipel, action: 'autostart', value: new_state ? 1 : 0 %>
+</query>

data/lib/archipel/api/internal/xml/vm/force_stop.xml.erb

@@ -0,0 +1,3 @@
+<query xmlns="archipel:vm:control">
+  <archipel action="destroy"/>
+</query>

data/lib/archipel/api/internal/xml/vm/info.xml.erb

@@ -0,0 +1,3 @@
+<query xmlns="archipel:vm:control">
+  <archipel action="info" />
+</query>

data/lib/archipel/api/internal/xml/vm/stop.xml.erb

@@ -0,0 +1,3 @@
+<query xmlns="archipel:vm:control">
+  <archipel action="shutdown"/>
+</query>

data/lib/archipel/api/vm/vm_info.rb

@@ -0,0 +1,56 @@
+require 'ostruct'
+require 'active_support/core_ext/numeric/bytes'
+
+
+class VmInfo
+  class State
+    attr_accessor :value, :name
+    @@index = {}
+
+    def initialize value, name
+      @value, @name = value, name
+      @@index[value] = self
+    end
+
+    STARTED = new 1, 'started'
+    STOPPED = new 5, 'stopped'
+
+    class << self
+      private :new
+    end
+
+    def method_missing method, *args
+      if method[-1] == '?'
+        method[0..-2] == name
+      else
+        super
+      end
+    end
+
+    def to_s
+      "VM state: #{name} (#{value})"
+    end
+
+    def self.from_int value
+      @@index[value]
+    end
+  end
+
+
+  attr_reader :state
+  attr_reader :autostart
+  attr_reader :memory, :memory_max
+  attr_reader :cpu_usage, :cpu_number
+
+  def initialize state, autostart, memory_kib, memory_max_kib, cpu_usage, cpu_number
+    pp state
+    @state = State.from_int state.to_i
+    @autostart = autostart.to_i == 0 ? false : true
+
+    @memory = memory_kib.to_i * 1024
+    @memory_max = memory_max_kib.to_i * 1024
+
+    @cpu_usage = cpu_usage.to_i
+    @cpu_number = cpu_number.to_i
+  end
+end

data/lib/archipel/api/vm_api.rb

@@ -1,5 +1,6 @@
 require_relative 'internal/api'
 require_relative 'internal/vm_xml_messages'
+require_relative 'vm/vm_info'
 
 
 class Archipel::Api::VmApi < Archipel::Api::Internal::Api
@@ -28,6 +29,24 @@ class Archipel::Api::VmApi < Archipel::Api::Internal::Api
     out['query'][0]['domain'][0]
   end
 
+  def info jid
+    out = method_missing :info, jid
+    resp = out['query'][0]['info'][0]
+    pp resp
+    VmInfo.new resp['state'], resp['autostart'],
+        resp['memory'], resp['maxMem'],
+        resp['cpuPrct'], resp['nrVirtCpu']
+  end
+
+  # Set autostart to new_state; read autostart state when new_state is not given
+  def autostart jid, new_state = nil
+    if new_state.nil?
+      info(jid).autostart
+    else
+      method_missing :autostart, jid, new_state
+    end
+  end
+
   def method_missing symbol, *args
     to = args[0]
     xml = @api.send symbol, *args

data/lib/archipel/api.rb

@@ -3,8 +3,9 @@ module Archipel
     module Internal
     end
 
-    def self.defaults login: nil, password: nil, server: nil, hypervisor: nil, ** kwargs
+    def self.defaults login: nil, password: nil, server: nil, hypervisor: nil, **kwargs
       @config = {login: login, password: password, server: server, hypervisor: hypervisor}
+      @config.merge! kwargs
     end
 
     def self.get_defaults

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archipel-api
 version: !ruby/object:Gem::Version
-  version: '3'
+  version: '4'
 platform: ruby
 authors:
 - Damian Nowak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -129,15 +129,20 @@ files:
 - lib/archipel/api/internal/xml/hypervisor/register_user.xml.erb
 - lib/archipel/api/internal/xml/hypervisor/unregister_user.xml.erb
 - lib/archipel/api/internal/xml/todo/clone_vm.xml.erb
+- lib/archipel/api/internal/xml/vm/autostart.xml.erb
 - lib/archipel/api/internal/xml/vm/create_disk.xml.erb
 - lib/archipel/api/internal/xml/vm/define_vm.xml.erb
+- lib/archipel/api/internal/xml/vm/force_stop.xml.erb
 - lib/archipel/api/internal/xml/vm/grant_permissions.xml.erb
+- lib/archipel/api/internal/xml/vm/info.xml.erb
 - lib/archipel/api/internal/xml/vm/list_disks.xml.erb
 - lib/archipel/api/internal/xml/vm/remove_disk.xml.erb
 - lib/archipel/api/internal/xml/vm/start.xml.erb
+- lib/archipel/api/internal/xml/vm/stop.xml.erb
 - lib/archipel/api/internal/xml/vm/subscribe.xml.erb
 - lib/archipel/api/internal/xml/vm/xml.xml.erb
 - lib/archipel/api/internal/xml_messages.rb
+- lib/archipel/api/vm/vm_info.rb
 - lib/archipel/api/vm_api.rb
 homepage: https://bitbucket.org/stratushost/ruby-archipel-api
 licenses: