Merge pull request #12 from adreyer/BOLT-372

 (BOLT-372) Add plan commands

Author: adreyer

lib/orchestrator_client.rb

@@ -55,7 +55,7 @@ def post(location, body)
     req.body = body.to_json
     res = https.request(req)
 
-    if res.code != "202"
+    unless Set.new(["202", "200"]).include? res.code
       raise OrchestratorClient::ApiError.make_error_from_response(res)
     end
 
@@ -75,7 +75,12 @@ def new_job(options, type = :deploy)
   end
 
   def run_task(options)
-    job = OrchestratorClient::Job.new(self, options, :task)
+    if options[:plan_job] || options['plan_job']
+      type = :plan_task
+    else
+      type = :task
+    end
+    job = OrchestratorClient::Job.new(self, options, type)
     job.start
     job.wait
     job.nodes['items']

lib/orchestrator_client/command.rb

@@ -4,18 +4,33 @@ def initialize(https)
     @https = https
   end
 
-  def task(options = {})
+  def deploy(options = {})
     raise ArgumentError, 'Must pass options as a hash' unless options.is_a? Hash
-    @https.post("command/task", options)
+    @https.post("command/deploy", options)
   end
 
-  def deploy(options = {})
+  def plan_start(options = {})
     raise ArgumentError, 'Must pass options as a hash' unless options.is_a? Hash
-    @https.post("command/deploy", options)
+    @https.post("command/plan_start", options)
+  end
+
+  def plan_finish(options = {})
+    raise ArgumentError, 'Must pass options as a hash' unless options.is_a? Hash
+    @https.post("command/plan_finish", options)
+  end
+
+  def plan_task(options = {})
+    raise ArgumentError, 'Must pass options as a hash' unless options.is_a? Hash
+    @https.post("command/plan_task", options)
   end
 
   def stop(job_number)
     data = {"job" => "#{job_number}"}
     @https.post("command/stop",data)
   end
+
+  def task(options = {})
+    raise ArgumentError, 'Must pass options as a hash' unless options.is_a? Hash
+    @https.post("command/task", options)
+  end
 end

lib/orchestrator_client/job.rb

@@ -26,6 +26,8 @@ def start
       result = @client.command.deploy(options)
     when :task
       result = @client.command.task(options)
+    when :plan_task
+      result = @client.command.plan_task(options)
     end
 
     @job_name = result['job']['name']