labmanager 0.0.2 → 0.1.0

data/lib/labmanager/labmanager.rb

@@ -0,0 +1,14 @@
+require "labmanager_service"
+
+class Labmanager
+
+        def method_missing(name, *args)
+
+
+
+
+
+        end
+end
+
+

data/lib/labmanager/labmanager_service.rb

@@ -12,10 +12,9 @@ class LabmanagerService < Handsoap::Service
   @@password =''
   @@pragmatic=false
   @@testmode=false
-  
-  
-  
+
   Handsoap.http_driver = :custom
+  Handsoap.timeout= 600
   
   
   def self.configure(config)
@@ -56,9 +55,7 @@ class LabmanagerService < Handsoap::Service
     doc.add_namespace 'labmanager', 'http://vmware.com/labmanager'
   end
 
-  def createConfiguration(args = {})
-    puts "create Document"
-    
+  def create_configuration(args = {})
     begin
 
       response = invoke('labmanager:ConfigurationCreateEx') do |message|
@@ -73,7 +70,7 @@ class LabmanagerService < Handsoap::Service
      
       
       if @@pragmatic then
-        config = getConfigurationByName(args[:name])
+        config = get_configuration_by_name(args[:name])
         config[:id]
       else
         raise error
@@ -83,7 +80,7 @@ class LabmanagerService < Handsoap::Service
 
   end
 
-  def deleteConfiguration(id)
+  def delete_configuration(id)
 
     response = invoke('labmanager:ConfigurationDelete') do |message|
       message.add('labmanager:configurationId',id)
@@ -91,37 +88,33 @@ class LabmanagerService < Handsoap::Service
 
   end
 
-  def getConfigurationByName(name)
-    response = invoke('labmanager:GetConfigurationByName') do |message|
-      message.add('labmanager:name',name)
-    end
+  def get_configuration_by_name(name)
 
-    hashes = (response/"//labmanager:GetConfigurationByNameResponse/labmanager:GetConfigurationByNameResult/labmanager:Configuration").map do |configuration|
-      {
-        :id => (configuration/"labmanager:id").to_s,
-        :name => (configuration/"labmanager:name").to_s,
-        :description => (configuration/"labmanager:description").to_s
-      }
-    end
+      get_configurations.each do |config|
+            return config  if config[:name] == name
+      end
 
-    return hashes[0]
+      return nil
 
   end
 
-  def getConfigurations
+  def get_configurations
+
     response = invoke('labmanager:GetCurrentWorkspace')
 
+
     hashes = (response/"//labmanager:GetCurrentWorkspaceResponse/labmanager:GetCurrentWorkspaceResult/labmanager:Configurations/labmanager:Configuration").map do |configuration|
       {
         :id => (configuration/"labmanager:id").to_s,
         :name => (configuration/"labmanager:name").to_s,
-        :description => (configuration/"labmanager:description").to_s
+        :description => (configuration/"labmanager:description").to_s,
+        :deployed =>  eval((configuration/"labmanager:isDeployed").to_s)
       }
     end
 
   end
 
-  def listTemplates()
+  def list_templates()
     response = invoke('labmanager:ListTemplates')
 
     hashes = (response/"//labmanager:ListTemplatesResponse/labmanager:ListTemplatesResult/labmanager:Template").map do |template|
@@ -134,7 +127,7 @@ class LabmanagerService < Handsoap::Service
 
   end
 
-  def getTemplate(id)
+  def get_template(id)
     response = invoke('labmanager:GetTemplate') do |message|
       message.add('labmanager:id',id)
     end
@@ -148,7 +141,7 @@ class LabmanagerService < Handsoap::Service
 
   end
 
-  def getTemplateByName(name)
+  def get_template_by_name(name)
     response = invoke('labmanager:GetTemplateByName') do |message|
       message.add('labmanager:name',name)
     end
@@ -164,7 +157,7 @@ class LabmanagerService < Handsoap::Service
     return hashes[0]
   end
 
-  def getNetworkByName(name)
+  def get_network_by_name(name)
     response = invoke('labmanager:GetNetworkTemplateByName') do |message|
       message.add('labmanager:name',name)
     end
@@ -178,7 +171,7 @@ class LabmanagerService < Handsoap::Service
 
   end
 
-  def listNetworks()
+  def list_networks()
     response = invoke('labmanager:ListNetworks')
 
     hashes = (response/"//labmanager:ListNetworksResponse/labmanager:ListNetworksResult/labmanager:Network").map do |network|
@@ -190,7 +183,7 @@ class LabmanagerService < Handsoap::Service
     end
   end
 
-  def createMachine(config)
+  def create_machine(config)
     begin
       response = invoke('labmanager:ConfigurationAddMachineEx') do |message|
         message.add('labmanager:id',config[:configuration_id])
@@ -211,8 +204,14 @@ class LabmanagerService < Handsoap::Service
       (response/"//labmanager:ConfigurationAddMachineExResponse/labmanager:ConfigurationAddMachineExResult").to_i
 
     rescue Handsoap::Fault => error
+
+      if error.reason.match("The object you selected is currently busy")
+        raise LabmanagerBusy
+      end
+
       if @@pragmatic then
-        machine = getMachineByName(config[:configuration_id],config[:name])
+
+        machine = get_machine_by_name(config[:configuration_id],config[:name])
         machine[:id]
       else
         raise error
@@ -220,15 +219,15 @@ class LabmanagerService < Handsoap::Service
     end
   end
 
-  def undeployMachine(id)
-    performMachineAction(id,MACHINE_ACTION_UNDEPLOY)
+  def undeploy_machine(id)
+    perform_machine_action(id,MACHINE_ACTION_FORCEUNDEPLOY)
   end
 
-  def deployMachine(id)
-    performMachineAction(id,MACHINE_ACTION_DEPLOY)
+  def deploy_machine(id)
+    perform_machine_action(id,MACHINE_ACTION_DEPLOY)
   end
 
-  def performMachineAction(id,action)
+  def perform_machine_action(id,action)
     begin
       response = invoke('labmanager:MachinePerformAction') do |message|
         message.add('labmanager:machineId',id)
@@ -236,26 +235,36 @@ class LabmanagerService < Handsoap::Service
       end
 
     rescue Handsoap::Fault => error
-      if !@@pragmatic then
+      if error.reason.match("The object you selected is currently busy")
+        raise LabmanagerBusy
+      else
+
+      if error.reason.match("Error in undeploying. Contact the Administrator if the problem persists")
+        raise LabmanagerBusy
+      end
+
         raise error
       end
+
     end
   end
 
-  def deleteMachine(id)
+  def delete_machine(id)
     begin
       response = invoke('labmanager:MachineDelete') do |message|
         message.add('labmanager:vmId',id)
       end
 
     rescue Handsoap::Fault => error
-      if !@@pragmatic then
-        raise error
+      if error.reason.match("The object you selected is currently busy")
+        raise LabmanagerBusy
       end
+
+        raise error
     end
   end
 
-  def getMachine(id)
+  def get_machine(id)
       response = invoke('labmanager:GetMachine') do |message|
         message.add('labmanager:machineId',id)
       end
@@ -267,12 +276,12 @@ class LabmanagerService < Handsoap::Service
         :description => (response/"//labmanager:GetMachineResponse/labmanager:GetMachineResult/labmanager:description").to_s,
         :ipaddress => (response/"//labmanager:GetMachineResponse/labmanager:GetMachineResult/labmanager:internalIP").to_s,
         :memory => (response/"//labmanager:GetMachineResponse/labmanager:GetMachineResult/labmanager:memory").to_s,
-        :deployed => (response/"//labmanager:GetMachineResponse/labmanager:GetMachineResult/labmanager:isDeployed").to_s,
+        :deployed => eval((response/"//labmanager:GetMachineResponse/labmanager:GetMachineResult/labmanager:isDeployed").to_s),
         :status => (response/"//labmanager:GetMachineResponse/labmanager:GetMachineResult/labmanager:status").to_s,
       }
   end
 
-  def getMachineByName(config_id,name)
+  def get_machine_by_name(config_id,name)
     response = invoke('labmanager:GetMachineByName') do |message|
       message.add('labmanager:configurationId',config_id)
       message.add('labmanager:name',name)
@@ -285,14 +294,14 @@ class LabmanagerService < Handsoap::Service
       :description => (response/"//labmanager:GetMachineByNameResponse/labmanager:GetMachineByNameResult/labmanager:description").to_s,
       :ipaddress => (response/"//labmanager:GetMachineByNameResponse/labmanager:GetMachineByNameResult/labmanager:internalIP").to_s,
       :memory => (response/"//labmanager:GetMachineByNameResponse/labmanager:GetMachineByNameResult/labmanager:memory").to_s,
-      :deployed => (response/"//labmanager:GetMachineByNameResponse/labmanager:GetMachineByNameResult/labmanager:isDeployed").to_s,
+      :deployed => eval((response/"//labmanager:GetMachineByNameResponse/labmanager:GetMachineByNameResult/labmanager:isDeployed").to_s),
       :status => (response/"//labmanager:GetMachineByNameResponse/labmanager:GetMachineByNameResult/labmanager:status").to_s,
 
     }
 
   end
 
-  def listMachines(config_id)
+  def list_machines(config_id)
     response = invoke('labmanager:GetTemplateByName') do |message|
       message.add('labmanager:configurationId',config_id)
     end
@@ -308,7 +317,11 @@ class LabmanagerService < Handsoap::Service
     return hashes
   end  
   
-  
-  private
+
+
+end
+
+
+class LabmanagerBusy <Exception
 
 end

data/test/test_configuration.rb

@@ -1,7 +1,7 @@
 require "test/unit"
 require "labmanager/labmanager_service"
 require "handsoap"
-require "test_helper"
+require "labmanager/test_helper"
 
 class TestCreateconfiguration < Test::Unit::TestCase
   
@@ -17,7 +17,7 @@ class TestCreateconfiguration < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.createConfiguration(:name=>'test',:description=>'test')
+    result = LabmanagerService.create_configuration(:name=>'test',:description=>'test')
     
     assert_equal result,1
   
@@ -29,7 +29,7 @@ class TestCreateconfiguration < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.getConfigurationByName("test")
+    result = LabmanagerService.get_configuration_by_name("test")
     
     assert_equal result[:id],"1"
     assert_equal result[:name],"test"
@@ -42,7 +42,7 @@ class TestCreateconfiguration < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.getConfigurations()
+    result = LabmanagerService.get_configurations()
     
     assert_equal result.length,2
     
@@ -54,7 +54,7 @@ class TestCreateconfiguration < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.deleteConfiguration(1)
+    result = LabmanagerService.delete_configuration(1)
     
     
   end

data/test/test_framework.rb

@@ -18,7 +18,7 @@ class TestFramework < Test::Unit::TestCase
   
   def test_framework
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.createConfiguration(:name=>'test',:description=>'test')
+    result = LabmanagerService.create_configuration(:name=>'test',:description=>'test')
 
     assert_equal 'http://localhost/LabManager/test', driver.last_request.url
     assert_equal :post, driver.last_request.http_method 

data/test/test_machines.rb

@@ -17,7 +17,7 @@ class TestMachines < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.createMachine({:configuration_id =>1,:template_id=>1,:name=>"testing",:description=>"testing"})
+    result = LabmanagerService.create_machine({:configuration_id =>1,:template_id=>1,:name=>"testing",:description=>"testing"})
     
     assert_equal result,1
     
@@ -29,7 +29,7 @@ class TestMachines < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.getMachine("1")
+    result = LabmanagerService.get_machine("1")
     
     assert_equal result[:id],"1"
     assert_equal result[:name],"machine1"
@@ -40,7 +40,7 @@ class TestMachines < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.getMachineByName("1","testing")
+    result = LabmanagerService.get_machine_by_name("1","testing")
     
     assert_equal result[:id],"1"
     assert_equal result[:name],"machine1"
@@ -51,7 +51,7 @@ class TestMachines < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.deployMachine(1)
+    result = LabmanagerService.deploy_machine(1)
     
   end
   
@@ -60,7 +60,7 @@ class TestMachines < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.undeployMachine(1)
+    result = LabmanagerService.undeploy_machine(1)
     
   end
   
@@ -69,7 +69,7 @@ class TestMachines < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.deleteMachine(1)
+    result = LabmanagerService.delete_machine(1)
     
   end
   def test_listMachines
@@ -77,7 +77,7 @@ class TestMachines < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.listMachines(1)
+    result = LabmanagerService.list_machines(1)
     assert_equal result.length,2
     
   end

data/test/test_networks.rb

@@ -17,7 +17,7 @@ class TestNetworks < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.listNetworks()
+    result = LabmanagerService.list_networks()
     
     assert_equal result.length,2
   
@@ -28,7 +28,7 @@ class TestNetworks < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.getNetworkByName("network1")
+    result = LabmanagerService.get_network_by_name("network1")
     
     assert_equal result[:id],"1"
   

data/test/test_templates.rb

@@ -17,7 +17,7 @@ class TestTemplates < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.listTemplates()
+    result = LabmanagerService.list_templates()
     
     assert_equal result.length,2
   
@@ -28,7 +28,7 @@ class TestTemplates < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.getTemplate(1)
+    result = LabmanagerService.get_template(1)
     
     assert_equal result[:id],"1"
     assert_equal result[:name],"testtemplate"
@@ -41,7 +41,7 @@ class TestTemplates < Test::Unit::TestCase
     Handsoap.http_driver = :mock
 
     driver = Handsoap::Http.drivers[:mock].new
-    result = LabmanagerService.getTemplateByName("template1")
+    result = LabmanagerService.get_template_by_name("template1")
     
     assert_equal result[:id],"1"
     assert_equal result[:name],"template1"

metadata

@@ -1,49 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: labmanager
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Andrew Battye
 autorequire: name
 bindir: bin
 cert_chain: []
-
-date: 2011-05-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: handsoap
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152248740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.8
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152248740
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2152248260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2152248260
 description: 
 email: andrew@battye.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/labmanager/constants.rb
+- lib/labmanager/labmanager.rb
 - lib/labmanager/labmanager_service.rb
 - lib/labmanager/net_http_driver.rb
 - test/test_configuration.rb
@@ -52,34 +49,31 @@ files:
 - test/test_machines.rb
 - test/test_networks.rb
 - test/test_templates.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby SOAP proxy for VMware Lab Manager
-test_files: 
+test_files:
 - test/test_configuration.rb
 - test/test_framework.rb
 - test/test_helper.rb