webee 0.3.6 → 0.3.7

data/Rakefile

@@ -23,6 +23,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'i18n'
   gem.add_runtime_dependency 'alchemist'
   gem.add_runtime_dependency 'activesupport'
+  gem.add_runtime_dependency 'json'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new

data/examples/bootstrap2.rb

@@ -0,0 +1,33 @@
+$: << '../lib'
+require 'rubygems'
+require 'webee'
+require 'md5'
+
+CIAB_IP = ENV['host'] || '127.0.0.1'
+
+WeBee::Api.user = ENV['user'] || 'admin'
+WeBee::Api.password = ENV['pass'] || 'xabiquo'
+WeBee::Api.url = "http://#{ENV['host'] || 'abiquo'}/api"
+
+#
+# Add a license
+#
+license_file = ARGV[0]
+if license_file.nil? or (not File.exist?(license_file))
+  $stderr.puts "Invalid license file"
+  exit 1
+end
+WeBee::Config.add_license File.read(license_file).strip.chomp
+
+dc = WeBee::Datacenter.create :name => 'BCN'
+rack = dc.add_rack :name => 'rack_1',
+                   :ha_enabled => false,
+                   :vlan_min_id => 100,
+                   :vlan_max_id => 2048,
+                   :vlan_per_vdc_expected => 6,
+                   :nrsq => 80
+
+machine = dc.discover_machine :ip => CIAB_IP, :hypervisortype => 'kvm'
+machine.virtual_switch = machine.virtual_switches.first
+machine.datastores.first.enabled = true 
+rack.add_machine(machine)

data/examples/test2.rb

@@ -6,70 +6,8 @@ require 'colorize'
 include WeBee
 Alchemist::use_si = true
 
-WeBee::Api.user = ENV['user'] || 'admin'
-WeBee::Api.password = ENV['pass'] || 'xabiquo'
+WeBee::Api.user = ENV['user'] || 'xfernandez'
+WeBee::Api.password = ENV['pass'] || 'xfernandez'
 WeBee::Api.url = 'http://mothership/api'
 
-stats = {
-  :free_hd => 0, 
-  :real_hd => 0,
-  :used_hd => 0, 
-  :hypervisors => 0,
-  :free_ram => 0,
-  :real_ram => 0,
-  :used_ram => 0,
-  :available_cpus => 0
-}
-
-Datacenter.all.each do |dc|
-  banner = "\n***** Datacenter (#{dc.name}) ******\n\n"
-  puts "*" * banner.size 
-  puts banner
-  puts "*" * banner.size 
-  dc.racks.each do |rack|
-    puts "Rack: #{rack.name}"
-    rack.machines.each do |m|
-      stats[:hypervisors] += 1
-      stats[:used_ram] += m.ram_used.to_i
-      stats[:real_ram] += m.real_ram.to_i
-      stats[:available_cpus] += m.real_cpu.to_i
-      stats[:used_hd] += m.hd_used.to_i.bytes.to.gigabytes.to_f.round
-      stats[:real_hd] += m.real_hd.to_i.bytes.to.gigabytes.to_f.round
-      puts "  #{m.name.green}"
-      puts "    IP:          #{m.ip}"
-      puts "    CPUs:        #{m.real_cpu}"
-      puts "    State:       #{m.state}"
-      puts "    Type:        #{m.hypervisortype}"
-      puts "    RAM:         #{m.real_ram.to_i} MB"
-      puts "    RAM Used:    #{m.ram_used.to_i} MB"
-      puts "    RAM Free:    #{m.real_ram.to_i - m.ram_used.to_i} MB"
-      puts "    HD Size:     #{m.real_hd.to_i.bytes.to.gigabytes.to_i} GB"
-      puts "    HD Used:     #{m.hd_used.to_i.bytes.to.gigabytes.to_i} GB"
-      puts "    HD Free:     #{(m.real_hd.to_i - m.hd_used.to_i).bytes.to.gigabytes.to_i} GB"
-      puts "    CPU Used:    #{m.cpu_used.to_i}"
-      puts "    Datastores:"
-      m.datastores.each do |ds|
-        puts "      Name:       #{ds.name}"
-        puts "      Enabled:    #{ds.enabled}"
-        puts "      Size:       #{ds.size.to_i.bytes.to.gigabytes.to_i} GB"
-        puts "      Used Size:  #{ds.used_size.to_i.bytes.to.gigabytes.to_i} GB"
-      end
-    end
-  end
-end
-
-stats[:free_ram] = stats[:real_ram] - stats[:used_ram]
-stats[:free_hd] = stats[:real_hd] - stats[:used_hd]
-
-puts "\n\n------------------------------------"
-puts "          Cloud Statistics"
-puts "------------------------------------"
-puts "Hypevisors:       #{stats[:hypervisors]}"
-puts "Available CPUs:   #{stats[:available_cpus]}"
-puts "Total RAM:        #{stats[:real_ram].megabytes.to.gigabytes} GB"
-puts "Free RAM:         #{stats[:free_ram].megabytes.to.gigabytes} GB"
-puts "Used RAM:         #{stats[:used_ram].megabytes.to.gigabytes} GB"
-puts "Total HD:         #{stats[:real_hd]} GB"
-puts "Free HD:          #{stats[:free_hd]} GB"
-puts "Used HD:          #{stats[:used_hd]} GB"
-
+puts User.all

data/lib/webee.rb

@@ -29,7 +29,7 @@ end
 
 module WeBee 
 
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 
   module RestResource
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webee
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Sergio Rubio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 Z
+date: 2011-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sax-machine
@@ -115,6 +115,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 description: Abiquo API Ruby Implementation
 email: sergio@rubio.name
 executables: 
@@ -142,6 +156,7 @@ files:
 - lib/webee/commands/user.rb
 - test/helper.rb
 - test/test_webee.rb
+- examples/bootstrap2.rb
 - examples/test.rb
 - examples/test2.rb
 - test/test_appliance_manager.rb
@@ -182,6 +197,7 @@ test_files:
 - examples/all_vms.rb
 - examples/basics.rb
 - examples/bootstrap.rb
+- examples/bootstrap2.rb
 - examples/list_hypervisors.rb
 - examples/test.rb
 - examples/test2.rb