morpheus-cli 5.3.3 → 5.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca7c939828b8f72ee86c663a19d01743a56d5c6c209cecc5e17b44046caeb484
-  data.tar.gz: e13fccbf1a45e8980e818e4cc1f0dba98d65e405c79f5d90e13c33341ad2e514
+  metadata.gz: 7e1172b58bb99b6348f15121c97f5c3d8db818c25fa977cd33835f7a3645da44
+  data.tar.gz: bd216d539aadf61f968cee0dabb6d36361bd79dbdd4ac86527a80872f64620ec
 SHA512:
-  metadata.gz: 5965b1af85499cadcae249f3109b6fd0ea4bee6af38192196fd6091bdcdb452f75c1f4025f372ec3d5f47ab1531e04acbf5fb2ed17848ba023087c309fdd06ee
-  data.tar.gz: 56bc2124de4e6b28c0c4484b5fa40beef19287708edd98ee1fdddbe334bc7854b853153209d1531793502aa8034d1c8ccf9fca643ec13aebf3eb8353cdd1f72e
+  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.3
+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/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_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/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

data/lib/morpheus/cli/cloud_resource_pools_command.rb

@@ -819,7 +819,7 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       print_red_alert "Resource Pool not found by name #{name}"
       return nil
     elsif resource_pools.size > 1
-      matching_resource_pools = folders.select { |it| name && (it['name'] == name || it['externalId'] == name) }
+      matching_resource_pools = resource_pools.select { |it| name && (it['name'] == name || it['externalId'] == name) }
       if matching_resource_pools.size == 1
         return matching_resource_pools[0]
       end

data/lib/morpheus/cli/clouds.rb

@@ -27,8 +27,6 @@ class Morpheus::Cli::Clouds
     @clouds_interface = @api_client.clouds
     @groups_interface = @api_client.groups
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
-    # preload stuff
-    get_available_cloud_types()
   end
 
   def handle(args)
@@ -134,38 +132,36 @@ class Morpheus::Cli::Clouds
 
   def get(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
       opts.footer = "Get details about a cloud.\n" +
                     "[name] is required. This is the name or id of a cloud."
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
+    params.merge!(parse_query_options(options))
     id_list = parse_id_list(args)
     return run_command_for_each_arg(id_list) do |arg|
-      _get(arg, options)
+      _get(arg, params, options)
     end
   end
 
-  def _get(arg, options={})
-    begin
-      if options[:dry_run]
-        @clouds_interface.setopts(options)
-        if arg.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @clouds_interface.dry.get(arg.to_i)
-        else
-          print_dry_run @clouds_interface.dry.list({name:arg})
-        end
-        return
-      end
-      cloud = find_cloud_by_name_or_id(arg)
-      @clouds_interface.setopts(options)
-      json_response = @clouds_interface.get(cloud['id'])
+  def _get(id, params, options={})
+    cloud = nil
+    if id.to_s !~ /\A\d{1,}\Z/
+      cloud = find_cloud_by_name_or_id(id)
+      id = cloud['id']
+    end
+    @clouds_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clouds_interface.dry.get(id.to_i, params)
+      return
+    end
+    json_response = @clouds_interface.get(id, params)
+    render_response(json_response, options, 'zone') do
       cloud = json_response['zone']
       cloud_stats = cloud['stats']
       # serverCounts moved to zone.stats.serverCounts
@@ -175,17 +171,6 @@ class Morpheus::Cli::Clouds
       else
         server_counts = json_response['serverCounts'] # legacy
       end
-      if options[:json]
-        puts as_json(json_response, options, 'zone')
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, 'zone')
-        return 0
-      end
-      if options[:csv]
-        puts records_as_csv([json_response['zone']], options)
-        return 0
-      end
       cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
       print_h1 "Cloud Details"
       print cyan
@@ -195,6 +180,7 @@ class Morpheus::Cli::Clouds
         "Type" => lambda {|it| cloud_type ? cloud_type['name'] : '' },
         "Code" => 'code',
         "Location" => 'location',
+        "Region Code" => 'regionCode',
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
         "Groups" => lambda {|it| it['groups'].collect {|g| g.instance_of?(Hash) ? g['name'] : g.to_s }.join(', ') },
         #"Owner" => lambda {|it| it['owner'].instance_of?(Hash) ? it['owner']['name'] : it['ownerId'] },
@@ -214,14 +200,9 @@ class Morpheus::Cli::Clouds
         print "Unmanaged: #{server_counts['unmanaged']}".center(20)
         print "\n"
       end
-
       print reset,"\n"
-
-      #puts instance
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
   def add(args)
@@ -954,13 +935,14 @@ class Morpheus::Cli::Clouds
         name: cloud['name'],
         type: cloud_type ? cloud_type['name'] : '',
         location: cloud['location'],
+        "REGION CODE": cloud['regionCode'],
         groups: (cloud['groups'] || []).collect {|it| it.instance_of?(Hash) ? it['name'] : it.to_s }.join(', '),
         servers: cloud['serverCount'],
         status: format_cloud_status(cloud)
       }
     end
     columns = [
-      :id, :name, :type, :location, :groups, :servers, :status
+      :id, :name, :type, :location, "REGION CODE", :groups, :servers, :status
     ]
     print as_pretty_table(rows, columns, opts)
   end

data/lib/morpheus/cli/hosts.rb

@@ -553,7 +553,6 @@ class Morpheus::Cli::Hosts
       server_columns.delete("Cost") if server['hourlyCost'].to_f == 0
       server_columns.delete("Price") if server['hourlyPrice'].to_f == 0 || server['hourlyPrice'] == server['hourlyCost']
       server_columns.delete("Labels") if server['labels'].nil? || server['labels'].empty?
-      server_columns.delete("Tags") if tags.nil? || tags.empty?
 
       print_description_list(server_columns, server)
 

data/lib/morpheus/cli/instances.rb

@@ -1365,7 +1365,6 @@ class Morpheus::Cli::Instances
         "Status" => lambda {|it| format_instance_status(it) }
       }
       description_cols.delete("Labels") if labels.nil? || labels.empty?
-      description_cols.delete("Tags") if tags.nil? || tags.empty?
       description_cols.delete("Apps") if instance['apps'].nil? || instance['apps'].empty?
       description_cols.delete("Power Schedule") if instance['powerSchedule'].nil?
       description_cols.delete("Expire Date") if instance['expireDate'].nil?
@@ -1694,19 +1693,77 @@ class Morpheus::Cli::Instances
     options = {:options => {}}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance] -g GROUP")
-      opts.on('--name VALUE', String, "Name") do |val|
-        options[:options]['name'] = val
-      end
       opts.on( '-g', '--group GROUP', "Group Name or ID for the new instance" ) do |val|
         options[:group] = val
       end
       opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID for the new instance" ) do |val|
         options[:cloud] = val
       end
+      opts.on('--name VALUE', String, "Name") do |val|
+        options[:options]['name'] = val
+      end
+      opts.on("--description [TEXT]", String, "Description") do |val|
+        options[:description] = val.to_s
+      end
+      opts.on("--environment ENV", String, "Environment code") do |val|
+        options[:environment] = val.to_s
+      end
+      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
+      end
+      opts.on('--metadata LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
+      end
+      opts.add_hidden_option('--metadata')
+      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
+        options[:labels] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+      end
+      # opts.on("--copies NUMBER", Integer, "Number of copies to provision") do |val|
+      #   options[:copies] = val.to_i
+      # end
+      # opts.on("--layout-size NUMBER", Integer, "Apply a multiply factor of containers/vms within the instance") do |val|
+      #   options[:layout_size] = val.to_i
+      # end
+      # opts.on( '-l', '--layout LAYOUT', "Layout ID" ) do |val|
+      #   options[:layout] = val
+      # end
+      opts.on( '-p', '--plan PLAN', "Service plan ID") do |val|
+        options[:service_plan] = val
+      end
+      opts.on( '--resource-pool ID', String, "Resource pool ID" ) do |val|
+        options[:resource_pool] = val
+      end
+      opts.on("--workflow ID", String, "Automation: Workflow ID") do |val|
+        options[:workflow_id] = val
+      end
+      opts.on("--ports ARRAY", String, "Exposed Ports, JSON formatted list of objects containing name and port") do |val|
+        # expects format like --ports '[{"name":"web","port":8080}]'
+        ports_array = JSON.parse(val)
+        options[:ports] = ports_array
+        options[:options]['ports'] = ports_array
+      end
+      # opts.on('-L', "--lb", "Enable Load Balancer") do
+      #   options[:enable_load_balancer] = true
+      # end
       opts.on("--create-user on|off", String, "User Config: Create Your User. Default is on") do |val|
         options[:create_user] = !['false','off','0'].include?(val.to_s)
       end
-      build_common_options(opts, options, [:options, :payload, :auto_confirm, :json, :dry_run, :remote])
+      opts.on("--user-group USERGROUP", String, "User Config: User Group") do |val|
+        options[:user_group_id] = val
+      end
+      opts.on("--shutdown-days DAYS", Integer, "Automation: Shutdown Days") do |val|
+        options[:shutdown_days] = val.to_i
+      end
+      opts.on("--expire-days DAYS", Integer, "Automation: Expiration Days") do |val|
+        options[:expire_days] = val.to_i
+      end
+      opts.on("--create-backup [on|off]", String, "Automation: Create Backups.") do |val|
+        options[:create_backup] = ['on','true','1',''].include?(val.to_s.downcase) ? 'on' : 'off'
+      end
+      opts.on("--security-groups LIST", String, "Security Groups, comma separated list of security group IDs") do |val|
+        options[:security_groups] = val.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
+      end
+      build_standard_post_options(opts, options, [:auto_confirm])
     end
     optparse.parse!(args)
     if args.count < 1 || args.count > 2
@@ -1724,12 +1781,20 @@ class Morpheus::Cli::Instances
 
       # defaults derived from clone
       options[:default_name] = instance['name'] + '-clone' if instance['name']
+      options[:default_description] = instance['description'] if !instance['description'].to_s.empty?
+      options[:default_environment] = instance['environment'] if instance['environment']
       options[:default_group] = instance['group']['id'] if instance['group']
       options[:default_cloud] = instance['cloud']['name'] if instance['cloud']
       options[:default_plan] = instance['plan']['name'] if instance['plan']
       options[:default_resource_pool] = instance['config']['resourcePoolId'] if instance['config']
       options[:default_config] = instance['config']
       options[:default_security_group] = instance['config']['securityGroups'][0]['id'] if instance['config'] && (instance['config']['securityGroups'] || []).count > 0
+      if instance['labels'] && !instance['labels'].empty?
+        options[:default_labels] = (instance['labels'] || []).join(',')
+      end
+      if instance['tags'] && !instance['tags'].empty?
+        options[:current_tags] = instance['tags']
+      end
 
       # immutable derived from clone
       options[:instance_type_code] = instance['instanceType']['code'] if instance['instanceType']
@@ -1767,13 +1832,52 @@ class Morpheus::Cli::Instances
         payload.deep_merge!(passed_options)
       end
       
+      #payload['instance'] ||= {}
+      # if options[:instance_name]
+      #   payload['instance']['name'] = options[:instance_name]
+      # end
+      # if options[:description] && !payload['instance']['description']
+      #   payload['instance']['description'] = options[:description]
+      # end
+      # if options[:environment] && !payload['instance']['instanceContext']
+      #   payload['instance']['instanceContext'] = options[:environment]
+      # end
+    
+      #payload[:copies] = options[:copies] if options[:copies] && options[:copies] > 0
+      if options[:layout_size] && options[:layout_size] > 0 # aka Scale Factor
+        payload[:layoutSize] = options[:layout_size]
+      end
+      if !options[:create_backup].nil?
+        payload[:createBackup] = options[:create_backup]
+      end
+      if options[:expire_days]
+        payload['instance'] ||= {}
+        payload['instance']['expireDays'] = options[:expire_days]
+      end
+      if options[:shutdown_days]
+        payload['instance'] ||= {}
+        payload['shutdownDays'] = options[:shutdown_days]
+      end
       # JD: this actually fixed a customer problem
       # It appears to be important to pass this... not sure if config.createUser is necessary...
       if options[:create_user].nil?
         options[:create_user] = true
       end
-      if options[:create_user] != nil
-        payload.deep_merge!({'createUser' => options[:create_user], 'config' =>{'createUser' => options[:create_user]}})
+      if options.key?(:create_user)
+        payload['config'] ||= {}
+        payload['config']['createUser'] = options[:create_user]
+        payload['createUser'] = options[:create_user]
+      end
+      if options[:user_group_id]
+        payload['instance'] ||= {}
+        payload['instance']['userGroup'] = {'id' => options[:user_group_id] }
+      end
+      if options[:workflow_id]
+        if options[:workflow_id].to_s =~ /\A\d{1,}\Z/
+          payload['taskSetId'] = options[:workflow_id].to_i
+        else
+          payload['taskSetName'] = options[:workflow_id]
+        end
       end
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to clone the instance #{instance['name']} as '#{payload['name']}'?", options)
         return 9, "aborted command"