plainprograms-virtuozzo 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+= CHANGELOG
+
+== 0.1.1 "Big Boy Busted"
+
+* Fixed a bunch of errors in the generate code from wsdl2ruby and resolved 
+  some oddness in the Connection#initialize methods implementation.
+* Basic operations work!
+
 == 0.1.0 "Big Boy"
 
 * After finding a bug in the way Virtuozzo handles parsing of SOAP headers

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'echoe'
 require 'spec/rake/spectask'
 
-Echoe.new('virtuozzo', '0.1.0') do |p|
+Echoe.new('virtuozzo', '0.1.1') do |p|
   p.description               = "Ruby library for Parallels Virtuozzo Agent's API"
   p.url                       = "http://github.com/plainprograms/virtuozzo"
   p.author                    = "James Thompson"

data/lib/virtuozzo.rb

@@ -6,7 +6,7 @@
 require 'base64'
 require 'rubygems'
 
-require 'soap4r'
+gem 'soap4r'
 
 __DIR__ = File.dirname(__FILE__)
 

data/lib/virtuozzo/constants.rb

@@ -4,7 +4,4 @@ module Virtuozzo # :nodoc:
 
   # Virtuozzo Agent's default system realm
   DEFAULT_REALM = '00000000-0000-0000-0000-000000000000'
-  
-  # UUID Generator
-  UUID_GENERATOR = UUID.new
 end

data/lib/virtuozzo/soap.rb

@@ -9,6 +9,8 @@ require 'virtuozzo/soap/drivers/process_driver'
 require 'virtuozzo/soap/drivers/up2date_driver'
 require 'virtuozzo/soap/drivers/support_driver'
 
+require 'soap/header/simplehandler'
+
 module Virtuozzo # :nodoc:
   module SOAP # :nodoc:
     # = HeaderHandler
@@ -16,7 +18,7 @@ module Virtuozzo # :nodoc:
     # Class designed to handle parsing the header region of a SOAP envelope for
     # the Virtuozzo API.
     #
-    class HeaderHandler < SOAP::Header::SimpleHandler
+    class HeaderHandler < ::SOAP::Header::SimpleHandler
       NAMESPACE = 'http://www.swsoft.com/webservices/vzl/4.0.0/soap_protocol'
   
       def initialize(session = nil, target = nil)
@@ -33,7 +35,7 @@ module Virtuozzo # :nodoc:
         hdr = {}
     
         hdr.merge!({@session_elem => @session}) unless @session.nil?
-        hdr.merge!(@target_elem => @target}) unless @target.nil? || @target == 'system'
+        hdr.merge!({@target_elem => @target}) unless @target.nil? || @target == 'system'
 
         return hdr
       end
@@ -45,62 +47,56 @@ module Virtuozzo # :nodoc:
     # API.
     #
     class Connection
-      def initialize(opts = {})
-        options = {
-          :host => "https://localhost:4646",
-          :username => "",
-          :password => "",
-          :realm => Virtuozzo::DEFAULT_REALM
-        }.merge(opts)
-        
-        @endpoint = options[:host]
-        @username = options[:username]
-        @password = options[:pasword]
-        @realm    = options[:realm]
+      def initialize(host, username, password, realm = Virtuozzo::DEFAULT_REALM, debug = false)        
+        @endpoint = host
+        @username = username
+        @password = password
+        @realm    = realm
 
         setup_ssl_protection
+        setup_debug_mode if debug
         establish_session
         setup_header_handler
       end
 
       def session_driver
-        @session_driver ||= Virtuozzo::SOAP::Drivers::SessionDriver(@endpoint)
+        @session_driver ||= Virtuozzo::SOAP::Drivers::SessionDriver.new(@endpoint)
       end
       
       def environment_driver
-        @environment_driver ||= Virtuozzo::SOAP::Drivers::EnvironmentDriver(@endpoint)
+        @environment_driver ||= Virtuozzo::SOAP::Drivers::EnvironmentDriver.new(@endpoint)
       end
       
       def template_driver
-        @template_driver ||= Virtuozzo::SOAP::Drivers::TemplateDriver(@endpoint)
+        @template_driver ||= Virtuozzo::SOAP::Drivers::TemplateDriver.new(@endpoint)
       end
       
       def relocator_driver
-        @relocator_driver ||= Virtuozzo::SOAP::Drivers::RelocatorDriver(@endpoint)
+        @relocator_driver ||= Virtuozzo::SOAP::Drivers::RelocatorDriver.new(@endpoint)
       end
       
       def device_driver
-        @device_driver ||= Virtuozzo::SOAP::Drivers::DeviceDriver(@endpoint)
+        @device_driver ||= Virtuozzo::SOAP::Drivers::DeviceDriver.new(@endpoint)
       end
       
       def network_driver
-        @network_driver ||= Virtuozzo::SOAP::Drivers::NetworkDriver(@endpoint)
+        @network_driver ||= Virtuozzo::SOAP::Drivers::NetworkDriver.new(@endpoint)
       end
       
       def process_info_driver
-        @process_info_driver ||= Virtuozzo::SOAP::Drivers::ProcessInfoDriver(@endpoint)
+        @process_info_driver ||= Virtuozzo::SOAP::Drivers::ProcessInfoDriver.new(@endpoint)
       end
       
       def process_driver
-        @process_driver ||= Virtuozzo::SOAP::Drivers::ProcessDriver(@endpoint)
+        @process_driver ||= Virtuozzo::SOAP::Drivers::ProcessDriver.new(@endpoint)
       end
       
       def up2date_driver
-        @up2date_driver ||= Virtuozzo::SOAP::Drivers::Up2dateDriver(@endpoint)
+        @up2date_driver ||= Virtuozzo::SOAP::Drivers::Up2dateDriver.new(@endpoint)
       end
       
       def support_driver
-        @support_driver ||= Virtuozzo::SOAP::Drivers::SupportDriver(@endpoint)
+        @support_driver ||= Virtuozzo::SOAP::Drivers::SupportDriver.new(@endpoint)
       end
 
       private
@@ -119,6 +115,19 @@ module Virtuozzo # :nodoc:
           support_driver.options['protocol.http.ssl_config.verify_mode'] = nil
         end
       end
+      
+      def setup_debug_mode
+        session_driver.wiredump_dev = STDOUT
+        environment_driver.wiredump_dev = STDOUT
+        template_driver.wiredump_dev = STDOUT
+        relocator_driver.wiredump_dev = STDOUT
+        device_driver.wiredump_dev = STDOUT
+        network_driver.wiredump_dev = STDOUT
+        process_info_driver.wiredump_dev = STDOUT
+        process_driver.wiredump_dev = STDOUT
+        up2date_driver.wiredump_dev = STDOUT
+        support_driver.wiredump_dev = STDOUT
+      end
 
       def establish_session
         login_opts = {

data/lib/virtuozzo/soap/drivers/device/types.rb

@@ -1038,6 +1038,19 @@ class TransferType
   end
 end
 
+# {http://www.swsoft.com/webservices/vzl/4.0.0/types}ip_addressType
+#   ip - (any)
+#   netmask - (any)
+class Ip_addressType
+  attr_accessor :ip
+  attr_accessor :netmask
+
+  def initialize(ip = nil, netmask = nil)
+    @ip = ip
+    @netmask = netmask
+  end
+end
+
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}system_nodeType
 #   address - Virtuozzo::SOAP::Drivers::Device::System_nodeType::Address
 #   login - Virtuozzo::SOAP::Drivers::Device::System_nodeType::Login
@@ -1436,19 +1449,6 @@ class Load_avg_statsType
   end
 end
 
-# {http://www.swsoft.com/webservices/vzl/4.0.0/types}ip_addressType
-#   ip - (any)
-#   netmask - (any)
-class Ip_addressType
-  attr_accessor :ip
-  attr_accessor :netmask
-
-  def initialize(ip = nil, netmask = nil)
-    @ip = ip
-    @netmask = netmask
-  end
-end
-
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}env_resourceType
 #   eid - (any)
 #   ip_pool - Virtuozzo::SOAP::Drivers::Device::Ip_poolType
@@ -1742,6 +1742,25 @@ class Vt_settingsType_ < Vt_settingsType
   end
 end
 
+# {http://www.swsoft.com/webservices/vzl/4.0.0/types}groupType
+#   user - Virtuozzo::SOAP::Drivers::Device::GroupType::User
+#   member_group - Virtuozzo::SOAP::Drivers::Device::GroupType::Member_group
+#   name - SOAP::SOAPString
+#   gid - SOAP::SOAPInt
+class GroupType
+  attr_accessor :user
+  attr_accessor :member_group
+  attr_accessor :name
+  attr_accessor :gid
+
+  def initialize(user = [], member_group = [], name = nil, gid = nil)
+    @user = user
+    @member_group = member_group
+    @name = name
+    @gid = gid
+  end
+end
+
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}userType
 #   initial_group - Virtuozzo::SOAP::Drivers::Device::UserType::Initial_group
 #   group - Virtuozzo::SOAP::Drivers::Device::UserType::Group
@@ -1802,13 +1821,7 @@ class UserType
   end
 end
 
-# {http://www.swsoft.com/webservices/vzl/4.0.0/types}groupType
-#   user - Virtuozzo::SOAP::Drivers::Device::GroupType::User
-#   member_group - Virtuozzo::SOAP::Drivers::Device::GroupType::Member_group
-#   name - SOAP::SOAPString
-#   gid - SOAP::SOAPInt
 class GroupType
-
   # inner class for member: user
   # {http://www.swsoft.com/webservices/vzl/4.0.0/types}user
   #   name - SOAP::SOAPString
@@ -1830,18 +1843,6 @@ class GroupType
       @name = name
     end
   end
-
-  attr_accessor :user
-  attr_accessor :member_group
-  attr_accessor :name
-  attr_accessor :gid
-
-  def initialize(user = [], member_group = [], name = nil, gid = nil)
-    @user = user
-    @member_group = member_group
-    @name = name
-    @gid = gid
-  end
 end
 
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}packageType

data/lib/virtuozzo/soap/drivers/device_driver.rb

@@ -104,8 +104,8 @@ module Virtuozzo
         def initialize(endpoint_url = nil)
           endpoint_url ||= DefaultEndpointUrl
           super(endpoint_url, nil)
-          self.mapping_registry = DefaultMappingRegistry::EncodedRegistry
-          self.literal_mapping_registry = DefaultMappingRegistry::LiteralRegistry
+          self.mapping_registry = Virtuozzo::SOAP::Drivers::Device::DefaultMappingRegistry::EncodedRegistry
+          self.literal_mapping_registry = Virtuozzo::SOAP::Drivers::Device::DefaultMappingRegistry::LiteralRegistry
           init_methods
         end
 

data/lib/virtuozzo/soap/drivers/environment/types.rb

@@ -600,6 +600,19 @@ class TransferType
   end
 end
 
+# {http://www.swsoft.com/webservices/vzl/4.0.0/types}ip_addressType
+#   ip - (any)
+#   netmask - (any)
+class Ip_addressType
+  attr_accessor :ip
+  attr_accessor :netmask
+
+  def initialize(ip = nil, netmask = nil)
+    @ip = ip
+    @netmask = netmask
+  end
+end
+
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}system_nodeType
 #   address - Virtuozzo::SOAP::Drivers::Environment::System_nodeType::Address
 #   login - Virtuozzo::SOAP::Drivers::Environment::System_nodeType::Login
@@ -998,19 +1011,6 @@ class Load_avg_statsType
   end
 end
 
-# {http://www.swsoft.com/webservices/vzl/4.0.0/types}ip_addressType
-#   ip - (any)
-#   netmask - (any)
-class Ip_addressType
-  attr_accessor :ip
-  attr_accessor :netmask
-
-  def initialize(ip = nil, netmask = nil)
-    @ip = ip
-    @netmask = netmask
-  end
-end
-
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}env_resourceType
 #   eid - (any)
 #   ip_pool - Virtuozzo::SOAP::Drivers::Environment::Ip_poolType
@@ -1304,6 +1304,25 @@ class Vt_settingsType_ < Vt_settingsType
   end
 end
 
+# {http://www.swsoft.com/webservices/vzl/4.0.0/types}groupType
+#   user - Virtuozzo::SOAP::Drivers::Environment::GroupType::User
+#   member_group - Virtuozzo::SOAP::Drivers::Environment::GroupType::Member_group
+#   name - SOAP::SOAPString
+#   gid - SOAP::SOAPInt
+class GroupType
+  attr_accessor :user
+  attr_accessor :member_group
+  attr_accessor :name
+  attr_accessor :gid
+
+  def initialize(user = [], member_group = [], name = nil, gid = nil)
+    @user = user
+    @member_group = member_group
+    @name = name
+    @gid = gid
+  end
+end
+
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}userType
 #   initial_group - Virtuozzo::SOAP::Drivers::Environment::UserType::Initial_group
 #   group - Virtuozzo::SOAP::Drivers::Environment::UserType::Group
@@ -1364,13 +1383,7 @@ class UserType
   end
 end
 
-# {http://www.swsoft.com/webservices/vzl/4.0.0/types}groupType
-#   user - Virtuozzo::SOAP::Drivers::Environment::GroupType::User
-#   member_group - Virtuozzo::SOAP::Drivers::Environment::GroupType::Member_group
-#   name - SOAP::SOAPString
-#   gid - SOAP::SOAPInt
 class GroupType
-
   # inner class for member: user
   # {http://www.swsoft.com/webservices/vzl/4.0.0/types}user
   #   name - SOAP::SOAPString
@@ -1392,18 +1405,6 @@ class GroupType
       @name = name
     end
   end
-
-  attr_accessor :user
-  attr_accessor :member_group
-  attr_accessor :name
-  attr_accessor :gid
-
-  def initialize(user = [], member_group = [], name = nil, gid = nil)
-    @user = user
-    @member_group = member_group
-    @name = name
-    @gid = gid
-  end
 end
 
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}packageType
@@ -2733,12 +2734,11 @@ class Vzaenvm_configurationType < Envm_configurationType
   attr_accessor :sve_visible
   attr_accessor :timeouts
 
-  def initialize(timeouts = nil, start_veid = nil, end_veid = nil, sve_visible = nil, timeouts = nil)
+  def initialize(timeouts = nil, start_veid = nil, end_veid = nil, sve_visible = nil)
     @timeouts = timeouts
     @start_veid = start_veid
     @end_veid = end_veid
     @sve_visible = sve_visible
-    @timeouts = timeouts
   end
 end
 

data/lib/virtuozzo/soap/drivers/environment_driver.rb

@@ -264,8 +264,8 @@ module Virtuozzo    # :nodoc:
         def initialize(endpoint_url = nil)
           endpoint_url ||= DefaultEndpointUrl
           super(endpoint_url, nil)
-          self.mapping_registry = DefaultMappingRegistry::EncodedRegistry
-          self.literal_mapping_registry = DefaultMappingRegistry::LiteralRegistry
+          self.mapping_registry = Virtuozzo::SOAP::Drivers::Environment::DefaultMappingRegistry::EncodedRegistry
+          self.literal_mapping_registry = Virtuozzo::SOAP::Drivers::Environment::DefaultMappingRegistry::LiteralRegistry
           init_methods
         end
 
@@ -296,5 +296,6 @@ module Virtuozzo    # :nodoc:
         end
       end
 
-
-end
+    end
+  end
+end

data/lib/virtuozzo/soap/drivers/network/types.rb

@@ -390,6 +390,19 @@ class TransferType
   end
 end
 
+# {http://www.swsoft.com/webservices/vzl/4.0.0/types}ip_addressType
+#   ip - (any)
+#   netmask - (any)
+class Ip_addressType
+  attr_accessor :ip
+  attr_accessor :netmask
+
+  def initialize(ip = nil, netmask = nil)
+    @ip = ip
+    @netmask = netmask
+  end
+end
+
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}system_nodeType
 #   address - Virtuozzo::SOAP::Drivers::Network::System_nodeType::Address
 #   login - Virtuozzo::SOAP::Drivers::Network::System_nodeType::Login
@@ -788,19 +801,6 @@ class Load_avg_statsType
   end
 end
 
-# {http://www.swsoft.com/webservices/vzl/4.0.0/types}ip_addressType
-#   ip - (any)
-#   netmask - (any)
-class Ip_addressType
-  attr_accessor :ip
-  attr_accessor :netmask
-
-  def initialize(ip = nil, netmask = nil)
-    @ip = ip
-    @netmask = netmask
-  end
-end
-
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}env_resourceType
 #   eid - (any)
 #   ip_pool - Virtuozzo::SOAP::Drivers::Network::Ip_poolType
@@ -1038,6 +1038,26 @@ class Vt_settingsType
   end
 end
 
+# {http://www.swsoft.com/webservices/vzl/4.0.0/types}groupType
+#   user - Virtuozzo::SOAP::Drivers::Network::GroupType::User
+#   member_group - Virtuozzo::SOAP::Drivers::Network::GroupType::Member_group
+#   name - SOAP::SOAPString
+#   gid - SOAP::SOAPInt
+class GroupType
+  attr_accessor :user
+  attr_accessor :member_group
+  attr_accessor :name
+  attr_accessor :gid
+
+  def initialize(user = [], member_group = [], name = nil, gid = nil)
+    @user = user
+    @member_group = member_group
+    @name = name
+    @gid = gid
+  end
+end
+
+
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}userType
 #   initial_group - Virtuozzo::SOAP::Drivers::Network::UserType::Initial_group
 #   group - Virtuozzo::SOAP::Drivers::Network::UserType::Group
@@ -1098,11 +1118,6 @@ class UserType
   end
 end
 
-# {http://www.swsoft.com/webservices/vzl/4.0.0/types}groupType
-#   user - Virtuozzo::SOAP::Drivers::Network::GroupType::User
-#   member_group - Virtuozzo::SOAP::Drivers::Network::GroupType::Member_group
-#   name - SOAP::SOAPString
-#   gid - SOAP::SOAPInt
 class GroupType
 
   # inner class for member: user
@@ -1126,18 +1141,6 @@ class GroupType
       @name = name
     end
   end
-
-  attr_accessor :user
-  attr_accessor :member_group
-  attr_accessor :name
-  attr_accessor :gid
-
-  def initialize(user = [], member_group = [], name = nil, gid = nil)
-    @user = user
-    @member_group = member_group
-    @name = name
-    @gid = gid
-  end
 end
 
 # {http://www.swsoft.com/webservices/vzl/4.0.0/types}packageType