fog-vcloud-director 0.2.2 → 0.3.0

data/lib/fog/vcloud_director/models/compute/template_vm.rb

@@ -1,8 +1,8 @@
 require 'fog/vcloud_director/models/compute/vm_customization'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class TemplateVm < Model
         identity  :id
 

data/lib/fog/vcloud_director/models/compute/template_vms.rb

@@ -1,13 +1,13 @@
 require 'fog/vcloud_director/models/compute/template_vm'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class TemplateVms < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::TemplateVm
+        model Fog::VcloudDirector::Compute::TemplateVm
 
         attribute :vapp_template
 

data/lib/fog/vcloud_director/models/compute/vapp.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vapp < Model
         identity  :id
 
@@ -22,7 +22,7 @@ module Fog
           #    vapp.vms.all
           #    vapp.vms.get_by_name
           if (vms = kwargs.delete(:vms))
-            @vms = Fog::Compute::VcloudDirector::Vms.new(
+            @vms = Fog::VcloudDirector::Compute::Vms.new(
               :vapp    => self,
               :service => kwargs[:service]
             ).with_item_list(Array(vms))
@@ -50,6 +50,7 @@ module Fog
           service.custom_fields( :vapp => self)
         end
 
+        # https://pubs.vmware.com/vcd-80/index.jsp#com.vmware.vcloud.api.sp.doc_90/GUID-843BE3AD-5EF6-4442-B864-BCAE44A51867.html
         def human_status
           case status
           when '-1', -1
@@ -83,7 +84,7 @@ module Fog
         def undeploy(action='powerOff')
           begin
             response = service.post_undeploy_vapp(id, :UndeployPowerAction => action)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -95,7 +96,7 @@ module Fog
           requires :id
           begin
             response = service.post_power_off_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -107,7 +108,7 @@ module Fog
           requires :id
           begin
             response = service.post_power_on_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -119,7 +120,7 @@ module Fog
           requires :id
           begin
             response = service.post_reboot_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -131,7 +132,7 @@ module Fog
           requires :id
           begin
             response = service.post_reset_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -143,7 +144,7 @@ module Fog
           requires :id
           begin
             response = service.post_shutdown_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -155,7 +156,7 @@ module Fog
           requires :id
           begin
             response = service.post_suspend_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -166,7 +167,7 @@ module Fog
           requires :id
           begin
             response = service.delete_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end

data/lib/fog/vcloud_director/models/compute/vapp_template.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VappTemplate < Model
         identity  :id
 

data/lib/fog/vcloud_director/models/compute/vapp_templates.rb

@@ -1,13 +1,13 @@
 require 'fog/vcloud_director/models/compute/vapp_template'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VappTemplates < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::VappTemplate
+        model Fog::VcloudDirector::Compute::VappTemplate
 
         attribute :vdc
 

data/lib/fog/vcloud_director/models/compute/vapps.rb

@@ -1,13 +1,13 @@
 require 'fog/vcloud_director/models/compute/vapp'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vapps < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::Vapp
+        model Fog::VcloudDirector::Compute::Vapp
 
         attribute :vdc
 

data/lib/fog/vcloud_director/models/compute/vdc.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vdc < Model
         identity  :id
 

data/lib/fog/vcloud_director/models/compute/vdcs.rb

@@ -1,13 +1,13 @@
 require 'fog/vcloud_director/models/compute/vdc'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vdcs < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::Vdc
+        model Fog::VcloudDirector::Compute::Vdc
 
         attribute :organization
 

data/lib/fog/vcloud_director/models/compute/vm.rb

@@ -1,8 +1,8 @@
 require 'fog/vcloud_director/models/compute/vm_customization'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vm < Model
         identity  :id
 
@@ -50,7 +50,7 @@ module Fog
           requires :id
           begin
             response = service.post_power_off_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -62,7 +62,7 @@ module Fog
           requires :id
           begin
             response = service.post_power_on_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -74,7 +74,7 @@ module Fog
           requires :id
           begin
             response = service.post_reboot_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -86,7 +86,7 @@ module Fog
           requires :id
           begin
             response = service.post_reset_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -97,7 +97,7 @@ module Fog
           requires :id
           begin
             response = service.post_undeploy_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -109,7 +109,7 @@ module Fog
           requires :id
           begin
             response = service.post_shutdown_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -121,7 +121,7 @@ module Fog
           requires :id
           begin
             response = service.post_suspend_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end

data/lib/fog/vcloud_director/models/compute/vm_customization.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VmCustomization < Model
         identity  :id
 

data/lib/fog/vcloud_director/models/compute/vm_customizations.rb

@@ -1,10 +1,10 @@
 require 'fog/vcloud_director/models/compute/vm_customization'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VmCustomizations < Collection
-        model Fog::Compute::VcloudDirector::VmCustomization
+        model Fog::VcloudDirector::Compute::VmCustomization
 
         attribute :vm
 

data/lib/fog/vcloud_director/models/compute/vm_network.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VmNetwork < Model
         identity  :id
 

data/lib/fog/vcloud_director/models/compute/vm_networks.rb

@@ -1,10 +1,10 @@
 require 'fog/vcloud_director/models/compute/vm_network'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VmNetworks < Collection
-        model Fog::Compute::VcloudDirector::VmNetwork
+        model Fog::VcloudDirector::Compute::VmNetwork
 
         attribute :vm
 

data/lib/fog/vcloud_director/models/compute/vms.rb

@@ -1,13 +1,13 @@
 require 'fog/vcloud_director/models/compute/vm'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vms < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::Vm
+        model Fog::VcloudDirector::Compute::Vm
 
         attribute :vapp
 

data/lib/fog/vcloud_director/parsers/compute/disks.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         class Disks < VcloudDirectorParser
           def reset
             @disk = {}

data/lib/fog/vcloud_director/parsers/compute/metadata.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         #
         # <Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd">
         #     <Link rel="up" type="application/vnd.vmware.vcloud.vm+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112"/>

data/lib/fog/vcloud_director/parsers/compute/network.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         #
         #{:xmlns=>"http://www.vmware.com/vcloud/v1.5",
         # :xmlns_xsi=>"http://www.w3.org/2001/XMLSchema-instance",

data/lib/fog/vcloud_director/parsers/compute/vapp.rb

@@ -1,9 +1,9 @@
 require 'fog/vcloud_director/parsers/compute/vm_parser_helper'
 
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         class Vapp < VcloudDirectorParser
           include VmParserHelper
 

data/lib/fog/vcloud_director/parsers/compute/vm.rb

@@ -1,9 +1,9 @@
 require 'fog/vcloud_director/parsers/compute/vm_parser_helper'
 
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         class Vm < VcloudDirectorParser
           include VmParserHelper
 

data/lib/fog/vcloud_director/parsers/compute/vm_customization.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         class VmCustomization < VcloudDirectorParser
           def reset
             @response = { }

data/lib/fog/vcloud_director/parsers/compute/vm_network.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         #
         #{:xmlns=>"http://www.vmware.com/vcloud/v1.5",
         # :xmlns_xsi=>"http://www.w3.org/2001/XMLSchema-instance",

data/lib/fog/vcloud_director/parsers/compute/vm_parser_helper.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         module VmParserHelper
           def initialize_vm
             {

data/lib/fog/vcloud_director/parsers/compute/vms.rb

@@ -1,9 +1,9 @@
 require 'fog/vcloud_director/parsers/compute/vm_parser_helper'
 
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         class Vms < VcloudDirectorParser
           include VmParserHelper
 

data/lib/fog/vcloud_director/parsers/compute/vms_by_metadata.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         class VmsByMetadata < VcloudDirectorParser
           def reset
             @response = { :vm_records => [] }