vcloud-rest 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 633b84969bc2687f204a6393a60c826791e057c1
-  data.tar.gz: 6588a7985b975089fd0ba629caaa719dd262c6a2
+  metadata.gz: 7c2eb998fce7438cab0aceb5308024a7c660b487
+  data.tar.gz: b7d09d0d744be363ef4dbe172c0d9d31474625eb
 SHA512:
-  metadata.gz: 1fbb7b9ce96cb65c796813ee31c7d1a266a15e791f8f51e507945c234b97860c1848827324e2d90df53723ac07fad7359a6eed5418620789df5a8fb3321982f5
-  data.tar.gz: 80d5e7180bd05dc72f208cd741e3b54e4204aa5387c5c11bc15ca86d9ab611871cf61b3cc0f4efa73b6192e8e85de021f64ca1913ea5f70d222cc686b50d3fd5
+  metadata.gz: ccab7973655779b11498d5df9da2c50626f6aa199ac0d97ca1417f0285e30b9d486a0a7f1aff43b84a132d76bd0d1bc9b80b3b2a8c6776fc86343f0c512014ac
+  data.tar.gz: 64a015a7b3803fdedfc30efe46c31ecced6f797a2036227eefe3cedb0811f17ae671433d87e13754104f723ad49faa91ea5b034d5eb146c9dc5db775b90975b7

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 Changes
 ==
+2013-12-13 (1.1.0)
+--
+
+FEATURES:
+
+* Add commands `[add|edit|delete]_vm_network` to manage multiple networks
+
+DEPRECATIONS:
+
+* `set_vm_network_config` is now deprecated
+
 2013-11-29 (1.0.0)
 --
 

data/lib/vcloud-rest/vcloud/vm.rb

@@ -116,9 +116,144 @@ module VCloudClient
       task_id
     end
 
+    ##
+    # Edit VM Network Config
+    #
+    # Retrieve the existing network config section and edit it
+    # to ensure settings are not lost
+    def edit_vm_network(vmId, network, config={})
+      params = {
+        'method' => :get,
+        'command' => "/vApp/vm-#{vmId}/networkConnectionSection"
+      }
+
+      netconfig_response, headers = send_request(params)
+
+      picked_network = netconfig_response.css("NetworkConnection").select do |net|
+        net.attribute('network').text == network[:name]
+      end.first
+
+      raise WrongItemIDError, "Network named #{network[:name]} not found." unless picked_network
+
+      if config[:ip_allocation_mode]
+        node = picked_network.css('IpAddressAllocationMode').first
+        node.content = config[:ip_allocation_mode]
+      end
+
+      if config[:network_index]
+        node = picked_network.css('NetworkConnectionIndex').first
+        node.content = config[:network_index]
+      end
+
+      if config[:is_connected]
+        node = picked_network.css('IsConnected').first
+        node.content = config[:is_connected]
+      end
+
+      if config[:ip]
+        node = picked_network.css('IpAddress').first
+        node.content = config[:ip]
+      end
+
+      params = {
+        'method' => :put,
+        'command' => "/vApp/vm-#{vmId}/networkConnectionSection"
+      }
+
+      response, headers = send_request(params, netconfig_response.to_xml, "application/vnd.vmware.vcloud.networkConnectionSection+xml")
+
+      task_id = headers[:location].gsub(/.*\/task\//, "")
+      task_id
+    end
+
+    ##
+    # Add a new network to a VM
+    def add_vm_network(vmId, network, config={})
+      params = {
+        'method' => :get,
+        'command' => "/vApp/vm-#{vmId}/networkConnectionSection"
+      }
+
+      netconfig_response, headers = send_request(params)
+
+      parent_section = netconfig_response.css('NetworkConnectionSection').first
+
+      # For some reasons these elements must be removed
+      netconfig_response.css("Link").each {|n| n.remove}
+
+      networks_count = netconfig_response.css('NetworkConnection').count
+
+      new_network = Nokogiri::XML::Node.new "NetworkConnection", parent_section
+      new_network["network"] = network[:name]
+      new_network["needsCustomization"] = true
+
+      idx_node = Nokogiri::XML::Node.new "NetworkConnectionIndex", new_network
+      idx_node.content = config[:network_index] || networks_count
+      new_network.add_child(idx_node)
+
+      is_connected_node = Nokogiri::XML::Node.new "IsConnected", new_network
+      is_connected_node.content = config[:is_connected] || true
+      new_network.add_child(is_connected_node)
+
+      allocation_node = Nokogiri::XML::Node.new "IpAddressAllocationMode", new_network
+      allocation_node.content = config[:ip_allocation_mode] || "POOL"
+      new_network.add_child(allocation_node)
+
+      if config[:ip]
+        ip_node = Nokogiri::XML::Node.new "IpAddress", new_network
+        ip_node.content = config[:ip]
+        new_network.add_child(ip_node)
+      end
+
+      parent_section.add_child(new_network)
+
+      params = {
+        'method' => :put,
+        'command' => "/vApp/vm-#{vmId}/networkConnectionSection"
+      }
+
+      put_response, headers = send_request(params, netconfig_response.to_xml, "application/vnd.vmware.vcloud.networkConnectionSection+xml")
+
+      task_id = headers[:location].gsub(/.*\/task\//, "")
+      task_id
+    end
+
+    ##
+    # Remove an existing network
+    def delete_vm_network(vmId, network)
+      params = {
+        'method' => :get,
+        'command' => "/vApp/vm-#{vmId}/networkConnectionSection"
+      }
+
+      netconfig_response, headers = send_request(params)
+
+      picked_network = netconfig_response.css("NetworkConnection").select do |net|
+        net.attribute('network').text == network[:name]
+      end.first
+
+      raise WrongItemIDError, "Network #{network[:name]} not found on this VM." unless picked_network
+
+      picked_network.remove
+
+      params = {
+        'method' => :put,
+        'command' => "/vApp/vm-#{vmId}/networkConnectionSection"
+      }
+
+      put_response, headers = send_request(params, netconfig_response.to_xml, "application/vnd.vmware.vcloud.networkConnectionSection+xml")
+
+      task_id = headers[:location].gsub(/.*\/task\//, "")
+      task_id
+    end
+
     ##
     # Set VM Network Config
+    #
+    # DEPRECATED: use set_vm_network
     def set_vm_network_config(vmid, network_name, config={})
+      @logger.warn 'DEPRECATION WARNING: use [add,delete,edit]_vm_network instead.'
+
       builder = Nokogiri::XML::Builder.new do |xml|
       xml.NetworkConnectionSection(
         "xmlns" => "http://www.vmware.com/vcloud/v1.5",

data/lib/vcloud-rest/version.rb

@@ -1,3 +1,3 @@
 module VCloudClient
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-rest
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Stefano Tortarolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -111,3 +111,4 @@ signing_key:
 specification_version: 4
 summary: Unofficial ruby bindings for VMWare vCloud's API
 test_files: []
+has_rdoc: