knife-vcair 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199066f3714ad9369bf2d91bb8e4ac713a3c79fa
-  data.tar.gz: 8ad35c187f1daa6d90c52199a2f3a5642377fee8
+  metadata.gz: f5fb6ce00fc091f2234646d471b17580de7f7597
+  data.tar.gz: f16f1691a223cd4ee3928a2f91b1b1c8e42e2e8c
 SHA512:
-  metadata.gz: 634f1a0bfd8af10368833a76caa22daa54c79558fc1669994956252aaf01a73d726c27162f858b99f9c33b4c5b23fd287d350ec0ba707193cd5697af16175e90
-  data.tar.gz: 4ab56fa22e838aa95f10c009633d12e365756feb8ed7928a72a70771aa68a134d97ed7ef6e8d1ab966f40f9fdddb29fd56aa14ab6e05959159a170bb843164f5
+  metadata.gz: d46cd5af03fb0f55e725fb599c155d67d0a1cb678103e979ef1f01a032a9e5a60420823355792622960f302be327d67aa9906325626a826f9d44a19cea43b3b0
+  data.tar.gz: f7a032cc18dd22499b2c6727e5957ec451ec3dbd3c72f690e292a1c198410acc11ed6eae8c367c0f2391314fb47e7067fd0db617374cc02da33f92e85cbfa82a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.0
+* added better exception handling for looking up vCloud Air networks, including adding ability to specify the network by ID instead of name
+
+## 0.7.0
+* added a vcair_api_path option, necessary for when using vCloud Air OnDemand #28
+
 ## 0.6.1
 * Fixed network selection for creating servers #23
 * Update bootstrap scripts #17

data/README.md

@@ -152,18 +152,6 @@ List the available vcair templates or images that may be used for deploying VMs.
 
 Lists the networks available to the current vcair organization.
 
-## knife vcair nat list ##
-
-**TODO** List the Network Address Translation (NAT) rules modifying the source/destination IP Addresses or packets arriving to and leaving from the vcair organization network.
-
-## knife vcair firewall list ##
-
-**TODO** The list of firewall rules configured for the current vcair organization network.
-
-## knife vcair ip list ##
-
-**TODO** The list of public IP Addresses provided and allocated for the current vcair organization network.
-
 
 # Notes #
 

data/lib/chef/knife/cloud/vcair_server_create_options.rb

@@ -49,10 +49,16 @@ class Chef
 
            option :vcair_net,
            :long => "--vcair-net NETWORKNAME",
-           :description => "Your VCAIR NETWORK",
+           :description => "vCloud Air Network Name",
            :default => nil,
            :proc => Proc.new { |key| Chef::Config[:knife][:vcair_net] = key }
 
+           option :vcair_net_id,
+           :long => "--vcair-net-id NETWORKNAME",
+           :description => "vCloud Air Network ID - take preference over --vcair-net",
+           :default => nil,
+           :proc => Proc.new { |key| Chef::Config[:knife][:vcair_net_id] = key }
+
             # TODO - Define your cloud specific create server options here. Example.
             # Vcair Server create params.
             # option :private_network,

data/lib/chef/knife/vcair_helpers.rb

@@ -13,7 +13,7 @@ class Chef
         def create_service_instance
           VcairService.new
         end
-        
+
         def org
           @org ||= @service.connection.organizations.get_by_name(
                      config_value(:vcair_org))
@@ -26,14 +26,32 @@ class Chef
             @vdc ||= org.vdcs.first
           end
         end
-        
+
         def net
-          if config_value(:vcair_net)
+          if config_value(:vcair_net_id)
+            Chef::Log.debug("Looking up network by ID: #{config_value(:vcair_net_id)}")
+            begin
+              @net ||= org.networks.get(config_value(:vcair_net_id))
+            rescue => e
+              raise "Unable to locate network ID #{config_value(:vcair_net_id)} -- #{e.message}"
+            end
+          elsif config_value(:vcair_net)
+            Chef::Log.debug("Looking up network by name: #{config_value(:vcair_net)}")
             @net ||= org.networks.get_by_name(config_value(:vcair_net))
           else
             # Grab first non-isolated (bridged, natRouted) network
+            Chef::Log.debug("No network specified, trying to locate one...")
             @net ||= org.networks.find { |n| n if !n.fence_mode.match("isolated") }
           end
+
+          raise "No network found - available networks: #{available_networks.join(', ')}" if @net.nil?
+
+          Chef::Log.debug("Using network #{@net.name} (#{@net.id})")
+          @net
+        end
+
+        def available_networks
+          org.networks.map { |network| "#{network.name} (#{network.id})"}
         end
 
         def template
@@ -43,11 +61,11 @@ class Chef
             cat.catalog_items.get_by_name(config_value(:image))
           end.compact.first
         end
-        
+
         def vapp
           @vapp ||= vdc.vapps.get_by_name(config_value(:chef_node_name))
         end
-        
+
         def vm
           @vm ||= vapp.vms.find {|v| v.vapp_name == config_value(:chef_node_name)}
         end
@@ -57,13 +75,13 @@ class Chef
             n if n[:networkName].match(net.name)
           end
         end
-        
+
 
         def config_value(key)
           key = key.to_sym
           Chef::Config[:knife][key] || config[key]
         end
-        
+
         def get_id(value)
           value['id']
         end
@@ -73,7 +91,7 @@ class Chef
             puts "#{ui.color(label, color)}: #{value}"
           end
         end
-        
+
         def validate!(keys=[:vcair_username, :vcair_password, :vcair_api_host, :vcair_org, :vcair_api_version])
           errors = []
           keys.each do |k|
@@ -82,12 +100,12 @@ class Chef
               errors << "You did not provide a valid '#{pretty_key}' value. Please set knife[:#{k}] in your knife.rb or pass as an option."
             end
           end
-          
+
           if errors.each{|e| ui.error(e)}.any?
             exit 1
           end
         end
-        
+
       end
     end
   end

data/lib/knife-vcair/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Vcair
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-vcair
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Matt Ray
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: VMware vcair support for Chef's Knife command