knife-vcair 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06e8218ec3d029bc32086adb6b02bca62e2eaa52
-  data.tar.gz: 0dd36e3994dce157de1475725d3ffe7206b87001
+  metadata.gz: 199066f3714ad9369bf2d91bb8e4ac713a3c79fa
+  data.tar.gz: 8ad35c187f1daa6d90c52199a2f3a5642377fee8
 SHA512:
-  metadata.gz: 688e1e6c79e5f6621beb4a652de9f66fce9cce42093f5ca3a1d52f8596e573fe4a8f556a301357862ae49678b1530e24ee0a7b26406ff0840eb19ed22aeaabd2
-  data.tar.gz: f0bbbc861117fe14550f77be187d57d7a002629fd0d5c27224532f3175c4985aca18db3f93ddc9662516479ee9fb9c86d374c85421df7b5b3cfb00988fe22c94
+  metadata.gz: 634f1a0bfd8af10368833a76caa22daa54c79558fc1669994956252aaf01a73d726c27162f858b99f9c33b4c5b23fd287d350ec0ba707193cd5697af16175e90
+  data.tar.gz: 4ab56fa22e838aa95f10c009633d12e365756feb8ed7928a72a70771aa68a134d97ed7ef6e8d1ab966f40f9fdddb29fd56aa14ab6e05959159a170bb843164f5

data/README.md

@@ -7,19 +7,6 @@ Please refer to the [CHANGELOG](CHANGELOG.md) for version history and known issu
 
 # Installation #
 
-## Current Source Build Instructions: ##
-
-Then build and install this gem, run:
-
-    $ gem build knife-vcair.gemspec
-    $ gem install knife-vcair-0.6.X.gem
-
-or if you are using the Chef Development Kit (Chef DK), to install it run:
-
-    $ chef gem install knife-vcair-0.X.0.gem
-
-## Future Rubygems Instructions: ##
-
 This plugin is distributed as a Ruby Gem. To install it, run:
 
     $ gem install knife-vcair
@@ -43,12 +30,12 @@ easiest way to accomplish this is to create these entries in your
 If your knife.rb file will be checked into a SCM system (ie readable
 by others) you may want to read the values from environment variables.
 
-    knife[:vcair_api_host] = "#{ENV['VCAIR_API_URL']}"
-    knife[:vcair_username] = "#{ENV['VCAIR_USERNAME']}"
-    knife[:vcair_password] = "#{ENV['VCAIR_PASSWORD']}"
-    knife[:vcair_org] = "#{ENV['VCAIR_ORG']}"
+    knife[:vcair_api_host] = ENV['VCAIR_API_URL']
+    knife[:vcair_username] = ENV['VCAIR_USERNAME']
+    knife[:vcair_password] = ENV['VCAIR_PASSWORD']
+    knife[:vcair_org] = ENV['VCAIR_ORG']
 
-## VMware's vcair ##
+## VMware vCloud Air - Subscription ##
 
 If you are using VMware's hosted vcair the API URL is found by logging
 into the https://vchs.vmware.com, and clicking on your Dashboard's
@@ -65,6 +52,22 @@ https://vchs.vmware.com login, giving us the values:
     knife[:vcair_password] = 'VCAIRSECRET'
     knife[:vcair_org] = 'M511664989-4904'
 
+## VMware vCloud Air - OnDemand ##
+
+Your Org ID is commonly a UUID-formatted string and can be found in the URL
+after you log in to vCloud Air OnDemand (for example:
+https://us-virginia-1-4....?orgName=SOME_UUID_HERE) or it will be displayed
+next to your name in the upper-left corner of the vCloud Director web UI.  You
+can also ascertain your Org ID by following [these instructions](http://pubs.vmware.com/vca/index.jsp#com.vmware.vcloud.api.tenant.doc_511/GUID-D902143B-CF49-4508-99CA-2715B448F5E8.html).
+
+Additionally, you will need to override the API path as the API path between
+the subscription service and the OnDemand service are different.  You will need
+to set the following entry in your `knife.rb` file:
+
+    knife[:vcair_api_path] = '/api/compute/api'
+
+... or you may pass it in on the CLI using `--vcair-api-path`.
+
 # knife vcair subcommands #
 
 This plugin provides the following Knife subcommands. Specific command

data/knife-vcair.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README.md", "LICENSE" ]
-  s.authors     = ["Matt Ray", "Chris McClimans", "Taylor Carpenter", "Wavell Watson", "eth Thomas"]
+  s.authors     = ["Matt Ray", "Chris McClimans", "Taylor Carpenter", "Wavell Watson", "Seth Thomas"]
   s.email       = ["matt@chef.io", "wolfpack@vulk.co", "sthomas@chef.io"]
   s.homepage    = "https://github.com/chef-partners/knife-vcair"
   s.summary     = %q{VMware vcair support for Chef's Knife command}

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

@@ -27,6 +27,7 @@ class Chef
           Chef::Log.debug("vcair_username #{Chef::Config[:knife][:vcair_username]}")
           Chef::Log.debug("vcair_org #{Chef::Config[:knife][:vcair_org]}")
           Chef::Log.debug("vcair_api_host #{Chef::Config[:knife][:vcair_api_host]}")
+          Chef::Log.debug("vcair_api_path #{Chef::Config[:knife][:vcair_api_path]}")
           Chef::Log.debug("vcair_api_version #{Chef::Config[:knife][:vcair_api_version]}")
           Chef::Log.debug("vcair_show_progress #{Chef::Config[:knife][:vcair_show_progress]}")
 
@@ -42,7 +43,8 @@ class Chef
               :vcloud_director_password => Chef::Config[:knife][:vcair_password],
               :vcloud_director_host => Chef::Config[:knife][:vcair_api_host],
               :vcloud_director_api_version => Chef::Config[:knife][:vcair_api_version],
-              :vcloud_director_show_progress => false
+              :vcloud_director_show_progress => false,
+              :path => Chef::Config[:knife][:vcair_api_path]
             }
           }))
         end
@@ -50,7 +52,6 @@ class Chef
         def add_api_endpoint
           @auth_params.merge!({:vcair_api_host => Chef::Config[:knife][:vcair_api_host]}) unless Chef::Config[:knife][:api_endpoint].nil?
         end
-
       end
     end
   end

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

@@ -39,7 +39,12 @@ class Chef
            :long => "--vcair-api-host HOST",
            :description => "The VCAIR API endpoint",
            :proc => Proc.new { |u| Chef::Config[:knife][:vcair_api_host] = u }
-           
+
+           option :vcair_api_path,
+           :long => '--vcair-api-path PATH',
+           :description => 'The API service endpoint path, if different from the default "/api"',
+           :proc => Proc.new { |path| Chef::Config[:knife][:vcair_api_path] = path}
+
            option :vcair_org,
            :short => "-O ORG",
            :long => "--vcair-org ORG",
@@ -68,7 +73,7 @@ class Chef
            :long => "--vcair-show-progress BOOL",
            :description => "Show VCAIR API Progress",
            :default => false
-           
+
           end
         end
       end

data/lib/knife-vcair/version.rb

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

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: knife-vcair
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Matt Ray
 - Chris McClimans
 - Taylor Carpenter
 - Wavell Watson
-- eth Thomas
+- Seth Thomas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -250,8 +250,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: VMware vcair support for Chef's Knife command
-test_files: []
+test_files:
+- spec/integration/config/knife.rb
+- spec/integration/config/validation.pem
+- spec/integration/vchs_spec.rb
+- spec/spec_helper.rb
+- spec/unit/lib/chef/knife/vcair_server_create_spec.rb
+- spec/utils/knifeutils.rb
+- spec/utils/matchers.rb
+has_rdoc: true