dtk-client 0.7.2.1 → 0.7.3

data/lib/commands/thor/provider.rb

@@ -17,7 +17,7 @@ module DTK::Client
       return DTK::Shell::OverrideTasks.new({
         :command_only => {
           :target => [
-            ['delete-target',"delete-target TARGET-IDENTIFIER","# Deletes target"],
+            ['delete-and-destroy',"delete-and-destroy TARGET-NAME","# Deletes target"],
             ['list',"list","# Lists available targets."]
 
           ]
@@ -32,32 +32,35 @@ module DTK::Client
     end
 
     def self.valid_child?(name_of_sub_context)
-      return Provider.valid_children().include?(name_of_sub_context.to_sym)
+      Provider.valid_children().include?(name_of_sub_context.to_sym)
     end
 
-    desc "create-ec2-provider PROVIDER-NAME --keypair KEYPAIR --security-group SECURITY-GROUP(S) [--bootstrap]", "Create ec2 provider. Multiple security groups separated with ',' (gr1,gr2,gr3,...)"
+    desc "create-provider-ec2 PROVIDER-NAME [--keypair KEYPAIR] [--security-group SECURITY-GROUP(S)]", "Create provider for ec2 vpc or classic. Multiple security groups separated with ',' (gr1,gr2,gr3,...)"
     method_option :keypair, :type => :string
     method_option :security_group, :type => :string, :aliases => '--security-groups'
+    # TODO: made this a hidden option; needs to be updated because now choice if vpc or classic
     method_option :bootstrap, :type => :boolean, :default => false
-    def create_ec2_provider(context_params)
+    def create_provider_ec2(context_params)
       provider_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
       provider_type = 'ec2'
 
       iaas_properties = Hash.new
-      #TODO: data-driven check if legal provider type and then what options needed depending on provider type
 
-      security_groups = []
-      keypair, security_group = context_params.retrieve_thor_options([:keypair!, :security_group!], options)
+      keypair, security_group = context_params.retrieve_thor_options([:keypair, :security_group], options)
 
-      raise ::DTK::Client::DtkValidationError.new("Multiple security groups should be separated with ',' and without spaces between them (e.g. --security_groups gr1,gr2,gr3,...) ") if security_group.end_with?(',')
+      iaas_properties.merge!(:keypair => keypair) if keypair
+      if security_group
+        if security_group.end_with?(',')
+          raise ::DTK::Client::DtkValidationError.new("Multiple security groups should be separated with ',' and without spaces between them (e.g. --security_groups gr1,gr2,gr3,...) ")
+        end
 
-      security_groups = security_group.split(',')
-      iaas_properties.merge!(:keypair_name => keypair)
+        security_groups = security_group.split(',')
 
-      if (security_groups.empty? || security_groups.size==1)
-        iaas_properties.merge!(:security_group => security_group)
-      else
-        iaas_properties.merge!(:security_group_set => security_groups)
+        if (security_groups.empty? || security_groups.size==1)
+          iaas_properties.merge!(:security_group => security_group)
+        else
+          iaas_properties.merge!(:security_group_set => security_groups)
+        end
       end
 
       result = DTK::Shell::InteractiveWizard::interactive_user_input(
@@ -73,40 +76,37 @@ module DTK::Client
 
       post_body =  {
         :iaas_properties => iaas_properties,
-        :provider_name => provider_name,
-        :iaas_type => provider_type,
-        :no_bootstrap => ! options.bootstrap?
+        :provider_name   => provider_name,
+        :iaas_type       => 'ec2',
+        :no_bootstrap    => ! options.bootstrap?
       }
 
       response = post rest_url("target/create_provider"), post_body
       @@invalidate_map << :provider
 
-      return response
+      response
     end
 
-    desc "create-physical-provider PROVIDER-NAME", "Create physical provider."
-    method_option :keypair, :type => :string
-    method_option :security_group, :type => :string, :aliases => '--security-groups'
-    method_option :bootstrap, :type => :boolean, :default => false
-    def create_physical_provider(context_params)
+    desc "create-provider-physical PROVIDER-NAME", "Create provider to manage physical nodes."
+    def create_provider_physical(context_params)
       provider_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
-      provider_type = 'physical'
 
       # Remove sensitive readline history
       OsUtil.pop_readline_history(2)
 
       post_body =  {
         :provider_name => provider_name,
-        :iaas_type => provider_type,
-        :no_bootstrap => ! options.bootstrap?
+        :iaas_type => 'physical'
       }
 
       response = post rest_url("target/create_provider"), post_body
       @@invalidate_map << :provider
 
-      return response
+      response
     end
 
+=begin
+TODO: deprecated until this can be in sync with create-targets from target context where params depend on type
 
     desc "PROVIDER-ID/NAME create-target [TARGET-NAME] --region REGION --keypair KEYPAIR --security-group SECURITY-GROUP(S)", "Create target based on given provider"
     method_option :region, :type => :string
@@ -142,9 +142,9 @@ module DTK::Client
       response = post rest_url("target/create"), post_body
       @@invalidate_map << :target
 
-      return response
+      response
     end
-
+=end
 
     desc "list","Lists available providers."
     def list(context_params)
@@ -173,33 +173,26 @@ module DTK::Client
       response.render_table(:target)
     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
-    def delete_provider(context_params)
+    desc "delete-and-destroy PROVIDER-NAME","Deletes target provider, its targets, and their assemblies"
+    def delete_and_destroy(context_params)
       provider_id   = context_params.retrieve_arguments([:option_1!],method_argument_names)
 
-      unless options.force?
-        return unless Console.confirmation_prompt("Are you sure you want to delete provider with identifier '#{provider_id}'"+'?')
-      end
-      
-      # this goes to provider
-      # Console.confirmation_prompt("Are you sure you want to delete target '#{target_id}' (all assemblies that belong to this target will be deleted as well)'"+'?')
+      # require explicit acknowldegement since deletes all targtes under it
+      return unless Console.confirmation_prompt("Are you sure you want to delete provider '#{provider_id}' and all target and service instances under it" +'?')
       
       post_body = {
-        :provider_id => provider_id
+        :target_id => provider_id,
+        :type      => 'template'
       }
 
       @@invalidate_map << :provider
 
-      post rest_url("target/delete_provider"), post_body
+      response = post(rest_url("target/delete_and_destroy"),post_body)
+      return response unless response.ok?
+      if info_array = response.data['info']
+        info_array.each{|info_msg|OsUtil.print(info_msg, :yellow)}
+      end
+      Response::Ok.new()
     end
 
     no_tasks do

data/lib/commands/thor/service.rb

@@ -94,6 +94,11 @@ module DTK::Client
           :delete_node_group => {
             :endpoint => "assembly",
             :url => "assembly/get_node_groups"
+          },
+          :pull_base_component_module => {
+            :endpoint => "assembly",
+            :url => "assembly/info_about",
+            :opts => {:subtype=>"instance", :about=>"modules"}
           }
         }
       }
@@ -271,6 +276,13 @@ module DTK::Client
       Response::Ok.new()
     end
 
+    desc "SERVICE-NAME/ID pull-base-component-module COMPONENT-MODULE-NAME [--force] [--revert]", "Pull base component module changes to component module in the service"
+    method_option :force, :type => :boolean, :default => false, :aliases => '-f'
+    method_option :revert, :type => :boolean, :default => false, :aliases => '-r'
+    def pull_base_component_module(context_params)
+      pull_base_component_module_aux(context_params)
+    end
+
     desc "SERVICE-NAME/ID push-component-module-updates COMPONENT-MODULE-NAME [--force]", "Push changes made to a component module in the service to its base component module."
     method_option :force, :type => :boolean, :default => false, :aliases => '-f'
     def push_component_module_updates(context_params)

data/lib/commands/thor/service_module.rb

@@ -293,11 +293,15 @@ module DTK::Client
     # end
 
     # desc "SERVICE-MODULE-NAME/ID pull-from-dtkn [-n NAMESPACE] [-v VERSION]", "Update local service module from remote repository."
-    desc "SERVICE-MODULE-NAME/ID pull-dtkn [-n NAMESPACE]", "Update local service module from remote repository."
-    method_option "namespace",:aliases => "-n",
-      :type => :string,
+    desc "SERVICE-MODULE-NAME/ID pull-dtkn [-n NAMESPACE] [--force]", "Update local service module from remote repository."
+    method_option :namespace,:aliases => '-n',
+      :type   => :string,
       :banner => "NAMESPACE",
-      :desc => "Remote namespace"
+      :desc   => "Remote namespace"
+    method_option :force,:aliases => '-f',
+      :type    => :boolean, 
+      :desc   => "Force pull",
+      :default => false
     def pull_dtkn(context_params)
       pull_dtkn_aux(context_params)
     end
@@ -605,6 +609,11 @@ module DTK::Client
       remote_remove_aux(context_params)
     end
 
+    desc "SERVICE-MODULE-NAME/ID fork NAMESPACE", "Fork service module to new namespace"
+    def fork(context_params)
+      fork_aux(context_params)
+    end
+
     #
     # DEVELOPMENT MODE METHODS
     #

data/lib/commands/thor/target.rb

@@ -1,8 +1,11 @@
+dtk_require_common_commands('thor/common_base')
 dtk_require_common_commands('thor/inventory_parser')
+dtk_require_common_commands('thor/create_target')
 module DTK::Client
   class Target < CommandBaseThor
+    include Commands
     include InventoryParserMixin
-
+    
     def self.pretty_print_cols()
       PPColumns.get(:target)
     end
@@ -31,8 +34,7 @@ module DTK::Client
       target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
 
       post_body = {:target_id => target_id}
-      response = post rest_url('target/info'), post_body
-      response.render_custom_info("target")
+      post rest_url('target/info'), post_body
     end
 
     desc "TARGET-NAME/ID import-nodes --source SOURCE","Reads from inventory dsl and populates the node instance objects (SOURCE: file:/path/to/file.yaml)."
@@ -42,12 +44,12 @@ module DTK::Client
       source = context_params.retrieve_thor_options([:source!], options)
 
       parsed_source = source.match(/^(\w+):(.+)/)
-      raise DTK::Client::DtkValidationError, "Invalid source! Valid source should contain source_type:source_path (e.g. --source file:path/to/file.yaml)." unless parsed_source
+      raise DtkValidationError, "Invalid source! Valid source should contain source_type:source_path (e.g. --source file:path/to/file.yaml)." unless parsed_source
 
       import_type = parsed_source[1]
       path = parsed_source[2]
       
-      raise DTK::Client::DtkValidationError, "We do not support '#{import_type}' as import source at the moment. Valid sources: #{ValidImportTypes}" unless ValidImportTypes.include?(import_type)
+      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}
 
@@ -70,7 +72,7 @@ module DTK::Client
     end
     ValidImportTypes = ["file"]
 
-    desc "set-default-target TARGET-IDENTIFIER","Sets the default target."
+    desc "set-default-target TARGET-NAME","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 }
@@ -84,44 +86,32 @@ module DTK::Client
       post rest_url("target/install_agents"), post_body
     end
 
-    desc "create-target [TARGET-NAME] --provider PROVIDER --region REGION --keypair KEYPAIR --security-group SECURITY-GROUP(S)", "Create target based on given provider"
+    desc "create-target-ec2-classic [TARGET-NAME] --provider PROVIDER --region REGION [--keypair KEYPAIR] [--security-group SECURITY-GROUP(S)]", "Create target based on given provider"
     method_option :provider, :type => :string
     method_option :region, :type => :string
     method_option :keypair, :type => :string
     method_option :security_group, :type => :string, :aliases => '--security-groups'
-    def create_target(context_params)
-      # we use :target_id but that will retunr provider_id (another name for target template ID)
-      target_name = context_params.retrieve_arguments([:option_1],method_argument_names)
-      provider, region, keypair, security_group = context_params.retrieve_thor_options([:provider!, :region, :keypair!, :security_group!], options)
-
-      #TODO: data-driven check if legal provider type and then what options needed depending on provider type
-      iaas_properties = Hash.new
-      DTK::Shell::InteractiveWizard.validate_region(region) if region
-
-      security_groups = []
-      raise ::DTK::Client::DtkValidationError.new("Multiple security groups should be separated with ',' and without spaces between them (e.g. --security_groups gr1,gr2,gr3,...) ") if security_group.end_with?(',')
-
-      security_groups = security_group.split(',')
-      iaas_properties.merge!(:keypair => keypair)
-
-      if (security_groups.empty? || security_groups.size==1)
-        iaas_properties.merge!(:security_group => security_group)
-      else
-        iaas_properties.merge!(:security_group_set => security_groups)
-      end
-
-      post_body = {
-        :provider_id => provider,
-        :iaas_properties => iaas_properties
-      }
-      post_body.merge!(:target_name => target_name) if target_name
-      post_body.merge!(:region => region) if region
-      response = post rest_url("target/create"), post_body
+    def create_target_ec2_classic(context_params)
+      option_list = [:provider!, :region!, :keypair, :security_group]
+      response = Common::CreateTarget.new(self,context_params).execute(:ec2_classic,option_list)
+      @@invalidate_map << :target
+      response
+    end
 
+    desc "create-target-ec2-vpc [TARGET-NAME] --provider PROVIDER --region REGION --subnet SUBNET-ID [--keypair KEYPAIR] [--security-group SECURITY-GROUP(S)]", "Create target based on given provider"
+    method_option :provider, :type => :string
+    method_option :subnet, :type => :string
+    method_option :region, :type => :string
+    method_option :keypair, :type => :string
+    method_option :security_group, :type => :string, :aliases => '--security-groups'
+    def create_target_ec2_vpc(context_params)
+      option_list = [:provider!, :subnet!, :region!, :keypair, :security_group]
+      response = Common::CreateTarget.new(self,context_params).execute(:ec2_vpc,option_list)
       @@invalidate_map << :target
-      return response
+      response
     end
 
+
     desc "TARGET-NAME/ID list-services","Lists service instances in given targets."
     def list_services(context_params)
       context_params.method_arguments = ["assemblies"]
@@ -181,27 +171,36 @@ module DTK::Client
       end
     end
 
-    desc "delete-target TARGET-IDENTIFIER","Deletes target or provider"
-    method_option :force, :aliases => '-y', :type => :boolean, :default => false
-    def delete_target(context_params)
-      target_id   = context_params.retrieve_arguments([:option_1!],method_argument_names)
+    desc "delete-and-destroy TARGET-NAME","Deletes target or provider"
+    def delete_and_destroy(context_params)
+      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)'"+'?')
      
       post_body = {
-        :target_id => target_id
+        :target_id => target_id,
+        :type      => 'instance'
       }
 
       @@invalidate_map << :target
 
-      return post rest_url("target/delete"), post_body
+      response = post(rest_url("target/delete_and_destroy"),post_body)
+      return response unless response.ok?
+      if info_array = response.data['info']
+        info_array.each{|info_msg|OsUtil.print(info_msg, :yellow)}
+      end
+      Response::Ok.new()
     end
 
-    desc "TARGET-NAME/ID edit-target [--keypair KEYPAIR] [--security-group SECURITY-GROUP(S)]","Edit keypair or security-group for given target"
+=begin
+# TODO: DTK-2056: rewite
+also put in list property
+    desc "TARGET-NAME/ID set-property PROPERTY VALUE
     method_option :keypair, :type => :string
     method_option :security_group, :type => :string, :aliases => '--security-groups'
-    def edit_target(context_params)
+    def set_property(context_params)
+      raise "change so that param is seperated key value parts"
       target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
       keypair, security_group = context_params.retrieve_thor_options([:keypair, :security_group], options)
 
@@ -225,7 +224,8 @@ module DTK::Client
         :target_id => target_id,
         :iaas_properties => iaas_properties
       }
-      return post rest_url("target/edit_target"), post_body
+      post rest_url("target/set_properties"), post_body
     end
+=end
   end
 end

data/lib/commands/thor/test_module.rb

@@ -116,7 +116,9 @@ module DTK::Client
     #
     desc "import-git GIT-SSH-REPO-URL [NAMESPACE:]TEST-MODULE-NAME", "Create new local test module by importing from provided git repo URL"
     def import_git(context_params)
-      import_git_module_aux(context_params)
+      response = import_git_module_aux(context_params)
+      @@invalidate_map << :test_module
+      response
     end
 
     desc "install NAMESPACE/REMOTE-TEST-MODULE-NAME","Install remote test module into local environment"
@@ -147,11 +149,15 @@ module DTK::Client
       publish_module_aux(context_params)
     end
 
-    desc "TEST-MODULE-NAME/ID pull-dtkn [-n NAMESPACE]", "Update local test module from remote repository."
-    method_option "namespace",:aliases => "-n",
-      :type => :string,
+    desc "TEST-MODULE-NAME/ID pull-dtkn [-n NAMESPACE] [--force]", "Update local test module from remote repository."
+    method_option :namespace,:aliases => '-n',
+      :type   => :string,
       :banner => "NAMESPACE",
-      :desc => "Remote namespace"
+      :desc   => "Remote namespace"
+    method_option :force,:aliases => '-f',
+      :type    => :boolean,
+      :desc   => "Force pull",
+      :default => false
     def pull_dtkn(context_params)
       pull_dtkn_aux(context_params)
     end
@@ -281,4 +287,4 @@ module DTK::Client
       end
     end
   end
-end
+end

data/lib/commands/thor/workspace.rb

@@ -72,6 +72,11 @@ module DTK::Client
           :delete_node_group => {
             :endpoint => "assembly",
             :url => "assembly/get_node_groups"
+          },
+          :pull_base_component_module => {
+            :endpoint => "assembly",
+            :url => "assembly/info_about",
+            :opts => {:subtype=>"instance", :about=>"modules"}
           }
         }
       }
@@ -191,6 +196,13 @@ module DTK::Client
       push_module_updates_aux(context_params)
     end
 
+    desc "WORKSPACE-NAME/ID pull-base-component-module COMPONENT-MODULE-NAME [--force] [--revert]", "Pull base component module changes to component module in workspace"
+    method_option :force, :type => :boolean, :default => false, :aliases => '-f'
+    method_option :revert, :type => :boolean, :default => false, :aliases => '-r'
+    def pull_base_component_module(context_params)
+      pull_base_component_module_aux(context_params)
+    end
+
     desc "WORKSPACE-NAME/ID push-assembly-updates [NAMESPACE:]SERVICE-MODULE-NAME/ASSEMBLY-NAME", "Push changes made to this workspace to the designated assembly."
     def push_assembly_updates(context_params)
       workspace_id, qualified_assembly_name = context_params.retrieve_arguments([:workspace_id!,:option_1!],method_argument_names) 

data/lib/core.rb

@@ -131,7 +131,7 @@ end
 def resolve_direct_access(params, config_exists=nil)
   return if params[:username_exists]
 
-  puts "Processing..." if config_exists
+  puts "Processing ..." if config_exists
   # check to see if catalog credentials are set
   conn = DTK::Client::Session.get_connection()
   response = conn.post DTK::Client::CommandBase.class, conn.rest_url("account/check_catalog_credentials"), {}

data/lib/domain/git_adapter.rb

@@ -279,6 +279,10 @@ module DTK
         end
       end
 
+      def reset_hard(current_branch_sha)
+        @git_repo.reset_hard(current_branch_sha)
+      end
+
     private
       def handle_git_error(&block)
         self.class.handle_git_error(&block)

data/lib/domain/response.rb

@@ -148,14 +148,6 @@ module DTK
           "dsl_parsed" => "DSL PARSED:"
         }
 
-        mappings["target"] = {
-          "id" => "ID:",
-          "display_name" => "NAME:",
-          "type" => "TYPE:",
-          "iaas_type" => "PROVIDER_TYPE:",
-          "provider_name" => "PROVIDER_NAME:"
-        }
-
         mappings[type][label] if mappings[type]
       end
 

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.7.2.1"
+  VERSION="0.7.3"
 end

data/lib/execute/script/add_tenant.rb

@@ -1,14 +1,14 @@
 class DTK::Client::Execute::Script
   class AddTenant < self
     def self.ret_params_from_argv()
-      banner = "Usage: dtk-execute add-tenant TENANT-NAME CATALOG-USERNAME -p PASSWORD [-s SERVICE-INSTANCE]"
-      tenant_name = catalog_username = tenant_number = nil
-      if ARGV.size > 2
+      banner = "Usage: dtk-execute add-tenant TENANT-NAME CATALOG-USERNAME -p PASSWORD -v VERSION [-s SERVICE-INSTANCE]"
+      version = tenant_name = catalog_username = tenant_number = nil
+      if ARGV.size > 3
         tenant_name = ARGV[1]
         if tenant_name =~ /^dtk([0-9]+)$/
           tenant_number = $1
         else
-          raise ErrorUsage.new("TENANT-NAME must be of form 'dtkNUMs', like dtk601")
+          raise ErrorUsage.new("TENANT-NAME must be of form 'dtkNUM', like dtk601")
         end
         catalog_username = ARGV[2]
       else
@@ -23,12 +23,19 @@ class DTK::Client::Execute::Script
         opts.on( '-s', '--service SERVICE-INSTANCE', "Name of Service instance" ) do |s|
           params[:service_instance] = s
         end
+        opts.on( '-v', '--version VERSION', "Version of code" ) do |v|
+          params[:version] = v
+        end
       end
 
-      # TODO: use opt parser to enforce that :password option is manditory
-      unless password = params[:password]
+      # TODO: use opt parser to enforce that :password and :version options are manditory
+      unless params[:password]
         raise ErrorUsage.new("Password is mandatory; use -p commnd line option")
       end
+      unless params[:version]
+        raise ErrorUsage.new("Version is mandatory; use -v commnd line option")
+      end
+      
       service_instance = params[:service_instance] || "dtkhost#{tenant_number[0]}"
       to_add = {
         :tenant_name      => tenant_name,
@@ -43,6 +50,7 @@ class DTK::Client::Execute::Script
       catalog_username = params[:catalog_username]
       service = params[:service_instance]
       password = params[:password]
+      version =  params[:version]
       server_node = params[:server_node_name] || 'server'
       router_node = params[:router_node_name] || 'router'
 
@@ -52,8 +60,16 @@ class DTK::Client::Execute::Script
       av_pairs = {
         :catalog_username => catalog_username,
         :tenant_password  => password,
-        :catalog_password => password
+        :catalog_password => password,
+        :server_branch    => version,
       }
+
+      linked_component_instances = 
+        [
+         "#{router_node}/dtk_nginx::vhosts_for_router",
+         "#{server_node}/dtk_postgresql::databases",
+         "#{server_node}/host::hostname"
+        ]
       
       ExecuteContext(:print_results => true) do
         result = call 'service/add_component',
@@ -70,16 +86,13 @@ class DTK::Client::Execute::Script
             :value          => v
         end
         
+       linked_component_instances.each do |linked_component_instance| 
         result = call 'service/link_components',
           :service          => service,
           :input_component  => "#{server_node}/#{component}",
-          :output_component => "#{server_node}/dtk_postgresql::databases"
+          :output_component => linked_component_instance
+        end
 
-        result = call 'service/link_components',
-          :service          => service,
-          :input_component  => "#{server_node}/#{component}",
-          :output_component => "#{router_node}/dtk_nginx::vhosts_for_router"
-        
         result = call 'service/execute_workflow',
           :service         => service,
           :workflow_name   => 'add_tenant',

data/lib/execute/script.rb

@@ -1,7 +1,6 @@
 class DTK::Client::Execute
   class Script < self
     dtk_require('script/add_tenant')
-    dtk_require('script/add_tenant_without_router')
     def self.execute()
       script_class().execute_script()
     end
@@ -9,7 +8,6 @@ class DTK::Client::Execute
    private
     Scripts = {
       'add-tenant' => AddTenant,
-      'add-tenant-without-router' => AddTenantWithoutRouter
     }
 
     def self.script_class()

data/lib/shell/context.rb

@@ -297,9 +297,23 @@ module DTK
         # we remove '..' from our entries
         entries = entries.select { |e| !(e.empty? || DTK::Shell::ContextAux.is_double_dot?(e)) }
 
+        # need this for autocomplete from service/node to service/utils
+        is_utils = active_context_copy.last_command_name.eql?('utils')
+
         # we go back in context based on '..'
         active_context_copy.pop_context(double_dots_count)
 
+        # if cd ../utils from service/node
+        if active_context_copy.current_command? && active_context_copy.last_command_name.eql?('node')
+          active_context_copy.pop_context(1)
+          entries = Context.check_invisible_context(active_context_copy, entries, root?, line_buffer, args, self)
+        end
+
+        # need this for autocomplete from service/node to service/utils
+        if is_utils
+          entries = Context.check_invisible_context(active_context_copy, entries, root?, line_buffer, args, self)
+        end
+
         # if cd .. back to node, skip node context and go to assembly/workspace context
         if (active_context_copy.last_context && entries)
           active_context_copy.pop_context(1) if (node_specific && active_context_copy.last_context.is_command? && active_context_copy.last_command_name.eql?("node") && on_complete)

data/lib/shell/domain/context_params.rb

@@ -9,8 +9,7 @@ module DTK::Shell
       @method_arguments = override_method_arguments
       @thor_options     = Hash.new
 
-      # freeze this - removed because we try to make a modification on this array later which raises error
-      #@method_arguments.freeze
+      @method_arguments
     end
 
     def add_context_to_params(context_name, entity_name, context_value = nil)

data/lib/util/console.rb

@@ -33,6 +33,25 @@ module DTK::Client
         end
       end
 
+      #
+      # Display confirmation prompt and repeat message until expected answer is given
+      #
+      def confirmation_prompt_simple(message, add_options=true)
+        # used to disable skip with ctrl+c
+        trap("INT", "SIG_IGN")
+        message += " (y/n)" if add_options
+
+        while line = Readline.readline("#{message}: ", true)
+          if (line.eql?("yes") || line.eql?("y") || line.empty?)
+            trap("INT",false)
+            return true
+          elsif (line.eql?("no") || line.eql?("n"))
+            trap("INT",false)
+            return false
+          end
+        end
+      end
+
       # Loading output used to display waiting status
       def wait_animation(message, time_seconds)
         print message