ruby_vcloud_sdk 0.5.1 → 0.6.0

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

@@ -13,6 +13,13 @@ module VCloudSdk
                   .first
       end
 
+      def product_sections_link
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:PRODUCT_SECTIONS] },
+                  true)
+                  .first
+      end
+
       def attach_disk_link
         get_nodes(XML_TYPE[:LINK],
                   { rel: "disk:attach",
@@ -41,10 +48,13 @@ module VCloudSdk
         node = nodes.first
         return unless node
         node.content = value
+        value
       end
 
       def reconfigure_link
-        get_nodes("Link", {"rel" => "reconfigureVm"}, true).first
+        get_nodes(XML_TYPE[:LINK],
+                  { rel: "reconfigureVm" },
+                  true).first
       end
 
       def insert_media_link
@@ -60,7 +70,9 @@ module VCloudSdk
       end
 
       def metadata_link
-        get_nodes("Link", {"type" => MEDIA_TYPE[:METADATA]}, true).first
+        get_nodes(XML_TYPE[:LINK],
+                  { type: MEDIA_TYPE[:METADATA] },
+                  true).first
       end
 
       def hardware_section
@@ -73,20 +85,22 @@ module VCloudSdk
 
       def network_connection_section
         get_nodes("NetworkConnectionSection",
-          {"type" => MEDIA_TYPE[:NETWORK_CONNECTION_SECTION]}).first
+                  type: MEDIA_TYPE[:NETWORK_CONNECTION_SECTION]).first
+      end
+
+      def product_section
+        get_nodes("ProductSection", nil, true, OVF).first
       end
 
       # hardware modification methods
 
-      def add_hard_disk(size_mb)
+      def add_hard_disk(capacity, bus_type, bus_sub_type)
         section = hardware_section
-        scsi_controller = section.scsi_controller
-        unless scsi_controller
-          raise ObjectNotFoundError, "No SCSI controller found for VM #{name}"
-        end
         # Create a RASD item
-        new_disk = WrapperFactory.create_instance("Item", nil,
-          hardware_section.doc_namespaces)
+        new_disk = WrapperFactory
+                     .create_instance("Item",
+                                      nil,
+                                      hardware_section.doc_namespaces)
         section.add_item(new_disk)
         # The order matters!
         new_disk.add_rasd(RASD_TYPES[:HOST_RESOURCE])
@@ -96,12 +110,11 @@ module VCloudSdk
         new_disk.set_rasd(rt, HARDWARE_TYPE[:HARD_DISK])
         host_resource = new_disk.get_rasd(RASD_TYPES[:HOST_RESOURCE])
         host_resource[new_disk.create_qualified_name(
-          "capacity", VCLOUD_NAMESPACE)] = size_mb.to_s
+          "capacity", VCLOUD_NAMESPACE)] = capacity.to_s
         host_resource[new_disk.create_qualified_name(
-          "busSubType", VCLOUD_NAMESPACE)] = scsi_controller.get_rasd_content(
-            RASD_TYPES[:RESOURCE_SUB_TYPE])
+          "busSubType", VCLOUD_NAMESPACE)] = bus_sub_type
         host_resource[new_disk.create_qualified_name(
-          "busType", VCLOUD_NAMESPACE)] = HARDWARE_TYPE[:SCSI_CONTROLLER]
+          "busType", VCLOUD_NAMESPACE)] = bus_type
       end
 
       def change_cpu_count(quantity)
@@ -116,37 +129,6 @@ module VCloudSdk
         item.set_rasd("VirtualQuantity", mb)
       end
 
-      def add_nic(nic_index, network_name, addressing_mode, ip = nil)
-        section = hardware_section
-        is_primary = hardware_section.nics.length == 0
-        new_nic = Xml::NicItemWrapper.new(Xml::WrapperFactory.create_instance(
-          "Item", nil, hardware_section.doc_namespaces))
-        section.add_item(new_nic)
-        new_nic.nic_index = nic_index
-        new_nic.network = network_name
-        new_nic.set_ip_addressing_mode(addressing_mode, ip)
-        new_nic.is_primary = is_primary
-        @logger.info("Adding NIC #{nic_index} to VM #{name} with the " +
-          "following parameters: Network name: #{network_name}, " +
-          "Addressing mode #{addressing_mode}, " +
-          "IP address: #{ip.nil? ? "blank" : ip}")
-      end
-
-      # NIC modification methods
-
-      def connect_nic(nic_index, network_name, addressing_mode,
-          ip_address = nil)
-        section = network_connection_section
-        new_connection = WrapperFactory.create_instance("NetworkConnection",
-          nil, network_connection_section.doc_namespaces)
-        section.add_item(new_connection)
-        new_connection.network_connection_index = nic_index
-        new_connection.network = network_name
-        new_connection.ip_address_allocation_mode = addressing_mode
-        new_connection.ip_address = ip_address if ip_address
-        new_connection.is_connected = true
-      end
-
       # 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)
@@ -168,15 +150,17 @@ module VCloudSdk
         net_conn_section = network_connection_section
         connection = net_conn_section.network_connection(nic_index)
         unless connection
-          raise ObjectNotFoundError,
-            "NIC #{nic_index} cannot be found on VM #{name}."
+          fail ObjectNotFoundError,
+               "NIC #{nic_index} cannot be found on VM #{name}."
         end
         connection.is_connected = is_connected
+        nil
       end
 
       def set_primary_nic(nic_index)
         net_conn_section = network_connection_section
         net_conn_section.primary_network_connection_index = nic_index
+        nil
       end
     end
   end

data/lib/ruby_vcloud_sdk/xml/wrapper_classes.rb

@@ -30,6 +30,8 @@ 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/product_section"
+require "ruby_vcloud_sdk/xml/wrapper_classes/product_section_list"
 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"

data/lib/ruby_vcloud_sdk/xml/xml_templates/NetworkConfig.xml

@@ -7,12 +7,7 @@
         <IsInherited />
         <Gateway />
         <Netmask />
-        <IpRanges>
-          <IpRange>
-            <StartAddress />
-            <EndAddress />
-          </IpRange>
-        </IpRanges>
+        <IpRanges />
       </IpScope>
     </IpScopes>
     <ParentNetwork type="application/vnd.vmware.vcloud.network+xml" name="" href=""/>

data/lib/ruby_vcloud_sdk/xml/xml_templates/ProductSectionList.xml

@@ -1 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns7:ProductSectionList xmlns="http://www.vmware.com/vcloud/extension/v1" xmlns:ns2="http://www.vmware.com/vcloud/v1" xmlns:ns3="http://schemas.dmtf.org/ovf/envelope/1" xmlns:ns4="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:ns5="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ns6="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ns7="http://www.vmware.com/vcloud/v1.5" xmlns:ns8="http://schemas.dmtf.org/ovf/environment/1" xmlns:ns9="http://www.vmware.com/vcloud/extension/v1.5" xmlns:ns10="http://www.vmware.com/vcloud/versions" type="" href=""/>
+<?xml version="1.0" encoding="UTF-8"?>
+<ProductSectionList xmlns="http://www.vmware.com/vcloud/v1.5"
+                    xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
+  <ovf:ProductSection
+          required="true">
+    <ovf:Info>Information about the installed software</ovf:Info>
+  </ovf:ProductSection>
+</ProductSectionList>

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ruby_vcloud_sdk
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
+  prerelease: 
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,26 +78,27 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  BOSH vCloud API client
-  b7e7d7
+description: ! 'BOSH vCloud API client
+
+  a51aef'
 email: support@cloudfoundry.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - lib/ruby_vcloud_sdk.rb
 - lib/ruby_vcloud_sdk/catalog.rb
 - lib/ruby_vcloud_sdk/catalog_item.rb
@@ -101,12 +111,14 @@ files:
 - lib/ruby_vcloud_sdk/edge_gateway.rb
 - lib/ruby_vcloud_sdk/errors.rb
 - lib/ruby_vcloud_sdk/infrastructure.rb
+- lib/ruby_vcloud_sdk/internal_disk.rb
 - lib/ruby_vcloud_sdk/ip_ranges.rb
 - lib/ruby_vcloud_sdk/memory.rb
 - lib/ruby_vcloud_sdk/network.rb
 - lib/ruby_vcloud_sdk/ovf_directory.rb
 - lib/ruby_vcloud_sdk/powerable.rb
 - lib/ruby_vcloud_sdk/resources.rb
+- lib/ruby_vcloud_sdk/right_record.rb
 - lib/ruby_vcloud_sdk/session.rb
 - lib/ruby_vcloud_sdk/vapp.rb
 - lib/ruby_vcloud_sdk/vdc.rb
@@ -147,6 +159,8 @@ files:
 - lib/ruby_vcloud_sdk/xml/wrapper_classes/org.rb
 - lib/ruby_vcloud_sdk/xml/wrapper_classes/org_network.rb
 - lib/ruby_vcloud_sdk/xml/wrapper_classes/org_vdc_network.rb
+- lib/ruby_vcloud_sdk/xml/wrapper_classes/product_section.rb
+- lib/ruby_vcloud_sdk/xml/wrapper_classes/product_section_list.rb
 - lib/ruby_vcloud_sdk/xml/wrapper_classes/query_result_records.rb
 - lib/ruby_vcloud_sdk/xml/wrapper_classes/recompose_vapp_params.rb
 - lib/ruby_vcloud_sdk/xml/wrapper_classes/session.rb
@@ -353,29 +367,31 @@ files:
 - lib/ruby_vcloud_sdk/xml/xml_templates/VmPendingQuestion.xml
 - lib/ruby_vcloud_sdk/xml/xml_templates/VmQuestionAnswer.xml
 - lib/ruby_vcloud_sdk/xml/xml_templates/generate_dictionary.rb
+- README.md
 homepage: https://github.com/vchs/ruby_vcloud_sdk
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: BOSH vCloud API client
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e4a7a59af14ae30e7e385ec2d53140e95bbeea19
-  data.tar.gz: f9ea0599b374ae52a64d243754736534d45c6233
-SHA512:
-  metadata.gz: ad8a5d9da2550b289ac57d6570a959ee26d28de8975e901d1b84666f61e14d5aeb5b3c2e1ae9000dfe334e60c3b7d267591d23e06ce062d814b74c91cc0a17c5
-  data.tar.gz: 098583e00f2b459ead4922fa101056a1c744e26ec16da444c0afb0ea0a684c55d1e2b09c380cd39623fdedde19d954c626472770dea51e803605da8b6d96c16b