archipel-api 4 → 5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 475d4a92a09d54d426ca4a446c4aad744e40df33
-  data.tar.gz: 622401326c20d369a4689a5d018db531604c2407
+  metadata.gz: bfedb12078b1d60c1415c991e5c4ac95f482e5b7
+  data.tar.gz: 42a12b2aea306c4a79936362935aa05b04b69c4a
 SHA512:
-  metadata.gz: 39a0875d3a497ccab74d9a7e37e35d796da10da408ad17b983893018d4a425c1fdec0fdedc2efcc3b8c445828a26e6b6494e093d35c6dd5701ebb789bfd34f92
-  data.tar.gz: abe4a90afbc1095f02f3dd7b0756bfe0b00a16a7739ed80b353d98da272045da21c293daa1899a429fa63103d53f07d31e289a40662a560214bc0bb69270438b
+  metadata.gz: 4a83bd10314dc4629280aa06b45f405ecabbfe39da3105ce5272f2488d00b888051096e77710321b617c362db566a3dc15a35a2e572ca39352c9e8004012fc2a
+  data.tar.gz: ba70978f4bce49c0ac2734ef6369ff89f6e05824aeeda5b83b3be29ac83c46a6691f60fd9a53493d833775c9514e3d07583623a74c82f43767598fde24d9a9e4

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

@@ -36,7 +36,7 @@ class Archipel::Api::Internal::Api
   end
 
   def in_connection
-    Jabber.debug = @config[:xmpp_debug]
+    Jabber.debug = ['true', true].include? @config[:xmpp_debug]
     client = Jabber::Client.new Jabber::JID.new @config[:login]
     client.connect @config[:server]
     client.auth @config[:password]
@@ -73,6 +73,6 @@ class Archipel::Api::Internal::Api
 
   private
   def debug?
-    @config[:debug]
+    ['true', true].include? @config[:debug]
   end
 end

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

@@ -28,14 +28,6 @@ class Archipel::Api::Internal::HypervisorXmlMessages
     render 'delete_vm', jid: jid
   end
 
-  def grant_permissions jid, user_jid
-    enabled = %w(settags getavatars setavatar presence message info create shutdown destroy reboot suspend resume xmldesc networkinfo define undefine capabilities nodeinfo network_getnames network_bridges appliance_get appliance_attach appliance_detach appliance_package drives_get oom_getadjust scheduler_jobs scheduler_schedule scheduler_unschedule scheduler_actions vnc_display snapshot_take snapshot_delete snapshot_get snapshot_current snapshot_revert)
-    disabled = %w(all permission_get permission_getown permission_list permission_set permission_setown subscription_add subscription_remove migrate autostart memory setvcpus free xmppserver_users_list xmppserver_users_number oom_setadjust drives_create drives_delete drives_getiso drives_convert drives_rename vmparking_park)
-
-    render 'grant_permissions', jid: jid, user_jid: user_jid,
-        enabled_permissions: enabled, disabled_permissions: disabled
-  end
-
   def list_users page = 0, humans_only = true
     render 'list_users', page: page, humans_only: humans_only
   end

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

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

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

@@ -20,7 +20,7 @@
         <apic/>
       </features>
       <devices>
-        <emulator>/usr/bin/qemu-kvm</emulator>
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
         <disk device="disk" type="file">
           <driver cache="none" type="qcow2" name="qemu"/>
           <%= tag :source, file: "/var/lib/libvirt/images/archipel/drives/#{uuid}/disk.qcow2" %>

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

@@ -43,7 +43,6 @@ class VmInfo
   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
 

data/lib/archipel/api/vm_api.rb

@@ -32,7 +32,6 @@ class Archipel::Api::VmApi < Archipel::Api::Internal::Api
   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']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archipel-api
 version: !ruby/object:Gem::Version
-  version: '4'
+  version: '5'
 platform: ruby
 authors:
 - Damian Nowak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby API for Archipel Agent, an XMPP-based orchestrator. See http://archipelproject.org/.
 email:
 - damian.nowak@pacmanvps.com