dtk-client 0.5.17 → 0.5.18

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

@@ -3,7 +3,7 @@ module DTK::Client
   module PushToRemoteMixin
 
     def push_to_remote_aux(remote_module_info, module_type)
-      returned_module_name = remote_module_info.data(:module_name)
+      full_module_name     = remote_module_info.data(:full_module_name)
       version = remote_module_info.data(:version)
 
       opts = {
@@ -13,12 +13,12 @@ module DTK::Client
         :local_branch => remote_module_info.data(:workspace_branch)
       }
 
-      response = Helper(:git_repo).push_changes(module_type,returned_module_name,version,opts)
+      response = Helper(:git_repo).push_changes(module_type,full_module_name,version,opts)
       return response unless response.ok?
       if response.data(:diffs).empty?
         raise DtkError, "No changes to push"
       end
-      
+
       Response::Ok.new()
     end
 

data/lib/commands/thor/account.rb

@@ -89,7 +89,7 @@ module DTK::Client
       new_pass_prompt = password_prompt("Enter new password: ")
       return if new_pass_prompt.nil?
       confirm_pass_prompt = password_prompt("Confirm new password: ")
-      
+
       if new_pass_prompt.eql?(confirm_pass_prompt)
         post_body = {:new_password => new_pass_prompt}
         response = post rest_url("account/set_password"), post_body
@@ -123,7 +123,7 @@ module DTK::Client
         DTK::Client::OsUtil.print("Provided ssh pub key has already been added.", :yellow)
       elsif matched_username
         DTK::Client::OsUtil.print("User ('#{matched_username}') already exists.", :yellow)
-      else        
+      else
         DTK::Client::Configurator.add_current_user_to_direct_access() if response.ok?
       end
 
@@ -133,7 +133,7 @@ module DTK::Client
     desc "delete-ssh-key KEYPAIR-NAME ","Deletes the named ssh key from your user account"
     def delete_ssh_key(context_params)
       name = context_params.retrieve_arguments([:option_1!],method_argument_names)
-      post_body = {:username => name.chomp}
+      post_body = { :username => name.chomp }
 
       response = post rest_url("account/remove_user_direct_access"), post_body
       return response unless response.ok?
@@ -142,6 +142,18 @@ module DTK::Client
       nil
     end
 
+    desc "set-default-namespace NAMESPACE", "Sets default namespace for your user account"
+    def set_default_namespace(context_params)
+      default_namespace = context_params.retrieve_arguments([:option_1!],method_argument_names)
+      post_body = { :namespace => default_namespace.chomp }
+
+      response = post rest_url("account/set_default_namespace"), post_body
+      return response unless response.ok?
+
+      OsUtil.print("Your default namespace has been set to '#{default_namespace}'!", :yellow)
+      nil
+    end
+
 
 
     # Will leave this commented for now until we check if above commands work as expected
@@ -164,7 +176,7 @@ module DTK::Client
     #   response, key_exists_already = Account.internal_add_user_access("component_module/add_user_direct_access", post_body, 'component module')
     #   return response unless (response.ok? || key_exists_already)
     #   proper_response = response if response.ok?
-      
+
     #   # if either of request passed we will add to known hosts
     #   if proper_response
     #     repo_manager_fingerprint,repo_manager_dns = proper_response.data_ret_and_remove!(:repo_manager_fingerprint,:repo_manager_dns)

data/lib/commands/thor/assembly.rb

@@ -1,48 +1,9 @@
-dtk_require("../../shell/status_monitor")
-
+dtk_require_from_base("shell/status_monitor")
+dtk_require_common_commands('thor/assembly_template')
 module DTK::Client
   class Assembly < CommandBaseThor
     no_tasks do
-      def get_assembly_name(assembly_id)
-        name = nil
-        3.times do
-          name = get_name_from_id_helper(assembly_id)
-          break if name
-        end
-
-        name
-      end
-
-      def get_assembly_stage_name(assembly_list,assembly_template_name)
-        name = nil
-        current_list = assembly_list.select{|e| e.include?(assembly_template_name)}
-
-        if current_list.empty?
-          name = assembly_template_name
-        else
-          numbers = []
-          base_name = nil
-
-          assembly_list.each do |assembly|
-            match = assembly.match(/#{assembly_template_name}(-)(\d*)/)
-            base_name = assembly_template_name if assembly_template_name.include?(assembly)
-            numbers << match[2].to_i if match
-          end
-
-          unless base_name
-            name = assembly_template_name
-          else
-            highest = numbers.max||1
-            new_highest = highest+1
-
-            all = (2..new_highest).to_a
-            nums = all - numbers
-            name = assembly_template_name + "-#{nums.first}"
-          end
-        end
-
-        name
-      end
+      include AssemblyTemplateMixin
     end
 
     def self.whoami()
@@ -55,10 +16,13 @@ module DTK::Client
       response = DTK::Client::CommandBaseThor.get_cached_response(:assembly, "assembly/list", {:subtype => 'template' })
       # response = DTK::Client::CommandBaseThor.get_cached_response(:module, "service_module/list")
 
+      service_namespace = service.split(":").first
+      service_name = service.split(":").last
+
       if response.ok?
         unless response['data'].nil?
           response['data'].each do |module_item|
-            if ("#{service.to_s}::#{assembly_template_name.to_s}" == (module_item['display_name']))
+            if ("#{service_name.to_s}::#{assembly_template_name.to_s}" == (module_item['display_name']) && service_namespace == module_item['namespace'])
               assembly_template_id = module_item['id']
               break
             end
@@ -206,7 +170,21 @@ module DTK::Client
       end
     end
 
-    desc "ASSEMBLY-NAME/ID stage [INSTANCE-NAME] [-t TARGET-NAME/ID]", "Stage assembly in target."
+    desc "ASSEMBLY-NAME/ID list-settings", "List all settings for given assembly."
+    def list_settings(context_params)
+      assembly_template_id = context_params.retrieve_arguments([:assembly_id!],method_argument_names)
+
+      post_body = {
+        :assembly_id => assembly_template_id
+      }
+
+      response = post rest_url("assembly/list_settings"), post_body
+      response.render_table(:service_setting) unless options.list?
+
+      response
+    end
+
+    desc "ASSEMBLY-NAME/ID stage [INSTANCE-NAME] [-t TARGET-NAME/ID] [--settings SETTINGS-NAME1[,..]]", "Stage assembly in target."
     method_option "in-target",:aliases => "-t" ,
       :type => :string, 
       :banner => "TARGET-NAME/ID",
@@ -214,7 +192,7 @@ module DTK::Client
     #hidden option
     method_option "instance-bindings",
       :type => :string 
-
+    method_option :settings, :type => :string, :aliases => '-s'
     def stage(context_params)
       assembly_template_id, name = context_params.retrieve_arguments([:assembly_id!, :option_1],method_argument_names)
       post_body = {
@@ -228,9 +206,9 @@ module DTK::Client
       assembly_template_name = get_assembly_name(assembly_template_id)
       assembly_template_name.gsub!('::','-') if assembly_template_name
 
-      # we check current options and forwarded options (from deploy method)
-      in_target = options["in-target"] || context_params.get_forwarded_thor_option("in-target")
+      in_target = options["in-target"]
       instance_bindings = options["instance-bindings"]
+      settings = parse_service_settings(options["settings"])
       assembly_list = Assembly.assembly_list()
 
       if name
@@ -242,6 +220,7 @@ module DTK::Client
       post_body.merge!(:target_id => in_target) if in_target
       post_body.merge!(:name => name) if name
       post_body.merge!(:instance_bindings => instance_bindings) if instance_bindings
+      post_body.merge!(:settings_json_form => JSON.generate(settings)) if settings
 
       response = post rest_url("assembly/stage"), post_body
       return response unless response.ok?
@@ -252,66 +231,64 @@ module DTK::Client
       return response
     end
 
-=begin
-    # desc "ASSEMBLY-NAME/ID deploy [-v VERSION] [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "Stage and deploy assembly in target."
-    # version_method_option
-    desc "ASSEMBLY-NAME/ID deploy [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "Stage and deploy assembly in target."
-    method_option "in-target",:aliases => "-t" ,
-      :type => :string,
-      :banner => "TARGET-NAME/ID",
-      :desc => "Target (id) to create assembly in" 
+
+#    desc "ASSEMBLY-NAME/ID deploy [INSTANCE-NAME] [-t TARGET-NAME/ID] [--settings SETTINGS-NAME1[,..]]", "Stage assembly in target."
+#     version_method_option
+    desc "ASSEMBLY-NAME/ID deploy [INSTANCE-NAME] [--settings SETTINGS-NAME1[,..]] [-m COMMIT-MSG]", "Stage and deploy assembly in target."
+    #hidden option
+    method_option "instance-bindings",
+      :type => :string 
+#    method_option "in-target",:aliases => "-t" ,
+#      :type => :string,
+#      :banner => "TARGET-NAME/ID",
+#      :desc => "Target (id) to create assembly in" 
     method_option "commit_msg",:aliases => "-m" ,
       :type => :string, 
       :banner => "COMMIT-MSG",
       :desc => "Commit message"
+    method_option :settings, :type => :string, :aliases => '-s'
     def deploy(context_params)
       context_params.forward_options(options)
-      response = stage(context_params)
-
-      return response unless response.ok?
-
-      # create task      
-      # commented assemlby_id until we implement json to yaml parsing on client side instead of server side
-      # assembly_id = response.data(:assembly_id)
-
-      # temp solution just to make deploy to work, since response we get from 'stage' command is simple string presented as yaml
-      assembly_id = response.data.match(/(id:)\s*(\d+)/)[2]
-
+      assembly_template_id, name = context_params.retrieve_arguments([:assembly_id!, :option_1],method_argument_names)
       post_body = {
-        :assembly_id => assembly_id,
-        :commit_msg => options["commit_msg"]||"Initial deploy"
+        :assembly_id => assembly_template_id
       }
-
-      response = post rest_url("assembly/find_violations"), post_body
-      return response unless response.ok?
-      if response.data and response.data.size > 0
-        error_message =  "The following violations were found; they must be corrected before the assembly can be deployed"
-        DTK::Client::OsUtil.print(error_message, :red)
-        return response.render_table(:violation)
+      if commit_msg = options["commit_msg"]
+        post_body.merge!(:commit_msg => commit_msg)
       end
 
-      ret = response = post(rest_url("assembly/create_task"), post_body)        
-
-      return response unless response.ok?
+      # using this to make sure cache will be invalidated after new assembly is created from other commands e.g.
+      # 'assembly-create', 'install' etc.
+      @@invalidate_map << :assembly
+      
+      assembly_template_name = get_assembly_name(assembly_template_id)
+      assembly_template_name.gsub!('::','-') if assembly_template_name
 
-      # execute task
-      task_id = response.data(:task_id)
-      response = post(rest_url("task/execute"), "task_id" => task_id)
+      # we check current options and forwarded options (from deploy method)
+      in_target = options["in-target"] || context_params.get_forwarded_thor_option("in-target")
+      instance_bindings = options["instance-bindings"]
+      settings = options["settings"]
+      assembly_list = Assembly.assembly_list()
 
-      # start watching task ID
-      if $shell_mode
-        DTK::Shell::StatusMonitor.start_monitoring(task_id) if response.ok?
+      if name
+        raise DTK::Client::DtkValidationError, "Unable to deploy service with name '#{name}'. Service with specified name exists already!" if assembly_list.include?(name)
+      else
+        name = get_assembly_stage_name(assembly_list,assembly_template_name)
       end
+      
+      post_body.merge!(:target_id => in_target) if in_target
+      post_body.merge!(:name => name) if name
+      post_body.merge!(:instance_bindings => instance_bindings) if instance_bindings
+      post_body.merge!(:settings_json_form => JSON.generate(settings)) if settings
 
+      response = post rest_url("assembly/deploy"), post_body
       return response unless response.ok?
-      ret.add_data_value!(:task_id,task_id)
-
       # when changing context send request for getting latest assemblies instead of getting from cache
       @@invalidate_map << :service
-
-      return ret
+      @@invalidate_map << :assembly
+      response
     end
-=end
+ 
 
     desc "delete ASSEMBLY-ID", "Delete assembly"
     method_option :force, :aliases => '-y', :type => :boolean, :default => false

data/lib/commands/thor/component_module.rb

@@ -33,7 +33,7 @@ module DTK::Client
         {
           :command_only => {
             :self => [
-              ["list"," list [--remote] [--diff]","# List loaded or remote component modules. Use --diff to compare loaded and remote component modules."]
+              ["list"," list [--remote] [--diff] [-n NAMESPACE]","# List loaded or remote component modules. Use --diff to compare loaded and remote component modules."]
             ],
             :"component" => [
               ["list","list","# List all component templates."],
@@ -114,27 +114,25 @@ TODO: might deprecate
       response.render_custom_info("module")
     end
 =end
-
-    desc "list [--remote] [--diff]", "List loaded or remote component modules. Use --diff to compare loaded and remote component modules."
+    desc "list [--remote] [--diff] [-n NAMESPACE]", "List loaded or remote component modules. Use --diff to compare loaded and remote component modules."
     method_option :remote, :type => :boolean, :default => false
     method_option :diff, :type => :boolean, :default => false
+    method_option :namespace, :aliases => "-n" ,
+      :type => :string,
+      :banner => "NAMESPACE",
+      :desc => "List modules only in specific namespace."
     def list(context_params)
-      # Amar: attribute context commented out per Rich suggeston
-      #if context_params.is_there_command?(:attribute)
-      #  return module_info_about(context_params, :attributes, :attribute)
-      #elsif context_params.is_there_command?(:"component-template")
-      # if context_params.is_there_command?(:"component-template")
-      if context_params.is_there_command?(:"component")
-        return module_info_about(context_params, :components, :component)
-      end
+      return module_info_about(context_params, :components, :component) if context_params.is_there_command?(:"component")
 
       forwarded_remote = context_params.get_forwarded_options()["remote"] if context_params.get_forwarded_options()
       remote           = options.remote? || forwarded_remote
       action           = (remote ? "list_remote" : "list")
-#     post_body        = (options.remote? ? { :rsa_pub_key => SSHUtil.rsa_pub_key_content() } : {:detail_to_include => ["remotes","versions"]})
+
       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
+      post_body.merge!(:module_namespace => options.namespace)
+
+      response = post rest_url("component_module/#{action}"),post_body
 
       return response unless response.ok?
       response.render_table()
@@ -175,14 +173,22 @@ TODO: might deprecate
     #### commands to interact with remote repo ###
 
 
-    desc "import COMPONENT-MODULE-NAME", "Create new component module from local clone"
+    desc "import [NAMESPACE:]COMPONENT-MODULE-NAME", "Create new component module from local clone"
     def import(context_params)
       response = import_module_aux(context_params)
-      @@invalidate_map << :component_module if response && response.ok?
+      @@invalidate_map << :component_module if (response && response.ok?)
 
       response
     end
 
+    #
+    # Creates component module from input git repo, removing .git dir to rid of pointing to user github, and creates component module
+    #
+    desc "import-git GIT-SSH-REPO-URL [NAMESPACE:]COMPONENT-MODULE-NAME", "Create new local component module by importing from provided git repo URL"
+    def import_git(context_params)
+      import_git_module_aux(context_params)
+    end
+
 =begin
 #    desc "COMPONENT-MODULE-NAME/ID validate-model [-v VERSION]", "Check the DSL model for errors"
     # version_method_option
@@ -209,7 +215,7 @@ TODO: might deprecate
     # 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"
+    desc "install NAMESPACE/REMOTE-COMPONENT-MODULE-NAME","Install remote component module into local environment"
     method_option "repo-manager",:aliases => "-r" ,
       :type => :string,
       :banner => "REPO-MANAGER",
@@ -221,13 +227,6 @@ TODO: might deprecate
       response
     end
 
-    #
-    # Creates component module from input git repo, removing .git dir to rid of pointing to user github, and creates component module
-    #
-    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)
-      import_git_module_aux(context_params)
-    end
 
 =begin
     => DUE TO DEPENDENCY TO PUPPET GEM WE OMMIT THIS <=
@@ -271,7 +270,7 @@ TODO: might deprecate
     end
 =end
 
-    desc "delete-from-catalog [NAMESPACE/]REMOTE-COMPONENT-MODULE-NAME [-y]", "Delete the component module from the DTK Network catalog"
+    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)
       delete_from_catalog_aux(context_params)
@@ -456,6 +455,23 @@ TODO: might deprecate
       list_diffs_module_aux(context_params)
     end
 
+    #
+    # DEVELOPMENT MODE METHODS
+    #
+    if DTK::Configuration.get(:development_mode)
+
+      desc "delete-all","Delete all service modules"
+      def delete_all(context_params)
+        return unless Console.confirmation_prompt("This will DELETE ALL component modules, are you sure"+'?')
+        response = list(context_params)
+
+        response.data().each do |e|
+          run_shell_command("delete #{e['display_name']} -y -p")
+        end
+      end
+
+    end
+
     #### end: commands related to cloning to and pushing from local clone
   end
 end

data/lib/commands/thor/node.rb

@@ -35,6 +35,13 @@ module DTK::Client
       {
         :context => {
           :add_component => "component_template"
+        },
+        :command => {
+          :delete_component => {
+            :endpoint => "assembly",
+            :url => "assembly/info_about",
+            :opts => {:subtype=>"instance", :about=>"components"}
+          }
         }
       }
     end

data/lib/commands/thor/provider.rb

@@ -35,47 +35,69 @@ 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(S)] [--bootstrap]", "Create provider. Multiple security groups separated with ',' (gr1,gr2,gr3,...)"
+    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,...)"
     method_option :keypair, :type => :string
     method_option :security_group, :type => :string, :aliases => '--security-groups'
     method_option :bootstrap, :type => :boolean, :default => false
-    def create_provider(context_params)
-      composed_provider_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
+    def create_ec2_provider(context_params)
+      provider_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
+      provider_type = 'ec2'
 
-      provider_type, provider_name = decompose_provider_type_and_name(composed_provider_name)
       iaas_properties = Hash.new
       #TODO: data-driven check if legal provider type and then what options needed depending on provider type
-      unless provider_type.eql?('physical')
-        security_groups = []
-        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?(',')
+      security_groups = []
+      keypair, security_group = context_params.retrieve_thor_options([:keypair!, :security_group!], options)
 
-        security_groups = security_group.split(',')
-        iaas_properties.merge!(:keypair_name => keypair)#,:security_group => security_group)
+      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?(',')
 
-        if (security_groups.empty? || security_groups.size==1)
-          iaas_properties.merge!(:security_group => security_group)#,:security_group => security_group)
-        else
-          iaas_properties.merge!(:security_group_set => security_groups)
-        end
+      security_groups = security_group.split(',')
+      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)
+      if (security_groups.empty? || security_groups.size==1)
+        iaas_properties.merge!(:security_group => security_group)#,:security_group => security_group)
+      else
+        iaas_properties.merge!(:security_group_set => security_groups)
       end
 
+      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)
+
       # Remove sensitive readline history
       OsUtil.pop_readline_history(2)
 
       post_body =  {
         :iaas_properties => iaas_properties,
         :provider_name => provider_name,
-        :iaas_type => provider_type.downcase,
+        :iaas_type => provider_type,
+        :no_bootstrap => ! options.bootstrap?
+      }
+
+      response = post rest_url("target/create_provider"), post_body
+      @@invalidate_map << :provider
+
+      return 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)
+      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?
       }
 

data/lib/commands/thor/service.rb

@@ -202,7 +202,7 @@ TODO: overlaps with different meaning
       cancel_task_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID create-assembly SERVICE-MODULE-NAME ASSEMBLY-NAME", "Create a new assembly from this service instance in the designated service module."
+    desc "SERVICE-NAME/ID create-assembly [NAMESPACE:]SERVICE-MODULE-NAME ASSEMBLY-NAME", "Create a new assembly from this service instance in the designated service module."
     def create_assembly(context_params)
       assembly_id, service_module_name, assembly_template_name = context_params.retrieve_arguments([:service_id!,:option_1!,:option_2!],method_argument_names)
       response = promote_assembly_aux(:create,assembly_id,service_module_name,assembly_template_name)
@@ -223,7 +223,7 @@ TODO: overlaps with different meaning
       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."
+    desc "SERVICE-NAME/ID push-assembly-updates [NAMESPACE:SERVICE-MODULE-NAME/ASSEMBLY-NAME]", "Push changes made to this service instance to the designated assembly; default is parent assembly."
     def push_assembly_updates(context_params)
       assembly_id, qualified_assembly_name = context_params.retrieve_arguments([:service_id!,:option_1],method_argument_names)
       service_module_name, assembly_template_name =
@@ -258,12 +258,10 @@ TODO: overlaps with different meaning
       edit_workflow_aux(context_params)
     end
 
-=begin
     desc "SERVICE-NAME/ID edit-attributes", "Edit service's attributes."
     def edit_attributes(context_params)
       edit_attributes_aux(context_params)
     end
-=end
 
     # desc "ASSEMBLY-NAME/ID promote-module-updates COMPONENT-MODULE-NAME [--force]", "Promotes changes made to component module in assembly to base component module"
     # method_option :force, :type => :boolean, :default => false, :aliases => '-f'
@@ -409,7 +407,7 @@ TODO: will put in dot release and will rename to 'extend'
           about, data_type = get_type_and_raise_error_if_invalid(about, "nodes", ["attributes", "components", "nodes", "tasks"])
         else
           data_type = :assembly
-          post_body = { :subtype  => 'instance', :detail_level => 'nodes' }
+          post_body = { :subtype  => 'instance', :detail_level => 'nodes',:include_namespaces => true}
           rest_endpoint = "assembly/list"
         end
       end
@@ -524,8 +522,7 @@ TODO: will put in dot release and will rename to 'extend'
       unless options.force?
         # Ask user if really want to delete assembly, if not then return to dtk-shell without deleting
         # used form "+'?' because ?" confused emacs ruby rendering
-        what = "service"
-        return unless Console.confirmation_prompt("Are you sure you want to delete and destroy #{what} '#{assembly_name}' and its nodes"+'?')
+        return unless Console.confirmation_prompt("Are you sure you want to delete and destroy service '#{assembly_name}' and its nodes"+'?')
       end
 
       # purge local clone