ruby_vcloud_sdk 0.4.8 → 0.5.1

data/lib/ruby_vcloud_sdk/xml/wrapper_classes.rb

@@ -1,3 +1,46 @@
-$:.unshift(File.join(File.dirname(__FILE__), "wrapper_classes"))
+require "ruby_vcloud_sdk/xml/wrapper_classes/item"
 
-Dir[File.dirname(__FILE__) + "/wrapper_classes/*.rb"].each { |r| require File.expand_path(r) }
+require "ruby_vcloud_sdk/xml/wrapper_classes/admin_catalog"
+require "ruby_vcloud_sdk/xml/wrapper_classes/admin_org"
+require "ruby_vcloud_sdk/xml/wrapper_classes/allocated_ip_addresses"
+require "ruby_vcloud_sdk/xml/wrapper_classes/catalog_item"
+require "ruby_vcloud_sdk/xml/wrapper_classes/disk"
+require "ruby_vcloud_sdk/xml/wrapper_classes/disk_attach_or_detach_params"
+require "ruby_vcloud_sdk/xml/wrapper_classes/disk_create_params"
+require "ruby_vcloud_sdk/xml/wrapper_classes/edge_gateway"
+require "ruby_vcloud_sdk/xml/wrapper_classes/entity"
+require "ruby_vcloud_sdk/xml/wrapper_classes/file"
+require "ruby_vcloud_sdk/xml/wrapper_classes/gateway_interface"
+require "ruby_vcloud_sdk/xml/wrapper_classes/hard_disk_item_wrapper"
+require "ruby_vcloud_sdk/xml/wrapper_classes/instantiate_vapp_template_params"
+require "ruby_vcloud_sdk/xml/wrapper_classes/ip_address"
+require "ruby_vcloud_sdk/xml/wrapper_classes/ip_scope"
+require "ruby_vcloud_sdk/xml/wrapper_classes/ip_range"
+require "ruby_vcloud_sdk/xml/wrapper_classes/ip_ranges"
+require "ruby_vcloud_sdk/xml/wrapper_classes/link"
+require "ruby_vcloud_sdk/xml/wrapper_classes/media"
+require "ruby_vcloud_sdk/xml/wrapper_classes/media_insert_or_eject_params"
+require "ruby_vcloud_sdk/xml/wrapper_classes/metadata_value"
+require "ruby_vcloud_sdk/xml/wrapper_classes/network"
+require "ruby_vcloud_sdk/xml/wrapper_classes/network_config"
+require "ruby_vcloud_sdk/xml/wrapper_classes/network_config_section"
+require "ruby_vcloud_sdk/xml/wrapper_classes/network_connection"
+require "ruby_vcloud_sdk/xml/wrapper_classes/network_connection_section"
+require "ruby_vcloud_sdk/xml/wrapper_classes/nic_item_wrapper"
+require "ruby_vcloud_sdk/xml/wrapper_classes/org"
+require "ruby_vcloud_sdk/xml/wrapper_classes/org_network"
+require "ruby_vcloud_sdk/xml/wrapper_classes/org_vdc_network"
+require "ruby_vcloud_sdk/xml/wrapper_classes/query_result_records"
+require "ruby_vcloud_sdk/xml/wrapper_classes/recompose_vapp_params"
+require "ruby_vcloud_sdk/xml/wrapper_classes/session"
+require "ruby_vcloud_sdk/xml/wrapper_classes/supported_versions"
+require "ruby_vcloud_sdk/xml/wrapper_classes/task"
+require "ruby_vcloud_sdk/xml/wrapper_classes/upload_vapp_template_params"
+require "ruby_vcloud_sdk/xml/wrapper_classes/vapp"
+require "ruby_vcloud_sdk/xml/wrapper_classes/vapp_template"
+require "ruby_vcloud_sdk/xml/wrapper_classes/vcloud"
+require "ruby_vcloud_sdk/xml/wrapper_classes/vdc"
+require "ruby_vcloud_sdk/xml/wrapper_classes/vdc_storage_profile"
+require "ruby_vcloud_sdk/xml/wrapper_classes/virtual_hardware_section"
+require "ruby_vcloud_sdk/xml/wrapper_classes/vm"
+require "ruby_vcloud_sdk/xml/wrapper_classes/vms"

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/admin_catalog.rb

@@ -2,16 +2,25 @@ module VCloudSdk
   module Xml
 
     class AdminCatalog < Wrapper
+      def description
+        get_nodes("Description").first
+      end
+
+      def description=(desc)
+        description.content = desc
+      end
+
       def add_item_link
-        get_nodes("Link", {"type"=>ADMIN_MEDIA_TYPE[:CATALOG_ITEM],
-          "rel"=>"add"}).first
+        get_nodes(XML_TYPE[:LINK],
+                  { type: ADMIN_MEDIA_TYPE[:CATALOG_ITEM],
+                    rel: XML_TYPE[:ADD] }).first
       end
 
       def catalog_items(name = nil)
         if name
-          get_nodes("CatalogItem", {"name" => name})
+          get_nodes(XML_TYPE[:CATALOGITEM], { name: name })
         else
-          get_nodes("CatalogItem")
+          get_nodes(XML_TYPE[:CATALOGITEM])
         end
       end
     end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/allocated_ip_addresses.rb

@@ -0,0 +1,9 @@
+module VCloudSdk
+  module Xml
+    class AllocatedIpAddresses < Wrapper
+      def ip_addresses
+        get_nodes(:IpAddress, nil, true)
+      end
+    end
+  end
+end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/catalog_item.rb

@@ -2,24 +2,16 @@ module VCloudSdk
   module Xml
 
     class CatalogItem < Wrapper
-      def name=(name)
-        @root["name"] = name
-      end
-
-      def remove_link
-        get_nodes("Link", {"rel" => "remove"}, true).first
-      end
-
       def entity=(entity)
-        entity_node = get_nodes("Entity").first
-        entity_node["name"] = entity.name
-        entity_node["id"] = entity.urn
-        entity_node["href"] = entity.href
-        entity_node["type"] = entity.type
+        entity_node = self.entity
+        entity_node[:name] = entity.name
+        entity_node[:id] = entity.urn
+        entity_node[:href] = entity.href
+        entity_node[:type] = entity.type
       end
 
       def entity
-        get_nodes("Entity").first
+        get_nodes(XML_TYPE[:ENTITY]).first
       end
     end
 

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/disk.rb

@@ -1,40 +1,50 @@
 module VCloudSdk
   module Xml
-
     class Disk < Wrapper
+      def bus_type
+        @root["busType"]
+      end
+
       def bus_type=(value)
         @root["busType"] = value.to_s
       end
 
+      def bus_sub_type
+        @root["busSubType"]
+      end
+
       def bus_sub_type=(value)
         @root["busSubType"] = value.to_s
       end
 
-      def delete_link
-        get_nodes("Link", {"rel" => "remove"}, true).first
+      def size_mb
+        @root["size"].to_i / 1024 / 1024
       end
 
-      def name=(name)
-        @root["name"] = name.to_s
+      def running_tasks
+        tasks.select { |t| RUNNING.include?(t.status) }
       end
 
-      def size_mb
-        @root["size"].to_i/1024/1024
+      def tasks
+        get_nodes(XML_TYPE[:TASK])
       end
 
-      def running_tasks
-        tasks.find_all {|t| RUNNING.include?(t.status)}
+      def status
+        @root["status"]
       end
 
-      def tasks
-        get_nodes("Task")
+      def vms_link
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:VMS] },
+                  true)
+                 .first
       end
 
       private
 
-      RUNNING = [TASK_STATUS[:RUNNING], TASK_STATUS[:QUEUED],
-          TASK_STATUS[:PRE_RUNNING]]
+      RUNNING = [TASK_STATUS[:RUNNING],
+                 TASK_STATUS[:QUEUED],
+                 TASK_STATUS[:PRE_RUNNING]]
     end
-
   end
 end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/disk_attach_or_detach_params.rb

@@ -1,12 +1,10 @@
 module VCloudSdk
   module Xml
-
     class DiskAttachOrDetachParams < Wrapper
       def disk_href=(value)
         disk = get_nodes("Disk").first
         disk["href"] = value.to_s
       end
     end
-
   end
 end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/disk_create_params.rb

@@ -1,6 +1,5 @@
 module VCloudSdk
   module Xml
-
     class DiskCreateParams < Wrapper
       def bus_type=(value)
         disk["busType"] = value.to_s
@@ -20,7 +19,7 @@ module VCloudSdk
 
       def add_locality(local)
         if !@local_exists.nil? && @local_exists
-          raise "Cannot add locality more than once to DiskCreateParams"
+          fail "Cannot add locality more than once to DiskCreateParams"
         end
         @local_exists = true
         node = create_child("Locality")
@@ -42,6 +41,5 @@ module VCloudSdk
         id.split(":").first
       end
     end
-
   end
 end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/edge_gateway.rb

@@ -0,0 +1,13 @@
+module VCloudSdk
+  module Xml
+    class EdgeGateway < Wrapper
+      def gateway_interfaces
+        get_nodes(:Configuration, nil, true)
+          .first
+          .get_nodes(:GatewayInterfaces, nil, true)
+          .first
+          .get_nodes(:GatewayInterface, nil, true)
+      end
+    end
+  end
+end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/gateway_interface.rb

@@ -0,0 +1,22 @@
+module VCloudSdk
+  module Xml
+    class GatewayInterface < Wrapper
+      def interface_type
+        get_nodes(:InterfaceType, nil, true)
+          .first
+          .content
+      end
+
+      def subnet_participation
+        get_nodes(:SubnetParticipation, nil, true)
+          .first
+      end
+
+      def ip_ranges
+        subnet_participation
+          .get_nodes(:IpRanges, nil, true)
+          .first
+      end
+    end
+  end
+end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/hard_disk_item_wrapper.rb

@@ -1,8 +1,5 @@
-require "item"
-
 module VCloudSdk
   module Xml
-
     class HardDiskItemWrapper < Item
       def hash
         [disk_id, instance_id, bus_type, bus_sub_type].hash
@@ -41,10 +38,13 @@ module VCloudSdk
         get_rasd_content(RASD_TYPES[:PARENT])
       end
 
+      def element_name
+        get_rasd_content(RASD_TYPES[:ELEMENT_NAME])
+      end
+
       def host_resource
         get_rasd(RASD_TYPES[:HOST_RESOURCE])
       end
     end
-
   end
 end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/ip_address.rb

@@ -0,0 +1,10 @@
+module VCloudSdk
+  module Xml
+    class IpAddress < Wrapper
+      def ip_address
+        get_nodes(:IpAddress, nil, true)
+          .first.content
+      end
+    end
+  end
+end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/ip_range.rb

@@ -0,0 +1,13 @@
+module VCloudSdk
+  module Xml
+    class IpRange < Wrapper
+      def start_address
+        get_nodes(:StartAddress).first.content
+      end
+
+      def end_address
+        get_nodes(:EndAddress).first.content
+      end
+    end
+  end
+end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/ip_ranges.rb

@@ -0,0 +1,9 @@
+module VCloudSdk
+  module Xml
+    class IpRanges < Wrapper
+      def ranges
+        get_nodes(:IpRange)
+      end
+    end
+  end
+end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/ip_scope.rb

@@ -1,55 +1,29 @@
 module VCloudSdk
   module Xml
-
     class IpScope < Wrapper
       def is_inherited?
-        get_nodes("IsInherited").first.content
+        get_nodes(:IsInherited).first.content
       end
 
       def is_inherited=(value)
-        get_nodes("IsInherited").first.content = value
+        get_nodes(:IsInherited).first.content = value
       end
 
       def gateway
-        get_nodes("Gateway").first.content
+        get_nodes(:Gateway).first.content
       end
 
       def gateway=(value)
-        get_nodes("Gateway").first.content = value
+        get_nodes(:Gateway).first.content = value
       end
 
       def netmask
-        get_nodes("Netmask").first.content
+        get_nodes(:Netmask).first.content
       end
 
       def netmask=(value)
-        get_nodes("Netmask").first.content = value
-      end
-
-      def start_address
-        nodes = get_nodes("StartAddress")
-        return nil unless nodes
-        node = nodes.first
-        return nil unless node
-        return node.content
-      end
-
-      def start_address=(value)
-        get_nodes("StartAddress").first.content = value
-      end
-
-      def end_address
-        nodes = get_nodes("EndAddress")
-        return nil unless nodes
-        node = nodes.first
-        return nil unless node
-        return node.content
-      end
-
-      def end_address=(value)
-        get_nodes("EndAddress").first.content = value
+        get_nodes(:Netmask).first.content = value
       end
     end
-
   end
 end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/item.rb

@@ -1,16 +1,11 @@
 module VCloudSdk
   module Xml
-
     class Item < Wrapper
       def add_rasd(name)
         raise "Cannot add duplicate RASD element #{name}." if get_rasd(name)
         add_child(name, "rasd", RASD)
       end
 
-      def edit_link
-        get_nodes("Link", {"rel" => "edit"}, true).first
-      end
-
       def get_rasd(name)
         get_nodes(name, nil, true, RASD).first
       end
@@ -23,10 +18,9 @@ module VCloudSdk
 
       def set_rasd(name, value)
         node = get_rasd(name)
-        raise "The RASD element #{name} does not exist." unless node
+        fail "The RASD element #{name} does not exist." unless node
         node.content = value
       end
     end
-
   end
 end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/link.rb

@@ -0,0 +1,14 @@
+module VCloudSdk
+  module Xml
+    class Link < Wrapper
+      def rel
+        @root["rel"]
+      end
+
+      def rel=(rel)
+        @root["rel"] = rel
+      end
+    end
+  end
+end
+

data/lib/ruby_vcloud_sdk/xml/wrapper_classes/media.rb

@@ -1,15 +1,6 @@
 module VCloudSdk
   module Xml
-
     class Media < Wrapper
-      def name
-        @root["name"]
-      end
-
-      def name=(name)
-        @root["name"] = name.to_s
-      end
-
       def size
         @root["size"]
       end
@@ -36,18 +27,11 @@ module VCloudSdk
 
       # Files that haven"t finished transferring
       def incomplete_files
-        files.find_all { |f| f["size"].to_i < 0 ||
-          (f["size"].to_i > f["bytesTransferred"].to_i) }
-      end
-
-      def delete_link
-        get_nodes("Link", {"rel" => "remove"}, true).first
-      end
-
-      def running_tasks
-        get_nodes("Task", {"status" => "running"})
+        files.select do |f|
+          f["size"].to_i < 0 ||
+          (f["size"].to_i > f["bytesTransferred"].to_i)
+        end
       end
     end
-
   end
 end