vcloud-rest 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caa1ca74dcbe7fe8b1742b78b56bcb17cfe1823e
-  data.tar.gz: 9d3a0952f7287a24d88d42f7337eff029906e801
+  metadata.gz: f5423c402bd67bd07893da3ed80210af1ae63b0c
+  data.tar.gz: 389acab1aaec5d6cbf9733dc02d5143f8fcdaabf
 SHA512:
-  metadata.gz: 44cecbe9acc1c69c66e9242f60d453658242c973fe851a23ab3c249e2cedf9858ed71719837eae9775cb45f1ccd2cd640e92c8e2a134191e713d7177dd0ccf4a
-  data.tar.gz: 50268f8c5b59a545636ecbccdfb3620d13074149dcd62e6820b2e5b81b6440893f3525b599c6da783445afb0189e9a60ffd4ded6f16906a6865fef7352b570d9
+  metadata.gz: 66eaeeec2baa31c8903f80ef68fd9315b260bcf72ea4180f014c118fa8cdaf1cff64f21f91af8aecb7b234534ac0f4bdc9a4726fa27feedd2e9f6e066bf76c47
+  data.tar.gz: a45669ed115205cd51fda43166b99d64892834f9128c04a78e2bba7ca0fcfb31b08a902d10f12eb2f08b75f3d5d272ca2fef65e766b9f340d30bc26926911925

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 Changes
 ==
+2014-02-06 (1.2.0)
+
+FEATURES:
+
+* vm
+    * actions to control vm snapshots just as vApp snapshots
+        * create_vm_snapshot
+        * revert_vm_snapshot
+    * network add/edit handle PrimaryNetworkConnectionIndex
+
+DEPRECATIONS:
+
+* `create_snapshot` is deprecated in favour of create_vapp_snapshot
+* `revert_snapshot` is deprecated in favour of revert_vapp_snapshot
+* remove `set_vm_network_config` deprecated in 1.1.0
+
+FIXES:
+
+* OVF: fix upload link retrieval (issue #23)
+* Remove network placeholder when adding a network to a VM
+
 2013-12-31 (1.1.1)
 --
 

data/README.md

@@ -17,7 +17,7 @@ This plugin is distributed as a Ruby Gem. To install it, run:
 
 Depending on your system's configuration, you may need to run this command with root privileges.
 
-vcloud-rest is tested against ruby 2.0.0, 1.9.x and 1.8.7+.
+vcloud-rest is tested against ruby 2.1.0, 2.0.0, 1.9.x and 1.8.7+.
 
 FEATURES
 --

data/lib/vcloud-rest/connection.rb

@@ -235,5 +235,37 @@ module VCloudClient
       task_id = headers[:location].gsub(/.*\/task\//, "")
       task_id
     end
+
+    ##
+    # Create a new vapp/vm snapshot (overwrites any existing)
+    def create_snapshot_action(id, description="New Snapshot", type=:vapp)
+      params = {
+          "method" => :post,
+          "command" => "/vApp/#{type}-#{id}/action/createSnapshot"
+      }
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.CreateSnapshotParams(
+            "xmlns" => "http://www.vmware.com/vcloud/v1.5") {
+          xml.Description description
+        }
+      end
+      response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.createSnapshotParams+xml")
+      task_id = headers[:location].gsub(/.*\/task\//, "")
+      task_id
+    end
+
+    ##
+    # Revert to an existing snapshot (vapp/vm)
+    def revert_snapshot_action(id, type=:vapp)
+      params = {
+          "method" => :post,
+          "command" => "/vApp/#{type}-#{id}/action/revertToCurrentSnapshot"
+      }
+      response, headers = send_request(params)
+      task_id = headers[:location].gsub(/.*\/task\//, "")
+      task_id
+    end
+
+
   end # class
 end

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

@@ -41,7 +41,9 @@ module VCloudClient
 
       # Get vAppTemplate Link from location
       vAppTemplate = headers[:location].gsub(/.*\/vAppTemplate\/vappTemplate\-/, "")
-      descriptorUpload = response.css("Files Link [rel='upload:default']").first[:href].gsub("#{@host_url}/transfer/", "")
+      uploadHref = response.css("Files Link [rel='upload:default']").first[:href]
+      descriptorUpload = uploadHref.gsub(/.*\/transfer\//, "")
+
       transferGUID = descriptorUpload.gsub("/descriptor.ovf", "")
 
       ovfFileBasename = File.basename(ovfFile, ".ovf")
@@ -89,7 +91,7 @@ module VCloudClient
         }
         response, headers = send_request(params)
         response.css("Files File [bytesTransferred='0'] Link [rel='upload:default']").each do |file|
-          fileName = file[:href].gsub("#{@host_url}/transfer/#{transferGUID}/","")
+          fileName = file[:href].gsub(/.*\/transfer\/#{transferGUID}\//, "")
           uploadFile = "#{ovfDir}/#{fileName}"
           uploadURL = "/transfer/#{transferGUID}/#{fileName}"
           upload_file(uploadURL, uploadFile, vAppTemplate, uploadOptions)

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

@@ -310,34 +310,34 @@ module VCloudClient
       { :vapp_id => vapp_id, :task_id => task_id }
     end
 
+
+
     ##
-    # Create a new snapshot (overwrites any existing)
-    def create_snapshot(vappId, description="New Snapshot")
-      params = {
-          "method" => :post,
-          "command" => "/vApp/vapp-#{vappId}/action/createSnapshot"
-      }
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.CreateSnapshotParams(
-            "xmlns" => "http://www.vmware.com/vcloud/v1.5") {
-          xml.Description description
-        }
-      end
-      response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.createSnapshotParams+xml")
-      task_id = headers[:location].gsub(/.*\/task\//, "")
-      task_id
+    # Create a new vm snapshot (overwrites any existing)
+    # DEPRECATED - use create_vapp_snapshot instead.
+    def create_snapshot(vmId, description="New Snapshot")
+      @logger.warn 'DEPRECATION WARNING: use [create,revert]_vapp_snapshot instead.'
+      create_snapshot_action(vmId, description, :vapp)
     end
 
     ##
     # Revert to an existing snapshot
-    def revert_snapshot(vappId)
-      params = {
-          "method" => :post,
-          "command" => "/vApp/vapp-#{vappId}/action/revertToCurrentSnapshot"
-      }
-      response, headers = send_request(params)
-      task_id = headers[:location].gsub(/.*\/task\//, "")
-      task_id
+    # DEPRECATED - use revert_vapp_snapshot instead.
+    def revert_snapshot(vmId)
+      @logger.warn 'DEPRECATION WARNING: use [create,revert]_vapp_snapshot instead.'
+      revert_snapshot_action(vmId, :vapp)
+    end
+
+    ##
+    # Create a new vm snapshot (overwrites any existing)
+    def create_vapp_snapshot(vmId, description="New Snapshot")
+      create_snapshot_action(vmId, description, :vapp)
+    end
+
+    ##
+    # Revert to an existing snapshot
+    def revert_vapp_snapshot(vmId)
+      revert_snapshot_action(vmId, :vapp)
     end
 
     ##

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

@@ -129,6 +129,11 @@ module VCloudClient
 
       netconfig_response, headers = send_request(params)
 
+      if config[:primary_index]
+        node = netconfig_response.css('PrimaryNetworkConnectionIndex').first
+        node.content = config[:primary_index]
+      end
+
       picked_network = netconfig_response.css("NetworkConnection").select do |net|
         net.attribute('network').text == network[:name]
       end.first
@@ -181,8 +186,18 @@ module VCloudClient
       # For some reasons these elements must be removed
       netconfig_response.css("Link").each {|n| n.remove}
 
+      # Delete placeholder network
+      netconfig_response.css('NetworkConnection').find{|n| n.attribute('network').text == 'none'}.remove
+
       networks_count = netconfig_response.css('NetworkConnection').count
 
+      primary_index_node = netconfig_response.css('PrimaryNetworkConnectionIndex').first
+      unless primary_index_node
+        primary_index_node = Nokogiri::XML::Node.new "PrimaryNetworkConnectionIndex", parent_section
+        parent_section.add_child(primary_index_node)
+      end
+      primary_index_node.content = config[:primary_index] || 0
+
       new_network = Nokogiri::XML::Node.new "NetworkConnection", parent_section
       new_network["network"] = network[:name]
       new_network["needsCustomization"] = true
@@ -247,40 +262,6 @@ module VCloudClient
       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",
-        "xmlns:ovf" => "http://schemas.dmtf.org/ovf/envelope/1") {
-        xml['ovf'].Info "VM Network configuration"
-        xml.PrimaryNetworkConnectionIndex(config[:primary_index] || 0)
-        xml.NetworkConnection("network" => network_name, "needsCustomization" => true) {
-          xml.NetworkConnectionIndex(config[:network_index] || 0)
-          xml.IpAddress config[:ip] if config[:ip]
-          xml.IsConnected(config[:is_connected] || true)
-          xml.IpAddressAllocationMode config[:ip_allocation_mode] if config[:ip_allocation_mode]
-        }
-      }
-      end
-
-      params = {
-        'method' => :put,
-        'command' => "/vApp/vm-#{vmid}/networkConnectionSection"
-      }
-
-      response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.networkConnectionSection+xml")
-
-      task_id = headers[:location].gsub(/.*\/task\//, "")
-      task_id
-    end
-
-
     ##
     # Set VM Guest Customization Config
     def set_vm_guest_customization(vmid, computer_name, config={})
@@ -462,6 +443,19 @@ module VCloudClient
       power_action(vmId, 'powerOn', :vm)
     end
 
+    ##
+    # Create a new vm snapshot (overwrites any existing)
+    def create_vm_snapshot(vmId, description="New Snapshot")
+      create_snapshot_action(vmId, description, :vm)
+    end
+
+    ##
+    # Revert to an existing snapshot
+    def revert_vm_snapshot(vmId)
+      revert_snapshot_action(vmId, :vm)
+    end
+
+
     private
       def add_disk(source_xml, disk_info)
         disks_count = source_xml.css("Item").css("rasd|HostResource").count

data/lib/vcloud-rest/version.rb

@@ -1,3 +1,3 @@
 module VCloudClient
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-rest
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Stefano Tortarolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
 description: Ruby bindings to create, list and manage vCloud servers
 email:
 - stefano.tortarolo@gmail.com