ovirt-engine-sdk 4.0.0.alpha0 → 4.0.0.alpha4

data/lib/ovirt/sdk/v4/services/vm_session_service.rb

@@ -25,20 +25,33 @@ module Ovirt
             @path = path
         end
         
-        def get
-          body = @connection.request({:method => :GET, :path => @path})
-          if body then
+        def get(opts = {})
+          query = {}
+          matrix = {}
+          request = Request.new(:method => :GET, :path => @path, :query => query, :matrix => matrix)
+          response = @connection.send(request)
+          case response.code
+          when 200
             begin
-              io = StringIO.new(body)
-              reader = XmlReader.new({:io => io})
-              return SessionReader.read_one(reader)
+              io = StringIO.new(response.body)
+              reader = XmlReader.new(:io => io)
+              return SessionReader.read_one(reader, @connection)
             ensure
               reader.close
               io.close
             end
+          else
+            check_fault(response)
           end
         end
         
+        def service(path)
+          if path.nil? || path == ''
+            return self
+          end
+          raise Error.new("The path \"#{path}\" doesn't correspond to any service")
+        end
+        
         def to_s
           return "#<#{VmSessionService}:#{@path}>"
         end

data/lib/ovirt/sdk/v4/services/vm_sessions_service.rb

@@ -25,24 +25,46 @@ module Ovirt
             @path = path
         end
         
-        def list
-          body = @connection.request({:method => :GET, :path => @path})
-          if body then
+        def list(opts = {})
+          query = {}
+          matrix = {}
+          value = opts[:max]
+          unless value.nil?
+            query['max'] = value
+            matrix['max'] = value
+          end
+          request = Request.new(:method => :GET, :path => @path, :query => query, :matrix => matrix)
+          response = @connection.send(request)
+          case response.code
+          when 200
             begin
-              io = StringIO.new(body)
-              reader = XmlReader.new({:io => io})
-              return SessionReader.read_many(reader)
+              io = StringIO.new(response.body)
+              reader = XmlReader.new(:io => io)
+              return SessionReader.read_many(reader, @connection)
             ensure
               reader.close
               io.close
             end
+          else
+            check_fault(response)
           end
         end
         
-        def session(id)
+        def session_service(id)
           return VmSessionService.new(@connection, "#{@path}/#{id}")
         end
         
+        def service(path)
+          if path.nil? || path == ''
+            return self
+          end
+          index = path.index('/')
+          if index.nil?
+            return session_service(path)
+          end
+          return session_service(path[0..(index - 1)]).service(path[(index +1)..-1])
+        end
+        
         def to_s
           return "#<#{VmSessionsService}:#{@path}>"
         end

data/lib/ovirt/sdk/v4/services/vm_watchdog_service.rb

@@ -25,38 +25,78 @@ module Ovirt
             @path = path
         end
         
-        def get
-          body = @connection.request({:method => :GET, :path => @path})
-          if body then
+        def get(opts = {})
+          query = {}
+          matrix = {}
+          request = Request.new(:method => :GET, :path => @path, :query => query, :matrix => matrix)
+          response = @connection.send(request)
+          case response.code
+          when 200
             begin
-              io = StringIO.new(body)
-              reader = XmlReader.new({:io => io})
-              return WatchdogReader.read_one(reader)
+              io = StringIO.new(response.body)
+              reader = XmlReader.new(:io => io)
+              return WatchdogReader.read_one(reader, @connection)
             ensure
               reader.close
               io.close
             end
+          else
+            check_fault(response)
+          end
+        end
+        
+        def remove(opts = {})
+          query = {}
+          matrix = {}
+          value = opts[:async]
+          unless value.nil?
+            value = XmlFormatter.format_boolean(value)
+            query['async'] = value
+            matrix['async'] = value
+          end
+          request = Request.new(:method => :DELETE, :path => @path, :query => query, :matrix => matrix)
+          response = @connection.send(request)
+          unless response.code == 200
+            check_fault(response)
           end
         end
         
         def update(watchdog)
-          io = StringIO.new
-          writer = XmlWriter.new({:io => io, :indent => true})
-          WatchdogWriter.write_one(watchdog, writer)
-          writer.close
-          body = io.string
-          body = @connection.request({:method => :PUT, :path => @path, :body => body})
-          if body then
+          if watchdog.is_a?(Hash)
+            watchdog = Ovirt::SDK::V4::Watchdog.new(watchdog)
+          end
+          request = Request.new(:method => :PUT, :path => @path)
+          begin
+            io = StringIO.new
+            writer = XmlWriter.new(:io => io, :indent => true)
+            WatchdogWriter.write_one(watchdog, writer, 'watchdog')
+          ensure
+            writer.close
+            io.close
+          end
+          request.body = io.string
+          response = @connection.send(request)
+          case response.code
+          when 200
             begin
-              io = StringIO.new(body)
-              reader = XmlReader.new({:io => io})
-              reader.read
-              return WatchdogReader.read_one(reader)
+              io = StringIO.new(response.body)
+              reader = XmlReader.new(:io => io)
+              return WatchdogReader.read_one(reader, @connection)
             ensure
               reader.close
               io.close
             end
+            return result
+          else
+            check_fault(response)
+          end
+        end
+        
+        def service(path)
+          if path.nil? || path == ''
+            return self
           end
+          raise Error.new("The path \"#{path}\" doesn't correspond to any service")
         end
         
         def to_s

data/lib/ovirt/sdk/v4/services/vm_watchdogs_service.rb

@@ -25,24 +25,76 @@ module Ovirt
             @path = path
         end
         
-        def list
-          body = @connection.request({:method => :GET, :path => @path})
-          if body then
+        def add(watchdog, opts = {})
+          if watchdog.is_a?(Hash)
+            watchdog = Ovirt::SDK::V4::Watchdog.new(watchdog)
+          end
+          request = Request.new(:method => :POST, :path => @path)
+          begin
+            io = StringIO.new
+            writer = XmlWriter.new(:io => io, :indent => true)
+            WatchdogWriter.write_one(watchdog, writer, 'watchdog')
+          ensure
+            writer.close
+            io.close
+          end
+          request.body = io.string
+          response = @connection.send(request)
+          case response.code
+          when 201, 202
             begin
-              io = StringIO.new(body)
-              reader = XmlReader.new({:io => io})
-              return WatchdogReader.read_many(reader)
+              io = StringIO.new(response.body)
+              reader = XmlReader.new(:io => io)
+              return WatchdogReader.read_one(reader, @connection)
             ensure
               reader.close
               io.close
             end
+          else
+            check_fault(response)
           end
         end
         
-        def watchdog(id)
+        def list(opts = {})
+          query = {}
+          matrix = {}
+          value = opts[:max]
+          unless value.nil?
+            query['max'] = value
+            matrix['max'] = value
+          end
+          request = Request.new(:method => :GET, :path => @path, :query => query, :matrix => matrix)
+          response = @connection.send(request)
+          case response.code
+          when 200
+            begin
+              io = StringIO.new(response.body)
+              reader = XmlReader.new(:io => io)
+              return WatchdogReader.read_many(reader, @connection)
+            ensure
+              reader.close
+              io.close
+            end
+          else
+            check_fault(response)
+          end
+        end
+        
+        def watchdog_service(id)
           return VmWatchdogService.new(@connection, "#{@path}/#{id}")
         end
         
+        def service(path)
+          if path.nil? || path == ''
+            return self
+          end
+          index = path.index('/')
+          if index.nil?
+            return watchdog_service(path)
+          end
+          return watchdog_service(path[0..(index - 1)]).service(path[(index +1)..-1])
+        end
+        
         def to_s
           return "#<#{VmWatchdogsService}:#{@path}>"
         end

data/lib/ovirt/sdk/v4/services/vms_service.rb

@@ -25,24 +25,88 @@ module Ovirt
             @path = path
         end
         
-        def list
-          body = @connection.request({:method => :GET, :path => @path})
-          if body then
+        def add(vm, opts = {})
+          if vm.is_a?(Hash)
+            vm = Ovirt::SDK::V4::Vm.new(vm)
+          end
+          request = Request.new(:method => :POST, :path => @path)
+          begin
+            io = StringIO.new
+            writer = XmlWriter.new(:io => io, :indent => true)
+            VmWriter.write_one(vm, writer, 'vm')
+          ensure
+            writer.close
+            io.close
+          end
+          request.body = io.string
+          response = @connection.send(request)
+          case response.code
+          when 201, 202
             begin
-              io = StringIO.new(body)
-              reader = XmlReader.new({:io => io})
-              return VmReader.read_many(reader)
+              io = StringIO.new(response.body)
+              reader = XmlReader.new(:io => io)
+              return VmReader.read_one(reader, @connection)
             ensure
               reader.close
               io.close
             end
+          else
+            check_fault(response)
           end
         end
         
-        def vm(id)
+        def list(opts = {})
+          query = {}
+          matrix = {}
+          value = opts[:case_sensitive]
+          unless value.nil?
+            value = XmlFormatter.format_boolean(value)
+            query['case_sensitive'] = value
+            matrix['case_sensitive'] = value
+          end
+          value = opts[:filter]
+          unless value.nil?
+            value = XmlFormatter.format_boolean(value)
+            query['filter'] = value
+            matrix['filter'] = value
+          end
+          value = opts[:search]
+          unless value.nil?
+            query['search'] = value
+            matrix['search'] = value
+          end
+          request = Request.new(:method => :GET, :path => @path, :query => query, :matrix => matrix)
+          response = @connection.send(request)
+          case response.code
+          when 200
+            begin
+              io = StringIO.new(response.body)
+              reader = XmlReader.new(:io => io)
+              return VmReader.read_many(reader, @connection)
+            ensure
+              reader.close
+              io.close
+            end
+          else
+            check_fault(response)
+          end
+        end
+        
+        def vm_service(id)
           return VmService.new(@connection, "#{@path}/#{id}")
         end
         
+        def service(path)
+          if path.nil? || path == ''
+            return self
+          end
+          index = path.index('/')
+          if index.nil?
+            return vm_service(path)
+          end
+          return vm_service(path[0..(index - 1)]).service(path[(index +1)..-1])
+        end
+        
         def to_s
           return "#<#{VmsService}:#{@path}>"
         end

data/lib/ovirt/sdk/v4/services/vnic_profile_service.rb

@@ -25,44 +25,90 @@ module Ovirt
             @path = path
         end
         
-        def get
-          body = @connection.request({:method => :GET, :path => @path})
-          if body then
+        def get(opts = {})
+          query = {}
+          matrix = {}
+          request = Request.new(:method => :GET, :path => @path, :query => query, :matrix => matrix)
+          response = @connection.send(request)
+          case response.code
+          when 200
             begin
-              io = StringIO.new(body)
-              reader = XmlReader.new({:io => io})
-              return VnicProfileReader.read_one(reader)
+              io = StringIO.new(response.body)
+              reader = XmlReader.new(:io => io)
+              return VnicProfileReader.read_one(reader, @connection)
             ensure
               reader.close
               io.close
             end
+          else
+            check_fault(response)
+          end
+        end
+        
+        def remove(opts = {})
+          query = {}
+          matrix = {}
+          value = opts[:async]
+          unless value.nil?
+            value = XmlFormatter.format_boolean(value)
+            query['async'] = value
+            matrix['async'] = value
+          end
+          request = Request.new(:method => :DELETE, :path => @path, :query => query, :matrix => matrix)
+          response = @connection.send(request)
+          unless response.code == 200
+            check_fault(response)
           end
         end
         
         def update(profile)
-          io = StringIO.new
-          writer = XmlWriter.new({:io => io, :indent => true})
-          VnicProfileWriter.write_one(profile, writer)
-          writer.close
-          body = io.string
-          body = @connection.request({:method => :PUT, :path => @path, :body => body})
-          if body then
+          if profile.is_a?(Hash)
+            profile = Ovirt::SDK::V4::VnicProfile.new(profile)
+          end
+          request = Request.new(:method => :PUT, :path => @path)
+          begin
+            io = StringIO.new
+            writer = XmlWriter.new(:io => io, :indent => true)
+            VnicProfileWriter.write_one(profile, writer, 'profile')
+          ensure
+            writer.close
+            io.close
+          end
+          request.body = io.string
+          response = @connection.send(request)
+          case response.code
+          when 200
             begin
-              io = StringIO.new(body)
-              reader = XmlReader.new({:io => io})
-              reader.read
-              return VnicProfileReader.read_one(reader)
+              io = StringIO.new(response.body)
+              reader = XmlReader.new(:io => io)
+              return VnicProfileReader.read_one(reader, @connection)
             ensure
               reader.close
               io.close
             end
+            return result
+          else
+            check_fault(response)
           end
         end
         
-        def permissions
+        def permissions_service
           return AssignedPermissionsService.new(@connection, "#{@path}/permissions")
         end
         
+        def service(path)
+          if path.nil? || path == ''
+            return self
+          end
+          if path == 'permissions'
+            return permissions_service
+          end
+          if path.start_with?('permissions/')
+            return permissions_service.service(path[12..-1])
+          end
+          raise Error.new("The path \"#{path}\" doesn't correspond to any service")
+        end
+        
         def to_s
           return "#<#{VnicProfileService}:#{@path}>"
         end