dtk-client 0.8.0 → 0.9.0

data/lib/commands/thor/target.rb

@@ -15,234 +15,236 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-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
-
-    def self.alternate_identifiers()
-      return ['PROVIDER']
-    end
-
-    def self.extended_context()
-      {
-        :context => {
-          # want auto complete for --provider option
-          "--provider" => "provider"
-        }
-      }
-    end
-
-    desc "TARGET-NAME/ID list-nodes","Lists node instances in given targets."
-    def list_nodes(context_params)
-      context_params.method_arguments = ["nodes"]
-      list(context_params)
-    end
-
-    desc "TARGET-NAME/ID info","Provides information about specified target"
-    def info(context_params)
-      target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
-
-      post_body = {:target_id => target_id}
-      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)."
-    method_option :source, :type => :string
-    def import_nodes(context_params)
-      target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
-      source = context_params.retrieve_thor_options([:source!], options)
-
-      parsed_source = source.match(/^(\w+):(.+)/)
-      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 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}
-
-      if import_type.eql?('file')
-        inventory_data = parse_inventory_file(path)
-        post_body.merge!(:inventory_data => inventory_data)
-      end
-
-      response  = post rest_url("target/import_nodes"), post_body
-      return response unless response.ok?
-
-      if response.data.empty?
-        OsUtil.print("No new nodes to import!", :yellow)
-      else
-        OsUtil.print("Successfully imported nodes:", :yellow)
-        response.data.each do |node|
-          OsUtil.print("#{node}", :yellow)
-        end
-      end
-    end
-    ValidImportTypes = ["file"]
-
-    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 }
-    end
-
-    desc "TARGET-NAME/ID install-agents","Install node agents on imported physical nodes."
-    def install_agents(context_params)
-      target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
-
-      post_body = {:target_id => target_id}
-      post rest_url("target/install_agents"), post_body
-    end
-
-    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_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
-      response
-    end
-
-
-    desc "TARGET-NAME/ID list-services","Lists service instances in given targets."
-    def list_services(context_params)
-      context_params.method_arguments = ["assemblies"]
-      list(context_params)
-    end
-
-    def self.validation_list(context_params)
-      provider_id = context_params.retrieve_arguments([:provider_id])
-
-      if provider_id
-        # if assembly_id is present we're loading nodes filtered by assembly_id
-        post_body = {
-          :subtype   => :instance,
-          :parent_id => provider_id
-        }
-
-        response = get_cached_response(:provider_target, "target/list", post_body)
-      else
-        # otherwise, load all nodes
-        response = get_cached_response(:target, "target/list", { :subtype => :instance })
-      end
-
-      response
-    end
-
-    desc "list","Lists available targets."
-    def list(context_params)
-      provider_id, target_id, about = context_params.retrieve_arguments([:provider_id, :target_id, :option_1],method_argument_names||="")
-
-      if target_id.nil?
-        post_body = {
-          :subtype   => :instance,
-          :parent_id => provider_id
-        }
-        response  = post rest_url("target/list"), post_body
-
-        response.render_table(:target)
-      else
-        post_body = {
-          :target_id => target_id,
-          :about => about
-        }
-
-        case about
-          when "nodes"
-            response  = post rest_url("target/info_about"), post_body
-            data_type =  :node
-          when "assemblies"
-            post_body.merge!(:detail_level => 'nodes', :include_workspace => true)
-            response  = post rest_url("target/info_about"), post_body
-            data_type =  :assembly
-          else
-            raise_validation_error_method_usage('list')
-        end
-
-        response.render_table(data_type)
-      end
-    end
-
-    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 services/nodes that belong to this target will be deleted as well)'"+'?')
-
-      post_body = {
-        :target_id => target_id,
-        :type      => 'instance'
-      }
-
-      @@invalidate_map << :target
-
-      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
-
-=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 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)
-
-      raise ::DTK::Client::DtkValidationError.new("You have to provide security-group or keypair to edit target!") unless keypair || security_group
-
-      security_groups, iaas_properties = [], {}
-      iaas_properties.merge!(:keypair => keypair) if keypair
-
-      if 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?(',')
-        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
-      @@invalidate_map << :target
-
-      post_body = {
-        :target_id => target_id,
-        :iaas_properties => iaas_properties
-      }
-      post rest_url("target/set_properties"), post_body
-    end
-=end
-  end
-end
+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
+
+    def self.alternate_identifiers()
+      return ['PROVIDER']
+    end
+
+    def self.extended_context()
+      {
+        :context => {
+          # want auto complete for --provider option
+          "--provider" => "provider"
+        }
+      }
+    end
+
+    desc "TARGET-NAME/ID list-nodes","Lists node instances in given targets."
+    def list_nodes(context_params)
+      context_params.method_arguments = ["nodes"]
+      list(context_params)
+    end
+
+    desc "TARGET-NAME/ID info","Provides information about specified target"
+    def info(context_params)
+      target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
+
+      post_body = {:target_id => target_id}
+      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)."
+    method_option :source, :type => :string
+    def import_nodes(context_params)
+      target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
+      source = context_params.retrieve_thor_options([:source!], options)
+
+      parsed_source = source.match(/^(\w+):(.+)/)
+      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 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}
+
+      if import_type.eql?('file')
+        inventory_data = parse_inventory_file(path)
+        post_body.merge!(:inventory_data => inventory_data)
+      end
+
+      response  = post rest_url("target/import_nodes"), post_body
+      return response unless response.ok?
+
+      if response.data.empty?
+        OsUtil.print("No new nodes to import!", :yellow)
+      else
+        OsUtil.print("Successfully imported nodes:", :yellow)
+        response.data.each do |node|
+          OsUtil.print("#{node}", :yellow)
+        end
+      end
+    end
+    ValidImportTypes = ["file"]
+
+    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 }
+    end
+
+    desc "TARGET-NAME/ID install-agents","Install node agents on imported physical nodes."
+    def install_agents(context_params)
+      target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
+
+      post_body = {:target_id => target_id}
+      post rest_url("target/install_agents"), post_body
+    end
+
+    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_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
+      response
+    end
+
+
+    desc "TARGET-NAME/ID list-services","Lists service instances in given targets."
+    def list_services(context_params)
+      context_params.method_arguments = ["assemblies"]
+      list(context_params)
+    end
+
+    def self.validation_list(context_params)
+      provider_id = context_params.retrieve_arguments([:provider_id])
+
+      if provider_id
+        # if assembly_id is present we're loading nodes filtered by assembly_id
+        post_body = {
+          :subtype   => :instance,
+          :parent_id => provider_id
+        }
+
+        response = get_cached_response(:provider_target, "target/list", post_body)
+      else
+        # otherwise, load all nodes
+        response = get_cached_response(:target, "target/list", { :subtype => :instance })
+      end
+
+      response
+    end
+
+    desc "list","Lists available targets."
+    def list(context_params)
+      provider_id, target_id, about = context_params.retrieve_arguments([:provider_id, :target_id, :option_1],method_argument_names||="")
+
+      if target_id.nil?
+        post_body = {
+          :subtype   => :instance,
+          :parent_id => provider_id
+        }
+        response  = post rest_url("target/list"), post_body
+
+        response.render_table(:target)
+      else
+        post_body = {
+          :target_id => target_id,
+          :about => about
+        }
+
+        case about
+          when "nodes"
+            response  = post rest_url("target/info_about"), post_body
+            data_type =  :node
+          when "assemblies"
+            post_body.merge!(:detail_level => 'nodes', :include_workspace => true)
+            response  = post rest_url("target/info_about"), post_body
+            data_type =  :assembly
+          else
+            raise_validation_error_method_usage('list')
+        end
+
+        response.render_table(data_type)
+      end
+    end
+
+    desc "delete-and-destroy TARGET-NAME [-y]","Deletes target or provider"
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    def delete_and_destroy(context_params)
+      target_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 target '#{target_id}' (all services/nodes that belong to this target will be deleted as well)'"+'?')
+      end
+
+      post_body = {
+        :target_id => target_id,
+        :type      => 'instance'
+      }
+
+      @@invalidate_map << :target
+
+      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
+
+=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 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)
+
+      raise ::DTK::Client::DtkValidationError.new("You have to provide security-group or keypair to edit target!") unless keypair || security_group
+
+      security_groups, iaas_properties = [], {}
+      iaas_properties.merge!(:keypair => keypair) if keypair
+
+      if 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?(',')
+        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
+      @@invalidate_map << :target
+
+      post_body = {
+        :target_id => target_id,
+        :iaas_properties => iaas_properties
+      }
+      post rest_url("target/set_properties"), post_body
+    end
+=end
+  end
+end

data/lib/commands/thor/task.rb

@@ -113,4 +113,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands/thor/test_module.rb

@@ -307,4 +307,4 @@ module DTK::Client
       end
     end
   end
-end
+end

data/lib/commands/thor/workspace.rb

@@ -462,7 +462,16 @@ module DTK::Client
     method_option :component, :aliases => '-c'
     method_option :attribute, :aliases => '-a'
     def edit_attributes(context_params)
-      edit_attributes_aux(context_params)
+      response = edit_attributes_aux(context_params)
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
+
+      response
     end
 
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/workspace>)
@@ -615,7 +624,17 @@ module DTK::Client
     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)
-      set_attribute_aux(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
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
+
+      response
     end
 
     desc "WORKSPACE-NAME/ID set-required-attributes", "Interactive dialog to set required attributes that are not currently set"
@@ -675,4 +694,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands.rb

@@ -15,43 +15,43 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module DTK
-  module Client
-    module CommandBase
-      #TODO: temp workaround
-      def rotate_args(rotated_args)
-        [rotated_args.last] + rotated_args[0..rotated_args.size-2]
-      end
-
-      def get(url)
-        get_connection.get(self.class,url)
-      end
-      def post(url,body=nil)
-        get_connection.post(self.class,url,body)
-      end
-
-      def post_file(url,body=nil)
-        get_connection.post_file(self.class,url,body)
-      end
-
-      def rest_url(route)
-        get_connection.rest_url(route)
-      end
-
-      def get_connection
-        DTK::Client::Session.get_connection()
-      end
-
-      def self.handle_argument_error(task, error)
-        super
-      end
-
-     private
-
-      def pretty_print_cols()
-        self.class.pretty_print_cols()
-      end
-    end
-
-  end
-end
+module DTK
+  module Client
+    module CommandBase
+      #TODO: temp workaround
+      def rotate_args(rotated_args)
+        [rotated_args.last] + rotated_args[0..rotated_args.size-2]
+      end
+
+      def get(url)
+        get_connection.get(self.class,url)
+      end
+      def post(url,body=nil)
+        get_connection.post(self.class,url,body)
+      end
+
+      def post_file(url,body=nil)
+        get_connection.post_file(self.class,url,body)
+      end
+
+      def rest_url(route)
+        get_connection.rest_url(route)
+      end
+
+      def get_connection
+        DTK::Client::Session.get_connection()
+      end
+
+      def self.handle_argument_error(task, error)
+        super
+      end
+
+     private
+
+      def pretty_print_cols()
+        self.class.pretty_print_cols()
+      end
+    end
+
+  end
+end

data/lib/config/configuration.rb

@@ -96,4 +96,4 @@ module DTK
       end
     end
   end
-end
+end

data/lib/config/disk_cacher.rb

@@ -77,4 +77,4 @@ class DiskCacher
     cookie_content
   end
 
-end
+end

data/lib/configurator.rb

@@ -173,4 +173,4 @@ module DTK
       end
     end
   end
-end
+end

data/lib/context_router.rb

@@ -41,4 +41,4 @@ module DTK
     end
 
   end
-end
+end

data/lib/core.rb

@@ -486,4 +486,4 @@ module DTK
       end
     end
   end
-end
+end