dtk-shell 0.10.0

data/lib/commands/thor/node_template.rb

@@ -0,0 +1,94 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class NodeTemplate < CommandBaseThor
+
+    def self.pretty_print_cols()
+      PPColumns.get(:node)
+    end
+
+    def self.extended_context()
+      {
+        :context => {
+          :add_component => "component_template"
+        }
+      }
+    end
+
+    def self.validation_list(context_params)
+      get_cached_response(:node_template, "node/list", {:subtype => 'template'})
+    end
+
+#    desc "list --all -t [TARGET-NAME]", "List all node templates."
+    desc "list", "List all node templates."
+    method_option :all, :type => :boolean, :default => false
+    method_option "target_identifier",:aliases => "-t" ,
+      :type => :string,
+      :banner => "TARGET-IDENTIFIER",
+      :desc => "Name or ID of desired target"
+    def list(context_params)
+      post_body = {
+        :subtype => 'template',
+        :target_indentifier => options.target_identifier,
+        :is_list_all => options.all
+      }
+      response = post rest_url("node/list"), post_body
+      response.render_table(options.all ? :node_template_all : :node_template)
+    end
+
+    #TODO: this may be moved to just be a utility fn
+    desc "image-upgrade OLD-IMAGE-ID NEW-IMAGE-ID", "Upgrade use of OLD-IMAGE-ID to NEW-IMAGE-ID"
+    def image_upgrade(context_params)
+      old_image_id, new_image_id = context_params.retrieve_arguments([:option_1!, :option_2!],method_argument_names)
+      post_body = {
+        :old_image_id => old_image_id,
+        :new_image_id => new_image_id
+      }
+      post rest_url("node/image_upgrade"), post_body
+    end
+
+    desc "add-node-template NODE-TEMPLATE-NAME [-t TARGET-NAME/ID] --os OS --image-id IMAGE-ID --size SIZE[,SIZE2,..]", "Add new node template"
+    method_option "target",:aliases => "-t"
+    method_option "os"
+    method_option "image-id",:aliases => "-i"
+    method_option "size",:aliases => "-s"
+    def add_node_template(context_params)
+      node_template_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
+      size_array = options[:size] && options[:size].split(',')
+
+      post_body = post_body(
+        :node_template_name => node_template_name,
+        :target_id => options['target'],
+        :operating_system => required_option('os'),
+        :image_id => required_option('image-id'),
+        :size_array => size_array
+      )
+      post rest_url("node/add_node_template"), post_body
+    end
+
+    desc "delete-node-template NODE-TEMPLATE-NAME", "Delete node template"
+    def delete_node_template(context_params)
+      node_template_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
+      post_body = post_body(
+        :node_template_name => node_template_name
+      )
+      post rest_url("node/delete_node_template"), post_body
+    end
+
+  end
+end

data/lib/commands/thor/project.rb

@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Project < CommandBaseThor
+
+    def self.pretty_print_cols()
+      PPColumns.get(:project)
+    end
+
+    desc "list","List projects"
+    def list(context_params)
+      search_hash = SearchHash.new()
+      search_hash.cols = pretty_print_cols()
+      post rest_url("project/list"), search_hash.post_body_hash()
+    end
+    
+  end
+end
+

data/lib/commands/thor/provider.rb

@@ -0,0 +1,233 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Provider < CommandBaseThor
+
+    def self.valid_children()
+      [:target]
+    end
+
+    def self.all_children()
+      [:target]
+    end
+
+    def self.validation_list(context_params)
+      get_cached_response(:provider, "target/list", {:subtype => :template })
+    end
+
+    def self.override_allowed_methods()
+      return DTK::Shell::OverrideTasks.new({
+        :command_only => {
+          :target => [
+            ['delete-and-destroy',"delete-and-destroy TARGET-NAME","# Deletes target"],
+            ['list',"list","# Lists available targets."]
+
+          ]
+        },
+        :identifier_only => {
+          :target      => [
+            ['list-nodes',"list-nodes","# Lists node instances in given targets."],
+            ['list-services',"list-services","# Lists assembly instances in given targets."]
+          ]
+        }
+      })
+    end
+
+    def self.valid_child?(name_of_sub_context)
+      Provider.valid_children().include?(name_of_sub_context.to_sym)
+    end
+
+    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_provider_ec2(context_params)
+      provider_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
+      provider_type = 'ec2'
+
+      iaas_properties = Hash.new
+
+      keypair, security_group = context_params.retrieve_thor_options([:keypair, :security_group], options)
+
+      iaas_properties.merge!(:keypair => keypair) if keypair
+      if security_group
+        if security_group.end_with?(',')
+          raise 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(',')
+
+        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 = 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       => 'ec2',
+        :no_bootstrap    => ! options.bootstrap?
+      }
+
+      response = post rest_url("target/create_provider"), post_body
+      @@invalidate_map << :provider
+
+      response
+    end
+
+    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)
+
+      # Remove sensitive readline history
+      OsUtil.pop_readline_history(2)
+
+      post_body =  {
+        :provider_name => provider_name,
+        :iaas_type => 'physical'
+      }
+
+      response = post rest_url("target/create_provider"), post_body
+      @@invalidate_map << :provider
+
+      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
+    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)
+      provider_id, target_name = context_params.retrieve_arguments([:provider_id!, :option_1],method_argument_names)
+      region, keypair, security_group = context_params.retrieve_thor_options([: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
+      Shell::InteractiveWizard.validate_region(region)
+
+      security_groups = []
+      raise 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_id,
+        :region => region,
+        :iaas_properties => iaas_properties
+      }
+      post_body.merge!(:target_name => target_name) if target_name
+      response = post rest_url("target/create"), post_body
+      @@invalidate_map << :target
+
+      response
+    end
+=end
+
+    desc "list","Lists available providers."
+    def list(context_params)
+      if context_params.is_there_command?(:"target")
+        list_targets(context_params)
+      else
+        response  = post rest_url("target/list"), { :subtype => :template }
+        response.render_table(:provider)
+      end
+    end
+
+    #TODO: Aldin; wanted to name this list_targets, but did not know how to do so w/o conflicting with desc "PROVIDER-ID/NAME list-targets
+    # Aldin: moved this to target base context (target>list)
+    #
+    # desc "list-all-targets","Lists all targets for all providers."
+    # def list_all_targets(context_params)
+    #   response  = post rest_url("target/list"), { :subtype => :instance }
+    #   response.render_table(:target)
+    # end
+
+    desc "PROVIDER-ID/NAME list-targets", "List targets"
+    def list_targets(context_params)
+      provider_id = context_params.retrieve_arguments([:provider_id!],method_argument_names)
+
+      response = post rest_url("target/list"), { :subtype => :instance, :parent_id => provider_id }
+      response.render_table(:target)
+    end
+
+    desc "delete-and-destroy PROVIDER-NAME [-y]","Deletes target provider, its targets, and their assemblies"
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    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 '#{provider_id}' and all target and service instances under it" +'?')
+      end
+
+      post_body = {
+        :target_id => provider_id,
+        :type      => 'template'
+      }
+
+      @@invalidate_map << :provider
+
+      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
+      
+      def decompose_provider_type_and_name(composed_name)
+        provider_type, provider_name = composed_name.split(':')
+
+        if (provider_type.nil? || provider_name.nil? || provider_type.empty? || provider_name.empty?)
+          raise DtkValidationError.new("Provider name and type are required parameters and should be provided in format PROVIDER-TYPE:PROVIDER-NAME")
+        end
+
+        return [provider_type, provider_name]
+      end
+
+    end
+    
+
+  end
+end

data/lib/commands/thor/remotes.rb

@@ -0,0 +1,49 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Remotes < CommandBaseThor
+
+    def self.valid_children()
+      []
+    end
+
+    # REMOTE INTERACTION
+    desc "push-remote", "Push local changes to remote git repository"
+    method_option :force, :aliases => '--force', :type => :boolean, :default => false
+    def push_remote(context_params)
+      raise "NOT IMPLEMENTED"
+    end
+
+    desc "list-remotes", "List git remotes for given module"
+    def list_remotes(context_params)
+      raise "NOT IMPLEMENTED"
+    end
+
+    desc "add-remote", "Add git remote for given module"
+    def add_remote(context_params)
+      raise "NOT IMPLEMENTED"
+    end
+
+    desc "remove-remote", "Remove git remote for given module"
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    def remove_remote(context_params)
+      raise "NOT IMPLEMENTED"
+    end
+
+  end
+end

data/lib/commands/thor/service.rb

@@ -0,0 +1,941 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'rest_client'
+require 'json'
+require 'colorize'
+require 'yaml'
+
+dtk_require_from_base('dtk_logger')
+dtk_require_from_base('util/os_util')
+dtk_require_from_base('command_helper')
+dtk_require_from_base('task_status')
+dtk_require_common_commands('thor/set_required_attributes')
+dtk_require_common_commands('thor/edit')
+dtk_require_common_commands('thor/purge_clone')
+dtk_require_common_commands('thor/assembly_workspace')
+dtk_require_common_commands('thor/action_result_handler')
+
+
+module DTK::Client
+  class Service < CommandBaseThor
+    no_tasks do
+      include TaskStatusMixin
+      include SetRequiredParamsMixin
+      include EditMixin
+      include PurgeCloneMixin
+      include AssemblyWorkspaceMixin
+      include ActionResultHandler
+
+      def get_assembly_name(assembly_id)
+        get_name_from_id_helper(assembly_id)
+      end
+
+      # def get_assembly_id(assembly_name)
+      #   assembly_id = nil
+      #   list = CommandBaseThor.get_cached_response(:service, "assembly/list", {})
+
+      #   list.data.each do |item|
+      #     if item["display_name"] == assembly_name
+      #       assembly_id = item["id"]
+      #       break
+      #     end
+      #   end
+
+      #   raise DtkError,"[ERROR] Illegal name (#{assembly_name}) for service." unless assembly_id
+      #   assembly_id
+      # end
+
+    end
+
+    def self.whoami()
+      return :service, "assembly/list", {:subtype  => 'instance'}
+    end
+
+    def self.pretty_print_cols()
+      PPColumns.get(:assembly)
+    end
+
+    def self.valid_children()
+      [:utils]
+    end
+
+    def self.invisible_context()
+      [:node]
+    end
+
+    # using extended_context when we want to use autocomplete from other context
+    # e.g. we are in assembly/apache context and want to create-component we will use extended context to add
+    # component-templates to autocomplete
+    def self.extended_context()
+      {
+        :context => {
+          :create_node => "node_template",
+          :create_node_group => "node_template",
+          :add_component_dependency => "component_template"
+        },
+        :command => {
+          :add_component => {
+            :endpoint => "component_template",
+            :url => "component/list",
+            :opts => {:subtype=>"template", :ignore => "test_module", :hide_assembly_cmps => "true"}
+          },
+          :edit_component_module => {
+            :endpoint => "assembly",
+            :url => "assembly/info_about",
+            :opts => {:subtype=>"instance", :about=>"modules"}
+          },
+          :push_component_module_updates => {
+            :endpoint => "assembly",
+            :url => "assembly/info_about",
+            :opts => {:subtype=>"instance", :about=>"modules"}
+          },
+          :delete_node => {
+            :endpoint => "assembly",
+            :url => "assembly/get_nodes_without_node_groups"
+          },
+          :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"}
+          },
+          :action_info => {
+            :endpoint => "assembly",
+            :url => "assembly/task_action_list"
+          },
+          :exec => {
+            :endpoint => "assembly",
+            :url => "assembly/list_actions"
+          },
+          :exec_sync => {
+            :endpoint => "assembly",
+            :url => "assembly/list_actions"
+          }
+          # TODO: DEPRECATE execute_workflow
+          # :execute_workflow => {
+          #   :endpoint => "assembly",
+          #   :url => "assembly/task_action_list"
+          # }
+        }
+      }
+    end
+
+    # this includes children of children
+    def self.all_children()
+      # [:node, :component, :attribute]
+      [:node]
+    end
+
+    def self.multi_context_children()
+      [[:utils],[:node, :utils]]
+    end
+
+    def self.valid_child?(name_of_sub_context)
+      return Service.valid_children().include?(name_of_sub_context.to_sym)
+    end
+
+    def self.validation_list(context_params)
+      get_cached_response(:service, "assembly/list", {})
+    end
+
+    # TODO: Hack which is necessery for the specific problem (DTK-541), something to reconsider down the line
+    # at this point not sure what would be clenear solution
+
+    # :all             => include both for commands with command and identifier
+    # :command_only    => only on command level
+    # :identifier_only => only on identifier level for given entity (command)
+    #
+    def self.override_allowed_methods()
+      override_methods = {
+        :all => {
+          # :node => [
+            # ['delete-component',"delete-component COMPONENT-ID","# Delete component from assembly's node"],
+            # ['list-components',"list-components","# List components associated with assembly's node."],
+            # ['list-attributes',"list-attributes","# List attributes associated with assembly's node."]
+          # ],
+          :component => [
+            ['list-attributes',"list-attributes","# List attributes associated with given component."]
+          ]
+        },
+        :command_only => {
+          :attribute => [
+            ['list-attributes',"list-attributes","# List attributes."]
+          ],
+          :node => [
+            ['delete',"delete NODE-NAME/ID [-y] ","# Delete node, terminating it if the node has been spun up."],
+            ['list',"list","# List nodes."]
+          ],
+          :component => [
+            ['delete',"delete COMPONENT-NAME/ID [-y] ","# Delete component from workspace."],
+            ['list-components',"list-components","# List components."]
+          ],
+          :utils => [
+# TODO: DTK-2027 might subsume by the dtk actions; currently server changes does not support this command
+#            ['execute-tests',"execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]","# Execute tests. --component filters execution per component, --timeout changes default execution timeout."],
+            ['get-netstats',"get-netstats","# Get netstats."],
+            ['get-ps',"get-ps [--filter PATTERN]","# Get ps."],
+            ['grep',"grep LOG-PATH NODE-ID-PATTERN GREP-PATTERN [--first]","# Grep log from multiple nodes. --first option returns first match (latest log entry)."],
+            ['tail',"tail LOG-PATH NODE-NAME [REGEX-PATTERN] [--more]","# Tail log from specified node. CTRL+C to quit."]
+          ],
+          :node_utils => [
+            ['get-netstats',"get-netstats","# Get netstats."],
+            ['get-ps',"get-ps [--filter PATTERN]","# Get ps."],
+            ['grep',"grep LOG-PATH GREP-PATTERN [--first]","# Grep log from node. --first option returns first match (latest log entry)."],
+            ['tail',"tail LOG-PATH [REGEX-PATTERN] [--more]","# Tail log from node. CTRL+C to quit."]
+          ]
+        },
+        :identifier_only => {
+          :node => [
+            ['add-component',"add-component COMPONENT","# Add a component to the node."],
+            ['delete-component',"delete-component COMPONENT-NAME [-y]","# Delete component from service's node"],
+            ['info',"info","# Return info about node instance belonging to given workspace."],
+            ['list-attributes',"list-attributes","# List attributes associated with service's node."],
+            ['list-components',"list-components","# List components associated with service's node."],
+            ['set-attribute',"set-attribute ATTRIBUTE-NAME [VALUE] [-u]","# (Un)Set attribute value. The option -u will unset the attribute's value."],
+            ['start', "start", "# Start node instance."],
+            ['stop', "stop", "# Stop node instance."],
+            ['ssh', "ssh REMOTE-USER [-i PATH-TO-PEM]","# SSH into node, optional parameters are path to identity file."]
+          ],
+          :node_group => [
+            ['start', "start", "# 2Start node instance."],
+            ['stop', "stop", "# 2Stop node instance."],
+            ['ssh', "ssh REMOTE-USER [-i PATH-TO-PEM]","# 2SSH into node, optional parameters are path to identity file."]
+          ],
+          :component => [
+            ['info',"info","# Return info about component instance belonging to given node."],
+            ['edit',"edit","# Edit component module related to given component."],
+            ['link-components',"link-components ANTECEDENT-CMP-NAME [DEPENDENCY-NAME]","#Link components to satisfy component dependency relationship."],
+            ['list-component-links',"list-component-links","# List component's links to other components."],
+            ['unlink-components',"unlink-components SERVICE-TYPE","# Delete service link on component."]
+          ],
+          :attribute => [
+            ['info',"info","# Return info about attribute instance belonging to given component."]
+          ]
+        }
+      }
+
+      if DTK::Configuration.get(:development_mode)
+        override_methods[:identifier_only][:node] << ['test-action-agent', "test-action-agent BASH-COMMAND-LINE", "Run bash command on test action agent"]
+      end
+
+      return DTK::Shell::OverrideTasks.new(override_methods, [:utils])
+    end
+
+    desc "SERVICE-NAME/ID destroy-and-reset-nodes [-y]", "Terminates all nodes, but keeps config state so they can be spun up from scratch."
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    def destroy_and_reset_nodes(context_params)
+      destroy_and_reset_nodes_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID start [NODE-NAME]", "Starts all the service nodes. A single node can be selected."
+    def start(context_params)
+      start_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID stop [NODE-NAME]", "Stops all the service nodes. A single node can be selected."
+    method_option :legacy, :aliases => '--legacy', :type => :boolean, :default => false
+    def stop(context_params)
+      stop_aux(context_params)
+    end
+
+
+    desc "SERVICE-NAME/ID cancel-task [TASK_ID]", "Cancels an executing task.  If task id is omitted, this command cancels the most recent executing task."
+    def cancel_task(context_params)
+      cancel_task_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID create-assembly [NAMESPACE:]SERVICE-MODULE-NAME ASSEMBLY-NAME [-m DESCRIPTION]", "Create a new assembly from this service instance in the designated service module."
+    method_option "description",:aliases => "-m" ,
+      :type => :string,
+      :banner => "DESCRIPTION"
+    def create_assembly(context_params)
+      if options.description?
+         if context_params.method_arguments.length > 2
+           raise DtkError, "The number of arguments is invalid. If you are using -m with multiple words please put them under quotation marks"
+         end
+      end
+
+      assembly_id, service_module_name, assembly_template_name = context_params.retrieve_arguments([:service_id!,:option_1!,:option_2!],method_argument_names)
+      # need default_namespace for create-assembly because need to check if local service-module directory existst in promote_assembly_aux
+      resp = post rest_url("namespace/default_namespace_name")
+      return resp unless resp.ok?
+      default_namespace = resp.data
+
+      opts = {:default_namespace => default_namespace}
+      if description = options.description
+        description = "#{description}"
+        opts.merge!(:description => description)
+      end
+
+      response = promote_assembly_aux(:create,assembly_id,service_module_name,assembly_template_name,opts)
+      return response unless response.ok?
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :service
+
+      Response::Ok.new()
+    end
+
+    desc "SERVICE-NAME/ID exec [NODE/NODE-GROUP/]ACTION [ACTION-PARAMS]", "Execute action asynchronously"
+    def exec(context_params)
+      exec_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID exec-sync [NODE/NODE-GROUP/]ACTION [ACTION-PARAMS]", "Execute action synchronously"
+    def exec_sync(context_params)
+      exec_sync_aux(context_params)
+    end
+
+    # desc "SERVICE-NAME/ID exec SERVICE-LEVEL-ACTION [PARAMS] [--stream-results]", "Execute a service level action", :hide => true
+    # method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    # def exec(context_params)
+    #   opts = {}
+    #   opts.merge!(:mode => :stream) if context_params.pure_cli_mode or options['stream-results']
+    #   converge_aux(context_params, opts)
+    # end
+
+    # TODO: DEPRECATE: keeping around for backward compatibiity but will be deprecating execute-workflow
+    # desc "SERVICE-NAME/ID execute-workflow WORKFLOW-ACTION [WORKFLOW-PARAMS] [-m COMMIT-MSG]", "Execute workflow.", :hide => true
+    # method_option "commit_msg",:aliases => "-m" ,
+    #   :type => :string,
+    #   :banner => "COMMIT-MSG",
+    #   :desc => "Commit message"
+    # def execute_workflow(context_params)
+    #   OsUtil.print_deprecate_message("Command 'execute-workflow' will be deprecated; use 'exec' instead")
+    #   converge(context_params)
+    # end
+
+    desc "SERVICE-NAME/ID converge [-m COMMIT-MSG] [--stream-results]", "Converge service instance."
+    method_option "commit_msg",:aliases => "-m" ,
+      :type => :string,
+      :banner => "COMMIT-MSG",
+      :desc => "Commit message"
+    method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    def converge(context_params)
+      opts = {}
+      opts.merge!(:mode => :stream) if context_params.pure_cli_mode or options['stream-results']
+      converge_aux(context_params, opts)
+    end
+
+    # desc "SERVICE-NAME/ID execute-action COMPONENT-INSTANCE [ACTION-NAME [ACTION-PARAMS]]", "Converge the component or execute tha action on the component.", :hide => true
+    # def execute_action(context_params)
+    #   execute_ad_hoc_action_aux(context_params)
+    # end
+
+    desc "SERVICE-NAME/ID list-actions [--type TYPE]", "List the actions defined on components in the service instance."
+    method_option :type, :aliases => '-t'
+    def list_actions(context_params)
+      list_actions_aux(context_params)
+    end
+
+    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 =
+        if qualified_assembly_name
+          if qualified_assembly_name =~ /(^[^\/]*)\/([^\/]*$)/
+            [$1,$2]
+          else
+            raise DtkError, "The term (#{qualified_assembly_name}) must have form SERVICE-MODULE-NAME/ASSEMBLY-NAME"
+          end
+        else
+          [nil, nil]
+        end
+
+      response = promote_assembly_aux(:update, assembly_id, service_module_name, assembly_template_name, :use_module_namespace => true)
+      return response unless response.ok?
+      @@invalidate_map << :assembly
+      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)
+      push_module_updates_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID edit-component-module COMPONENT-MODULE-NAME", "Edit a component module used in the service."
+    def edit_component_module(context_params)
+      edit_module_aux(context_params)
+    end
+
+    # desc "SERVICE-NAME/ID create-workflow WORKFLOW-NAME [--from BASE-WORKFLOW-NAME]", "Create a new workflow in the service instance."
+    # method_option :from, :type => :string
+    # def create_workflow(context_params)
+    #   edit_or_create_workflow_aux(context_params,:create => true,:create_from => options.from)
+    # end
+
+    desc "SERVICE-NAME/ID edit-action [SERVICE-LEVEL-ACTION]", "Edit action in the service instance."
+    def edit_action(context_params)
+      edit_or_create_workflow_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID edit-attributes [-n NODE] [-c COMPONENT] [-a ATTRIBUTE]", "Edit service's attributes."
+    method_option :node, :aliases => '-n'
+    method_option :component, :aliases => '-c'
+    method_option :attribute, :aliases => '-a'
+    def edit_attributes(context_params)
+      response = edit_attributes_aux(context_params)
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+
+      response
+    end
+
+=begin
+TODO: will put in dot release and will rename to 'extend'
+    desc "ASSEMBLY-NAME/ID add EXTENSION-TYPE [-n COUNT]", "Adds a sub assembly template to the assembly"
+    method_option "count",:aliases => "-n" ,
+      :type => :string, #integer
+      :banner => "COUNT",
+      :desc => "Number of sub-assemblies to add"
+    def add_node(context_params)
+      assembly_id,service_add_on_name = context_params.retrieve_arguments([:assembly_id!,:option_1!],method_argument_names)
+
+      # create task
+      post_body = {
+        :assembly_id => assembly_id,
+        :service_add_on_name => service_add_on_name
+      }
+
+      post_body.merge!(:count => options.count) if options.count
+
+      response = post rest_url("assembly/add__service_add_on"), post_body
+      # when changing context send request for getting latest assemblies instead of getting from cache
+      @@invalidate_map << :assembly
+
+      return response
+    end
+
+=end
+
+    # TODO: deprecating --wait since subsubsumed by mode
+    # desc "SERVICE-NAME/ID task-status [--wait] [--summarize]", "Get the task status of the running or last running service task."
+    desc "SERVICE-NAME/ID task-status [--mode MODE] [--summarize]", "Get the task status of the running or last running service task."
+    method_option "mode",:aliases => "-m" ,
+      :type => :string,
+      :banner => "MODE",
+      :desc => "Mode in which task status display; one of [stream,snapshot,refresh]; default is 'snapshot'"
+    method_option :summarize, :type => :boolean, :default => false, :aliases => '-s'
+    # TODO: leaving --wait in for backwards compatability
+    method_option :wait, :type => :boolean, :default => false
+    def task_status(context_params)
+      response = task_status_aw_aux(context_params)
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+      response
+    end
+
+    desc "SERVICE-NAME/ID task-action-detail", "Get the task info of the running or last running service task."
+    def task_action_detail(context_params)
+      task_action_detail_aw_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID list-nodes","List nodes associated with service."
+    def list_nodes(context_params)
+      list_nodes_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID list-component-links","List component links."
+    def list_component_links(context_params)
+      list_component_links_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID list-components [--deps]","List components associated with service."
+    method_option :deps, :type => :boolean, :default => false, :aliases => '-l'
+    def list_components(context_params)
+      list_components_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID list-attributes [-f FORMAT] [-t TAG,..] [--links] [-n NODE] [-c COMPONENT] [-a ATTRIBUTE]","List attributes associated with service."
+    method_option :format, :aliases => '-f'
+    method_option :tags, :aliases => '-t'
+    method_option :links, :type => :boolean, :default => false, :aliases => '-l'
+    method_option :node, :aliases => '-n'
+    method_option :component, :aliases => '-c'
+    method_option :attribute, :aliases => '-a'
+    def list_attributes(context_params)
+      list_attributes_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID list-component-modules","List component modules associated with service."
+    def list_component_modules(context_params)
+      list_modules_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID list-tasks","List tasks associated with service."
+    def list_tasks(context_params)
+      list_tasks_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID list-violations [ACTION] [--fix]", "Finds violations that must be corrected before converging the service or running the specified action."
+    method_option :fix, :aliases => '-f', :type => :boolean, :default => false, :banner => 'Run wizard to fix violations found'
+    def list_violations(context_params)
+      list_violations_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID print-includes", "Finds includes in the service."
+    def print_includes(context_params)
+      print_includes_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID action-info [SERVICE-LEVEL-ACTION]", "Get the contents of action associated with the service."
+    def action_info(context_params)
+      action_info_aux(context_params)
+    end
+
+    # desc "SERVICE-NAME/ID list-workflows", "List the workflows associated with the service.", :hide => true
+    # def list_workflows(context_params)
+    #   workflow_list_aux(context_params)
+    # end
+
+    desc "list","List services."
+    def list(context_params)
+      assembly_id, node_id, component_id, attribute_id, about = context_params.retrieve_arguments([:service_id,:node_id,:component_id,:attribute_id,:option_1],method_argument_names)
+      detail_to_include = nil
+
+      if about
+        case about
+          when "nodes"
+            data_type = :node
+          when "components"
+            data_type = :component
+            detail_to_include = [:component_dependencies]
+          when "attributes"
+            data_type = :attribute
+            detail_to_include = [:attribute_links]
+          when "tasks"
+            data_type = :task
+          else
+            raise_validation_error_method_usage('list')
+        end
+      end
+
+      post_body = {
+        :assembly_id => assembly_id,
+        :node_id => node_id,
+        :component_id => component_id,
+        :subtype     => 'instance'
+      }
+      post_body.merge!(:detail_to_include => detail_to_include) if detail_to_include
+      rest_endpoint = "assembly/info_about"
+
+      if context_params.is_last_command_eql_to?(:attribute)
+        raise DtkError, "Not supported command for current context level." if attribute_id
+        about, data_type = get_type_and_raise_error_if_invalid(about, "attributes", ["attributes"])
+      elsif context_params.is_last_command_eql_to?(:component)
+        if component_id
+          about, data_type = get_type_and_raise_error_if_invalid(about, "attributes", ["attributes"])
+        else
+          about, data_type = get_type_and_raise_error_if_invalid(about, "components", ["attributes", "components"])
+        end
+      elsif context_params.is_last_command_eql_to?(:node)
+        if node_id
+          about, data_type = get_type_and_raise_error_if_invalid(about, "components", ["attributes", "components"])
+        else
+          about, data_type = get_type_and_raise_error_if_invalid(about, "nodes", ["attributes", "components", "nodes"])
+        end
+      else
+        if assembly_id
+          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',:include_namespaces => true}
+          rest_endpoint = "assembly/list"
+        end
+      end
+
+      post_body[:about] = about
+      response = post rest_url(rest_endpoint), post_body
+
+      # set render view to be used
+      response.render_table(data_type)
+
+      return response
+    end
+
+    desc "SERVICE-NAME/ID list-diffs COMPONENT-MODULE-NAME", "List diffs between module in service instance and base module."
+    def list_diffs(context_params)
+      list_remote_module_diffs(context_params)
+    end
+
+    desc "SERVICE-NAME/ID grant-access USER-ACCOUNT PUB-KEY-NAME [PATH-TO-PUB-KEY] [--nodes NODE-NAMES]", "Grants ssh access to user account USER-ACCOUNT for nodes in service instance"
+    method_option :nodes, :type => :string, :default => nil
+    def grant_access(context_params)
+      grant_access_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID revoke-access USER-ACCOUNT PUB-KEY-NAME [PATH-TO-PUB-KEY] [--nodes NODE-NAMES]", "Revokes ssh access to user account USER-ACCOUNT for nodes in service instance"
+    method_option :nodes, :type => :string, :default => nil
+    def revoke_access(context_params)
+      revoke_access_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID list-ssh-access", "List SSH access for each of the nodes"
+    def list_ssh_access(context_params)
+      list_ssh_access_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID info", "Get info about content of the service."
+    def info(context_params)
+      info_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID link-attributes TARGET-ATTR SOURCE-ATTR", "Link the value of the target attribute to the source attribute."
+    def link_attributes(context_params)
+      link_attributes_aux(context_params)
+    end
+
+    desc "delete-and-destroy NAME/ID [-y] [--force] [-r]", "Delete service instance, terminating any nodes that have been spun up. Use -r with target to delete all service instances staged into specified target."
+    method_option :y, :aliases => '-y', :type => :boolean, :default => false
+    method_option :force, :aliases => '-f', :type => :boolean, :default => false
+    method_option :recursive, :aliases => '-r', :type => :boolean, :default => false
+    def delete_and_destroy(context_params)
+      response = delete_and_destroy_aux(context_params)
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+      @@invalidate_map << :service_module
+      response
+    end
+
+    desc "SERVICE-NAME/ID set-attribute ATTRIBUTE-NAME [VALUE] [-u] [-c] [-n]", "(Un)Set attribute value. The option -u will unset the attribute's value, -c to set component-attribute, -n to set node-attribute."
+    method_option :unset, :aliases => '-u', :type => :boolean, :default => false
+    method_option :component_attribute, :aliases => '-c', :type => :boolean, :default => false
+    method_option :node_attribute, :aliases => '-n', :type => :boolean, :default => false
+    def set_attribute(context_params)
+      response = set_attribute_aux(context_params)
+      return response unless response.ok?
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+
+      response
+    end
+
+    desc "SERVICE-NAME/ID create-attribute ATTRIBUTE-NAME [VALUE] [--type DATATYPE] [--required] [--dynamic]", "Create a new attribute and optionally assign it a value."
+    method_option :required, :type => :boolean, :default => false
+    method_option :dynamic, :type => :boolean, :default => false
+    method_option "type",:aliases => "-t"
+    def create_attribute(context_params)
+      create_attribute_aux(context_params)
+    end
+
+    # using ^^ before NODE-NAME to remove this command from assembly/assembly_id/node/node_id but show in assembly/assembly_id
+    desc "SERVICE-NAME/ID create-node ^^NODE-NAME [-i IMAGE] [-s SIZE]", "Add (stage) a new node in the service."
+    method_option :image, :aliases => '-i', :type => :string
+    method_option :instance_size, :aliases => '-s', :type => :string
+    def create_node(context_params)
+      response = create_node_aux(context_params)
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
+
+      return response unless response.ok?
+
+      message = "Created node '#{response.data["display_name"]}'."
+      OsUtil.print(message, :yellow)
+    end
+
+    desc "SERVICE-NAME/ID create-node-group ^^NODE-GROUP-NAME [-i IMAGE] [-s SIZE] [-n CARDINALITY]", "Add (stage) a new node group in the service."
+    method_option :image, :aliases => '-i', :type => :string
+    method_option :instance_size, :aliases => '-s', :type => :string
+    method_option :cardinality, :aliases => '-n', :type => :string, :default => 1
+    def create_node_group(context_params)
+      response = create_node_group_aux(context_params)
+      return response unless response.ok?
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
+
+      message = "Created node group '#{response.data["display_name"]}'."
+      OsUtil.print(message, :yellow)
+    end
+
+    desc "SERVICE-NAME/ID link-components TARGET-CMP-NAME SOURCE-CMP-NAME [DEPENDENCY-NAME]","Link the target component to the source component."
+    def link_components(context_params)
+      link_components_aux(context_params)
+    end
+
+    # only supported at node-level
+    # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
+    desc "SERVICE-NAME/ID add-component COMPONENT [--auto-complete]", "Add a component to the service. Use --auto-complete to link components automatically"
+    method_option :auto_complete, :type => :boolean, :default => true
+    def add_component(context_params)
+      response = create_component_aux(context_params)
+
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+
+      response
+    end
+
+    # using ^^ before NODE-NAME to remove this command from assembly/assembly_id/node/node_id but show in assembly/assembly_id
+    desc "SERVICE-NAME/ID delete-node ^^NODE-NAME [-y] [--force]","Delete node, terminating it if the node has been spun up."
+    method_option :y, :aliases => '-y', :type => :boolean, :default => false
+    method_option :force, :aliases => '-f', :type => :boolean, :default => false
+    def delete_node(context_params)
+      response = delete_node_aux(context_params)
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
+
+      return response
+    end
+
+    desc "SERVICE-NAME/ID delete-node-group ^^NODE-NAME [-y] [--force]","Delete node group and all nodes that are part of that group."
+    method_option :y, :aliases => '-y', :type => :boolean, :default => false
+    method_option :force, :aliases => '-f', :type => :boolean, :default => false
+    def delete_node_group(context_params)
+      response = delete_node_group_aux(context_params)
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
+
+      return response
+    end
+
+    desc "HIDE_FROM_BASE delete NAME/ID [-y]","Delete node, terminating it if the node has been spun up."
+    def delete(context_params)
+      if context_params.is_last_command_eql_to?(:node)
+        response = delete_node_aux(context_params)
+        return response unless response.ok?
+        @@invalidate_map << :service_node
+
+        response
+      elsif context_params.is_last_command_eql_to?(:component)
+        response = delete_component_aux(context_params)
+        return response unless response.ok?
+        @@invalidate_map << :assembly_node_component
+
+        response
+      end
+    end
+
+    desc "SERVICE-NAME/ID unlink-components TARGET-CMP-NAME SOURCE-CMP-NAME [DEPENDENCY-NAME]", "Remove a component link."
+    def unlink_components(context_params)
+      unlink_components_aux(context_params)
+    end
+
+    # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
+    desc "SERVICE-NAME/ID delete-component COMPONENT-NAME [-y] [--force]","Delete component from the service."
+    method_option :y, :aliases => '-y', :type => :boolean, :default => false
+    method_option :force, :aliases => '-f', :type => :boolean, :default => false
+    def delete_component(context_params)
+      response = delete_component_aux(context_params)
+
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+      @@invalidate_map << :service_node_component
+
+      response
+    end
+
+    # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
+    desc "HIDE_FROM_BASE get-netstats", "Get netstats"
+    def get_netstats(context_params)
+      get_netstats_aux(context_params)
+    end
+
+=begin
+# TODO: DTK-2027 might subsume by the dtk actions; currently server changes does not support this command
+    # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
+    desc "HIDE_FROM_BASE execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]", "Execute tests. --component filters execution per component, --timeout changes default execution timeout"
+    method_option :component, :type => :string, :desc => "Component name"
+    method_option :timeout, :type => :string, :desc => "Timeout"
+    def execute_tests(context_params)
+      execute_tests_aux(context_params)
+    end
+=end
+
+    # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
+    desc "HIDE_FROM_BASE get-ps [--filter PATTERN]", "Get ps"
+    method_option :filter, :type => :boolean, :default => false, :aliases => '-f'
+    def get_ps(context_params)
+      get_ps_aux(context_params)
+    end
+
+    desc "SERVICE-NAME/ID set-required-attributes", "Interactive dialog to set required attributes that are not currently set"
+    def set_required_attributes(context_params)
+      assembly_id = context_params.retrieve_arguments([:service_id!],method_argument_names)
+      set_required_attributes_aux(assembly_id,:assembly,:instance)
+    end
+
+    # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
+    desc "HIDE_FROM_BASE tail LOG-PATH NODE-NAME [REGEX-PATTERN] [--more]","Tail specified number of lines from log. CTRL+C to quit."
+    method_option :more, :type => :boolean, :default => false
+    def tail(context_params)
+      tail_aux(context_params)
+    end
+
+    # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
+    desc "HIDE_FROM_BASE grep LOG-PATH NODES-ID-PATTERN GREP-PATTERN [--first]","Grep log from multiple nodes. --first option returns first match (latest log entry)."
+    method_option :first, :type => :boolean, :default => false
+    def grep(context_params)
+      grep_aux(context_params)
+    end
+
+    desc "stage ASSEMBLY-TEMPLATE [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "Stage assembly in target."
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option :parent_service, :type => :string, :aliases => '-t'
+    version_method_option
+    #hidden option
+    method_option "instance-bindings", :type => :string
+    def stage(context_params)
+      stage_aux(context_params)
+    end
+
+    desc "set-default-target INSTANCE-NAME/ID", "Set default target service instance."
+    def set_default_target(context_params)
+      set_default_target_aux(context_params)
+    end
+
+    desc "stage-target ASSEMBLY-TEMPLATE [INSTANCE-NAME] -t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "Stage assembly as target instance."
+    method_option :settings, :type => :string, :aliases => '-s'
+    method_option :auto_complete, :type => :boolean, :default => true
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option :parent_service, :type => :string, :aliases => '-t'
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
+    method_option :is_target, :type => :boolean, :default => true
+    def stage_target(context_params)
+      response = stage_aux(context_params)
+      return response unless response.ok?
+
+      # when changing context send request for getting latest assemblies instead of getting from cache
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      return response
+    end
+
+    desc "deploy-target ASSEMBLY-TEMPLATE [INSTANCE-NAME] [-v VERSION] [--no-auto-complete] [--stream-results]", "Deploy assembly as target instance."
+    method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
+    method_option :is_target, :type => :boolean, :default => true
+    # method_option :settings, :type => :string, :aliases => '-s'
+    def deploy_target(context_params)
+      response = deploy_aux(context_params)
+      return response unless response.ok?
+
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      response
+    end
+
+    desc "deploy ASSEMBLY-TEMPLATE [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "Deploy assembly in target."
+    method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option :parent_service, :type => :string, :aliases => '-t'
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
+    # method_option :settings, :type => :string, :aliases => '-s'
+    def deploy(context_params)
+      response = deploy_aux(context_params)
+      return response unless response.ok?
+
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      response
+    end
+
+    desc "SERVICE-NAME/ID set-required-attributes-and-converge", "Interactive dialog to set required attributes that are not currently set", :hide => true
+    def set_required_attributes_and_converge(context_params)
+      begin
+        response = set_required_attributes_converge_aux(context_params)
+      rescue DtkError::InteractiveWizardError => e
+        @@invalidate_map << :service
+        @@invalidate_map << :assembly
+
+        # if skip correction wizzard still go to newly created service instance
+        if instance_name = (context_params.get_forwarded_options()||{})[:instance_name]
+          MainContext.get_context.change_context(["/service/#{instance_name}"])
+        end
+
+        raise e
+      end
+
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      # if instance_name = opts[:instance_name]
+      #   MainContext.get_context.change_context([instance_name])
+      # end
+
+      response
+    end
+
+    desc "create-workspace [WORKSPACE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID]", "Create workspace"
+    method_option :parent_service, :type => :string, :aliases => '-t'
+    def create_workspace(context_params)
+      response = create_workspace_aux(context_params)
+      return response unless response.ok?
+
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      yaml_response = YAML.load(response.data)
+      if workspace_instance = yaml_response['new_workspace_instance']
+        MainContext.get_context.change_context(["/service/#{workspace_instance['name']}"])
+      else
+        fail DtkError.new('Workspace instance is not staged properly, please try again!')
+      end
+
+      response
+    end
+  end
+end