morpheus-cli 5.3.2.1 → 5.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e27f28e852866d25457815c852eec19a3f65bd3b0ae8a33d8e055d990f631e79
-  data.tar.gz: 5270f5c81e872491cbf9e1e59f33cf78bf233c152c1347fa61cb01c544073e34
+  metadata.gz: 7e1172b58bb99b6348f15121c97f5c3d8db818c25fa977cd33835f7a3645da44
+  data.tar.gz: bd216d539aadf61f968cee0dabb6d36361bd79dbdd4ac86527a80872f64620ec
 SHA512:
-  metadata.gz: 172818b1030b243ebb2c9c7e316b0cefe173b5a198ff8184f7c0b7bce275954e80109b45c426530ef1587635199e6cc17dedc248011cc11626e2d0f5e8f3f1c1
-  data.tar.gz: 45bdeca37c208f7e7889bd9ab87b0012fea6623faf1b80628fef2ad0df55182388c8e1cd647f9fdd51628d48a4d6cca715e718bb655c8612683fe4ffc9ede3f8
+  metadata.gz: 24e82961eae144b2b9a00f555313ae653b6c1f844a9be549553481c7e91789011858075acfc76efabfeb3a503f211f4ddc76c79a8a33cff1d4bf07a355179753
+  data.tar.gz: 0cf97e82534466142e81d7a20ff7672578de00179cfab36a1e94e6900a24193090e1dd1c91d6c6d409000ac92623ed06ae9e6f5f346937c2912b42b5fedac561

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 5.3.2.1
+RUN gem install morpheus-cli -v 5.3.4
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -486,6 +486,10 @@ class Morpheus::APIClient
     Morpheus::LoadBalancerPoolsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def virtual_servers
+    Morpheus::VirtualServersInterface.new(common_interface_options).setopts(@options)
+  end
+
   def tasks
     Morpheus::TasksInterface.new(common_interface_options).setopts(@options)
   end
@@ -836,6 +840,14 @@ class Morpheus::APIClient
     Morpheus::VdiGatewaysInterface.new(common_interface_options).setopts(@options)
   end
 
+  def network_servers
+    Morpheus::NetworkServersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def rest(endpoint)
+    Morpheus::RestInterface.new(common_interface_options).setopts(@options.merge({base_path: "#{@base_url}/api/#{endpoint}"}))
+  end
+
   # add new interfaces here
 
   protected

data/lib/morpheus/api/clouds_interface.rb

@@ -24,17 +24,10 @@ class Morpheus::CloudsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def get(params=nil)
-    url = "#{@base_url}/api/zones"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-
-    if params.is_a?(Hash)
-      headers[:params].merge!(params)
-    elsif params.is_a?(Numeric)
-      url = "#{@base_url}/api/zones/#{params}"
-    elsif params.is_a?(String)
-      headers[:params]['name'] = params
-    end
+  def get(id, params={})
+    validate_id!(id)
+    url = "#{@base_url}/api/zones/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end

data/lib/morpheus/api/instances_interface.rb

@@ -57,11 +57,24 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def cancel_removal(id, params = {})
-    url = "#{@base_url}/api/instances/#{id}/cancel-removal"
-    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers}
-    execute(opts)
+  def extend_shutdown(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/extend-shutdown", params: params, payload: payload, headers: headers)
+  end
+
+  def extend_expiration(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/extend-expiration", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_shutdown(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-shutdown", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_expiration(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-expiration", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_removal(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-removal", params: params, payload: payload, headers: headers)
   end
 
   def stop(id, params={})

data/lib/morpheus/api/load_balancer_pools_interface.rb

@@ -1,9 +1,9 @@
-require 'morpheus/api/secondary_rest_interface'
+require 'morpheus/api/rest_interface'
 
-class Morpheus::LoadBalancerPoolsInterface < Morpheus::SecondaryRestInterface
+class Morpheus::LoadBalancerPoolsInterface < Morpheus::RestInterface
 
-  def base_path(load_balancer_id)
-    "/api/load-balancers/#{load_balancer_id}/pools"
+  def base_path
+    "/api/load-balancer-pools"
   end
 
 end

data/lib/morpheus/api/load_balancer_profiles_interface.rb

@@ -0,0 +1,10 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::LoadBalancerProfilesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/load-balancer-profiles"
+  end
+
+end
+

data/lib/morpheus/api/load_balancer_virtual_servers_interface.rb

@@ -1,9 +1,9 @@
-require 'morpheus/api/secondary_rest_interface'
+require 'morpheus/api/rest_interface'
 
-class Morpheus::LoadBalancerVirtualServersInterface < Morpheus::SecondaryRestInterface
+class Morpheus::LoadBalancerVirtualServersInterface < Morpheus::RestInterface
 
-  def base_path(load_balancer_id)
-    "/api/load-balancers/#{load_balancer_id}/virtual-servers"
+  def base_path
+    "/api/load-balancer-virtual-servers"
   end
 
 end

data/lib/morpheus/api/network_routers_interface.rb

@@ -143,6 +143,27 @@ class Morpheus::NetworkRoutersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def create_bgp_neighbor(router_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/bgp-neighbors"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update_bgp_neighbor(router_id, nat_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/bgp-neighbors/#{nat_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy_bgp_neighbor(router_id, nat_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/bgp-neighbors/#{nat_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def update_permissions(router_id, payload)
     url = "#{@base_url}/api/networks/routers/#{router_id}/permissions"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/network_servers_interface.rb

@@ -0,0 +1,42 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkServersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def list_scopes(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/scopes", params: params, headers: headers)
+  end
+
+  def get_scope(server_id, scope_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(scope_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", params: params, headers: headers)
+  end
+
+  def create_scope(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/scopes", params: params, payload: payload, headers: headers)
+  end
+
+  def update_scope(server_id, scope_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(scope_id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy_scope(server_id, scope_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(scope_id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", params: params, headers: headers)
+  end
+
+  def update_scope_permissions(server_id, scope_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(scope_id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", payload: payload.to_json, params: params, headers: headers)
+  end
+end

data/lib/morpheus/api/rest_interface.rb

@@ -7,7 +7,8 @@ class Morpheus::RestInterface < Morpheus::APIClient
   # subclasses should override in your interface
   # Example: "/api/things"
   def base_path
-    raise "#{self.class} has not defined base_path!"
+    raise "#{self.class} has not defined base_path!" if @options[:base_path].nil?
+    @options[:base_path]
   end
 
   def list(params={}, headers={})

data/lib/morpheus/api/virtual_images_interface.rb

@@ -45,10 +45,10 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
-  def destroy(id)
+  def destroy(id, params={})
     url = "#{@base_url}/api/virtual-images/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :delete, url: url, headers: headers)
+    execute(method: :delete, url: url, params: params, headers: headers)
   end
 
   # multipart file upload
@@ -165,4 +165,25 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
     execute(method: :delete, url: url, headers: headers)
   end
 
+  def location_base_path(resource_id)
+    "/api/virtual-images/#{resource_id}/locations"
+  end
+
+  def list_locations(resource_id, params={}, headers={})
+    validate_id!(resource_id)
+    execute(method: :get, url: "#{location_base_path(resource_id)}", params: params, headers: headers)
+  end
+
+  def get_location(resource_id, id, params={}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{location_base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
+  def destroy_location(resource_id, id, params = {}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{location_base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
 end

data/lib/morpheus/api/virtual_servers_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::VirtualServersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/load-balancer-virtual-servers"
+  end
+
+end

data/lib/morpheus/cli/apps.rb

@@ -438,7 +438,7 @@ class Morpheus::Cli::Apps
                       instance_prompt_options[:default_cloud] = cloud ? cloud['name'] : nil
                       instance_prompt_options[:environment] = selected_environment ? selected_environment['code'] : nil
                       instance_prompt_options[:default_security_groups] = scoped_instance_config['securityGroups'] ? scoped_instance_config['securityGroups'] : nil
-                      
+
                       instance_prompt_options[:no_prompt] = options[:no_prompt]
                       #instance_prompt_options[:always_prompt] = options[:no_prompt] != true # options[:always_prompt]
                       instance_prompt_options[:options] = scoped_instance_config # meh, actually need to make these default values instead..
@@ -460,8 +460,9 @@ class Morpheus::Cli::Apps
                       instance_prompt_options[:locked_fields] = scoped_instance_config['lockedFields']
                       instance_prompt_options[:for_app] = true
                       # this provisioning helper method handles all (most) of the parsing and prompting
+                      scoped_instance_config = Marshal.load( Marshal.dump(scoped_instance_config) )
                       instance_config_payload = prompt_new_instance(instance_prompt_options)
-                      
+
                       # strip all empty string and nil
                       instance_config_payload.deep_compact!
                       # use the blueprint config as the base

data/lib/morpheus/cli/cli_command.rb

@@ -215,7 +215,8 @@ module Morpheus
           opts.on(arg1, arg2, description) do |val|
             if option_type['type'] == 'checkbox'
               val = (val.to_s != 'false' && val.to_s != 'off')
-            else
+            elsif option_type['dataType'] != 'string'
+              # 'dataType': 'string' added to cli to avoid auto conversion to JSON
               # attempt to parse JSON, this allows blank arrays for multiSelect like --tenants []
               if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
                 begin
@@ -1202,11 +1203,18 @@ module Morpheus
       # this could go be done in optparse.parse instead perhaps
       def verify_args!(opts={})
         args = opts[:args] || []
-        if opts[:count]
-          if args.count < opts[:count]
-            raise_args_error("not enough arguments, expected #{opts[:count]} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
-          elsif args.count > opts[:count]
-            raise_args_error("too many arguments, expected #{opts[:count]} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
+        count = opts[:count]
+        # simplify output for verify_args!(min:2, max:2) or verify_args!(max:0)
+        if opts[:min] && opts[:max] && opts[:min] == opts[:max]
+          count = opts[:min]
+        elsif opts[:max] == 0
+          count = 0
+        end
+        if count
+          if args.count < count
+            raise_args_error("not enough arguments, expected #{count} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
+          elsif args.count > count
+            raise_args_error("too many arguments, expected #{count} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
           end
         else
           if opts[:min]

data/lib/morpheus/cli/cli_registry.rb

@@ -77,14 +77,26 @@ module Morpheus
 
         def exec_command(command_name, args)
           #puts "exec_command(#{command_name}, #{args})"
-          found_alias_command = instance.get_alias(command_name)
           if has_alias?(command_name)
             exec_alias(command_name, args)
           elsif has_command?(command_name)
             instance.get(command_name).new.handle(args)
           else
             # todo: need to just return error instead of raise
-            raise CommandNotFoundError.new("'#{command_name}' is not a morpheus command.")
+            msg = "'#{command_name}' is not a morpheus command."
+            suggestions = find_command_suggestions(command_name)
+            if suggestions && suggestions.size == 1
+              msg += "\nThe most similar command is:\n"
+              suggestions.first(5).each do |suggestion|
+                msg += "\t" + suggestion + "\n"
+              end
+            elsif suggestions && suggestions.size > 1
+              msg += "\nThe most similar commands are:\n"
+              suggestions.first(5).each do |suggestion|
+                msg += "\t" + suggestion + "\n"
+              end
+            end
+            raise CommandNotFoundError.new(msg)
           end
         end
 
@@ -269,6 +281,47 @@ module Morpheus
           return exit_code, err
         end
 
+        def cached_command_list
+          @cached_command_list ||= (all.keys + all_aliases.keys).collect { |it| it.to_s }.sort
+        end
+
+        def clear_cached_command_list
+          @cached_command_list = nil
+        end
+
+        # find suggested commands (or aliases) for a name that was not found
+        # First this looks for the plural of the original guess
+        # Then pop characters off the end looking for partial matches
+        # as long as the guess is at least 3 characters
+        def find_command_suggestions(command_name)
+          every_command = cached_command_list
+          guess = command_name
+          suggestions = []
+          while guess.size >= 3
+            plural_guess = guess.pluralize
+            if every_command.include?(guess)
+              suggestions << guess
+            end
+            if every_command.include?(plural_guess)
+              suggestions << plural_guess
+            end
+            # if every_command.include?(guess)
+            #   suggestions << plural_guess
+            # else
+              guess_regexp = /^#{Regexp.escape(guess)}/i
+              every_command.each do |it|
+                if it =~ guess_regexp
+                  suggestions << it
+                end
+              end
+            # end
+            guess = guess[0..-2]
+          end
+          suggestions.uniq!
+          suggestions.sort! { |x,y| [x.split('-').size, x] <=> [y.split('-').size, y] }
+          return suggestions
+        end
+
       end
 
     end