dtk-client 0.7.4.1 → 0.7.5

data/lib/commands/thor/library.rb

@@ -1,3 +1,4 @@
+# TODO: Marked for removal [Haris]
 module DTK::Client
 
   class Library < CommandBaseThor

data/lib/commands/thor/node.rb

@@ -1,6 +1,5 @@
 dtk_require_common_commands('thor/task_status')
 dtk_require_common_commands('thor/set_required_attributes')
-dtk_require_common_commands('thor/test_action_agent')
 
 module DTK::Client
   class Node < CommandBaseThor
@@ -10,7 +9,6 @@ module DTK::Client
     no_tasks do
       include TaskStatusMixin
       include SetRequiredParamsMixin
-      include TestActionAgent
     end
 
     def self.pretty_print_cols()
@@ -96,39 +94,6 @@ module DTK::Client
        post rest_url("node/info"), post_body
     end
 
-    desc "NODE-NAME/ID test-action-agent BASH-COMMAND-LINE", "Run bash command on test action agent"
-    def test_action_agent(context_params)
-      response = test_agent_aux(context_params)
-      return response unless response.ok?
-
-      # this I will fix to have more clear output
-      data = response.data(:results)
-
-      datas  = data.values.first['results']
-      errors = data.values.first['errors']
-
-
-      datas.each do |data|
-        OsUtil.print("Command: #{data['description']}, status: #{data['status']}", :yellow)
-        if data['stdout'] && !data['stdout'].empty?
-          print data['stdout']
-        end
-
-        if data['stderr'] && !data['stderr'].empty?
-          print data['stderr']
-        end
-      end
-
-      if errors && !errors.empty?
-        puts; puts;
-        OsUtil.print('Some errors have been detected', :white)
-        errors.each_with_index { |err, index| OsUtil.print("#{index+1}. #{err}", :red) }
-      end
-
-
-      return nil
-    end
-
     desc "NODE-NAME/ID ssh REMOTE-USER [-i PATH-TO-PEM]","SSH into node, optional parameters are path to indentity file."
     method_option "--identity-file",:aliases => '-i',:type => :string, :desc => "Identity-File used for connection, if not provided default is used", :banner => "IDENTITY-FILE"
     def ssh(context_params)
@@ -164,7 +129,7 @@ module DTK::Client
 
         connection_string = "#{remote_user}@#{public_dns}"
 
- 
+
         ssh_command = nil
 
         if identity_file_location

data/lib/commands/thor/node_template.rb

@@ -21,7 +21,7 @@ module DTK::Client
     desc "list", "List all node templates."
     method_option :all, :type => :boolean, :default => false
     method_option "target_identifier",:aliases => "-t" ,
-      :type => :string, 
+      :type => :string,
       :banner => "TARGET-IDENTIFIER",
       :desc => "Name or ID of desired target"
     def list(context_params)
@@ -46,10 +46,10 @@ module DTK::Client
     end
 
     desc "add-node-template NODE-TEMPLATE-NAME [-t TARGET-NAME/ID] --os OS --image-id IMAGE-ID --size SIZE[,SIZE2,..]", "Add new node template"
-    method_option "target",:aliases => "-t" 
+    method_option "target",:aliases => "-t"
     method_option "os"
-    method_option "image-id",:aliases => "-i" 
-    method_option "size",:aliases => "-s" 
+    method_option "image-id",:aliases => "-i"
+    method_option "size",:aliases => "-s"
     def add_node_template(context_params)
       node_template_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
       size_array = options[:size] && options[:size].split(',')
@@ -73,49 +73,6 @@ module DTK::Client
       post rest_url("node/delete_node_template"), post_body
     end
 
-=begin
-  #Not implemented yet
-    desc "NODE-TEMPLATE-NAME/ID info", "Get information about given node template."
-    method_option :list, :type => :boolean, :default => false
-    def info(context_params)
-      node_template_id = context_params.retrieve_arguments([:node_template_id!],method_argument_names)
-      data_type = :node
-
-      post_body = {
-        :node_id => node_template_id,
-        :subtype => 'template'
-      }
-      response = post rest_url("node/info"), post_body
-
-      response.render_table(data_type) unless options.list?
-
-      return response
-    end
-=end
-
-=begin
-    #TODO: move to form desc "NODE-TEMPLATE-NAME/ID stage [INSTANCE-NAME]"
-    #will then have to reverse arguments
-    desc "stage NODE-TEMPLATE-NAME [INSTANCE-NAME]", "Stage node template in target."
-    method_option "in-target",:aliases => "-t" ,
-      :type => :numeric, 
-      :banner => "TARGET-ID",
-      :desc => "Target (id) to create node instance in" 
-    def stage(context_params)
-      node_template_id, name = context_params.retrieve_arguments([:option_1!, :option_2],method_argument_names)
-      post_body = {
-        :node_template_identifier => node_template_id
-      }
-      post_body.merge!(:target_id => options["in-target"]) if options["in-target"]
-      post_body.merge!(:name => name) if name
-      response = post rest_url("node/stage"), post_body
-      # when changing context send request for getting latest node_templates instead of getting from cache
-      @@invalidate_map << :node_template
-      @@invalidate_map << :node
-
-      response
-    end
-=end
   end
 end
 

data/lib/commands/thor/service.rb

@@ -17,7 +17,6 @@ DEBUG_SLEEP_TIME = DTK::Configuration.get(:debug_task_frequency)
 
 module DTK::Client
   class Service < CommandBaseThor
-
     no_tasks do
       include TaskStatusMixin
       include SetRequiredParamsMixin
@@ -45,8 +44,6 @@ module DTK::Client
         assembly_id
       end
 
-
-
     end
 
     def self.whoami()
@@ -169,7 +166,7 @@ module DTK::Client
           ]
         },
         :identifier_only => {
-          :node      => [
+          :node => [
             ['add-component',"add-component COMPONENT","# Add a component to the node."],
             ['delete-component',"delete-component COMPONENT-NAME [-y]","# Delete component from service's node"],
             ['info',"info","# Return info about node instance belonging to given workspace."],
@@ -211,7 +208,6 @@ module DTK::Client
       destroy_and_reset_nodes_aux(context_params)
     end
 
-
     desc "SERVICE-NAME/ID start [NODE-NAME]", "Starts all the service nodes. A single node can be selected."
     def start(context_params)
       start_aux(context_params)
@@ -251,32 +247,53 @@ module DTK::Client
       Response::Ok.new()
     end
 
-    # TODO: DTK-1986 introduces the hidden optional terms [WORKFLOW-ACTION [WORKFLOW-PARAMS]]
-    # desc "SERVICE-NAME/ID converge [-m COMMIT-MSG] [WORKFLOW-ACTION [WORKFLOW-PARAMS]]", "Converge service instance."
+    desc "SERVICE-NAME/ID execute-workflow WORKFLOW-ACTION [WORKFLOW-PARAMS] [-m COMMIT-MSG]", "Execute workflow."
+    method_option "commit_msg",:aliases => "-m" ,
+      :type => :string,
+      :banner => "COMMIT-MSG",
+      :desc => "Commit message"
+    def execute_workflow(context_params)
+      converge(context_params)
+    end
     desc "SERVICE-NAME/ID converge [-m COMMIT-MSG]", "Converge service instance."
     method_option "commit_msg",:aliases => "-m" ,
       :type => :string,
       :banner => "COMMIT-MSG",
       :desc => "Commit message"
     def converge(context_params)
-      converge_aux(context_params)
+      opts = Hash.new
+      if context_params.pure_cli_mode
+        opts.merge!(:mode => :stream)
+      end
+      converge_aux(context_params,opts)
+    end
+
+    desc "SERVICE-NAME/ID execute-action COMPONENT-INSTANCE [ACTION-NAME [ACTION-PARAMS]]", "Converge the component or execute tha action on the component."
+    def execute_action(context_params)
+      execute_ad_hoc_action_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID list-actions [--summary]", "List the actions defined on components in the service instance."
+    method_option :summary, :aliases => '-s', :type => :boolean, :default => false
+    def list_actions(context_params)
+      list_ad_hoc_actions_aux(context_params)
     end
 
     desc "SERVICE-NAME/ID push-assembly-updates [NAMESPACE:SERVICE-MODULE-NAME/ASSEMBLY-NAME]", "Push changes made to this service instance to the designated assembly; default is parent assembly."
     def push_assembly_updates(context_params)
-      assembly_id, qualified_assembly_name = context_params.retrieve_arguments([:service_id!,:option_1],method_argument_names)
+      assembly_id, qualified_assembly_name = context_params.retrieve_arguments([:service_id!, :option_1], method_argument_names)
       service_module_name, assembly_template_name =
         if qualified_assembly_name
           if qualified_assembly_name =~ /(^[^\/]*)\/([^\/]*$)/
             [$1,$2]
           else
-            raise DtkError,"The term (#{qualified_assembly_name}) must have form SERVICE-MODULE-NAME/ASSEMBLY-NAME"
+            raise DtkError, "The term (#{qualified_assembly_name}) must have form SERVICE-MODULE-NAME/ASSEMBLY-NAME"
           end
         else
-          [nil,nil]
+          [nil, nil]
         end
 
-      response = promote_assembly_aux(:update,assembly_id, service_module_name, assembly_template_name,{:use_module_namespace=>true})
+      response = promote_assembly_aux(:update, assembly_id, service_module_name, assembly_template_name, :use_module_namespace => true)
       return response unless response.ok?
       @@invalidate_map << :assembly
       Response::Ok.new()
@@ -300,9 +317,15 @@ module DTK::Client
       edit_module_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID edit-workflow", "Edit service's workflow."
+    desc "SERVICE-NAME/ID create-workflow WORKFLOW-NAME [--from BASE-WORKFLOW-NAME]", "Create a new workflow in the service instance."
+    method_option :from, :type => :string
+    def create_workflow(context_params)
+      edit_or_create_workflow_aux(context_params,:create => true,:create_from => options.from)
+    end
+
+    desc "SERVICE-NAME/ID edit-workflow [WORKFLOW-NAME]", "Edit a workflow in the service instance."
     def edit_workflow(context_params)
-      edit_workflow_aux(context_params)
+      edit_or_create_workflow_aux(context_params)
     end
 
     desc "SERVICE-NAME/ID edit-attributes", "Edit service's attributes."
@@ -341,21 +364,18 @@ TODO: will put in dot release and will rename to 'extend'
       return response
     end
 
-    desc "ASSEMBLY-NAME/ID possible-extensions", "Lists the possible extensions to the assembly"
-    def possible_extensions(context_params)
-      assembly_id = context_params.retrieve_arguments([:assembly_id!],method_argument_names)
-
-      post_body = {
-        :assembly_id => assembly_id
-      }
-      response = post(rest_url("assembly/list_possible_add_ons"),post_body)
-      response.render_table(:service_add_on)
-    end
 =end
 
-    desc "SERVICE-NAME/ID task-status [--wait] [--summarize]", "Get the task status of the running or last running service task."
-    method_option :wait, :type => :boolean, :default => false
+    # TODO: deprecating --wait since subsubsumed by mode
+    # desc "SERVICE-NAME/ID task-status [--wait] [--summarize]", "Get the task status of the running or last running service task."
+    desc "SERVICE-NAME/ID task-status [--mode MODE] [--summarize]", "Get the task status of the running or last running service task."
+    method_option "mode",:aliases => "-m" ,
+      :type => :string,
+      :banner => "MODE",
+      :desc => "Mode in which task status display; one of [stream,snapshot,refresh]; default is 'snapshot'"
     method_option :summarize, :type => :boolean, :default => false, :aliases => '-s'
+    # leaving --wait in for backwards compatability
+    method_option :wait, :type => :boolean, :default => false
     def task_status(context_params)
       task_status_aw_aux(context_params)
     end
@@ -409,11 +429,16 @@ TODO: will put in dot release and will rename to 'extend'
       print_includes_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID workflow-info", "Get the structure of the workflow associated with service."
+    desc "SERVICE-NAME/ID workflow-info [WORKFLOW-NAME]", "Get the contents of a workflow associated with the service."
     def workflow_info(context_params)
       workflow_info_aux(context_params)
     end
 
+    desc "SERVICE-NAME/ID workflow-list", "List the workflows associated with the service."
+    def workflow_list(context_params)
+      workflow_list_aux(context_params)
+    end
+
     desc "list","List services."
     def list(context_params)
       assembly_id, node_id, component_id, attribute_id, about = context_params.retrieve_arguments([:service_id,:node_id,:component_id,:attribute_id,:option_1],method_argument_names)
@@ -484,22 +509,6 @@ TODO: will put in dot release and will rename to 'extend'
       list_remote_module_diffs(context_params)
     end
 
-    # desc "ASSEMBLY-NAME/ID list-attribute-mappings SERVICE-LINK-NAME/ID", "List attribute mappings associated with service link"
-    # def list_attribute_mappings(context_params)
-    #   post_body = Helper(:service_link).post_body_with_id_keys(context_params,method_argument_names)
-    #   post rest_url("assembly/list_attribute_mappings"), post_body
-    # end
-
-    #desc "ASSEMBLY-NAME/ID list-smoketests","List smoketests on asssembly"
-    #def list_smoketests(context_params)
-    #  assembly_id = context_params.retrieve_arguments([:assembly_id!],method_argument_names)
-    #
-    #  post_body = {
-    #    :assembly_id => assembly_id
-    #  }
-    #  post rest_url("assembly/list_smoketests"), post_body
-    #end
-
     desc "SERVICE-NAME/ID grant-access USER-ACCOUNT PUB-KEY-NAME [PATH-TO-PUB-KEY] [--nodes NODE-NAMES]", "Grants ssh access to user account USER-ACCOUNT for nodes in service instance"
     method_option :nodes, :type => :string, :default => nil
     def grant_access(context_params)
@@ -571,8 +580,10 @@ TODO: will put in dot release and will rename to 'extend'
       response
     end
 
-    desc "SERVICE-NAME/ID set-attribute ATTRIBUTE-NAME [VALUE] [-u]", "(Un)Set attribute value. The option -u will unset the attribute's value."
+    desc "SERVICE-NAME/ID set-attribute ATTRIBUTE-NAME [VALUE] [-u] [-c] [-n]", "(Un)Set attribute value. The option -u will unset the attribute's value, -c to set component-attribute, -n to set node-attribute."
     method_option :unset, :aliases => '-u', :type => :boolean, :default => false
+    method_option :component_attribute, :aliases => '-c', :type => :boolean, :default => false
+    method_option :node_attribute, :aliases => '-n', :type => :boolean, :default => false
     def set_attribute(context_params)
       set_attribute_aux(context_params)
     end
@@ -626,7 +637,7 @@ TODO: will put in dot release and will rename to 'extend'
 
     # only supported at node-level
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
-    desc "HIDE_FROM_BASE add-component NODE-NAME COMPONENT", "Add a component to the service."
+    desc "SERVICE-NAME/ID add-component COMPONENT", "Add a component to the service."
     def add_component(context_params)
       response = create_component_aux(context_params)
 
@@ -690,7 +701,7 @@ TODO: will put in dot release and will rename to 'extend'
     end
 
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
-    desc "HIDE_FROM_BASE delete-component COMPONENT-NAME [-y]","Delete component from the service."
+    desc "SERVICE-NAME/ID delete-component COMPONENT-NAME [-y]","Delete component from the service."
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_component(context_params)
       response = delete_component_aux(context_params)

data/lib/commands/thor/service_module.rb

@@ -181,9 +181,9 @@ module DTK::Client
     # end
 
     # version_method_option
-    desc "install NAMESPACE/REMOTE-SERVICE-MODULE-NAME [-y] [-i]", "Install remote service module into local environment. -y will automatically clone component modules. -i will ignore component import error."
+    desc "install NAMESPACE/REMOTE-SERVICE-MODULE-NAME [-y]", "Install remote service module into local environment. -y will automatically clone component modules."
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
-    method_option :ignore, :aliases => '-i', :type => :boolean, :default => false
+    # method_option :ignore, :aliases => '-i', :type => :boolean, :default => false
     method_option :update_none, :type => :boolean, :default => false
     def install(context_params)
       response = install_module_aux(context_params)
@@ -367,53 +367,6 @@ module DTK::Client
       edit_module_aux(context_params)
     end
 
-    # desc "SERVICE-MODULE-NAME/ID create-version NEW-VERSION", "Snapshot current state of service module as a new version"
-    # def create_version(context_params)
-    #   service_module_id,version = context_params.retrieve_arguments([:service_module_id!,:option_1!],method_argument_names)
-    #   post_body = {
-    #     :service_module_id => service_module_id,
-    #     :rsa_pub_key => SSHUtil.rsa_pub_key_content()
-    #   }
-    #   response = post rest_url("service_module/versions"), post_body
-    #   return response unless response.ok?
-    #   versions = (response.data.first && response.data.first['versions'])||Array.new
-    #   if versions.include?(version)
-    #     return Response::Error::Usage.new("Version #{version} exists already")
-    #   end
-
-    #   service_module_name = get_service_module_name(service_module_id)
-    #   module_location = OsUtil.module_location(:service_module,service_module_name,version)
-    #   if File.directory?(module_location)
-    #     raise DtkError, "Target service module directory for version #{version} (#{module_location}) exists already; it must be deleted and this comamnd retried"
-    #   end
-
-    #   post_body = {
-    #     :service_module_id => service_module_id,
-    #     :version => version
-    #   }
-
-    #   response = post rest_url("service_module/create_new_version"), post_body
-    #   return response unless response.ok?
-
-    #   internal_trigger = omit_output = true
-    #   clone_aux(:service_module,service_module_name,version,internal_trigger,omit_output)
-    # end
-
-    # desc "SERVICE-MODULE-NAME/ID set-component-module-version COMPONENT-MODULE-NAME VERSION", "Set the version of the component module to use in the service module's assemblies"
-    # def set_component_module_version(context_params)
-    #   service_module_id,component_module_id,version = context_params.retrieve_arguments([:service_module_id!,:option_1!,:option_2!],method_argument_names)
-    #   post_body = {
-    #     :service_module_id => service_module_id,
-    #     :component_module_id => component_module_id,
-    #     :version => version
-    #   }
-    #   response = post rest_url("service_module/set_component_module_version"), post_body
-    #   @@invalidate_map << :service_module
-    #   return response unless response.ok?()
-    #   module_name,commit_sha,workspace_branch = response.data(:module_name,:commit_sha,:workspace_branch)
-    #   Helper(:git_repo).synchronize_clone(:service_module,module_name,commit_sha,:local_branch=>workspace_branch)
-    # end
-
     # TODO: put in two versions, one that creates empty and anotehr taht creates from local dir; use --empty flag
     desc "import [NAMESPACE:]SERVICE-MODULE-NAME", "Create new service module from local clone"
     def import(context_params)

data/lib/commands/thor/target.rb

@@ -5,7 +5,7 @@ module DTK::Client
   class Target < CommandBaseThor
     include Commands
     include InventoryParserMixin
-    
+
     def self.pretty_print_cols()
       PPColumns.get(:target)
     end
@@ -48,7 +48,7 @@ module DTK::Client
 
       import_type = parsed_source[1]
       path = parsed_source[2]
-      
+
       raise DtkValidationError, "We do not support '#{import_type}' as import source at the moment. Valid sources: #{ValidImportTypes}" unless ValidImportTypes.include?(import_type)
 
       post_body = {:target_id => target_id}
@@ -57,7 +57,7 @@ module DTK::Client
         inventory_data = parse_inventory_file(path)
         post_body.merge!(:inventory_data => inventory_data)
       end
-      
+
       response  = post rest_url("target/import_nodes"), post_body
       return response unless response.ok?
 
@@ -142,12 +142,12 @@ module DTK::Client
       provider_id, target_id, about = context_params.retrieve_arguments([:provider_id, :target_id, :option_1],method_argument_names||="")
 
       if target_id.nil?
-        post_body = { 
+        post_body = {
           :subtype   => :instance,
           :parent_id => provider_id
         }
         response  = post rest_url("target/list"), post_body
-           
+
         response.render_table(:target)
       else
         post_body = {
@@ -176,8 +176,8 @@ module DTK::Client
       target_id  = context_params.retrieve_arguments([:option_1!],method_argument_names)
 
       # No -y options since risk is too great
-      return unless Console.confirmation_prompt("Are you sure you want to delete target '#{target_id}' (all assemblies/nodes that belong to this target will be deleted as well)'"+'?')
-     
+      return unless Console.confirmation_prompt("Are you sure you want to delete target '#{target_id}' (all services/nodes that belong to this target will be deleted as well)'"+'?')
+
       post_body = {
         :target_id => target_id,
         :type      => 'instance'