dtk-client 0.5.14 → 0.5.15

data/lib/commands/thor/component_module.rb

@@ -17,6 +17,7 @@ module DTK::Client
   class ComponentModule < CommandBaseThor
 
     DEFAULT_COMMIT_MSG = "Initial commit."
+    PULL_CATALOGS = ["dtkn"]
 
     def self.valid_children()
       # [:"component-template"]
@@ -48,7 +49,7 @@ module DTK::Client
             :"component" => [
               ["list","list","# List all component templates."],
               ["list-attributes","list-attributes", "# List all attributes for given component."]
-            ]            
+            ]
             #:attribute => [
             #  ['list',"list","List attributes for given component"]
             #]
@@ -140,7 +141,7 @@ module DTK::Client
         return unless Console.confirmation_prompt("Are you sure you want to delete component-module #{version.nil? ? '' : 'version '}'#{component_module_name}#{version.nil? ? '' : ('-' + version.to_s)}' and all items contained in it"+'?')
       end
 
-      response = 
+      response =
         if options.purge?
           opts = {:module_name => component_module_name}
           if version then opts.merge!(:version => version)
@@ -157,10 +158,10 @@ module DTK::Client
       }
       action = (version ? "delete_version" : "delete")
       post_body[:version] = version if version
-      
+
       response = post(rest_url("component_module/#{action}"), post_body)
       return response unless response.ok?
-      
+
       # when changing context send request for getting latest modules instead of getting from cache
       @@invalidate_map << :component_module
 
@@ -189,7 +190,7 @@ module DTK::Client
         :attribute_value => value,
         :component_module_id => component_module_id
       }
-      
+
       post rest_url("attribute/set"), post_body
     end
 
@@ -201,7 +202,7 @@ TODO: might deprecate
     desc "COMPONENT-MODULE-NAME/ID info", "Get information about given component module."
     def info(context_params)
       component_module_id = context_params.retrieve_arguments([:component_module_id!],method_argument_names)
-      
+
       post_body = {
         :component_module_id => component_module_id
       }
@@ -231,7 +232,7 @@ TODO: might deprecate
       post_body        = (remote ? { :rsa_pub_key => SSHUtil.rsa_pub_key_content() } : {:detail_to_include => ["remotes"]})
       post_body[:diff] = options.diff? ? options.diff : {}
       response         = post rest_url("component_module/#{action}"),post_body
-      
+
       return response unless response.ok?
       response.render_table()
     end
@@ -276,7 +277,7 @@ TODO: might deprecate
       git_import = context_params.get_forwarded_options()[:git_import] if context_params.get_forwarded_options()
       name_option = git_import ? :option_2! : :option_1!
       module_name = context_params.retrieve_arguments([name_option],method_argument_names)
-      
+
       # first check that there is a directory there and it is not already a git repo, and it ha appropriate content
       response = Helper(:git_repo).check_local_dir_exists_with_content(:component_module,module_name)
       return response unless response.ok?
@@ -292,7 +293,7 @@ TODO: might deprecate
 
       repo_url,repo_id,module_id,branch = response.data(:repo_url,:repo_id,:module_id,:workspace_branch)
       response = Helper(:git_repo).initialize_client_clone_and_push(:component_module,module_name,branch,repo_url,module_directory)
-      
+
       return response unless response.ok?
       repo_obj,commit_sha =  response.data(:repo_obj,:commit_sha)
 
@@ -311,7 +312,7 @@ TODO: might deprecate
       # which will always be called from this method
       # if error = response.data(:dsl_parsed_info)
       #   dsl_parsed_message = ServiceImporter.error_message(module_name, error)
-      #   DTK::Client::OsUtil.print(dsl_parsed_message, :red) 
+      #   DTK::Client::OsUtil.print(dsl_parsed_message, :red)
       # end
 
       dsl_created_info = response.data(:dsl_created_info)
@@ -325,9 +326,9 @@ TODO: might deprecate
       # we push clone changes anyway, user can change and push again
       context_params.add_context_to_params(module_name, :"component-module", module_id)
       response = push(context_params, true)
-      
+
       if git_import
-        response[:module_id] = module_id 
+        response[:module_id] = module_id
         response.add_data_value!(:external_dependencies,external_dependencies) if external_dependencies
       end
 
@@ -355,14 +356,14 @@ TODO: might deprecate
       reparse_aux(module_location)
     end
 =end
-    
+
     # TODO: put in back support for:desc "import REMOTE-MODULE[,...] [LIBRARY-NAME/ID]", "Import remote component module(s) into library"
     # TODO: put in doc REMOTE-MODULE havs namespace and optionally version information; e.g. r8/hdp or r8/hdp/v1.1
     # if multiple items and failire; stops on first failure
 #    desc "install [NAMESPACE/]REMOTE-COMPONENT-MODULE-NAME [-r DTK-REPO-MANAGER]","Install remote component module into local environment"
     desc "install [NAMESPACE/]REMOTE-COMPONENT-MODULE-NAME","Install remote component module into local environment"
     method_option "repo-manager",:aliases => "-r" ,
-      :type => :string, 
+      :type => :string,
       :banner => "REPO-MANAGER",
       :desc => "DTK Repo Manager from which to resolve requested module."
     def install(context_params)
@@ -374,7 +375,7 @@ TODO: might deprecate
       do_not_raise = context_params.get_forwarded_options()[:do_not_raise] if context_params.get_forwarded_options()
       ignore_component_error = context_params.get_forwarded_options()[:ignore_component_error] if context_params.get_forwarded_options()
       additional_message = context_params.get_forwarded_options()[:additional_message] if context_params.get_forwarded_options()
-      
+
       remote_namespace, local_module_name = get_namespace_and_name(remote_module_name)
       if clone_dir = Helper(:git_repo).local_clone_dir_exists?(:component_module,local_module_name,version)
         message = "Component module's directory (#{clone_dir}) exists on client. To install this needs to be renamed or removed"
@@ -390,16 +391,16 @@ TODO: might deprecate
       post_body.merge!(:do_not_raise => do_not_raise) if do_not_raise
       post_body.merge!(:ignore_component_error => ignore_component_error) if ignore_component_error
       post_body.merge!(:additional_message => additional_message) if additional_message
-      
+
       response = post rest_url("component_module/import"), post_body
       return response unless response.ok?
 
-      return response if response.data(:does_not_exist)      
+      return response if response.data(:does_not_exist)
       module_name,repo_url,branch,version = response.data(:module_name,:repo_url,:workspace_branch,:version)
-      
+
       if error = response.data(:dsl_parsed_info)
         dsl_parsed_message = ServiceImporter.error_message(module_name, error)
-        DTK::Client::OsUtil.print(dsl_parsed_message, :red) 
+        DTK::Client::OsUtil.print(dsl_parsed_message, :red)
       end
 
       response = ""
@@ -417,21 +418,21 @@ TODO: might deprecate
     desc "import-git GIT-SSH-REPO-URL COMPONENT-MODULE-NAME", "Create new local component module by importing from provided git repo URL"
     def import_git(context_params)
       git_repo_url, module_name = context_params.retrieve_arguments([:option_1!, :option_2!],method_argument_names)
-      
+
       # Create component module from user's input git repo
       response = Helper(:git_repo).create_clone_with_branch(:component_module, module_name, git_repo_url)
-      
+
       # Raise error if git repository is invalid
       # raise DtkError,"Git repository URL '#{git_repo_url}' is invalid." unless response.ok?
       return response unless response.ok?
 
       # Remove .git directory to rid of git pointing to user's github
       FileUtils.rm_rf("#{response['data']['module_directory']}/.git")
-      
+
       context_params.forward_options({:git_import => true})
       # Reuse module create method to create module from local component_module
       create_response = import(context_params)
-       
+
       if create_response.ok?
         if external_dependencies = create_response.data(:external_dependencies)
           inconsistent = external_dependencies["inconsistent"]
@@ -445,11 +446,11 @@ TODO: might deprecate
         delete(context_params,:force_delete => true, :no_error_msg => true)
         return create_response
       end
-      
+
       Response::Ok.new()
     end
 
-=begin 
+=begin
     => DUE TO DEPENDENCY TO PUPPET GEM WE OMMIT THIS <=
     desc "import-puppet-forge PUPPET-FORGE-MODULE-NAME", "Imports puppet module from puppet forge via puppet gem"
     def import_puppet_forge(context_params)
@@ -483,14 +484,14 @@ TODO: might deprecate
 
       if error = response.data(:dsl_parsed_info)
         dsl_parsed_message = ServiceImporter.error_message(module_name, error)
-        DTK::Client::OsUtil.print(dsl_parsed_message, :red) 
+        DTK::Client::OsUtil.print(dsl_parsed_message, :red)
       end
 
       #TODO: need to check if local clone directory exists
       Helper(:git_repo).create_clone_with_branch(:component_module,module_name,repo_url,branch,version)
     end
 =end
-    
+
     desc "delete-from-catalog [NAMESPACE/]REMOTE-COMPONENT-MODULE-NAME [-y]", "Delete the component module from the DTK Network catalog"
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_from_catalog(context_params)
@@ -522,8 +523,8 @@ TODO: might deprecate
     #   }
 
     #   response = post rest_url("component_module/export"), post_body
-      
-    #   return response         
+
+    #   return response
     # end
 
     desc "COMPONENT-MODULE-NAME/ID publish [[NAMESPACE/]REMOTE-COMPONENT-MODULE-NAME]", "Publish component module to remote repository."
@@ -537,21 +538,22 @@ TODO: might deprecate
       }
 
       response = post rest_url("component_module/export"), post_body
-      
-      return response         
+      return response unless response.ok?
+      DTK::Client::RemoteDependencyUtil.print_dependency_warnings(response, "Module has been successfully published!")
+      nil
     end
 
     desc "COMPONENT-MODULE-NAME/ID pull-dtkn [-n NAMESPACE]", "Update local component module from remote repository."
     method_option "namespace",:aliases => "-n",
-      :type => :string, 
+      :type => :string,
       :banner => "NAMESPACE",
       :desc => "Remote namespace"
-    def pull_dtkn(context_params)     
+    def pull_dtkn(context_params)
       component_module_id, component_module_name = context_params.retrieve_arguments([:component_module_id!,:component_module_name,:option_1],method_argument_names)
       catalog = 'dtkn'
       version = options["version"]
 
-      raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PullCatalogs}" unless catalog
+      raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PULL_CATALOGS}" unless catalog
 
       if component_module_name.to_s =~ /^[0-9]+$/
         component_module_id = component_module_name
@@ -573,18 +575,19 @@ TODO: might deprecate
       #elsif catalog.to_s.eql?("origin")
         #needs to be implemented
       else
-        raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PullCatalogs}"
+        raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PULL_CATALOGS}"
       end
     end
 
-    PullCatalogs = ["dtkn"]
 
+=begin
     desc "COMPONENT-MODULE-NAME/ID chown REMOTE-USER", "Set remote module owner"
     method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
     def chown(context_params)
       component_module_id, remote_user = context_params.retrieve_arguments([:component_module_id!,:option_1!],method_argument_names)
       chown_aux(component_module_id, remote_user, options.namespace)
     end
+=end
 
     desc "COMPONENT-MODULE-NAME/ID chmod PERMISSION-SELECTOR", "Update remote permissions e.g. ug+rw , user and group get RW permissions"
     method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
@@ -675,7 +678,7 @@ TODO: might deprecate
     ##
     #
     # internal_trigger: this flag means that other method (internal) has trigger this.
-    #                   This will change behaviour of method in such way that edit will not be 
+    #                   This will change behaviour of method in such way that edit will not be
     #                   triggered after it.
     #
     #desc "COMPONENT-MODULE-NAME/ID clone [-v VERSION] [-n]", "Locally clone component module and component files. Use -n to skip edit prompt"
@@ -687,7 +690,7 @@ TODO: might deprecate
       component_module_id = context_params.retrieve_arguments([:component_module_id!],method_argument_names)
       module_name         = context_params.retrieve_arguments([:component_module_name],method_argument_names)
       version             = thor_options["version"]
-      internal_trigger    = true if thor_options['skip_edit']   
+      internal_trigger    = true if thor_options['skip_edit']
 
       # if this is not name it will not work, we need module name
       if module_name.to_s =~ /^[0-9]+$/
@@ -729,7 +732,7 @@ TODO: might deprecate
     desc "COMPONENT-MODULE-NAME/ID push", "Push changes from local copy of component module to server"
      version_method_option
      method_option "message",:aliases => "-m" ,
-       :type => :string, 
+       :type => :string,
        :banner => "COMMIT-MSG",
        :desc => "Commit message"
      # hidden option for dev
@@ -752,11 +755,11 @@ TODO: might deprecate
 #    desc "COMPONENT-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [-m COMMIT-MSG]", "Push changes from local copy of component module to remote repository (dtkn)."
     desc "COMPONENT-MODULE-NAME/ID push-dtkn [-n NAMESPACE]", "Push changes from local copy of component module to remote repository (dtkn)."
     method_option "message",:aliases => "-m" ,
-      :type => :string, 
+      :type => :string,
       :banner => "COMMIT-MSG",
       :desc => "Commit message"
     method_option "namespace",:aliases => "-n",
-        :type => :string, 
+        :type => :string,
         :banner => "NAMESPACE",
         :desc => "Remote namespace"
     #hidden option for dev
@@ -821,7 +824,7 @@ TODO: might deprecate
       modules_path    = OsUtil.module_clone_location()
       module_location = "#{modules_path}/#{module_name}#{version && "-#{version}"}"
 
-      # check if there is repository cloned 
+      # check if there is repository cloned
       if File.directory?(module_location)
         list_diffs_aux(:component_module, component_module_id, options.remote?, version)
       else

data/lib/commands/thor/library.rb

@@ -68,7 +68,8 @@ module DTK::Client
     def import_service_module(context_params)
       library_id, service_modules = context_params.retrieve_arguments([:library_id, :option_1!],method_argument_names)
       post_body = {
-       :remote_module_name => service_modules
+        :remote_module_name => service_modules,
+        :rsa_pub_key => SSHUtil.rsa_pub_key_content()
       }
       post_body.merge!(:library_id => library_id) if library_id
 

data/lib/commands/thor/provider.rb

@@ -18,7 +18,7 @@ module DTK::Client
         :command_only => {
           :target => [
             ['delete-target',"delete-target TARGET-IDENTIFIER","# Deletes target"],
-            ['list-targets',"list-targets","# Lists available targets."]
+            ['list',"list","# Lists available targets."]
 
           ]
         },
@@ -35,37 +35,36 @@ module DTK::Client
       return Provider.valid_children().include?(name_of_sub_context.to_sym)
     end
 
-    desc "create-provider PROVIDER-TYPE:PROVIDER-NAME --keypair KEYPAIR --security-group SECURITY-GROUP [--no-bootstrap]", "Create provider"
+    desc "create-provider PROVIDER-TYPE:PROVIDER-NAME [--keypair KEYPAIR] [--security-group SECURITY-GROUP] [--bootstrap]", "Create provider"
     method_option :keypair,    :type => :string
     method_option :security_group, :type => :string
-    method_option :no_bootstrap, :type => :boolean, :default => false
+    method_option :bootstrap, :type => :boolean, :default => false
     def create_provider(context_params)
       composed_provider_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
 
       provider_type, provider_name = decompose_provider_type_and_name(composed_provider_name)
-      keypair, security_group = context_params.retrieve_thor_options([:keypair!, :security_group!], options)
-
-      result = DTK::Shell::InteractiveWizard::interactive_user_input(
-        {'IAAS Credentials' => { :type => :group, :options => [
-              {:key    => {}},
-              {:secret => {}}
-          ]}})
-      
-      access_key, secret_key = result['IAAS Credentials'].values_at(:key, :secret)
+      iaas_properties = Hash.new
+      #TODO: daat-driven check if legal provider type and then what options needed depending on provider type
+      unless provider_type.eql?('physical')
+        keypair, security_group = context_params.retrieve_thor_options([:keypair!, :security_group!], options)
+        iaas_properties.merge!(:keypair_name => keypair,:security_group => security_group)
+        result = DTK::Shell::InteractiveWizard::interactive_user_input(
+          {'IAAS Credentials' => { :type => :group, :options => [
+                {:key    => {}},
+                {:secret => {}}
+            ]}})
+        access_key, secret_key = result['IAAS Credentials'].values_at(:key, :secret)
+        iaas_properties.merge!(:key => access_key,:secret => secret_key)
+      end
 
       # Remove sensitive readline history
       OsUtil.pop_readline_history(2)
 
-      post_body = {
-        :iaas_properties => {
-          :key     => access_key,
-          :secret  => secret_key,
-          :keypair_name => keypair,
-          :security_group => security_group
-        },
-          :provider_name => provider_name,
-          :iaas_type => provider_type.downcase,
-          :no_bootstrap => options.no_bootstrap?
+      post_body =  {
+        :iaas_properties => iaas_properties,
+        :provider_name => provider_name,
+        :iaas_type => provider_type.downcase,
+        :no_bootstrap => ! options.bootstrap?
       }
 
       response = post rest_url("target/create_provider"), post_body
@@ -98,31 +97,38 @@ module DTK::Client
 
     desc "list","Lists available providers."
     def list(context_params)
-      response  = post rest_url("target/list"), { :subtype => :template }
-      response.render_table(:provider)
+      if context_params.is_there_command?(:"target")
+        list_targets(context_params)
+      else
+        response  = post rest_url("target/list"), { :subtype => :template }
+        response.render_table(:provider)
+      end
     end
 
     #TODO: Aldin; wanted to name this list_targets, but did not know how to do so w/o conflicting with desc "PROVIDER-ID/NAME list-targets
-    desc "list-all-targets","Lists all targets for all providers."
-    def list_all_targets(context_params)
-      response  = post rest_url("target/list"), { :subtype => :instance }
-      response.render_table(:target)
-    end
+    # Aldin: moved this to target base context (target>list)
+    #
+    # desc "list-all-targets","Lists all targets for all providers."
+    # def list_all_targets(context_params)
+    #   response  = post rest_url("target/list"), { :subtype => :instance }
+    #   response.render_table(:target)
+    # end
 
     desc "PROVIDER-ID/NAME list-targets", "List targets"
     def list_targets(context_params)
       provider_id = context_params.retrieve_arguments([:provider_id!],method_argument_names)
 
-      response  = post rest_url("target/list"), { :subtype => :instance, :parent_id => provider_id }
-
+      response = post rest_url("target/list"), { :subtype => :instance, :parent_id => provider_id }
       response.render_table(:target)
     end
 
-    desc "set-default-target TARGET-NAME/ID","Sets the default target."
-    def set_default_target(context_params)
-      target_id = context_params.retrieve_arguments([:option_1!],method_argument_names)
-      post rest_url("target/set_default"), { :target_id => target_id }
-    end
+    # Aldin: moved to target base context (target>set-default-target)
+    #
+    # desc "set-default-target TARGET-NAME/ID","Sets the default target."
+    # def set_default_target(context_params)
+    #   target_id = context_params.retrieve_arguments([:option_1!],method_argument_names)
+    #   post rest_url("target/set_default"), { :target_id => target_id }
+    # end
 
     desc "delete-provider PROVIDER-IDENTIFIER [-y]","Deletes targets provider"
     method_option :force, :aliases => '-y', :type => :boolean, :default => false

data/lib/commands/thor/service.rb

@@ -46,7 +46,7 @@ module DTK::Client
       end
 
 
-      
+
     end
 
     def self.whoami()
@@ -66,24 +66,24 @@ module DTK::Client
     end
 
     # using extended_context when we want to use autocomplete from other context
-    # e.g. we are in assembly/apache context and want to create-component we will use extended context to add 
+    # e.g. we are in assembly/apache context and want to create-component we will use extended context to add
     # component-templates to autocomplete
     def self.extended_context()
       {
         :context => {
           :add_component => "component_template",
           :create_node => "node_template",
-          :add_component_dependency => "component_template"  
+          :add_component_dependency => "component_template"
         },
         :command => {
           :edit_component_module => {
-            :endpoint => "assembly", 
-            :url => "assembly/info_about", 
+            :endpoint => "assembly",
+            :url => "assembly/info_about",
             :opts => {:subtype=>"instance", :about=>"modules"}
           },
           :push_component_module_updates => {
-            :endpoint => "assembly", 
-            :url => "assembly/info_about", 
+            :endpoint => "assembly",
+            :url => "assembly/info_about",
             :opts => {:subtype=>"instance", :about=>"modules"}
           }
         }
@@ -143,8 +143,9 @@ TODO: overlaps with different meaning
             ['delete',"delete COMPONENT-NAME/ID [-y] ","# Delete component from workspace."],
             ['list-components',"list-components","# List components."]
           ],
-          :utils => [ 
+          :utils => [
             ['execute-tests',"execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]","# Execute tests. --component filters execution per component, --timeout changes default execution timeout."],
+            ['execute-tests-v2',"execute-tests-v2 [--component COMPONENT-NAME] [--timeout TIMEOUT]","# Execute tests. --component filters execution per component, --timeout changes default execution timeout."],
             ['get-netstats',"get-netstats","# Get netstats."],
             ['get-ps',"get-ps [--filter PATTERN]","# Get ps."],
             ['grep',"grep LOG-PATH NODE-ID-PATTERN GREP-PATTERN [--first]","# Grep log from multiple nodes. --first option returns first match (latest log entry)."],
@@ -213,19 +214,19 @@ TODO: overlaps with different meaning
 
       Response::Ok.new()
     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" 
+      :desc => "Commit message"
     def converge(context_params)
       converge_aux(context_params)
     end
 
     desc "SERVICE-NAME/ID push-assembly-updates [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 =~ /(^[^\/]*)\/([^\/]*$)/
@@ -275,7 +276,7 @@ TODO: overlaps with different meaning
 TODO: will put in dot release and will rename to 'extend'
     desc "ASSEMBLY-NAME/ID add EXTENSION-TYPE [-n COUNT]", "Adds a sub assembly template to the assembly"
     method_option "count",:aliases => "-n" ,
-      :type => :string, #integer 
+      :type => :string, #integer
       :banner => "COUNT",
       :desc => "Number of sub-assemblies to add"
     def add_node(context_params)
@@ -296,7 +297,7 @@ 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" 
+    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)
 
@@ -377,7 +378,7 @@ TODO: will put in dot release and will rename to 'extend'
             data_type = :task
           else
             raise_validation_error_method_usage('list')
-        end 
+        end
       end
 
       post_body = {
@@ -389,7 +390,7 @@ TODO: will put in dot release and will rename to 'extend'
       post_body.merge!(:detail_to_include => detail_to_include) if detail_to_include
       rest_endpoint = "assembly/info_about"
 
-      if context_params.is_last_command_eql_to?(:attribute)        
+      if context_params.is_last_command_eql_to?(:attribute)
         raise DTK::Client::DtkError, "Not supported command for current context level." if attribute_id
         about, data_type = get_type_and_raise_error_if_invalid(about, "attributes", ["attributes"])
       elsif context_params.is_last_command_eql_to?(:component)
@@ -411,7 +412,7 @@ TODO: will put in dot release and will rename to 'extend'
           data_type = :assembly
           post_body = { :subtype  => 'instance', :detail_level => 'nodes' }
           rest_endpoint = "assembly/list"
-        end  
+        end
       end
 
       post_body[:about] = about
@@ -446,12 +447,12 @@ TODO: will put in dot release and will rename to 'extend'
 
       path_to_rsa_pub_key ||= SSHUtil.default_rsa_pub_key_path()
       rsa_pub_key_content = SSHUtil.read_and_validate_pub_key(path_to_rsa_pub_key)
-    
+
       response = post_file rest_url("assembly/initiate_ssh_pub_access"), {
         :agent_action => :grant_access,
-        :system_user => system_user, 
-        :rsa_pub_name => rsa_key_name, 
-        :rsa_pub_key => rsa_pub_key_content, 
+        :system_user => system_user,
+        :rsa_pub_name => rsa_key_name,
+        :rsa_pub_key => rsa_pub_key_content,
         :assembly_id => service_id,
         :target_nodes => options.nodes
       }
@@ -469,10 +470,10 @@ TODO: will put in dot release and will rename to 'extend'
     method_option :nodes, :type => :string, :default => nil
     def revoke_access(context_params)
       service_id, system_user, rsa_key_name = context_params.retrieve_arguments([:service_id!,:option_1!, :option_2!],method_argument_names)
-      
-      response = post_file rest_url("assembly/initiate_ssh_pub_access"), { 
+
+      response = post_file rest_url("assembly/initiate_ssh_pub_access"), {
         :agent_action => :revoke_access,
-        :system_user => system_user, 
+        :system_user => system_user,
         :rsa_pub_name => rsa_key_name,
         :assembly_id => service_id,
         :target_nodes => options.nodes
@@ -487,12 +488,12 @@ TODO: will put in dot release and will rename to 'extend'
       nil
     end
 
-    desc "SERVICE-NAME/ID list-ssh-access", "List SSH access for each of the nodes" 
+    desc "SERVICE-NAME/ID list-ssh-access", "List SSH access for each of the nodes"
     def list_ssh_access(context_params)
       service_id = context_params.retrieve_arguments([:service_id!],method_argument_names)
 
-      response = post_file rest_url("assembly/list_ssh_access"), { 
-        :assembly_id => service_id 
+      response = post_file rest_url("assembly/list_ssh_access"), {
+        :assembly_id => service_id
       }
 
       response.render_table(:ssh_access)
@@ -538,7 +539,7 @@ TODO: will put in dot release and will rename to 'extend'
       }
 
       response = post rest_url("assembly/delete"), post_body
-         
+
       # when changing context send request for getting latest assemblies instead of getting from cache
       @@invalidate_map << :service
       @@invalidate_map << :assembly
@@ -624,7 +625,7 @@ TODO: will put in dot release and will rename to 'extend'
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_component(context_params)
       response = delete_component_aux(context_params)
-      
+
       @@invalidate_map << :service
       @@invalidate_map << :service_node
       @@invalidate_map << :service_node_component
@@ -640,12 +641,20 @@ TODO: will put in dot release and will rename to 'extend'
 
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
     desc "HIDE_FROM_BASE execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]", "Execute tests. --component filters execution per component, --timeout changes default execution timeout"
-    method_option :component, :type => :string, :desc => "Component name" 
+    method_option :component, :type => :string, :desc => "Component name"
     method_option :timeout, :type => :string, :desc => "Timeout"
     def execute_tests(context_params)
       execute_tests_aux(context_params)
     end
 
+    # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
+    desc "HIDE_FROM_BASE execute-tests-v2 [--component COMPONENT-NAME] [--timeout TIMEOUT]", "Execute tests. --component filters execution per component, --timeout changes default execution timeout"
+    method_option :component, :type => :string, :desc => "Component name"
+    method_option :timeout, :type => :string, :desc => "Timeout"
+    def execute_tests_v2(context_params)
+      execute_tests_v2_aux(context_params)
+    end
+
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
     desc "HIDE_FROM_BASE get-ps [--filter PATTERN]", "Get ps"
     method_option :filter, :type => :boolean, :default => false, :aliases => '-f'
@@ -673,7 +682,7 @@ TODO: will put in dot release and will rename to 'extend'
       grep_aux(context_params)
     end
 
-    
+
   end
 end