dtk-client 0.5.14 → 0.5.15

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODg5ZmJhZjg4YWIxZGY3YmQ5OWY5OTE4NDFiYmFmOWMzNWQ2ODk3NQ==
-  data.tar.gz: !binary |-
-    OTQ3MGVkMDQ1NzY2YWJmNmNiZjJmZjFkMmVlYTA1Yjg4MzU5MzEzNg==
+SHA1:
+  metadata.gz: 988f4e6645da4af4e3907fe6ed38d8f457cd5d9c
+  data.tar.gz: ec2260330f913cf07d40f3ed455c8bb28003db04
 SHA512:
-  metadata.gz: !binary |-
-    ODdkYWU3NGJlZWFjNDgyOWJhODZkY2I2ZmFlNWMzYzYyODAwNzY4NDAxMjk4
-    MWFkMzc3ODdlYjJkZTI3ZWUxZGE5ZWVmZTk4NmZiODU0NGYzNWFjNzBmMTUx
-    MzRhZjJjNmIzODRhNmE1NjhkZTE5YjM4NjM1NzFmMWMzNGJkNjI=
-  data.tar.gz: !binary |-
-    MDVmOTQ4MDZiNjVjOWQxODg5M2Y4YzFiODMzY2VmN2Q1YzZlYWIxMDk5MjNl
-    YjhmNTRkNzRmMjQ2NGQ3NjcyOWIwZDNhNjVjZDVmNjQ4NmI4YmNlNzIzNzU4
-    MGE0YTk2MzI0MDYwMDFiODUxOTQzODlhYzkzMDIyOWZhMzQzMzE=
+  metadata.gz: 96f830afde5b005ffa1f1998f4cb206dcda17a1e1c227f44405110976ae9cbc5d181a3094ab7f9d744b178fa9de8184f32cfa750f56cc02ad83ba972c3b219f5
+  data.tar.gz: 880b7ab10bbba7a5c2d9e33a43a9cc0a5056c48c92b15659cf5de44649bdea9659ca3795f6f26789deb00b88bcd4f1bed4395ba12c8f49a9e52b30982b23d14e

data/lib/commands/common/thor/assembly_workspace.rb

@@ -817,6 +817,101 @@ module DTK::Client
       end
     end
 
+    def execute_tests_v2_aux(context_params)
+      assembly_or_workspace_id,node_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:node_id],method_argument_names)
+
+      execute_test_tries = 30
+      execute_test_sleep = 1
+
+      if !options['timeout'].nil?
+        begin
+          execute_test_tries = Integer(options['timeout'])
+        rescue
+          raise DTK::Client::DtkValidationError, "Timeout value is not valid"
+        end
+      end
+
+      #Get list of components on particular node
+      post_body = {
+        :assembly_id => assembly_or_workspace_id,
+        :node_id => node_id,
+        :subtype => "instance",
+        :about => "components"
+      }
+
+      response = post(rest_url("assembly/info_about"),post_body)
+
+      components = []
+      if !response['data'].nil?
+        response['data'].each do |c|
+          components << c['display_name']
+        end
+      end
+
+      #Filter out request per specific component
+      #Filter works for two types of component notation provided: node/component and component
+      if !options["component"].nil?
+          components.reject! do |c|
+            if options["component"].include? "/" 
+              c != options["component"] 
+            else
+              c.split("/").last != options["component"]
+            end
+          end
+      end
+      components = nil if components.empty?
+
+      post_body = {
+        :assembly_id => assembly_or_workspace_id,
+        :node_id => node_id,
+        :components => components
+      }  
+
+      response = post(rest_url("assembly/initiate_execute_tests_v2"),post_body)
+
+      raise DTK::Client::DtkValidationError, response.data(:errors).first if response.data(:errors)
+      return response unless response.ok?
+
+      action_results_id = response.data(:action_results_id)
+      end_loop, response, count, ret_only_if_complete = false, nil, 0, true
+
+      until end_loop do
+        post_body = {
+          :action_results_id => action_results_id,
+          :return_only_if_complete => ret_only_if_complete,
+          :disable_post_processing => false,
+          :sort_key => "module_name"
+        }
+        response = post(rest_url("assembly/get_action_results"),post_body)
+        count += 1
+        if count > execute_test_tries or response.data(:is_complete)
+          error_msg = ""
+          response.data(:results).each do |k,v|
+            unless v.nil?
+              error_msg << v['test_error'] if v.to_s.include?('test_error')
+            end
+          end
+          raise DTK::Client::DtkError, "Error while executing test script:\n" + error_msg + "Please fix test script with edit-component-module command and try again." unless error_msg.empty?
+          end_loop = true
+        else
+          #last time in loop return whetever is there
+          if count == execute_test_tries
+            ret_only_if_complete = false
+          end
+          sleep execute_test_sleep
+        end
+      end
+
+      if (response.data(:results).empty? && options['timeout'].nil?)
+        raise DTK::Client::DtkValidationError, "Could not finish execution of tests in default timeframe (#{execute_test_tries} seconds). Try again with passing --timeout TIMEOUT parameter" 
+      elsif (response.data(:results).empty? && !options['timeout'].nil?)
+        raise DTK::Client::DtkValidationError, "Could not finish execution of tests in set timeframe (#{execute_test_tries} seconds). Try again with increasing --timeout TIMEOUT parameter"
+      else
+        response.set_data(*response.data(:results))
+        response.render_table(:execute_tests_data_v2)
+      end
+    end
+
     def get_ps_aux(context_params)
       get_ps_tries = 6
       get_ps_sleep = 0.5

data/lib/commands/common/thor/common.rb

@@ -2,7 +2,7 @@ module DTK::Client
   module CommonMixin
    private
     #returns module_name,repo_url,branch,not_ok_response( only if error)
-    def workspace_branch_info(module_type,module_id,version,opts={})
+    def workspace_branch_info(module_type, module_id, version, opts={})
       if info = opts[:workspace_branch_info]
         [info[:module_name],info[:repo_url],info[:branch]]
       else
@@ -16,7 +16,7 @@ module DTK::Client
       end
     end
 
-    def get_workspace_branch_info_post_body(module_type,module_id,version_explicit,opts={})
+    def get_workspace_branch_info_post_body(module_type, module_id, version_explicit, opts={})
       id_field = "#{module_type}_id"
       post_body = {
         id_field => module_id
@@ -31,7 +31,7 @@ module DTK::Client
       post_body
     end
 
-    def get_remote_module_info_aux(module_type,module_id,remote_namespace,version=nil)
+    def get_remote_module_info_aux(module_type, module_id, remote_namespace, version=nil, module_refs_content=nil)
       id_field      = "#{module_type}_id"
       rsa_pub_value = SSHUtil.rsa_pub_key_content()
 
@@ -43,8 +43,11 @@ module DTK::Client
       }
       post_body.merge!(:version => version) if version
       post_body.merge!(:remote_namespace => remote_namespace) if remote_namespace
+      post_body.merge!(:module_ref_content => module_refs_content) if module_refs_content && !module_refs_content.empty?
 
-      post(rest_url("#{module_type}/get_remote_module_info"),post_body)
+      response = post(rest_url("#{module_type}/get_remote_module_info"),post_body)
+      RemoteDependencyUtil.print_dependency_warnings(response)
+      response
     end
 
   end

data/lib/commands/common/thor/edit.rb

@@ -80,7 +80,7 @@ module DTK::Client
           if file_to_edit
             "Would you like to commit changes to the file?"
           else
-            "Would you like to commit and push ALL the changes?"
+            "Would you like to commit ALL the changes?"
           end
         confirmed_ok = Console.confirmation_prompt(confirm_msg)
       end

data/lib/commands/common/thor/inventory_parser.rb

@@ -0,0 +1,78 @@
+dtk_require_from_base('configurator')
+module DTK::Client
+  module InventoryParserMixin
+   private
+
+    def parse_inventory_file(file_path)
+      ssh_creds_path = ::DTK::Client::Configurator::NODE_SSH_CREDENTIALS
+      ssh_creds_data = parse_ssh_credentials_file(ssh_creds_path)
+
+      hash = validate_inventory_data(file_path)
+
+      ret = Hash.new
+      defaults = hash["defaults"]
+
+      hash["nodes"].each do |node_name, data|
+        display_name = data["name"]||node_name
+        ssh_credentials = data["ssh_credentials"]||defaults["ssh_credentials"]
+
+        raise DtkValidationError, "Credentials for '#{ssh_credentials}' does not exist in credentials file '#{ssh_creds_path}'" unless ssh_creds_data.include?(ssh_credentials)
+        
+        ref = "physical--#{display_name}"
+        ret[ref] = {
+          :display_name => display_name,
+          :os_type => data["os_type"]||defaults["os_type"],
+          :managed => false,
+          :external_ref => {:type => "physical", :routable_host_address => node_name, :ssh_credentials => ssh_creds_data["#{ssh_credentials}"]}
+        }
+      end
+
+      ret
+    end
+
+    def parse_ssh_credentials_file(file_path)
+      begin
+        data = YAML.load_file(file_path)
+      rescue SyntaxError => e
+        raise DSLParsing::YAMLParsing.new("YAML parsing error #{e.message} in file", file_path)
+      end
+
+      data.each do |k,v|
+        raise DtkValidationError, "File: '#{file_path}'. Ssh credentials '#{k}' missing required field 'ssh_user'." unless v['ssh_user']
+        raise DtkValidationError, "File: '#{file_path}'. Ssh credentials '#{k}' should contain 'ssh_password' or 'sudo_password'." unless (v['ssh_password'] || v['sudo_password'])
+      end
+
+      data
+    end
+
+    def validate_inventory_data(file_path)
+      begin
+        data = YAML.load_file(file_path)
+      rescue SyntaxError => e
+        raise DSLParsing::YAMLParsing.new("YAML parsing error #{e.message} in file", file_path)
+      end
+
+      defaults = data['defaults']||[]
+      nodes = data['nodes']||[]
+
+      nodes.each do |k,v|
+        os_type = v['os_type']||defaults['os_type']
+        ssh_credentials = v['ssh_credentials']||defaults['ssh_credentials']
+
+        # os_type is required field and should be set through node specific fields or used from defaults
+        raise DtkValidationError, "Missing required field 'os_type' for node '#{k}'." unless os_type
+
+        # ssh_credentials is required field and should be set through node specific fields or used from defaults
+        raise DtkValidationError, "Missing required field 'ssh_credentials' for node '#{k}'." unless ssh_credentials
+
+        # currently we support 'ubuntu', 'centos, 'redhat' and 'debian' as os types and should be set through node specific field
+        # or used from defaults
+        raise DtkValidationError, "Os_type '#{os_type}' is not valid for node '#{k}'. Valid os types: #{ValidOsTypes}." unless ValidOsTypes.include?(os_type)
+      end
+
+      data
+    end
+    ValidOsTypes = ['ubuntu', 'centos', 'redhat', 'debian']
+
+  end
+end

data/lib/commands/common/thor/pull_from_remote.rb

@@ -15,7 +15,7 @@ module DTK::Client
         :remote_namespace? => remote_namespace,
         :rsa_pub_key? => rsa_pub_key
       )
-      response = post(rest_url("#{module_type}/get_remote_module_info"),post_body)      
+      response = post(rest_url("#{module_type}/get_remote_module_info"),post_body)
       return response unless response.ok?
       module_name = response.data(:module_name)
       remote_params = response.data_hash_form(:remote_repo_url,:remote_repo,:remote_branch)
@@ -23,7 +23,7 @@ module DTK::Client
 
       # check and import component module dependencies before importing service itself
       if (module_type == :service_module)
-        import_module_component_dependencies(module_id,remote_namespace) 
+        import_module_component_dependencies(module_id,remote_namespace)
       end
       # check whether a local module exists to determine whether pull from local clone or try to pull from server
       if Helper(:git_repo).local_clone_exists?(module_type,module_name,version)
@@ -44,12 +44,13 @@ module DTK::Client
     def import_module_component_dependencies(module_id,remote_namespace=nil)
       post_body = PostBody.new(
         :service_module_id => module_id,
-        :remote_namespace? => remote_namespace
+        :remote_namespace? => remote_namespace,
+        :rsa_pub_key => SSHUtil.rsa_pub_key_content()
       )
       response = post(rest_url("service_module/resolve_pull_from_remote"),post_body)
 
       print "Resolving dependencies please wait ... "
-      
+
       if (response.ok? && !(missing_components = response.data(:missing_modules)).empty?)
         puts " New dependencies found, Installing."
 
@@ -58,9 +59,12 @@ module DTK::Client
       else
         puts 'Done.'
       end
+
+      RemoteDependencyUtil.print_dependency_warnings(response)
+      nil
     end
 
-    module PullFromRemote 
+    module PullFromRemote
       extend CommandBase
       def self.perform_locally(cmd_obj,module_type,module_id,module_name,remote_params)
         opts = remote_params
@@ -71,8 +75,8 @@ module DTK::Client
         end
 
         return response
-        
-        # removing this for now, because we will use push-clone-changes as part of pull-from-remote command 
+
+        # removing this for now, because we will use push-clone-changes as part of pull-from-remote command
         # post_body = {
         #   id_field(module_type) => module_id,
         #   :commit_sha => response.data[:commit_sha],
@@ -91,12 +95,12 @@ module DTK::Client
         }
         post_body.merge!(:version => remote_params[:version]) if remote_params[:version]
         response = post rest_url("#{module_type}/pull_from_remote"), post_body
-        
-        
+
+
         puts "You have successfully pulled code on server instance." if response.ok?
         response
       end
-      
+
       def self.id_field(module_type)
         "#{module_type}_id"
       end

data/lib/commands/common/thor/push_to_remote.rb

@@ -2,28 +2,7 @@ dtk_require_common_commands('thor/common')
 module DTK::Client
   module PushToRemoteMixin
 
-    ##
-    #
-    # module_type: will be :component_module or :service_module
-    # def push_to_remote_aux(module_type,module_id, module_name,remote_namespace,version=nil)
     def push_to_remote_aux(remote_module_info, module_type)
-      # commented out, because we perform this check before calling 'push_to_remote_aux' from service-module/component-module
-      # id_field = "#{module_type}_id"
-
-      # rsa_pub_value = SSHUtil.rsa_pub_key_content()
-
-      # post_body = {
-      #   id_field => module_id,
-      #   :rsa_pub_key => rsa_pub_value,
-      #   :access_rights => "rw",
-      #   :action => "push"
-      # }
-      # post_body.merge!(:version => version) if version
-      # post_body.merge!(:remote_namespace => remote_namespace) if remote_namespace
-
-      # response = post(rest_url("#{module_type}/get_remote_module_info"),post_body)
-      # return response unless response.ok?
-
       returned_module_name = remote_module_info.data(:module_name)
       version = remote_module_info.data(:version)
 

data/lib/commands/thor/account.rb

@@ -69,7 +69,7 @@ module DTK::Client
     desc "set-password", "Change password for your dtk user account"
     def set_password(context_params)
       old_pass_prompt, old_pass, new_pass_prompt, confirm_pass_prompt = nil
-      cred_file = ::DTK::Client::Configurator.CRED_FILE
+      cred_file = ::DTK::Client::Configurator::CRED_FILE
       old_pass = parse_key_value_file(cred_file)[:password]
       username = parse_key_value_file(cred_file)[:username]
 
@@ -105,7 +105,7 @@ module DTK::Client
 
     desc "list-ssh-keys", "Show list of key pairs that your account profile has saved"
     def list_ssh_keys(context_params)
-      username  = parse_key_value_file(::DTK::Client::Configurator.CRED_FILE)[:username]
+      username  = parse_key_value_file(::DTK::Client::Configurator::CRED_FILE)[:username]
       post_body = {:username => username}
 
       response = post rest_url("account/list_ssh_keys"), post_body