ruby_vcloud_sdk 0.4.8 → 0.5.1

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

@@ -1,6 +1,5 @@
 module VCloudSdk
   module Xml
-
     class MediaInsertOrEjectParams < Wrapper
       def media_href=(value)
         media["href"] = value
@@ -9,9 +8,8 @@ module VCloudSdk
       private
 
       def media
-         get_nodes("Media", nil, true).first
+        get_nodes("Media", nil, true).first
       end
     end
-
   end
 end

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

@@ -7,10 +7,6 @@ module VCloudSdk
         link_node.node.before(item.node)
       end
 
-      def edit_link
-        get_nodes("Link", {"rel" => "edit"}, true).first
-      end
-
       def network_connections
         get_nodes("NetworkConnection")
       end

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

@@ -1,5 +1,3 @@
-require "item"
-
 module VCloudSdk
   module Xml
 

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

@@ -0,0 +1,44 @@
+module VCloudSdk
+  module Xml
+    class Org < Wrapper
+      def vdc_link(name)
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:VDC],
+                    name: name },
+                  true).first
+      end
+
+      def catalogs
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:CATALOG] },
+                  true)
+      end
+
+      def catalog_link(name)
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:CATALOG],
+                    name: name },
+                  true).first
+      end
+
+      def networks
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:ORG_NETWORK] },
+                  true)
+      end
+
+      def network(name)
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:ORG_NETWORK],
+                    name: name },
+                  true).first
+      end
+
+      def disks
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:DISK] },
+                  true)
+      end
+    end
+  end
+end

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

@@ -1,11 +1,19 @@
 module VCloudSdk
   module Xml
-
     class OrgVdcNetwork < Wrapper
       def ip_scope
-        get_nodes("IpScope").first
+        get_nodes(:IpScope).first
+      end
+
+      def ip_ranges
+        get_nodes(:IpRanges).first
       end
-    end
 
+      def allocated_addresses_link
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:ALLOCATED_NETWORK_IPS] },
+                  true).first
+      end
+    end
   end
 end

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

@@ -0,0 +1,14 @@
+module VCloudSdk
+  module Xml
+    class QueryResultRecords < Wrapper
+      # Reference: http://pubs.vmware.com/vcd-55/index.jsp?topic=%2Fcom.vmware.vcloud.api.reference.doc_55%2Fdoc%2Ftypes%2FQueryResultOrgVdcStorageProfileRecordType.html
+      def org_vdc_storage_profile_records
+        get_nodes("OrgVdcStorageProfileRecord")
+      end
+
+      def edge_gateway_records
+        get_nodes("EdgeGatewayRecord")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module VCloudSdk
+  module Xml
+    class RecomposeVAppParams < Wrapper
+      def description
+        get_nodes("Description").first
+      end
+
+      def description=(desc)
+        description.content = desc
+      end
+
+      def all_eulas_accepted=(value)
+        eulas_node = get_nodes("AllEULAsAccepted").first
+        eulas_node.content = value
+      end
+
+      def add_source_item(entity_to_add_href)
+        return unless entity_to_add_href
+
+        node_sourced_item = create_child("SourcedItem",
+                                         namespace.prefix,
+                                         namespace.href)
+        node_source = add_child("Source",
+                                namespace.prefix,
+                                namespace.href,
+                                node_sourced_item)
+        node_source["href"] = entity_to_add_href
+
+        get_nodes("AllEULAsAccepted").first.node.before(node_sourced_item)
+      end
+
+      def add_delete_item(entity_to_delete_href)
+        return unless entity_to_delete_href
+
+        node_delete_item = create_child("DeleteItem")
+        node_delete_item["href"] = entity_to_delete_href
+
+        get_nodes("AllEULAsAccepted").first.node.after(node_delete_item)
+      end
+    end
+  end
+end

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

@@ -2,14 +2,14 @@ module VCloudSdk
   module Xml
 
     class Session < Wrapper
-      def admin_root
-        get_nodes("Link", {"type" =>
-          VCloudSdk::Xml::ADMIN_MEDIA_TYPE[:VCLOUD]}).first
+      def organization
+        get_nodes(XML_TYPE[:LINK],
+                  { type: VCloudSdk::Xml::MEDIA_TYPE[:ORGANIZATION] }).first
       end
 
       def entity_resolver
-        get_nodes("Link", {"type" =>
-          VCloudSdk::Xml::MEDIA_TYPE[:ENTITY]}).first
+        get_nodes(XML_TYPE[:LINK],
+                  { type: VCloudSdk::Xml::MEDIA_TYPE[:ENTITY] }).first
       end
     end
 

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

@@ -0,0 +1,19 @@
+module VCloudSdk
+  module Xml
+
+    class SupportedVersions < Wrapper
+      def login_url
+        ns = namespace.href # Typically it's 'http://www.vmware.com/vcloud/versions'
+        get_nodes('VersionInfo', nil, false, ns).each do |node|
+          if node.get_nodes('Version', nil, false, ns).first.content  \
+            == VCloudSdk::Client::VCLOUD_VERSION_NUMBER
+            return node.get_nodes("LoginUrl", nil, false, ns).first
+          end
+        end
+
+        nil
+      end
+    end
+
+  end
+end

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

@@ -3,7 +3,7 @@ module VCloudSdk
 
     class Task < Wrapper
       def cancel_link
-        get_nodes("Link", {"rel" => "task:cancel"}).first
+        get_nodes(XML_TYPE[:LINK], { rel: "task:cancel" }).first
       end
 
       def status

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

@@ -1,11 +1,9 @@
 module VCloudSdk
   module Xml
-
     class UploadVAppTemplateParams < Wrapper
-      def name=(name)
-        @root["name"] = name
+      def storage_profile=(storage_profile)
+        add_child(storage_profile) unless storage_profile.nil?
       end
     end
-
   end
 end

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

@@ -1,6 +1,5 @@
 module VCloudSdk
   module Xml
-
     class VApp < Wrapper
       def description
         get_nodes("Description").first.content
@@ -10,36 +9,28 @@ module VCloudSdk
         get_nodes("NetworkConfigSection").first
       end
 
-      def power_on_link
-        get_nodes("Link", {"rel" => "power:powerOn"}, true).first
-      end
-
-      def power_off_link
-        get_nodes("Link", {"rel" => "power:powerOff"}, true).first
-      end
-
       def reboot_link
         get_nodes("Link", {"rel" => "power:reboot"}, true).first
       end
 
-      def remove_link
-        get_nodes("Link", {"rel" => "remove"}, true).first
-      end
-
-      def running_tasks
-        get_nodes("Task", {"status" => "running"})
+      def tasks
+        get_nodes(XML_TYPE[:TASK])
       end
 
-      def tasks
-        get_nodes("Task")
+      def discard_state
+        get_nodes("Link", {"rel" => "discardState"}, true).first
       end
 
-      def undeploy_link
-        get_nodes("Link", {"rel" => "undeploy"}, true).first
+      def recompose_vapp_link
+        link = get_nodes(XML_TYPE[:LINK],
+                         { rel: "recompose" },
+                         true).first
       end
 
-      def discard_state
-        get_nodes("Link", {"rel" => "discardState"}, true).first
+      def vdc_link
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:VDC] },
+                  true).first
       end
 
       def vms
@@ -47,7 +38,7 @@ module VCloudSdk
       end
 
       def vm(name)
-        get_nodes("Vm", {"name" => name}).first
+        get_nodes("Vm", name: name).first
       end
     end
 

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

@@ -1,5 +1,3 @@
-require "vapp"
-
 module VCloudSdk
   module Xml
 

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

@@ -3,11 +3,13 @@ module VCloudSdk
 
     class VCloud < Wrapper
       def organizations
-        get_nodes("OrganizationReference")
+        get_nodes('OrganizationReference')
       end
 
-      def organization(name)
-        get_nodes("OrganizationReference", {"name" => name}).first
+      def organization
+        # TODO: check and make sure that
+        # there is only one "OrganizationReference" node in response
+        get_nodes('OrganizationReference').first
       end
     end
 

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

@@ -1,54 +1,111 @@
 module VCloudSdk
   module Xml
-
     class Vdc < Wrapper
       def add_disk_link
-         get_nodes("Link", {"type"=>MEDIA_TYPE[:DISK_CREATE_PARAMS]}).first
+        get_nodes(XML_TYPE[:LINK],
+                  type: MEDIA_TYPE[:DISK_CREATE_PARAMS])
+                  .first
       end
 
       def disks(name = nil)
         if name.nil?
-          get_nodes("ResourceEntity", {"type"=>MEDIA_TYPE[:DISK]})
+          get_nodes("ResourceEntity",
+                    type: MEDIA_TYPE[:DISK])
         else
           get_nodes("ResourceEntity",
-            {"type"=>MEDIA_TYPE[:DISK], "name"=>name})
+                    type: MEDIA_TYPE[:DISK], name: name)
+                    .first
         end
       end
 
       def instantiate_vapp_template_link
-        get_nodes("Link",
-          {"type"=>MEDIA_TYPE[:INSTANTIATE_VAPP_TEMPLATE_PARAMS]}).first
+        get_nodes(XML_TYPE[:LINK],
+                  type: MEDIA_TYPE[:INSTANTIATE_VAPP_TEMPLATE_PARAMS])
+                  .first
       end
 
       def upload_link
-        get_nodes("Link",
-          {"type"=>MEDIA_TYPE[:UPLOAD_VAPP_TEMPLATE_PARAMS]}).first
+        get_nodes(XML_TYPE[:LINK],
+                  type: MEDIA_TYPE[:UPLOAD_VAPP_TEMPLATE_PARAMS])
+                  .first
       end
 
       def upload_media_link
-        get_nodes("Link", {"type"=>MEDIA_TYPE[:MEDIA]}).first
+        get_nodes(XML_TYPE[:LINK],
+                  type: MEDIA_TYPE[:MEDIA])
+                  .first
+      end
+
+      def vapps
+        get_nodes(:ResourceEntity, type: MEDIA_TYPE[:VAPP])
+      end
+
+      def edge_gateways_link
+        get_nodes(XML_TYPE[:LINK],
+                  rel: "edgeGateways")
+                  .first
       end
 
       # vApp Template names are not unique so multiple ones can be returned.
       def get_vapp_templates(name)
         get_nodes("ResourceEntity",
-          {"type"=>MEDIA_TYPE[:VAPP_TEMPLATE], "name"=>name})
+                  type: MEDIA_TYPE[:VAPP_TEMPLATE], name: name)
       end
 
       def available_networks
-        get_nodes("Network", {"type"=>MEDIA_TYPE[:NETWORK]})
+        get_nodes("Network",
+                  type: MEDIA_TYPE[:NETWORK])
       end
 
       def available_network(name)
         get_nodes("Network",
-          {"type"=>MEDIA_TYPE[:NETWORK], "name"=>name}).first
+                  type: MEDIA_TYPE[:NETWORK], name: name)
+                  .first
       end
 
       def storage_profiles
-        get_nodes("VdcStorageProfile",
-          {"type"=>MEDIA_TYPE[:VDC_STORAGE_PROFILE]})
+        get_nodes(:VdcStorageProfile, type: MEDIA_TYPE[:VDC_STORAGE_PROFILE])
       end
-    end
 
+      def storage_profile(name)
+        get_nodes(:VdcStorageProfile,
+                  type: MEDIA_TYPE[:VDC_STORAGE_PROFILE], name: name)
+                  .first
+      end
+
+      def available_cpu_cores
+        cpu_resource = get_nodes("ComputeCapacity")
+                         .first.get_nodes("Cpu").first
+        available_cpu_clock_speed = get_available_resource(cpu_resource)
+
+        # clock units can only be MHz or GHz
+        units = cpu_resource.get_nodes("Units").first.content
+        if units == "MHz"
+          available_cpu_clock_speed = available_cpu_clock_speed / 1000
+        end
+
+        # We assume 1 GHz is converted to 1 vCpu core
+        available_cpu_clock_speed
+      end
+
+      def available_memory_mb
+        memory_resource = get_nodes("ComputeCapacity")
+                            .first.get_nodes("Memory").first
+        available_memory = get_available_resource(memory_resource)
+
+        # clock units can only be MB or GB
+        units = memory_resource.get_nodes("Units").first.content
+        available_memory = available_memory * 1024 if units == "GB"
+        available_memory
+      end
+
+      private
+
+      def get_available_resource(resource_node)
+        limited_resource = resource_node.get_nodes("Limit").first.content.to_i
+        return -1 if limited_resource == 0
+        limited_resource - resource_node.get_nodes("Used").first.content.to_i
+      end
+    end
   end
 end

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

@@ -1,6 +1,5 @@
 module VCloudSdk
   module Xml
-
     class VirtualHardwareSection < Wrapper
       def add_item(item)
         system_node = get_nodes("System", nil, true, OVF).first
@@ -8,8 +7,10 @@ module VCloudSdk
       end
 
       def edit_link
-        get_nodes("Link", {"rel" => "edit",
-          "type" => MEDIA_TYPE[:VIRTUAL_HARDWARE_SECTION]}, true).first
+        get_nodes(XML_TYPE[:LINK],
+                  { rel: XML_TYPE[:EDIT],
+                    type: MEDIA_TYPE[:VIRTUAL_HARDWARE_SECTION] },
+                  true).first
       end
 
       def cpu
@@ -54,8 +55,10 @@ module VCloudSdk
       end
 
       def hard_disks
-        items = hardware.find_all { |h| h.get_rasd_content(
-          RASD_TYPES[:RESOURCE_TYPE]) == HARDWARE_TYPE[:HARD_DISK] }
+        items = hardware.select do |h|
+          h.get_rasd_content(
+          RASD_TYPES[:RESOURCE_TYPE]) == HARDWARE_TYPE[:HARD_DISK]
+        end
         items.map { |i| HardDiskItemWrapper.new(i) }
       end
 
@@ -63,6 +66,5 @@ module VCloudSdk
         get_nodes("Item", nil, false, OVF)
       end
     end
-
   end
 end