fog 1.42.1 → 2.0.0.pre.0

data/lib/fog/ninefold/requests/compute/start_virtual_machine.rb

@@ -0,0 +1,12 @@
+module Fog
+  module Compute
+    class Ninefold
+      class Real
+        def start_virtual_machine(options = {})
+          request('startVirtualMachine', options, :expects => [200],
+                  :response_prefix => 'startvirtualmachineresponse', :response_type => Hash)
+        end
+      end
+    end
+  end
+end

data/lib/fog/ninefold/requests/compute/stop_virtual_machine.rb

@@ -0,0 +1,12 @@
+module Fog
+  module Compute
+    class Ninefold
+      class Real
+        def stop_virtual_machine(options = {})
+          request('stopVirtualMachine', options, :expects => [200],
+                  :response_prefix => 'stopvirtualmachineresponse', :response_type => Hash)
+        end
+      end
+    end
+  end
+end

data/lib/fog/ninefold/requests/compute/update_load_balancer_rule.rb

@@ -0,0 +1,11 @@
+module Fog
+  module Compute
+    class Ninefold
+      class Real
+        def update_load_balancer_rule(options={})
+          request 'updateLoadBalancerRule', options, :expects => [200], :response_prefix => 'updateloadbalancerruleresponse', :response_type => Hash
+        end
+      end
+    end
+  end
+end

data/lib/fog/ninefold/requests/compute/update_virtual_machine.rb

@@ -0,0 +1,12 @@
+module Fog
+  module Compute
+    class Ninefold
+      class Real
+        def update_virtual_machine(options = {})
+          request('updateVirtualMachine', options, :expects => [200],
+                  :response_prefix => 'updatevirtualmachineresponse', :response_type => Hash)
+        end
+      end
+    end
+  end
+end

data/lib/fog/ninefold/storage.rb

@@ -0,0 +1,53 @@
+require 'fog/ninefold'
+require 'fog/atmos'
+
+module Fog
+  module Storage
+    class Ninefold < Fog::Storage::Atmos
+      STORAGE_HOST = "onlinestorage.ninefold.com" #"api.ninefold.com"
+      STORAGE_PATH = "" #"/storage/v1.0"
+      STORAGE_PORT = "80" # "443"
+      STORAGE_SCHEME = "http" # "https"
+
+      requires :ninefold_storage_token, :ninefold_storage_secret
+      recognizes :persistent
+
+      model_path 'fog/storage/atmos/models'
+      model       :directory
+      collection  :directories
+      model       :file
+      collection  :files
+
+      module Utils
+      end
+
+      class Mock < Fog::Storage::Atmos::Mock
+        include Utils
+
+        def initialize(options={})
+          @ninefold_storage_token = options[:ninefold_storage_token]
+          @ninefold_storage_secret = options[:ninefold_storage_secret]
+        end
+
+        def request(options)
+          raise "Ninefold Storage mocks not implemented"
+        end
+      end
+
+      class Real < Fog::Storage::Atmos::Real
+        include Utils
+
+        def initialize(options={})
+          endpoint = "#{STORAGE_SCHEME}://"\
+                     "#{STORAGE_HOST}:"\
+                     "#{STORAGE_PORT}"\
+                     "#{STORAGE_PATH}"
+          options[:atmos_storage_endpoint] = endpoint
+          options[:atmos_storage_token] = options[:ninefold_storage_token]
+          options[:atmos_storage_secret] = options[:ninefold_storage_secret]
+          super(options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/opennebula/compute.rb

@@ -1,8 +1,8 @@
 require 'fog/opennebula/core'
 
 module Fog
-  module Compute
-    class OpenNebula < Fog::Service
+ module Compute
+  class OpenNebula < Fog::Service
       requires   :opennebula_endpoint
       recognizes :opennebula_username, :opennebula_password
 
@@ -26,106 +26,35 @@ module Fog
       request :vm_destroy
       request :get_vnc_console
       request :vm_resume
-      request :vm_suspend
       request :vm_stop
       request :template_pool
       request :vm_disk_snapshot
       request :vm_shutdown
       request :image_pool
 
-      class Mock
-        def self.data
-          @data ||= Hash.new do |hash, key|
-            hash[key] = {
-              "vms" => [
-                {
-                  "onevm_object" => "",
-                  "status" => "RUNNING",
-                  "state" => "3",
-                  "id" => 4,
-                  "uuid" => "5",
-                  "gid" => "5",
-                  "name" => "MockVM",
-                  "user" => "MockUser",
-                  "group" => "MockGroup",
-                  "cpu" => "2",
-                  "memory" => "1024",
-                  "mac" => "00:01:02:03:04:05",
-                  "ip" => "1.1.1.1"
-                }
-              ],
-              "image_pool" => [
-                {}
-              ],
-              "template_pool" => [
-                {
-                  "content" => %Q{
-                    NAME = mock-vm
-                    MEMORY = 512
-                    VCPU = 1
-                    CPU = 1
-                  },
-                  "id" => 1,
-                  "name" => 'mock',
-                  "cpu" => 1,
-                  "vcpu" => 1,
-                  "memory" => 512,
-                  "sched_requirements" => 'CPUSPEED > 1000',
-                  "sched_rank" => 'FREECPU',
-                  "sched_ds_requirements" => "NAME=mock",
-                  "sched_ds_rank" => "FREE_MB",
-                  "disk" => {},
-                  "nic" => {},
-                  "os" => {
-                    'ARCH' => 'x86_64'
-                  },
-                  "graphics" => {},
-                  "raw" => %|["DATA"=>"<cpu match='exact'><model fallback='allow'>core2duo</model></cpu>", "TYPE"=>"kvm"]|,
-                  "context" => {},
-                  "user_variables" => {}
-                }
-              ]
-            }
-          end
-        end
-
-        def self.reset
-          @data = nil
-        end
-
-        include Collections
-        def initialize(options={})
-          @opennebula_endpoint = options[:opennebula_endpoint]
-          @opennebula_username = options[:opennebula_username]
-          @opennebula_password = options[:opennebula_password]
-          require 'opennebula'
-        end
-
-        def client
-          return @client
-        end
-
-        def data
-          self.class.data[@opennebula_endpoint]
-        end
+    class Mock
+      include Collections
+      def initialize(options={})
+        require 'opennebula'
+      end
 
-        def reset_data
-          self.class.data.delete(@opennebula_endpoint)
-        end
+      def client
+        return @client
       end
+    end
 
-      class Real
-        include Collections
+    class Real
+      include Collections
 
-        def client
-          return @client
-        end
+      def client
+        return @client
+      end
 
-        def initialize(options={})
-          require 'opennebula'
-          @client = ::OpenNebula::Client.new("#{options[:opennebula_username]}:#{options[:opennebula_password]}", options[:opennebula_endpoint])
-        end
+      def initialize(options={})
+        require 'opennebula'
+        @client = ::OpenNebula::Client.new("#{options[:opennebula_username]}:#{options[:opennebula_password]}", options[:opennebula_endpoint])
       end
     end
   end
+ end
 end

data/lib/fog/opennebula/models/compute/flavor.rb

@@ -48,24 +48,24 @@ module Fog
           return "CPU=#{vcpu.to_f/10}\n" unless cpu
           return "CPU=#{vcpu}\n" if cpu.to_i > vcpu.to_i
           "CPU=#{cpu}\n"
-        end
+        end  
 
         def get_vcpu
           self.vcpu = 1 unless vcpu
           "VCPU=#{vcpu}\n"
-        end
+        end  
 
         def get_memory
           self.memory = 128 unless memory
           "MEMORY=#{memory}\n"
-        end
+        end  
 
         def get_raw
           return "" unless raw
           ret = "RAW=#{raw}\n"
           ret.gsub!(/\{/, '[')
           ret.gsub!(/\}/, ']')
-          ret.gsub!(/=>/,'=')
+          ret.gsub!(/>/,'')
           ret
         end
 
@@ -82,7 +82,7 @@ module Fog
           ret.gsub!(/\{/, '[')
           ret.gsub!(/\}/, ']')
           ret.gsub!(/>/,'')
-          ret
+          ret 
         end
 
         def get_os
@@ -91,16 +91,16 @@ module Fog
           ret.gsub!(/\{/, '[')
           ret.gsub!(/\}/, ']')
           ret.gsub!(/>/,'')
-          ret
+          ret 
         end
 
         def get_graphics
-          return "" unless graphics
+          return "" unless graphics 
           ret = "GRAPHICS=#{graphics}\n"
           ret.gsub!(/\{/, '[')
           ret.gsub!(/\}/, ']')
           ret.gsub!(/>/,'')
-          ret
+          ret 
         end
 
         def get_nic
@@ -115,26 +115,26 @@ module Fog
           #ret.gsub!(/\{/, '[')
           #ret.gsub!(/\}/, ']')
           #ret.gsub!(/>/,'')
-          ret
+          ret 
         end
 
         def get_sched_ds_requirements
-          return "" unless sched_ds_requirements
+          return "" unless sched_ds_requirements 
           %Q|SCHED_DS_REQUIREMENTS="#{sched_ds_requirements.gsub(/"/){ %q(\") }}"\n|
         end
 
         def get_sched_ds_rank
-          return "" unless sched_ds_rank
+          return "" unless sched_ds_rank 
           %Q|SCHED_DS_RANK="#{sched_ds_rank.gsub(/"/){ %q(\") }}"\n|
         end
 
         def get_sched_requirements
-          return "" unless sched_requirements
+          return "" unless sched_requirements 
           %Q|SCHED_REQUIREMENTS="#{sched_requirements.gsub(/"/){ %q(\") }}"\n|
         end
 
         def get_sched_rank
-          return "" unless sched_rank
+          return "" unless sched_rank 
           %Q|SCHED_RANK="#{sched_rank.gsub(/"/){ %q(\") }}"\n|
         end
 

data/lib/fog/opennebula/models/compute/server.rb

@@ -60,21 +60,13 @@ module Fog
             service.vm_resume(id)
           end
           true
-        end
+        end	
 
         def stop
           Fog::Logger.warning("stop VM: ID:#{id}")
           service.vm_stop(id)
         end
 
-        def suspend
-          service.vm_suspend(id)
-        end
-
-        def resume
-          service.vm_resume(id)
-        end
-
         def destroy
           service.vm_destroy(id)
         end

data/lib/fog/opennebula/requests/compute/image_pool.rb

@@ -18,6 +18,7 @@ module Fog
               end
             end
           end
+          images.delete nil
           images
         end #def image_pool
       end #class Real

data/lib/fog/opennebula/requests/compute/list_vms.rb

@@ -53,15 +53,33 @@ module Fog
 
       class Mock
         def list_vms(filter = {})
-          vms = []
-          self.data['vms'].each do |vm|
-            if filter[:id].nil?
-              vms << vm
-            elsif filter[:id] == vm['id']
-              vms << vm
-            end
+          if filter[:id].nil?
+            vm1 = mock_vm 'fog-vm1'
+            vm2 = mock_vm 'fog-vm2'
+            vm3 = mock_vm 'fog-vm3'
+            return [vm1, vm2, vm3]
+          elsif filter[:mock_return]
+            mock_vm 'fog-vm1', filter[:id]
+          else 
+            []
           end
-          vms
+        end
+        def mock_vm(name, id=4)
+          data = {}
+          data["onevm_object"] = ""
+          data["status"] = "Running"
+          data["state"]  = "3"
+          data["id"]     = id
+          data["uuid"]   = "5"
+          data["gid"]    = "5"
+          data["name"]   = "MockVM-#{name}"
+          data["user"]   = "MockUser" 
+          data["group"]  = "MockGroup"
+          data["cpu"]    = "2"
+          data["memory"] = "1024"
+          data["mac"]	 = "00:01:02:03:04:05"
+          data["ip"]	 = "1.1.1.1"
+          data
         end
       end
     end

data/lib/fog/opennebula/requests/compute/template_pool.rb

@@ -21,9 +21,6 @@
 # OS=[
 #     ARCH="x86_64",
 #     BOOT="network,hd" ]
-# RAW=[
-#   DATA="<cpu match='exact'><model fallback='allow'>core2duo</model></cpu>",
-#   TYPE="kvm" ]
 
 
 module Fog
@@ -40,7 +37,7 @@ module Fog
             templates.info!(-2, filter[:id], filter[:id])
           end # if filter[:id].nil?
 
-          templates = templates.map do |t|
+          templates = templates.map do |t| 
             # filtering by name
             # done here, because OpenNebula:TemplatePool does not support something like .delete_if
             if filter[:name] && filter[:name].is_a?(String) && !filter[:name].empty?
@@ -54,8 +51,8 @@ module Fog
             end
 
             h = Hash[
-              :id => t.to_hash["VMTEMPLATE"]["ID"],
-              :name => t.to_hash["VMTEMPLATE"]["NAME"],
+              :id => t.to_hash["VMTEMPLATE"]["ID"], 
+              :name => t.to_hash["VMTEMPLATE"]["NAME"], 
               :content => t.template_str,
               :USER_VARIABLES => "" # Default if not set in template
             ]
@@ -70,7 +67,7 @@ module Fog
                   vnet = networks.get(n["NETWORK_ID"].to_s)
                 elsif n["NETWORK"]
                   vnet = networks.get_by_name(n["NETWORK"].to_s)
-                else
+                else 
                   next
                 end
                 h["NIC"] << interfaces.new({ :vnet => vnet, :model => n["MODEL"] || "virtio" })
@@ -90,15 +87,15 @@ module Fog
             else
               # should i break?
             end
-
+          
             # every key should be lowercase
             ret_hash = {}
-            h.each_pair do |k,v|
-              ret_hash.merge!({k.downcase => v})
+            h.each_pair do |k,v| 
+              ret_hash.merge!({k.downcase => v}) 
             end
             ret_hash
           end
-
+          
           templates.delete nil
           raise Fog::Compute::OpenNebula::NotFound, "Flavor/Template not found" if templates.empty?
           templates
@@ -110,14 +107,38 @@ module Fog
           nic1 = Mock_nic.new
           nic1.vnet = networks.first
 
-          self.data['template_pool']
-          self.data['template_pool'].each do |tmpl|
-            tmpl['nic'][0] = nic1
-          end
-          self.data['template_pool']
+          [ 
+            {
+              :content => %Q{
+                NAME = mock-vm
+                MEMORY = 512
+                VCPU = 1
+                CPU = 1
+              },
+              :id => 1,
+              :name => 'mock',
+              :cpu => 1,
+              :vcpu => 1,
+              :memory => 512,
+              :sched_requirements => 'CPUSPEED > 1000',
+              :sched_rank => 'FREECPU',
+              :sched_ds_requirements => "NAME=mock",
+              :sched_ds_rank => "FREE_MB",
+              :disk => {},
+              :nic => {},
+              :nic => [ nic1 ] ,
+              :os => {
+                'ARCH' => 'x86_64'
+              },
+              :graphics => {},
+              :raw => {},
+              :context => {},
+              :user_variables => {}
+            }
+          ]
         end
 
-        class Mock_nic
+        class Mock_nic 
           attr_accessor :vnet
 
           def id
@@ -126,9 +147,6 @@ module Fog
           def name
             "fogtest"
           end
-          def model
-            "virtio-net"
-          end
         end
       end #class Mock
     end #class OpenNebula