ruby_vcloud_sdk 0.6.0 → 0.7.0

data/lib/ruby_vcloud_sdk/vapp.rb

@@ -1,6 +1,7 @@
 require_relative "infrastructure"
 require_relative "powerable"
 require_relative "vm"
+require_relative "network_config"
 
 module VCloudSdk
   class VApp
@@ -28,10 +29,10 @@ module VCloudSdk
       wait_for_running_tasks(vapp, "VApp #{vapp_name}")
 
       Config.logger.info "Deleting vApp #{vapp_name}."
-      monitor_task(connection.delete(vapp.remove_link),
+      monitor_task(connection.delete(vapp.remove_link.href),
                    @session.time_limit[:delete_vapp]) do |task|
         Config.logger.info "vApp #{vapp_name} deleted."
-        return task
+        return
       end
 
       fail ApiRequestError,
@@ -66,6 +67,12 @@ module VCloudSdk
       end
     end
 
+    def vm_exists?(name)
+      entity_xml.vms.any? do |vm|
+        vm.name == name
+      end
+    end
+
     def find_vm_by_name(name)
       entity_xml.vms.each do |vm|
         return VCloudSdk::VM.new(@session, vm.href) if vm.name == name
@@ -113,10 +120,11 @@ module VCloudSdk
                             payload,
                             Xml::MEDIA_TYPE[:NETWORK_CONFIG_SECTION])
       monitor_task(task)
+      self
     end
 
     def delete_network_by_name(name)
-      unless list_networks.any? { |network_name| network_name == name}
+      unless list_networks.any? { |network_name| network_name == name }
         fail ObjectNotFoundError,
              "Network '#{name}' is not found"
       end
@@ -134,7 +142,7 @@ module VCloudSdk
                             payload,
                             Xml::MEDIA_TYPE[:NETWORK_CONFIG_SECTION])
       monitor_task(task)
-      nil
+      self
     end
 
     private

data/lib/ruby_vcloud_sdk/vdc.rb

@@ -19,7 +19,7 @@ module VCloudSdk
                    :name, :upload_link, :upload_media_link,
                    :instantiate_vapp_template_link
 
-    public :find_network_by_name
+    public :find_network_by_name, :network_exists?
 
     def initialize(session, link)
       @session = session
@@ -48,6 +48,12 @@ module VCloudSdk
       fail ObjectNotFoundError, "Storage profile '#{name}' is not found"
     end
 
+    def storage_profile_exists?(name)
+      storage_profile_records.any? do |storage_profile|
+        storage_profile.name == name
+      end
+    end
+
     def vapps
       entity_xml.vapps.map do |vapp_link|
         VCloudSdk::VApp.new(@session, vapp_link)
@@ -70,6 +76,12 @@ module VCloudSdk
       fail ObjectNotFoundError, "VApp '#{name}' is not found"
     end
 
+    def vapp_exists?(name)
+      entity_xml.vapps.any? do |vapp|
+        vapp.name == name
+      end
+    end
+
     def resources
       cpu = VCloudSdk::CPU.new(entity_xml.available_cpu_cores)
       memory = VCloudSdk::Memory.new(entity_xml.available_memory_mb)
@@ -123,8 +135,8 @@ module VCloudSdk
     end
 
     def disk_exists?(name)
-      disks.any? do |disk|
-        disk.name == name
+      list_disks.any? do |disk_name|
+        disk_name == name
       end
     end
 
@@ -165,7 +177,7 @@ module VCloudSdk
            "#{disks.size} disks with name #{name} were found" if disks.size > 1
 
       delete_single_disk(disks.first)
-      nil
+      self
     end
 
     def delete_all_disks_by_name(name)
@@ -182,7 +194,7 @@ module VCloudSdk
 
       fail CloudError,
            "Failed to delete one or more of the disks with name '#{name}'. Check logs for details." unless success
-      nil
+      self
     end
 
     def storage_profile_xml_node(name)

data/lib/ruby_vcloud_sdk/version.rb

@@ -1,3 +1,3 @@
 module VCloudSdk
-  VERSION = '0.5.0'
+  VERSION = '0.7.0'
 end

data/lib/ruby_vcloud_sdk/vm.rb

@@ -2,6 +2,7 @@ require "forwardable"
 require_relative "infrastructure"
 require_relative "powerable"
 require_relative "internal_disk"
+require_relative "nic"
 
 module VCloudSdk
   class VM
@@ -92,6 +93,19 @@ module VCloudSdk
         .map { |network_connection| network_connection.network }
     end
 
+    def nics
+      primary_index = entity_xml
+                        .network_connection_section
+                        .primary_network_connection_index
+      entity_xml
+        .network_connection_section
+        .network_connections
+        .map do |network_connection|
+          VCloudSdk::NIC.new(network_connection,
+                             network_connection.network_connection_index == primary_index)
+        end
+    end
+
     def independent_disks
       hardware_section = entity_xml.hardware_section
       disks = []
@@ -122,10 +136,10 @@ module VCloudSdk
       task = connection.post(entity_xml.attach_disk_link.href,
                              disk_attach_or_detach_params(disk),
                              Xml::MEDIA_TYPE[:DISK_ATTACH_DETACH_PARAMS])
-      task = monitor_task(task)
+      monitor_task(task)
 
       Config.logger.info "Disk '#{disk.name}' is attached to VM '#{name}'"
-      task
+      self
     end
 
     def detach_disk(disk)
@@ -143,10 +157,10 @@ module VCloudSdk
       task = connection.post(entity_xml.detach_disk_link.href,
                              disk_attach_or_detach_params(disk),
                              Xml::MEDIA_TYPE[:DISK_ATTACH_DETACH_PARAMS])
-      task = monitor_task(task)
+      monitor_task(task)
 
       Config.logger.info "Disk '#{disk.name}' is detached from VM '#{name}'"
-      task
+      self
     end
 
     def insert_media(catalog_name, media_file_name)
@@ -163,6 +177,7 @@ module VCloudSdk
                              media_insert_or_eject_params(media),
                              Xml::MEDIA_TYPE[:MEDIA_INSERT_EJECT_PARAMS])
       monitor_task(task)
+      self
     end
 
     def eject_media(catalog_name, media_file_name)
@@ -179,6 +194,7 @@ module VCloudSdk
                              media_insert_or_eject_params(media),
                              Xml::MEDIA_TYPE[:MEDIA_INSERT_EJECT_PARAMS])
       monitor_task(task)
+      self
     end
 
     def add_nic(
@@ -203,7 +219,7 @@ module VCloudSdk
       fail CloudError,
            "VM #{name} is powered-on and cannot add NIC." if is_status?(payload, :POWERED_ON)
 
-      nic_index = list_networks.size # nic index begins with 0
+      nic_index = add_nic_index
 
       Config.logger
         .info("Adding NIC #{nic_index}, network #{network_name} using mode '#{ip_addressing_mode}' #{ip.nil? ? "" : "IP: #{ip}"}")
@@ -230,6 +246,20 @@ module VCloudSdk
                              payload,
                              Xml::MEDIA_TYPE[:VM])
       monitor_task(task)
+      self
+    end
+
+    def delete_nics(*nics)
+      payload = entity_xml
+      fail CloudError,
+           "VM #{name} is powered-on and cannot delete NIC." if is_status?(payload, :POWERED_ON)
+
+      payload.delete_nics(*nics)
+      task = connection.post(payload.reconfigure_link.href,
+                             payload,
+                             Xml::MEDIA_TYPE[:VM])
+      monitor_task(task)
+      self
     end
 
     def product_section_properties
@@ -240,8 +270,8 @@ module VCloudSdk
     end
 
     def product_section_properties=(properties)
-      Config.logger
-        .info("Updating VM #{name} production sections with properties: #{properties.pretty_inspect}")
+      Config.logger.info(
+        "Updating VM #{name} production sections with properties: #{properties.inspect}")
       task = connection.put(entity_xml.product_sections_link.href,
                             product_section_list_params(properties),
                             Xml::MEDIA_TYPE[:PRODUCT_SECTIONS])
@@ -288,10 +318,35 @@ module VCloudSdk
                              payload,
                              Xml::MEDIA_TYPE[:VM])
       monitor_task(task)
+      self
+    end
+
+    def delete_internal_disk_by_name(name)
+      payload = entity_xml
+
+      unless payload.delete_hard_disk?(name)
+        fail ObjectNotFoundError, "Internal disk '#{name}' is not found"
+      end
+
+      task = connection.post(payload.reconfigure_link.href,
+                             payload,
+                             Xml::MEDIA_TYPE[:VM])
+      monitor_task(task)
+      self
     end
 
     private
 
+    def add_nic_index
+      # nic index begins with 0
+      i = 0
+      nic_indexes = nics.map { |n| n.nic_index }
+      while (nic_indexes.include?(i))
+        i += 1
+      end
+      i
+    end
+
     def disk_attach_or_detach_params(disk)
       Xml::WrapperFactory
         .create_instance("DiskAttachOrDetachParams")

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

@@ -42,24 +42,69 @@ module VCloudSdk
         @local_exists = true
 
         locality.each do |k,v|
-          node_sp = create_child("SourcedVmInstantiationParams")
+          node_sp = create_child("SourcedVmInstantiationParams",
+                                 namespace.prefix,
+                                 namespace.href)
           is_source_delete.node.after(node_sp)
 
-          node_sv = add_child("Source", nil, nil, node_sp)
+          node_sv = add_child("Source",
+                              namespace.prefix,
+                              namespace.href,
+                              node_sp)
           node_sv["type"] = k.type
           node_sv["name"] = k.name
           node_sv["href"] = k.href
 
-          node_lp = create_child("LocalityParams")
+          node_lp = create_child("LocalityParams",
+                                 namespace.prefix,
+                                 namespace.href)
           node_sv.after(node_lp)
 
-          node_re = add_child("ResourceEntity", nil, nil, node_lp)
+          node_re = add_child("ResourceEntity",
+                              namespace.prefix,
+                              namespace.href,
+                              node_lp)
           node_re["type"] = v.type
           node_re["name"] = v.name
           node_re["href"] = v.href
         end
       end
 
+      def set_network_config(vapp_network_name, vdc_netowrk_href, fence_mode)
+        instantiation_param = get_nodes("InstantiationParams").first
+
+        net_config_section = add_child("NetworkConfigSection",
+                                       namespace.prefix,
+                                       namespace.href,
+                                       instantiation_param.node)
+
+        ovf_info = add_child("Info", "ovf", OVF, net_config_section)
+        ovf_info.content = "Configuration parameters for logical networks"
+
+        network_config = create_child("NetworkConfig",
+                                      namespace.prefix,
+                                      namespace.href)
+        ovf_info.after(network_config)
+        network_config["networkName"] = vapp_network_name
+
+        configuration = add_child("Configuration",
+                                  namespace.prefix,
+                                  namespace.href,
+                                  network_config)
+
+        parent_network = add_child("ParentNetwork",
+                                   namespace.prefix,
+                                   namespace.href,
+                                   configuration)
+        parent_network["href"] = vdc_netowrk_href
+
+        fence_node = create_child("FenceMode",
+                                  namespace.prefix,
+                                  namespace.href)
+        parent_network.after(fence_node)
+        fence_node.content = fence_mode
+      end
+
       private
 
       def is_source_delete

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

@@ -1,6 +1,5 @@
 module VCloudSdk
   module Xml
-
     class NetworkConnection < Wrapper
       def network
         @root["network"]
@@ -16,15 +15,18 @@ module VCloudSdk
       end
 
       def network_connection_index=(value)
-        unless get_nodes("NetworkConnectionIndex").first
+        index_node = get_nodes("NetworkConnectionIndex").first
+        if index_node.nil?
           index_node = create_child("NetworkConnectionIndex")
           add_child(index_node)
         end
-        get_nodes("NetworkConnectionIndex").first.content = value
+        index_node.content = value
       end
 
       def ip_address
-        get_nodes("IpAddress").first.content
+        ip_address_node = get_nodes("IpAddress").first
+        return if ip_address_node.nil?
+        ip_address_node.content
       end
 
       def ip_address=(value)
@@ -59,13 +61,13 @@ module VCloudSdk
       end
 
       def ip_address_allocation_mode=(value)
-        if !IP_ADDRESSING_MODE.values.include?(value)
-          raise ArgumentError, "Invalid IP addressing mode.  Valid modes " +
-              "are: #{IP_ADDRESSING_MODE.values.join(" ")}"
+        unless IP_ADDRESSING_MODE.values.include?(value)
+          fail ArgumentError,
+               "Invalid IP addressing mode.  Valid modes " +
+               "are: #{IP_ADDRESSING_MODE.values.join(" ")}"
         end
         get_nodes("IpAddressAllocationMode").first.content = value
       end
     end
-
   end
 end

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

@@ -1,6 +1,5 @@
 module VCloudSdk
   module Xml
-
     class NetworkConnectionSection < Wrapper
       def add_item(item)
         link_node = get_nodes("Link").first
@@ -12,10 +11,11 @@ module VCloudSdk
       end
 
       def network_connection(index)
-        net = network_connections.find {
-          |n| n.network_connection_index == index.to_s }
+        net = network_connections.find do |n|
+          n.network_connection_index == index.to_s
+        end
         unless net
-          raise ObjectNotFoundError, "Network connection #{index} does not exist."
+          fail ObjectNotFoundError, "Network connection #{index} does not exist."
         end
         net
       end
@@ -38,26 +38,27 @@ module VCloudSdk
         connection = network_connection(index)
         if connection
           connection.node.remove
-          reconcile_primary_network()
+          reconcile_primary_network
         else
-          raise ObjectNotFoundError,
-            "Cannot remove network connection #{index}: does not exist."
+          fail ObjectNotFoundError,
+               "Cannot remove network connection #{index}: does not exist."
         end
       end
 
       private
 
-      def reconcile_primary_network()
+      def reconcile_primary_network
         new_primary = network_connections.first
         if new_primary
-          self.primary_network_connection_index =
-            new_primary.network_connection_index
+          primary_index = new_primary.network_connection_index
+          self.primary_network_connection_index = primary_index
+          primary_index
         else
           primary = get_nodes("PrimaryNetworkConnectionIndex").first
           primary.node.remove if primary
+          nil
         end
       end
     end
-
   end
 end

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

@@ -1,6 +1,12 @@
 module VCloudSdk
   module Xml
     class Org < Wrapper
+      def vdcs
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:VDC] },
+                  true)
+      end
+
       def vdc_link(name)
         get_nodes(XML_TYPE[:LINK],
                   { type: MEDIA_TYPE[:VDC],

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

@@ -5,31 +5,56 @@ module VCloudSdk
         property_node = add_child("Property",
                                   ovf_namespace_prefix,
                                   OVF)
-        property_node["#{ovf_namespace_prefix}:type"] = property["type"].nil? ? "string" : property["type"]
+        property_node["#{ovf_namespace_prefix}:type"] =
+          property["type"].nil? ? "string" : property["type"]
         property_node["#{ovf_namespace_prefix}:key"] = property["key"]
         property_node["#{ovf_namespace_prefix}:value"] = property["value"]
-        property_node["#{ovf_namespace_prefix}:password"] = property["password"] if property["password"]
+        property_node["#{ovf_namespace_prefix}:password"] =
+          property["password"] if property["password"] # default to false
+        property_node["#{ovf_namespace_prefix}:userConfigurable"] =
+          property["userConfigurable"] if property["userConfigurable"] # default to false
 
-        unless property["Label"].nil?
-          label_node = add_child("Label", ovf_namespace_prefix, OVF, property_node)
-          label_node.content = property["Label"]
+        %w[Label Description].each do |k|
+          add_child_node_property(property_node, property, k)
+        end
+
+        if property["value"].nil?
+          value_node = add_child("Value", ovf_namespace_prefix, OVF, property_node)
+          value_node.attribute("value").value = property["value"]
         end
       end
 
       def properties
         get_nodes("Property", nil, true, OVF).map do |property_node|
           property = {}
-          property["type"] = property_node.attribute("type").content
-          property["key"] = property_node.attribute("key").content
-          property["value"] = property_node.attribute("value").content
-          property["password"] = property_node.attribute("password").content
+          %w[type key value password userConfigurable].each do |k|
+            attr = property_node.attribute(k)
+            property[k] = attr.nil? ? "" : attr.content
+          end
 
-          label_node = property_node.get_nodes("Label", nil, true, OVF).first
-          property["Label"] = label_node.content unless label_node.nil?
+          %w[Label Description].each do |k|
+            read_child_node_property(property_node, property, k)
+          end
 
+          value_node = property_node.get_nodes("Value", nil, true, OVF).first
+          property["value"] = value_node.attribute("value").content unless value_node.nil?
           property
         end
       end
+
+      private
+
+      def add_child_node_property(property_node, property, key)
+        unless property[key].nil?
+          child_node = add_child(key, ovf_namespace_prefix, OVF, property_node)
+          child_node.content = property[key]
+        end
+      end
+
+      def read_child_node_property(property_node, property, key)
+        child_node = property_node.get_nodes(key, nil, true, OVF).first
+        property[key] = child_node.content unless child_node.nil?
+      end
     end
   end
 end

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

@@ -35,8 +35,9 @@ module VCloudSdk
       end
 
       def nics
-        items = hardware.find_all {|h| h.get_rasd_content(
-          RASD_TYPES[:RESOURCE_TYPE]) == HARDWARE_TYPE[:NIC] }
+        items = hardware.select do |h|
+          h.get_rasd_content(RASD_TYPES[:RESOURCE_TYPE]) == HARDWARE_TYPE[:NIC]
+        end
         items.map { |i| NicItemWrapper.new(i) }
       end
 
@@ -45,14 +46,29 @@ module VCloudSdk
       end
 
       def remove_hw(hw_type, index)
-        item = hardware.find { |h|
+        index = index.to_s
+        item = hardware.find do |h|
           h.get_rasd_content(RASD_TYPES[:RESOURCE_TYPE]) == hw_type &&
-          h.get_rasd_content(RASD_TYPES[:ADDRESS_ON_PARENT]) == index }
+            h.get_rasd_content(RASD_TYPES[:ADDRESS_ON_PARENT]) == index
+        end
         if item
           item.node.remove
         else
-          raise ObjectNotFoundError,
-            "Cannot remove hw item #{hw_type}:#{index}, does not exist."
+          fail ObjectNotFoundError,
+               "Cannot remove hw item #{hw_type}:#{index}, does not exist."
+        end
+      end
+
+      def reconcile_primary_network(primary_index)
+        primary_index = primary_index.to_s
+        hardware.select do |item|
+          item.get_rasd_content(RASD_TYPES[:RESOURCE_TYPE]) == HARDWARE_TYPE[:NIC]
+        end.each do |item|
+          if item.get_rasd_content(RASD_TYPES[:ADDRESS_ON_PARENT]) == primary_index
+            item.get_rasd(RASD_TYPES[:CONNECTION]).attribute("primaryNetworkConnection").value = "true"
+          else
+            item.get_rasd(RASD_TYPES[:CONNECTION]).attribute("primaryNetworkConnection").value = "false"
+          end
         end
       end
 

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

@@ -117,6 +117,17 @@ module VCloudSdk
           "busType", VCLOUD_NAMESPACE)] = bus_type
       end
 
+      def delete_hard_disk?(disk_name)
+        hardware_section.hard_disks.each do |disk|
+          if disk.element_name == disk_name
+            disk.node.remove
+            return true
+          end
+        end
+
+        false
+      end
+
       def change_cpu_count(quantity)
         @logger.debug("Updating CPU count on vm #{name} to #{quantity} ")
         item = hardware_section.cpu
@@ -132,7 +143,7 @@ module VCloudSdk
       # Deletes NIC from VM.  Accepts variable number of arguments for NICs.
       # To delete all NICs from VM use the splat operator
       # ex: delete_nic(vm, *vm.hardware_section.nics)
-      def delete_nic(*nics)
+      def delete_nics(*nics)
         # Trying to remove a NIC without removing the network connection
         # first will cause an error.  Removing the network connection of a NIC
         # in the NetworkConnectionSection will automatically delete the NIC.
@@ -141,8 +152,9 @@ module VCloudSdk
         nics.each do |nic|
           nic_index = nic.nic_index
           @logger.info("Removing NIC #{nic_index} from VM #{name}")
-          net_conn_section.remove_network_connection(nic_index)
+          primary_index = net_conn_section.remove_network_connection(nic_index)
           vhw_section.remove_nic(nic_index)
+          vhw_section.reconcile_primary_network(primary_index) if primary_index
         end
       end