dtk-client 0.5.16 → 0.5.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmFlYmQ1YjcyYjFmMmQ5NzA0NDA5NjJkNjVhZTY2OTJlN2FjMjBlOQ==
+    NjlmZmNkNDc5M2UxMjc5N2JhODE2MWJhNTVmYzc1M2RjMWJjZjk5ZQ==
   data.tar.gz: !binary |-
-    OWI4ZTU4NTZkZTNiODRhMWY1NDdkZDA4YWRjMzc0Y2Y1NTlhYjQxYQ==
+    NTg2ZGMwMzhjZmY4MDkwM2JlZDcyODllMjkwOTcwMDEwZDg3ZDZkOQ==
 SHA512:
   metadata.gz: !binary |-
-    NzE1MTZiNjQ3MmQ1MDBjMDIzMjk2NjU3NTQzMDU4NWY4ZWI4ZTA0MWMzNjdj
-    ZmVkN2M2NGRkZGMyOGRlZDM5MmY4ZDA5MjllYjA0ZTI5OWRjYzQ5ZmU1ZDhm
-    YzQ2NmRiMGU4ZWJlNjYzYTg2ZjcxNWQ2ZmU1YWRiNThmZWU0YTU=
+    NzVjZjZjY2M2ZmE1MWY5MzU2MzdmNzI0NmFlNWIzNmJlMDA0N2VkZDhiOWJk
+    OTJkMGIyMWQ2Y2FlYWNiNWQ1YWYzNTU4MmNmYmVlNTdlYjI2ZWU3NjUwMGY1
+    NTgzZjA5ODQ4YmZiMjhiZGJiMWY3MWFmOTQxNzIyNmRmMjJjMTI=
   data.tar.gz: !binary |-
-    ZWVjOGQ0YzRhNGU2ZmMyY2NmZmE0ZDk0NWZkOTVmYTM5YjFmNzJjOGU2Yjk3
-    OWU5Njg1YzBjNmE5OTE1YTlhNjMwYTA3YjZjZjk3OWNkZGRjZTRlNjM4NGZh
-    NzhjNjg3M2Q3Y2Q4MmQ2NDViNjExN2I2MWQwMGU4ZGEzMjIwNjk=
+    NTViMjM2NDZmNDU1MjQ1MmM5OWFiYmM1YzQzMDk1NjEyMTJhMjM2YTI1ZDdl
+    YTcxYTdmMmE2Y2NhMjZkNmJjMmM0ZDJlMGRkZmQ5MDU1ZGVmNTM3ZjA4NTg5
+    Yjg1ZDM2MzM3ZGYzODQ2NThiNzZiOTJmZDVmOGQ2Y2RmMzdlNjU=

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

@@ -736,45 +736,15 @@ module DTK::Client
         end
       end
 
-      #Get list of components on particular node
       post_body = {
         :assembly_id => assembly_or_workspace_id,
-        :node_id => node_id,
-        :subtype => "instance",
-        :about => "components"
-      }
-
-      response = post(rest_url("assembly/info_about"),post_body)
-
-      components = []
-      if !response['data'].nil?
-        response['data'].each do |c|
-          components << c['display_name']
-        end
-      end
-
-      #Filter out request per specific component
-      #Filter works for two types of component notation provided: node/component and component
-      if !options["component"].nil?
-          components.reject! do |c|
-            if options["component"].include? "/" 
-              c != options["component"] 
-            else
-              c.split("/").last != options["component"]
-            end
-          end
-      end
-      components = nil if components.empty?
-
-      post_body = {
-        :assembly_id => assembly_or_workspace_id,
-        :node_id => node_id,
-        :components => components
-      }  
+        :components => options["component"]
+      } 
+      post_body[:node_id] = node_id unless node_id.nil?
 
       response = post(rest_url("assembly/initiate_execute_tests"),post_body)
 
-      raise DTK::Client::DtkValidationError, response.data(:errors).first if response.data(:errors)
+      raise DTK::Client::DtkValidationError, response.data(:errors) if response.data(:errors)
       return response unless response.ok?
 
       action_results_id = response.data(:action_results_id)
@@ -844,6 +814,7 @@ module DTK::Client
           :sort_key => "pid"
         }
         response = post(rest_url("assembly/get_action_results"),post_body)
+
         count += 1
         if count > get_ps_tries or response.data(:is_complete)
           end_loop = true

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

@@ -19,12 +19,15 @@ module DTK::Client
         raise DtkValidationError, "Credentials for '#{ssh_credentials}' does not exist in credentials file '#{ssh_creds_path}'" unless ssh_creds_data.include?(ssh_credentials)
         
         ref = "physical--#{display_name}"
-        ret[ref] = {
+        row = ret[ref] = {
           :display_name => display_name,
           :os_type => data["os_type"]||defaults["os_type"],
           :managed => false,
           :external_ref => {:type => "physical", :routable_host_address => node_name, :ssh_credentials => ssh_creds_data["#{ssh_credentials}"]}
         }
+        if tags = data["tags"]
+          row[:tags] = tags
+        end
       end
 
       ret

data/lib/commands/thor/provider.rb

@@ -35,19 +35,31 @@ 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] [--bootstrap]", "Create provider"
-    method_option :keypair,    :type => :string
-    method_option :security_group, :type => :string
+    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,...)"
+    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)
 
       provider_type, provider_name = decompose_provider_type_and_name(composed_provider_name)
       iaas_properties = Hash.new
-      #TODO: daat-driven check if legal provider type and then what options needed depending on provider type
+      #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)
-        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?(',')
+
+        security_groups = security_group.split(',')
+        iaas_properties.merge!(:keypair_name => keypair)#,:security_group => security_group)
+
+        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    => {}},

data/lib/commands/thor/service.rb

@@ -148,7 +148,7 @@ TODO: overlaps with different meaning
             ['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 NODE-ID LOG-PATH [REGEX-PATTERN] [--more]","# Tail specified number of lines from log."]
+            ['tail',"tail NODE-NAME LOG-PATH [REGEX-PATTERN] [--more]","# Tail specified number of lines from log."]
           ]
         },
         :identifier_only => {
@@ -660,7 +660,7 @@ TODO: will put in dot release and will rename to 'extend'
     end
 
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
-    desc "HIDE_FROM_BASE tail NODES-IDENTIFIER LOG-PATH [REGEX-PATTERN] [--more]","Tail specified number of lines from log"
+    desc "HIDE_FROM_BASE tail NODE-NAME LOG-PATH [REGEX-PATTERN] [--more]","Tail specified number of lines from log"
     method_option :more, :type => :boolean, :default => false
     def tail(context_params)
       tail_aux(context_params)

data/lib/commands/thor/workspace.rb

@@ -48,7 +48,8 @@ module DTK::Client
         :context => {
           :add_component => "component_template",
           :create_node => "node_template",
-          :add_component_dependency => "component_template"  
+          :add_component_dependency => "component_template",
+          :set_target => 'target'
         },
         :command => {
           :edit_component_module => {
@@ -120,7 +121,7 @@ module DTK::Client
             ['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 NODE-ID LOG-PATH [REGEX-PATTERN] [--more]","# Tail specified number of lines from log."]
+            ['tail',"tail NODE-NAME LOG-PATH [REGEX-PATTERN] [--more]","# Tail specified number of lines from log."]
           ]
         },
         :identifier_only => {
@@ -437,7 +438,7 @@ module DTK::Client
     end
 
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/workspace>)
-    desc "HIDE_FROM_BASE tail NODES-IDENTIFIER LOG-PATH [REGEX-PATTERN] [--more]","Tail specified number of lines from log"
+    desc "HIDE_FROM_BASE tail NODE-NAME LOG-PATH [REGEX-PATTERN] [--more]","Tail specified number of lines from log"
     method_option :more, :type => :boolean, :default => false
     def tail(context_params)
       tail_aux(context_params)

data/lib/configurator.rb

@@ -17,7 +17,7 @@ module DTK
 			def self.check_config_exists
 				exists = true
 				if !File.exists?(CONFIG_FILE)
-					puts "", "Please enter the DTK server address (example: dtk.r8network.com)"
+					puts "", "Please enter the DTK server address (example: instance.dtk.io)"
 					header = File.read(File.expand_path('../lib/config/client.conf.header', File.dirname(__FILE__)))
 					generate_conf_file(CONFIG_FILE, [['server_host', 'Server address']], header)
 					exists = false

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.5.16"
+  VERSION="0.5.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler