knife-vcloud 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15f25cf5b3ff33de3c9781a8bf54ba462830e2fd
-  data.tar.gz: bfe80065421e3114b11639dbc8e693f526646628
+  metadata.gz: 10c1b893ad8aa6677bb69cecb3e94466e044b492
+  data.tar.gz: c1ddbbadd0b3ae1978010314d6f0a99cfa6a93c3
 SHA512:
-  metadata.gz: bd8e9aaa2c3771d518dcc6e2e4b9988d4adf9e58885b4d4576bd9b40a150ee21a6f220f525f795de7aa9bb2c10b73a1ae5ebd0ffd2d7a255e0a97e0aa0f03b29
-  data.tar.gz: 0897800fc0a73dc7ced36609748d3ee76c2d235119dc97e7388c545db48104f63459352510239e7e41a4ed390d2fbc68c5c7d0270a0ad9278866b9e634e6371b
+  metadata.gz: 9f7b6ea402d9bb1e79340dd031ff3ed8c4d69eea102aa064972f9c9306cb977449755ddca892a6ef6926a08b690e611fcc1fd22c54c3830331f17e4db287ef85
+  data.tar.gz: 8930ea3e4d97cfd3ef521df8c05901cd123a16d4f226fbf8feca9837bb13aad96a91153dea82d1c3f386e0386b636bbf70bc75ca4f277d39b66090bb9ed82b52

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 Changes
 ==
+2014-06-03 (1.3.0)
+
+This version requires vcloud-rest v. 1.3.0.
+
+FEATURES:
+
+* Add "media" item type management to `catalog item show`
+* Add commands `[vm|vapp] discard suspended` to discard suspended state of a vApp or VM
+
+FIXES:
+
+* Adapt 'vc vm show' to display different IPs from same network
+
+Note that now `get_vm` appends NetworkConnectionIndex to network name to generate a unique hash key.
+
 2014-02-06 (1.2.0)
 --
 

data/README.md

@@ -23,7 +23,7 @@ FEATURES
 - show VDCs
 - show Catalogs
 - show Catalog Items
-- create/start/stop/delete/show/reset/suspend/reboot vApps and VMs
+- create/start/stop/delete/show/reset/suspend/reboot/discard suspended vApps and VMs
 - add/edit/delete vApp networks (both internal and external)
 - basic VM network configuration
 - basic VM Guest Customization configuration
@@ -31,9 +31,12 @@ FEATURES
 
 PREREQUISITES
 --
-- chef >= 0.10.0
+- chef
 - knife-windows
-- vcloud-rest ~> 1.2.0
+- vcloud-rest
+
+(see *knife-vcloud.gemspec* for details)
+
 
 USAGE
 --
@@ -52,6 +55,7 @@ USAGE
     knife vc vapp clone [VDC] [SOURCE_VAPP] [DEST_NAME] (options)
     knife vc vapp create [VDC] [NAME] [DESCRIPTION] [TEMPLATE_ID] (options)
     knife vc vapp delete [VAPP] (options)
+    knife vc vapp discard suspended [VAPP] (options)
     knife vc vapp network external [add|delete|edit| [VAPP] [NETWORK] (options)
     knife vc vapp network internal [add|delete|edit| [VAPP] [NETWORK] (options)
     knife vc vapp reboot [VAPP] (options)
@@ -230,6 +234,8 @@ _Example:_
 ###Manage vApp/VM status
 vApp/VM's status can be managed with _start/stop/reboot/reset/suspend/delete_
 
+A suspended state can be discarded, it means that a vApp/VM is switched from paused to stopped.
+
 Note: use _knife vc vm..._ to operate on VMs.
 
 _Example:_

data/lib/chef/knife/catalog/vc_catalog_item_show.rb

@@ -33,22 +33,42 @@ class Chef
         catalog_item = get_catalog_item(item_arg)
         connection.logout
 
-        header = [
-            ui.color('Name', :bold),
-            ui.color('Template ID', :bold)
-        ]
-
-        ui.msg "#{ui.color('Description:', :cyan)} #{catalog_item[:description]}"
-        list = header
-        list.flatten!
-
-        catalog_item[:items].each do |item|
-          list << (item[:name] || '')
-          list << (item[:id] || '')
-          # TODO: show VMs using this item? item[:vms_hash]
-        end
+        if catalog_item[:type] == "vAppTemplate"
+          header = [
+              ui.color('Name', :bold),
+              ui.color('Template ID', :bold)
+          ]
+
+          ui.msg "#{ui.color('Description:', :cyan)} #{catalog_item[:description]}"
+          list = header
+
+          catalog_item[:items].each do |item|
+            list << (item[:name] || '')
+            list << (item[:id] || '')
+            # TODO: show VMs using this item? item[:vms_hash]
+          end
+
+          ui.msg ui.list(list, :columns_across, 2)
+
+        elsif catalog_item[:type] == "media"
+          header = [
+              ui.color('Name', :bold),
+              ui.color('Media ID', :bold)
+          ]
 
-        ui.msg ui.list(list, :columns_across, 2)
+          ui.msg "#{ui.color('Description:', :cyan)} #{catalog_item[:description]}"
+          list = header
+
+          list << (catalog_item[:name] || '')
+          list << (catalog_item[:id] || '')
+
+          ui.msg ui.list(list, :columns_across, 2)
+
+        elsif catalog_item[:type] == "unknown"
+
+          ui.msg "#{ui.color('Description:', :cyan)} #{catalog_item[:description]}"
+          ui.msg "#{ui.color('Unknown catalog item type', :bold)}"
+        end
       end
     end
   end

data/lib/chef/knife/vapp/vc_vapp_discard_suspended.rb

@@ -0,0 +1,44 @@
+#
+# Author:: Marco Betti (<m.betti@gmail.com>)
+# Copyright:: Copyright (c) 2014
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class Chef
+  class Knife
+    class VcVappDiscardSuspended < Chef::Knife
+      include Knife::VcCommon
+      include Knife::VcVappCommon
+
+      banner "knife vc vapp discard suspended [VAPP] (options)"
+
+      def run
+        $stdout.sync = true
+
+        vapp_arg = @name_args.shift
+
+        connection.login
+        vapp = get_vapp(vapp_arg)
+
+        task_id = connection.discard_suspend_state_vapp vapp[:id]
+
+        ui.msg "Discarding vApp suspended state..."
+        wait_task(connection, task_id)
+
+        connection.logout
+      end
+    end
+  end
+end

data/lib/chef/knife/vapp/vc_vapp_snapshot.rb

@@ -42,11 +42,11 @@ class Chef
 
         case command
           when :create
-            task_id = connection.create_snapshot vapp[:id]
+            task_id = connection.create_vapp_snapshot vapp[:id]
             ui.msg "vApp snapshot creation..."
             wait_task(connection, task_id)
           when :revert
-            task_id = connection.revert_snapshot vapp[:id]
+            task_id = connection.revert_vapp_snapshot vapp[:id]
             ui.msg "vApp snapshot revert..."
             wait_task(connection, task_id)
         end

data/lib/chef/knife/vc_commands.rb

@@ -51,6 +51,7 @@ require 'chef/knife/vapp/vc_vapp_suspend'
 require 'chef/knife/vapp/vc_vapp_clone'
 require 'chef/knife/vapp/vc_vapp_bootstrap'
 require 'chef/knife/vapp/vc_vapp_snapshot'
+require 'chef/knife/vapp/vc_vapp_discard_suspended'
 
 # VM
 require 'chef/knife/common/vc_vm_common'
@@ -65,6 +66,7 @@ require 'chef/knife/vm/vc_vm_start'
 require 'chef/knife/vm/vc_vm_stop'
 require 'chef/knife/vm/vc_vm_suspend'
 require 'chef/knife/vm/vc_vm_bootstrap'
+require 'chef/knife/vm/vc_vm_discard_suspended'
 
 # OVF
 require 'chef/knife/ovf/vc_ovf_upload'

data/lib/chef/knife/vm/vc_vm_discard_suspended.rb

@@ -0,0 +1,44 @@
+#
+# Author:: Marco Betti (<m.betti@gmail.com>)
+# Copyright:: Copyright (c) 2014
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class Chef
+  class Knife
+    class VcVmDiscardSuspended < Chef::Knife
+      include Knife::VcCommon
+      include Knife::VcVmCommon
+
+      banner "knife vc vm discard suspended [VM] (options)"
+
+      def run
+        $stdout.sync = true
+
+        vm_arg = @name_args.shift
+
+        connection.login
+        vm = get_vm(vm_arg)
+
+        task_id = connection.discard_suspend_state_vm vm[:id]
+
+        ui.msg "Discarding VM suspended state..."
+        wait_task(connection, task_id)
+
+        connection.logout
+      end
+    end
+  end
+end

data/lib/chef/knife/vm/vc_vm_show.rb

@@ -61,7 +61,8 @@ class Chef
 
         list << ['', '', ui.color('Networks', :bold), '']
         vm[:networks].each do |network, values|
-          list << [(network || ''), '']
+          # remove NetworkConnectionIndex from network hash key
+          list << [network.gsub(/^(.*)_[0-9]+$/, '\1') || '', '']
           values.each do |k, v|
             list << "  #{(pretty_symbol(k) || '')}"
             list << (v || '')

data/lib/knife-vcloud/version.rb

@@ -1,3 +1,3 @@
 module KnifeVCloud
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: knife-vcloud
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Stefano Tortarolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcloud-rest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
 description: A Knife plugin to create, list and manage vCloud servers
@@ -74,8 +74,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- README.md
 - LICENSE
+- README.md
 - lib/chef/knife/catalog/vc_catalog_item_show.rb
 - lib/chef/knife/catalog/vc_catalog_show.rb
 - lib/chef/knife/common/vc_bootstrap_common.rb
@@ -93,6 +93,7 @@ files:
 - lib/chef/knife/vapp/vc_vapp_clone.rb
 - lib/chef/knife/vapp/vc_vapp_create.rb
 - lib/chef/knife/vapp/vc_vapp_delete.rb
+- lib/chef/knife/vapp/vc_vapp_discard_suspended.rb
 - lib/chef/knife/vapp/vc_vapp_network_external.rb
 - lib/chef/knife/vapp/vc_vapp_network_internal.rb
 - lib/chef/knife/vapp/vc_vapp_reboot.rb
@@ -108,6 +109,7 @@ files:
 - lib/chef/knife/vdc/vc_vdc_show.rb
 - lib/chef/knife/vm/vc_vm_bootstrap.rb
 - lib/chef/knife/vm/vc_vm_config_guest.rb
+- lib/chef/knife/vm/vc_vm_discard_suspended.rb
 - lib/chef/knife/vm/vc_vm_network.rb
 - lib/chef/knife/vm/vc_vm_reboot.rb
 - lib/chef/knife/vm/vc_vm_reset.rb
@@ -128,19 +130,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A knife plugin for the VMWare vCloud API
 test_files: []
-has_rdoc: