lib/cloudstack-cli/option_resolver.rb in cloudstack-cli-1.0.0.rc1 vs lib/cloudstack-cli/option_resolver.rb in cloudstack-cli-1.0.0.rc2

@@ -97,11 +97,14 @@
       options
     end
 
     def resolve_iso(options = options)
       if options[:iso]
-        unless iso = client.list_isos(name: options[:iso]).first
+        unless iso = client.list_isos(
+            name: options[:iso],
+            project_id: options[:project_id]
+          ).first
           say "Error: Iso '#{args[:iso]}' is invalid.", :red
           exit 1
         end
         unless options[:diskoffering_id]
           say "Error: a disk offering is required when using iso.", :red
@@ -113,10 +116,14 @@
       options
     end
 
     def resolve_template(options = options)
       if options[:template]
-        if template = client.list_templates(name: options[:template], template_filter: "all").first
+        if template = client.list_templates(
+            name: options[:template],
+            template_filter: "executable",
+            project_id: options[:project_id]
+          ).first
           options[:template_id] = template['id']
         else
           say "Error: Template #{options[:template]} not found.", :red
           exit 1
         end