dtk-client 0.6.8 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTNhNzQ0NThlZmEwYTM4MTBjY2VmYWRkMjM1MTNiOTk1NGFiNWEwYQ==
+    ODdhNDYxZmYwMjY5YjVlODJhNzA4YjAzNGZlYTJiMWUzNDU4ZTQ3MQ==
   data.tar.gz: !binary |-
-    NTlmMzU3OTZmYTdkNjVhMWVlYThiNWE5YmVlOGE1NDQxNGJlYjhlZA==
+    YWU3YjdjMjgxNjk4MDMwZDJkMjM5NjhkM2QxNmUwNjQxYTQyMWFiNA==
 SHA512:
   metadata.gz: !binary |-
-    OTc0YjFhOTUzOGVmMmViMjNiMzY4MzcyZWFkMTA4M2NhY2YyZDgyMThhMThm
-    MjJlMzVlNWU4NTI3YWNjODI5YmJhMzE1YjE3ZGVhODc4NjAzZmFhZTI1OTE4
-    ZDEwMzQzMDJlM2M3MmY3YmQ4MjUwZjQ5OTY0ZGVlZGQ1OGZlNDk=
+    YjgxYTk4MWM2ODA2OWNiNjI5NjQwYjJlZGI0MWY5MTMzNjgzMGUyZjExZTZi
+    OWUxMmQwMjFlYmEyMWI0ZGE1OWQ1YmMyOTI0MzljMDU4MDI0YzM2NmY0ZWEw
+    ZjY0YTliNzRmMGZjMmMzYzg4YzM5ZDFiNzNkZTBiNWY1OTM3NjQ=
   data.tar.gz: !binary |-
-    ZjIwY2M4NWFiYmUwOWUwNDU5MGQ4ODBmNWQ1NDgwZjA3MDcyM2NjOTY3OGVi
-    YTVmOGIyMmI3YmY4OWUxNDI0OTQyODY4M2VmZmE3YTQzNzgwYzBkNDZjZDNi
-    OWUyMzkzYTYyMWY5NTIyMTE1YjkyNjRiNzM0MmUwZDg0ZWVhNzE=
+    MDMyYzU2YWZmYzc4NjQ0YTI2YTIzN2E2OTllMjRhMDZlM2Q5ODU2ZGY1ZTI5
+    M2Q2OTY3NWY5ODJiOGMxZWY3MzZiZDdhZWViZTZiNGMyYzNlM2Q0YmQ0ODkx
+    N2NlNzZhYWE5Y2UzYWIzOGJjZDc3ZWUzYzFmZDcyYmNhNzdkMTM=

data/bin/dtk

@@ -7,7 +7,11 @@ require File.expand_path('../lib/client', File.dirname(__FILE__))
 require File.expand_path('../lib/configurator', File.dirname(__FILE__))
 require File.expand_path('../lib/parser/adapters/thor',    File.dirname(__FILE__))
 require File.expand_path('../lib/shell/context', File.dirname(__FILE__))
-require File.expand_path('../lib/shell/domain', File.dirname(__FILE__))
+require File.expand_path('../lib/shell/domain/context_entity', File.dirname(__FILE__))
+require File.expand_path('../lib/shell/domain/active_context', File.dirname(__FILE__))
+require File.expand_path('../lib/shell/domain/context_params', File.dirname(__FILE__))
+require File.expand_path('../lib/shell/domain/override_tasks', File.dirname(__FILE__))
+require File.expand_path('../lib/shell/domain/shadow_entity', File.dirname(__FILE__))
 require File.expand_path('../lib/commands/thor/account', File.dirname(__FILE__))
 require File.expand_path('../lib/shell/parse_monkey_patch', File.dirname(__FILE__))
 require File.expand_path('../lib/shell/help_monkey_patch', File.dirname(__FILE__))

data/lib/auxiliary.rb

@@ -10,7 +10,6 @@ module DTK
       end
     end
 
-    #TODO: probably move this
     class PostBody < Hash
       def initialize(raw={})
         super()

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

@@ -78,6 +78,7 @@ module DTK::Client
 
       post_body.merge!(:assembly_template_name => assembly_template_name) if assembly_template_name
       post_body.merge!(:use_module_namespace => true) if opts[:use_module_namespace]
+      post_body.merge!(:description => opts[:description]) if opts[:description]
       response = post rest_url("assembly/promote_to_template"), post_body
       return response unless response.ok?()
 
@@ -103,6 +104,11 @@ module DTK::Client
       response.render_table(:violation)
     end
 
+    def print_includes_aux(context_params)
+      assembly_or_workspace_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID],method_argument_names)
+      response = post rest_url("assembly/print_includes"),:assembly_id => assembly_or_workspace_id
+    end
+
     def converge_aux(context_params)
       assembly_or_workspace_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID],method_argument_names)
 
@@ -270,7 +276,7 @@ module DTK::Client
 
     def task_status_aw_aux(context_params)
       assembly_or_workspace_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID],method_argument_names)
-      response = task_status_aux(assembly_or_workspace_id,:assembly,options.wait?)
+      response = task_status_aux(assembly_or_workspace_id,:assembly,:wait => options.wait?,:summarize => options.summarize?)
 
       # TODO: Hack which is necessery for the specific problem (DTK-725), we don't get proper error message when there is a timeout doing converge
       unless response == true
@@ -285,6 +291,15 @@ module DTK::Client
       response
     end
 
+    def task_action_detail_aw_aux(context_params)
+      assembly_or_workspace_id, message_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID, :option_1!], method_argument_names)
+      post_body = {
+        :assembly_id => assembly_or_workspace_id,
+        :message_id => message_id
+      }
+      post rest_url("assembly/task_action_detail"), post_body
+    end
+
     def link_attributes_aux(context_params)
       assembly_id, target_attr_term, source_attr_term = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:option_1!,:option_2!],method_argument_names)
       post_body = {
@@ -521,6 +536,9 @@ module DTK::Client
       assembly_or_workspace_id, node_id, component_id, attribute_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID, :node_id, :component_id, :attribute_id],method_argument_names)
       is_json_return = context_params.get_forwarded_options[:json_return] || false
 
+      # return only node group info if triggered from node group
+      is_node_group = true if context_params.shadow_entity_name == 'node_group'
+
       post_body = {
         :assembly_id => assembly_or_workspace_id,
         :node_id     => node_id,
@@ -530,6 +548,7 @@ module DTK::Client
         :json_return => is_json_return
       }
 
+      post_body.merge!(:only_node_group_info => true) if is_node_group
       resp = post rest_url("assembly/info"), post_body
 
       # if waiting for json response we do not need to render rest of data

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

@@ -17,7 +17,7 @@ module DTK::Client
         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}"
         row = ret[ref] = {
           :display_name => display_name,

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

@@ -1,13 +1,4 @@
 dtk_require_from_base("util/os_util")
-
-# For Aldin: dont thing these are needed although this may be stylistic, which is fine; just putting here to make where the include
-#  include ReparseMixin 
-# ..
-# are comming from
-dtk_require_common_commands('thor/push_clone_changes')
-dtk_require_common_commands('thor/reparse')
-dtk_require_common_commands('thor/common')
-
 dtk_require_from_base('commands')
 dtk_require_from_base("command_helper")
 
@@ -19,7 +10,6 @@ module DTK::Client
       include PushCloneChangesMixin
       include ReparseMixin
 
-      # For Rich: this is used for import-git
       def from_git()
         git_repo_url, module_name    = retrieve_arguments([:option_1!, :option_2!])
         namespace, local_module_name = get_namespace_and_name(module_name, ModuleUtil::NAMESPACE_SEPERATOR)
@@ -48,11 +38,6 @@ module DTK::Client
         @context_params.forward_options(thor_options)
         create_response = from_git_or_file()
 
-        if create_response.ok?
-          module_name, module_namespace, repo_url, branch, not_ok_response = workspace_branch_info(module_type, create_response.data['module_id'], create_response.data['version'])
-          create_response = not_ok_response if not_ok_response
-        end
-
         unless create_response.ok?
           delete_dir        = namespace.nil? ? local_module_name : "#{namespace}/#{local_module_name}"
           full_module_name  = create_response.data[:full_module_name]
@@ -63,10 +48,10 @@ module DTK::Client
         end
 
         opts_pull = {
-          :local_branch => branch,
-          :namespace => module_namespace
+          :local_branch => @branch,
+          :namespace    => @module_namespace
         }
-        pull_response = Helper(:git_repo).pull_changes(module_type, module_name, opts_pull)
+        pull_response = Helper(:git_repo).pull_changes(module_type, @module_name, opts_pull)
         return pull_response unless pull_response.ok?
 
         if external_dependencies = create_response.data(:external_dependencies)
@@ -76,93 +61,46 @@ module DTK::Client
         Response::Ok.new()
       end
 
-      # For Rich: this is for import
       def from_file()
         module_type = @command.get_module_type(@context_params)
         module_name = retrieve_arguments([:option_1!])
+        opts        = {}
         namespace, local_module_name = get_namespace_and_name(module_name, ModuleUtil::NAMESPACE_SEPERATOR)
-        opts = {}
 
         response = from_git_or_file()
         return response unless response.ok?
 
-        repo_obj         = response.data['repo_obj']
-        module_final_dir = repo_obj.repo_dir
-        old_dir          = response.data['old_dir']
-        new_module_name  = response.data['new_module_name']
-
-        module_name, module_namespace, repo_url, branch, not_ok_response = workspace_branch_info(module_type, response.data['module_id'], response.data['version'])
-        return not_ok_response if not_ok_response
-
         opts_pull = {
-          :local_branch => branch,
-          :namespace => module_namespace
+          :local_branch => @branch,
+          :namespace    => @module_namespace
         }
+        resp = Helper(:git_repo).pull_changes(module_type, @module_name, opts_pull)
+        return resp unless resp.ok?
 
-        dsl_updated_info      = response.data(:dsl_updated_info)
-        dsl_created_info      = response.data(:dsl_created_info)
-        external_dependencies = response.data(:external_dependencies)
-
-        dsl_updated_info = response.data(:dsl_updated_info)
-        if dsl_updated_info and !dsl_updated_info.empty?
-          new_commit_sha = dsl_updated_info[:commit_sha]
-          unless new_commit_sha and new_commit_sha == commit_sha
-            resp = Helper(:git_repo).pull_changes(module_type, module_name, opts_pull)
-            return resp unless resp.ok?
-          end
-        end
-
-        # For Aldin; wil update the server side to  have dsl_created_info not have content when that is added on server side
-        # so setting acondition wrt to this and casing on this, i.e., whether need to commit file and then do push
-        # after we make sure working we can remove code that commits dsl file on client side
-        push_needed = false
-        if dsl_created_info and !dsl_created_info.empty?
-          path = dsl_created_info["path"]
-          msg = "A #{path} file has been created for you, located at #{module_final_dir}"
-          if content = dsl_created_info["content"]
-            resp = Helper(:git_repo).add_file(repo_obj, path, content, msg)
-            return resp unless resp.ok?
-            push_needed = true
-          end
-        end
-
-        ##### code that does push that can be removed once we always do commit of dsl on server side
-        if push_needed
-          if external_dependencies
-            ambiguous        = external_dependencies['ambiguous']||[]
-            possibly_missing = external_dependencies["possibly_missing"]||[]
-            opts.merge!(:set_parsed_false => true, :skip_module_ref_update => true) unless ambiguous.empty? && possibly_missing.empty?
-          end
-
-          @context_params.add_context_to_params(local_module_name, module_type.to_s.gsub!(/\_/,'-').to_sym, response.data['module_id'])
-          response = push_module_aux(@context_params, true, opts)
-
-          unless response.ok?
-            # remove new directory and leave the old one if import without namespace failed
-            if old_dir and (old_dir != module_final_dir)
-              FileUtils.rm_rf(module_final_dir) unless namespace
-            end
-            return response
-          end
+        if error = response.data(:dsl_parse_error)
+          dsl_parsed_message = ServiceImporter.error_message(module_name, error)
+          DTK::Client::OsUtil.print(dsl_parsed_message, :red)
         end
-        ##### end: code that does push
 
         # remove source directory if no errors while importing
-        if old_dir and (old_dir != module_final_dir)
-          FileUtils.rm_rf(old_dir) unless namespace
+        module_final_dir = @repo_obj.repo_dir
+        if @old_dir and (@old_dir != module_final_dir)
+          FileUtils.rm_rf(@old_dir) unless namespace
         end
 
-        if external_dependencies
+        if external_dependencies = response.data(:external_dependencies)
           print_external_dependencies(external_dependencies, 'dtk.model.yaml includes')
         end
 
         # if user do import from default directory (e.g. import ntp - without namespace) print message
-        DTK::Client::OsUtil.print("Module '#{new_module_name}' has been created and module directory moved to #{module_final_dir}",:yellow) unless namespace
+        DTK::Client::OsUtil.print("Module '#{@new_module_name}' has been created and module directory moved to #{module_final_dir}",:yellow) unless namespace
 
         Response::Ok.new()
       end
 
-      # For Rich: common code for import-git and import
+
+      private
+
       def from_git_or_file()
         default_ns = @context_params.get_forwarded_options()[:default_namespace]
         git_import = @context_params.get_forwarded_options()[:git_import]
@@ -171,7 +109,6 @@ module DTK::Client
         module_name = @context_params.retrieve_arguments([name_option])
         module_type = @command.get_module_type(@context_params)
         version     = @options["version"]
-        create_response = {}
 
         # extract namespace and module_name from full name (r8:maven will result in namespace = r8 & name = maven)
         namespace, local_module_name = get_namespace_and_name(module_name, ModuleUtil::NAMESPACE_SEPERATOR)
@@ -193,57 +130,55 @@ module DTK::Client
         response = post(rest_url("#{module_type}/create"), post_body)
         return response unless response.ok?
 
-        repo_url,repo_id,module_id,branch,new_module_name = response.data(:repo_url, :repo_id, :module_id, :workspace_branch, :full_module_name)
-        response = Helper(:git_repo).rename_and_initialize_clone_and_push(module_type.to_sym, local_module_name, new_module_name, branch, repo_url, module_directory)
+        repo_url, repo_id, @module_id, branch, @new_module_name = response.data(:repo_url, :repo_id, :module_id, :workspace_branch, :full_module_name)
+        response = Helper(:git_repo).rename_and_initialize_clone_and_push(module_type.to_sym, local_module_name, @new_module_name, branch, repo_url, module_directory)
         return response unless (response && response.ok?)
 
-        repo_obj, commit_sha = response.data(:repo_obj, :commit_sha)
-        module_final_dir     = repo_obj.repo_dir
-        old_dir              = response.data[:old_dir]
+        @repo_obj, commit_sha = response.data(:repo_obj, :commit_sha)
+        module_final_dir      = @repo_obj.repo_dir
+        @old_dir              = response.data[:old_dir]
 
         post_body = {
           :repo_id    => repo_id,
           :commit_sha => commit_sha,
           :commit_dsl => true,
           :scaffold_if_no_dsl => true,
-          "#{module_type}_id".to_sym => module_id
+          "#{module_type}_id".to_sym => @module_id
         }
+
+        # For Rich: DTK-1925
+        # we need to send :update_from_includes that will be used on server in /Users/aldin/Reactor8/server/application/model/module/base_module/update_module.rb:111
+        #
+        # this line bellow
         post_body.merge!(:git_import => true) if git_import
+        # should be changed with this code:
+        # if git_import
+        #   post_body.merge!(:git_import => true)
+        # else
+        #   post_body.merge!(:update_from_includes => true)
+        # end
         response = post(rest_url("#{module_type}/update_from_initial_create"), post_body)
 
         unless response.ok?
-          response.set_data_hash({ :full_module_name => new_module_name })
+          response.set_data_hash({ :full_module_name => @new_module_name })
           # remove new directory and leave the old one if import without namespace failed
-          if old_dir and (old_dir != module_final_dir)
+          if @old_dir and (@old_dir != module_final_dir)
             FileUtils.rm_rf(module_final_dir) unless (namespace && git_import)
           end
           return response
         end
 
-        dsl_updated_info      = response.data(:dsl_updated_info)
-        dsl_created_info      = response.data(:dsl_created_info)
-        external_dependencies = response.data(:external_dependencies)
+        dsl_updated_info = response.data(:dsl_updated_info)
+        dsl_created_info = response.data(:dsl_created_info)
         DTK::Client::OsUtil.print("A module_refs.yaml file has been created for you, located at #{module_final_dir}", :yellow) if dsl_updated_info && !dsl_updated_info.empty?
         DTK::Client::OsUtil.print("A #{dsl_created_info["path"]} file has been created for you, located at #{module_final_dir}", :yellow) if dsl_created_info && !dsl_created_info.empty?
 
-        module_name, module_namespace, repo_url, branch, not_ok_response = workspace_branch_info(module_type, module_id, version)
+        @module_name, @module_namespace, repo_url, @branch, not_ok_response = workspace_branch_info(module_type, @module_id, version)
         return not_ok_response if not_ok_response
 
-        # For Rich: did not have time today, but should find better way to pass these arguments to from_git and from_file methods
-        # For Aldin: are all these values needed in teh calling fns. ANyways anotehr way to do it is to just set instance vars so from here
-        # @module_id = module_id
-        # then calling fn coudl just use @module_id
-        response.add_data_value!(:module_id, module_id)
-        response.add_data_value!(:version, version)
-        response.add_data_value!(:repo_obj, repo_obj)
-        response.add_data_value!(:old_dir, old_dir)
-        response.add_data_value!(:new_module_name, new_module_name)
-
         response
       end
 
-      private
-      # ... the methods that represent the basic steps of from_git and from_git_or_file
     end
   end
 end

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

@@ -21,8 +21,6 @@ PULL_CATALOGS = ["dtkn"]
 
 module DTK::Client
   class CommonModule
-    # TODO: For Aldin; looking to use nested file structure if helpers just relate to one file in common;
-    # example here is import which is helper for module.rb
     dtk_require_common_commands('thor/module/import')
     
     def initialize(command,context_params)
@@ -130,6 +128,15 @@ module DTK::Client
         return nil unless is_go
       end
 
+      post_body = {
+       "#{module_type}_id".to_sym => module_id
+      }
+      action = (version ? "delete_version" : "delete")
+      post_body[:version] = version if version
+
+      response = post(rest_url("#{module_type}/#{action}"), post_body)
+      return response unless response.ok?
+
       response =
         if options.purge? || method_opts[:purge]
           opts = {:module_name => module_name}
@@ -143,15 +150,6 @@ module DTK::Client
 
       return response unless response.ok?
 
-      post_body = {
-       "#{module_type}_id".to_sym => module_id
-      }
-      action = (version ? "delete_version" : "delete")
-      post_body[:version] = version if version
-
-      response = post(rest_url("#{module_type}/#{action}"), post_body)
-      return response unless response.ok?
-
       unless method_opts[:no_error_msg]
         msg = "Module '#{module_name}' "
         if version then msg << "version #{version} has been deleted"
@@ -220,221 +218,11 @@ module DTK::Client
     end
 
     def import_git_module_aux(context_params)
-      # For Aldin
-      # This would now be one top level call
-      # uncomment this out to se simple example 
-      # CommonModule::Import.new(self,context_params).from_git()
-
-      git_repo_url, module_name    = context_params.retrieve_arguments([:option_1!, :option_2!], method_argument_names)
-      namespace, local_module_name = get_namespace_and_name(module_name, ModuleUtil::NAMESPACE_SEPERATOR)
-
-      module_type  = get_module_type(context_params)
-      thor_options = { :git_import => true}
-
-      unless namespace
-        resp = post rest_url("namespace/default_namespace_name")
-        return resp unless resp.ok?
-
-        namespace = resp.data
-        thor_options[:default_namespace] = namespace
-      end
-
-      opts = {
-        :namespace => namespace,
-        :branch    => options['branch']
-      }
-      response = Helper(:git_repo).create_clone_from_optional_branch(module_type.to_sym, local_module_name, git_repo_url, opts)
-      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(thor_options)
-      create_response = import_module_aux(context_params)
-
-      if create_response.ok?
-        if external_dependencies = create_response.data(:external_dependencies)
-          inconsistent = external_dependencies["inconsistent"]||[]
-          possibly_missing = external_dependencies["possibly_missing"]||[]
-          ambiguous = external_dependencies["ambiguous"]||[]
-          amb_sorted = ambiguous.map { |k,v| "#{k.split('/').last} (#{v.join(', ')})" }
-          OsUtil.print("There are inconsistent module dependencies mentioned in the git repo: #{inconsistent.join(', ')}", :red) unless inconsistent.empty?
-          OsUtil.print("There are missing module dependencies mentioned in the git repo: #{possibly_missing.join(', ')}", :yellow) unless possibly_missing.empty?
-          OsUtil.print("There are ambiguous module dependencies mentioned in the git repo: '#{amb_sorted.join(', ')}'. One of the namespaces should be selected by editing the module_refs file", :yellow) if ambiguous && !ambiguous.empty?
-        end
-      else
-        delete_dir        = namespace.nil? ? local_module_name : "#{namespace}/#{local_module_name}"
-        full_module_name  = create_response.data[:full_module_name]
-        local_module_name = full_module_name.nil? ? delete_dir : full_module_name
-        delete_module_sub_aux(context_params, local_module_name, :force_delete => true, :no_error_msg => true, :purge => true)
-        return create_response
-      end
-
-      Response::Ok.new()
+      CommonModule::Import.new(self, context_params).from_git()
     end
-    def import_module_aux(context_params)
-      # CommonModule::Import.new(self,context_params).from_file()
-      if context_params.get_forwarded_options()
-        default_ns = context_params.get_forwarded_options()[:default_namespace]
-        git_import = context_params.get_forwarded_options()[:git_import]
-      end
-
-      name_option = git_import ? :option_2! : :option_1!
-      module_name = context_params.retrieve_arguments([name_option],method_argument_names)
-      module_type = get_module_type(context_params)
-      version     = options["version"]
-      opts        = {}
-
-      # extract namespace and module_name from full name (r8:maven will result in namespace = r8 & name = maven)
-      namespace, local_module_name = get_namespace_and_name(module_name, ModuleUtil::NAMESPACE_SEPERATOR)
-      namespace = default_ns if default_ns && namespace.nil?
 
-      # 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(module_type.to_sym, local_module_name, nil, namespace)
-      return response unless response.ok?
-
-      #check for yaml/json parsing errors before import
-      module_directory = response.data(:module_directory)
-      reparse_aux(module_directory)
-
-      # first make call to server to create an empty repo
-      post_body = {
-        :module_name => local_module_name,
-        :module_namespace => namespace
-      }
-      response = post(rest_url("#{module_type}/create"), post_body)
-      return response unless response.ok?
-
-      repo_url,repo_id,module_id,branch,new_module_name = response.data(:repo_url, :repo_id, :module_id, :workspace_branch, :full_module_name)
-      response = Helper(:git_repo).rename_and_initialize_clone_and_push(module_type.to_sym, local_module_name, new_module_name, branch, repo_url, module_directory)
-      return response unless (response && response.ok?)
-
-      repo_obj, commit_sha = response.data(:repo_obj, :commit_sha)
-      module_final_dir     = repo_obj.repo_dir
-      old_dir              = response.data[:old_dir]
-
-      post_body = {
-        :repo_id    => repo_id,
-        :commit_sha => commit_sha,
-        :commit_dsl => true,
-        :scaffold_if_no_dsl => true,
-        "#{module_type}_id".to_sym => module_id
-      }
-      post_body.merge!(:git_import => true) if git_import
-      response = post(rest_url("#{module_type}/update_from_initial_create"), post_body)
-
-      if error = response.data(:dsl_parse_error)
-        dsl_parsed_message = ServiceImporter.error_message(module_name, error)
-        DTK::Client::OsUtil.print(dsl_parsed_message, :red)
-      end
-
-      unless response.ok?
-        response.set_data_hash({ :full_module_name => new_module_name })
-        # remove new directory and leave the old one if import without namespace failed
-        if old_dir and (old_dir != module_final_dir)
-          FileUtils.rm_rf(module_final_dir) unless (namespace && git_import)
-        end
-        return response
-      end
-
-      dsl_updated_info      = response.data(:dsl_updated_info)
-      dsl_created_info      = response.data(:dsl_created_info)
-      external_dependencies = response.data(:external_dependencies)
-      DTK::Client::OsUtil.print("A module_refs.yaml file has been created for you, located at #{module_final_dir}", :yellow) if dsl_updated_info && !dsl_updated_info.empty?
-      DTK::Client::OsUtil.print("A #{dsl_created_info["path"]} file has been created for you, located at #{module_final_dir}", :yellow) if dsl_created_info && !dsl_created_info.empty?
-
-      module_name, module_namespace, repo_url, branch, not_ok_response = workspace_branch_info(module_type, module_id, version)
-      return not_ok_response if not_ok_response
-
-      opts_pull = {
-        :local_branch => branch,
-        :namespace => module_namespace
-      }
-
-      # if import-git then always pull changes because files are created on server side
-      if git_import
-        resp = Helper(:git_repo).pull_changes(module_type, module_name, opts_pull)
-        return resp unless resp.ok?
-        response[:module_id] = module_id
-      else
-        # For Aldin; I think all code below this is just for import for file; so think we reorganize to have evrything above this be a common
-        # routine called by both; and then put in new method for 'import from file' that calss common , whcih passes back response
-        # and then calls the rest in the 'import from file' body
-
-        # since we are creating module_refs and dtk,,odel.yaml files on server need to pull
-        dsl_updated_info = response.data(:dsl_updated_info)
-        if dsl_updated_info and !dsl_updated_info.empty?
-          new_commit_sha = dsl_updated_info[:commit_sha]
-          unless new_commit_sha and new_commit_sha == commit_sha
-            resp = Helper(:git_repo).pull_changes(module_type, module_name, opts_pull)
-            return resp unless resp.ok?
-          end
-        end
-
-        # For Aldin; wil update the server side to  have dsl_created_info not have content when that is added on server side
-        # so setting acondition wrt to this and casing on this, i.e., whether need to commit file and then do push
-        # after we make sure working we can remove code that commits dsl file on client side
-        push_needed = false
-        if dsl_created_info and !dsl_created_info.empty?
-          path = dsl_created_info["path"]
-          msg = "A #{path} file has been created for you, located at #{module_final_dir}"
-          if content = dsl_created_info["content"]
-            resp = Helper(:git_repo).add_file(repo_obj, path, content, msg)
-            return resp unless resp.ok?
-            push_needed = true
-          end
-        end
-
-        ##### code that does push that can be removed once we always do commit of dsl on server side
-        if push_needed
-          if external_dependencies
-            ambiguous        = external_dependencies['ambiguous']||[]
-            possibly_missing = external_dependencies["possibly_missing"]||[]
-            opts.merge!(:set_parsed_false => true, :skip_module_ref_update => true) unless ambiguous.empty? && possibly_missing.empty?
-          end
-          
-          context_params.add_context_to_params(local_module_name, module_type.to_s.gsub!(/\_/,'-').to_sym, module_id)
-          response = push_module_aux(context_params, true, opts)
-
-          if error = response.data(:dsl_parse_error)
-            dsl_parsed_message = ServiceImporter.error_message(module_name, error)
-            DTK::Client::OsUtil.print(dsl_parsed_message, :red)
-          end
-          
-          unless response.ok?
-            # remove new directory and leave the old one if import without namespace failed
-            if old_dir and (old_dir != module_final_dir)
-              FileUtils.rm_rf(module_final_dir) unless namespace
-            end
-            return response
-          end
-        end
-        ##### end: code that does push  
-
-        response = Response::Ok.new()
- 
-        # remove source directory if no errors while importing
-        if old_dir and (old_dir != module_final_dir)
-          FileUtils.rm_rf(old_dir) unless namespace
-        end
-
-        # For Aldin: need to also check to see if any parsing errors by looking at what is now in response under dsl_parse_error
-        # (it was just renamed from dsl_parse_info)
-
-        if external_dependencies
-          ambiguous        = external_dependencies["ambiguous"]||[]
-          amb_sorted       = ambiguous.map { |k,v| "#{k.split('/').last} (#{v.join(', ')})" }
-          possibly_missing = external_dependencies["possibly_missing"]||[]
-          OsUtil.print("There are missing module dependencies in dtk.model.yaml includes: #{possibly_missing.join(', ')}", :yellow) unless possibly_missing.empty?
-          OsUtil.print("There are ambiguous module dependencies in dtk.model.yaml includes: '#{amb_sorted.join(', ')}'. One of the namespaces should be selected by editing the module_refs file", :yellow) unless ambiguous.empty?
-        end
-
-        # if user do import from default directory (e.g. import ntp - without namespace) print message
-        # module directory moved from (~/dtk/component_module/<module_name>) to (~/dtk/component_module/<default_namespace>/<module_name>)
-        DTK::Client::OsUtil.print("Module '#{new_module_name}' has been created and module directory moved to #{module_final_dir}",:yellow) unless namespace
-      end
-
-      response
+    def import_module_aux(context_params)
+      CommonModule::Import.new(self,context_params).from_file()
     end
 
     def install_module_aux(context_params)
@@ -654,7 +442,7 @@ module DTK::Client
 #      if catalog.to_s.eql?("origin")
 #        push_clone_changes_aux(:component_module,component_module_id,version,options["message"]||DEFAULT_COMMIT_MSG,internal_trigger)
       if catalog.to_s.eql?("dtkn")
-        module_refs_content = RemoteDependencyUtil.module_ref_content(module_location) if module_type == :service_module
+        module_refs_content = RemoteDependencyUtil.module_ref_content(module_location) if module_type == 'service_module'
         remote_module_info  = get_remote_module_info_aux(module_type.to_sym, module_id, options["namespace"], version, module_refs_content, local_namespace)
         return remote_module_info unless remote_module_info.ok?
 
@@ -733,7 +521,6 @@ module DTK::Client
         assembly_template_location = "#{module_location}/assemblies/#{assembly_template_name}"
         base_file = "#{module_location}/assemblies/#{assembly_template_name}.dtk.assembly"
 
-        # Aldin: could not find better solution, leaving as is for now
         assembly_file_location =
           if File.exists?("#{base_file}.yaml")
             "#{base_file}.yaml"