morpheus-cli 5.3.2.3 → 5.4.1

data/lib/morpheus/cli/{network_groups_command.rb → commands/network_groups_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkGroupsCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{network_pool_servers_command.rb → commands/network_pool_servers_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkPoolServersCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{network_pools_command.rb → commands/network_pools_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkPoolsCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{network_proxies_command.rb → commands/network_proxies_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkProxiesCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{network_routers_command.rb → commands/network_routers_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkRoutersCommand
   include Morpheus::Cli::CliCommand
@@ -17,6 +13,7 @@ class Morpheus::Cli::NetworkRoutersCommand
   register_subcommands :add_route, :remove_route, :routes
   register_subcommands :update_permissions
   register_subcommands :add_nat, :update_nat, :remove_nat, :nats, :nat
+  register_subcommands :add_bgp_neighbor, :update_bgp_neighbor, :remove_bgp_neighbor, :bgp_neighbors, :bgp_neighbor
 
   def initialize()
   end
@@ -313,7 +310,7 @@ class Morpheus::Cli::NetworkRoutersCommand
             server_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networkServer', 'type' => 'select', 'fieldLabel' => 'Network Server', 'required' => true, 'optionSource' => 'networkServer'}], options[:options], @api_client, params, nil, true)['networkServer']
             server = {'id' => server_id}
           end
-          router['networkServer'] = {'id' => server['id']}
+          params['router']['networkServer'] = router['networkServer'] = {'id' => server['id']}
           params['networkServerId'] = server['id']
         else
           # prompt cloud
@@ -637,59 +634,51 @@ class Morpheus::Cli::NetworkRoutersCommand
   end
 
   def _firewall_rule_group(router_id, group_id, options)
-    begin
-      @network_routers_interface.setopts(options)
-      if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @network_routers_interface.dry.get(router_id.to_i)
+    @network_routers_interface.setopts(options)
+    if options[:dry_run]
+      if router_id.to_s =~ /\A\d{1,}\Z/
+        print_dry_run @network_routers_interface.dry.list({name:router_id})
+      else
+        if group_id.to_s =~ /\A\d{1,}\Z/
+          print_dry_run @network_routers_interface.dry.get_firewall_rule_group(router_id.to_i, group_id)
         else
-          print_dry_run @network_routers_interface.dry.list({name:router_id})
+          print_dry_run @network_routers_interface.dry.list_firewall_rule_groups(router_id.to_i, {phrase:router_id})
         end
-        return
       end
-      router = find_router(router_id)
-      if router.nil?
-        return 1
-      end
-
-      if router['type']['hasFirewallGroups']
-        group = (router['firewall']['ruleGroups'] || []).find {|it| it['id'].to_s == group_id.to_s || it['name'] == group_id.to_s}
+      return
+    end
+    router = find_router(router_id)
+    if router.nil?
+      return 1
+    end
 
-        if group
-          json_response = {'ruleGroup' => group}
+    if router['type']['hasFirewallGroups']
+      group = find_firewall_rule_group(router['id'], group_id)
+      return 1 if group.nil?
 
-          if options[:json]
-            puts as_json(json_response, options, "ruleGroup")
-            return 0
-          elsif options[:yaml]
-            puts as_yaml(json_response, options, "ruleGroup")
-            return 0
-          elsif options[:csv]
-            puts records_as_csv([json_response['ruleGroup']], options)
-            return 0
-          end
+      render_response({ruleGroup: group}, options, 'ruleGroup') do
+        print_h1 "Firewall Rule Group Details"
+        print cyan
+        description_cols = {
+          "ID" => lambda {|it| it['id'] },
+          "Name" => lambda {|it| it['name'] },
+          "Description" => lambda {|it| it['description']},
+          "Priority" => lambda {|it| it['priority']},
+          "Category" => lambda {|it| it['groupLayer']}
+        }
+        print_description_list(description_cols, group)
 
-          print_h1 "Firewall Rule Group Details"
-          print cyan
-          description_cols = {
-            "ID" => lambda {|it| it['id'] },
-            "Name" => lambda {|it| it['name'] },
-            "Description" => lambda {|it| it['description']},
-            "Priority" => lambda {|it| it['priority']},
-            "Category" => lambda {|it| it['groupLayer']}
-          }
-          print_description_list(description_cols, group)
-        else
-          print_red_alert "Firewall rule group #{group_id} not found for router #{router['name']}"
+        if is_master_account
+          description_cols["Visibility"] = lambda {|it| it['visibility']}
+          description_cols["Tenants"] = lambda {|it| it['tenants'].collect {|tenant| tenant['name']}.join(', ')}
         end
-      else
-        print_h1 "No Firewall Rule Groups"
+        print_description_list(description_cols, group)
       end
-      println reset
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
+    else
+      print_red_alert "Firewall rule groups not supported for #{router['type']['name']}"
       return 1
     end
+    println reset
   end
 
   def add_firewall_rule_group(args)
@@ -706,6 +695,7 @@ class Morpheus::Cli::NetworkRoutersCommand
       opts.on('--priority VALUE', Integer, "Priority for this firewall rule group (not applicable to all firewall types)") do |val|
         params['priority'] = val
       end
+      add_perms_options(opts, options, ['plans', 'groups'])
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Create a network router firewall rule group."
     end
@@ -745,7 +735,14 @@ class Morpheus::Cli::NetworkRoutersCommand
 
         # prompt options
         option_result = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options].deep_merge({:context_map => {'group' => ''}}), @api_client, {}, nil, true)
-        payload = {'ruleGroup' => params.deep_merge(option_result)}
+
+        rule_group = params.deep_merge(option_result)
+
+        # prompt perms
+        if is_master_account
+          rule_group.merge!(prompt_permissions_v2(options, ['plans', 'groups']))
+        end
+        payload = {'ruleGroup' => rule_group}
       end
 
       @network_routers_interface.setopts(options)
@@ -782,6 +779,7 @@ class Morpheus::Cli::NetworkRoutersCommand
       opts.on('--priority VALUE', Integer, "Priority for this firewall rule group (not applicable to all firewall types)") do |val|
         params['priority'] = val
       end
+      add_perms_options(opts, options, ['plans', 'groups'])
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a network router firewall rule group.\n" +
         "[router] is required. This is the name or id of an existing network router.\n" +
@@ -813,6 +811,11 @@ class Morpheus::Cli::NetworkRoutersCommand
         exit 1
       end
 
+      if is_master_account
+        params['visibility'] = options[:visibility] if !options[:visibility].nil?
+        params['tenants'] = options[:tenants].collect {|it| {'id' => it}} if !options[:tenants].nil?
+      end
+
       payload = parse_payload(options) || {'ruleGroup' => params}
       payload['ruleGroup'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
@@ -1148,7 +1151,6 @@ class Morpheus::Cli::NetworkRoutersCommand
         api_params = {}
         api_params['networkServerId'] = router['networkServer']['id'] if router['networkServer']
         api_params['zoneId'] = router['zone']['id'] if router['networkServer'].nil?
-        api_params['groupId'] = options[:group] if !options[:group].nil?
         option_result = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options].deep_merge({:context_map => {'rule' => ''}}), @api_client, api_params, nil, true)
         payload = {'rule' => params.deep_merge(option_result)}
       end
@@ -1517,11 +1519,11 @@ class Morpheus::Cli::NetworkRoutersCommand
     options = {}
     query_params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[router] [rule]")
+      opts.banner = subcommand_usage("[router] [route]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
       opts.footer = "Delete a network router route.\n" +
-          "[router] is required. This is the name or id of an existing network router."
-      "[route] is required. This is the name or id of an existing network router route."
+        "[router] is required. This is the name or id of an existing network router."
+        "[route] is required. This is the name or id of an existing network router route."
     end
     optparse.parse!(args)
     if args.count != 2
@@ -1628,11 +1630,11 @@ class Morpheus::Cli::NetworkRoutersCommand
   def nat(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[router] [rule]")
+      opts.banner = subcommand_usage("[router] [nat]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Display network router firewall rule details." + "\n" +
         "[router] is required. This is the name or id of a network router.\n" +
-        "[rule] is required. This is the name or id of a firewall rule.\n"
+        "[nat] is required. This is the name or id of a NAT.\n"
     end
 
     optparse.parse!(args)
@@ -1887,6 +1889,268 @@ class Morpheus::Cli::NetworkRoutersCommand
     end
   end
 
+  def bgp_neighbors(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[router]")
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List network router BGP neighbors." + "\n" +
+        "[router] is required. This is the name or id of a network router."
+    end
+
+    optparse.parse!(args)
+    connect(options)
+
+    if args.count < 1
+      puts optparse
+      return 1
+    end
+    _bgp_neighbors(args[0], options)
+  end
+
+  def _bgp_neighbors(router_id, options)
+    @network_routers_interface.setopts(options)
+    if options[:dry_run]
+      if args[0].to_s =~ /\A\d{1,}\Z/
+        print_dry_run @network_routers_interface.dry.get(router_id.to_i)
+      else
+        print_dry_run @network_routers_interface.dry.list({name:router_id})
+      end
+      return
+    end
+    router = find_router(router_id)
+    if router.nil?
+      return 1
+    end
+
+    if router['type']['hasBgp']
+      json_response = {'networkRouterBgpNeighbors' => router['bgpNeighbors']}
+      render_response(json_response, options, 'networkRouterBgpNeighbor') do
+        print_h1 "Network Router BGP Neighbors For: #{router['name']}"
+        print cyan
+        print_bgp_neighbors(router)
+      end
+    else
+      print_red_alert "BGP not supported for #{router['type']['name']}"
+    end
+    print reset
+  end
+
+  def bgp_neighbor(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[router] [BGP neighbor]")
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Display details on network router BGP neighbor." + "\n" +
+        "[router] is required. This is the name or id of a network router.\n" +
+        "[BGP neighbor] is required. This is the id of a BGP neighbor.\n"
+    end
+
+    optparse.parse!(args)
+    connect(options)
+
+    if args.count < 2
+      puts optparse
+      return 1
+    end
+
+    @network_routers_interface.setopts(options)
+    if options[:dry_run]
+      if args[0].to_s =~ /\A\d{1,}\Z/
+        print_dry_run @network_routers_interface.dry.get(args[0].to_i)
+      else
+        print_dry_run @network_routers_interface.dry.list({name:args[0]})
+      end
+      return
+    end
+    router = find_router(args[0])
+    if router.nil?
+      return 1
+    end
+
+    if router['type']['hasBgp']
+      bgp_neighbor = (router['bgpNeighbors'] || []).find {|it| it['id'] == args[1].to_i}
+
+      if bgp_neighbor
+        json_response = {'networkRouterBgpNeighbor' => bgp_neighbor}
+        render_response(json_response, options, 'networkRouterBgpNeighbor') do
+          print_h1 "Network Router BGP Neighbor Details"
+          print cyan
+
+          description_cols = {
+            "ID" => lambda {|it| it['id']}
+          }
+
+          router['type']['bgpNeighborOptionTypes'].sort_by {|it| it['displayOrder']}.each do |option_type|
+            description_cols[option_type['fieldLabel']] = lambda {|it| Morpheus::Cli::OptionTypes.get_option_value(it, option_type, true)}
+          end
+          print_description_list(description_cols, bgp_neighbor)
+        end
+      else
+        print_red_alert "BGP Neighbors #{args[1]} not found for router #{router['name']}"
+      end
+    else
+      print_red_alert "BGP Neighbors not supported for #{router['type']['name']}"
+    end
+    println reset
+  end
+
+  def add_bgp_neighbor(args)
+    options = {:options=>{}}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[router]")
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Create a network router BGP neighbor."
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count < 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
+      return 1
+    end
+
+    router = find_router(args[0])
+
+    if router.nil?
+      return 1
+    end
+
+    if !router['type']['hasNat']
+      print_red_alert "BGP not supported for #{router['type']['name']}"
+      return 1
+    end
+
+    if options[:payload]
+      payload = options[:payload]
+    else
+      option_types = router['type']['bgpNeighborOptionTypes'].sort_by {|it| it['displayOrder']}
+
+      # prompt options
+      option_result = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options].deep_merge({:context_map => {'bgpNeighbor' => ''}}), @api_client, {'networkRouterId' => router['id']}, nil, true)
+      payload = {'networkRouterBgpNeighbor' => params.deep_merge(option_result)}
+    end
+
+    @network_routers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @network_routers_interface.dry.create_bgp_neighbor(router['id'], payload)
+      return
+    end
+
+    json_response = @network_routers_interface.create_bgp_neighbor(router['id'], payload)
+    render_response(json_response, options, 'networkRouterBgpNeighbor') do
+      print_green_success "\nAdded Network Router BGP neighbor #{json_response['id']}\n"
+      _bgp_neighbors(router['id'], options)
+    end
+  end
+
+  def update_bgp_neighbor(args)
+    options = {:options=>{}}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[router] [BGP neighbor]")
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Update a network router BGP neighbor.\n" +
+        "[router] is required. This is the name or id of an existing network router.\n" +
+        "[BGP neighbor] is required. This is the id of an existing network router BGP neighbor."
+    end
+    optparse.parse!(args)
+    if args.count != 2
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+
+    router = find_router(args[0])
+
+    if router.nil?
+      return 1
+    end
+
+    if !router['type']['hasBgp']
+      print_red_alert "BGP not supported for #{router['type']['name']}"
+      return 1
+    end
+
+    bgp_neighbor = router['bgpNeighbors'] ? router['bgpNeighbors'].find {|it| it['id'] == args[1].to_i} : nil
+
+    if !bgp_neighbor
+      print_red_alert "BGP neighbor #{args[1]} not found for router #{router['name']}"
+      exit 1
+    end
+
+    payload = parse_payload(options) || {'networkRouterBgpNeighbor' => params}
+    payload['networkRouterBgpNeighbor'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options] && !payload['networkRouterBgpNeighbor'].nil?
+
+    if payload['networkRouterBgpNeighbor'].empty?
+      option_types = router['type']['bgpNeighborOptionTypes'].sort_by {|it| it['displayOrder']}
+      print_green_success "Nothing to update"
+      println cyan
+      print Morpheus::Cli::OptionTypes.display_option_types_help(
+        option_types,
+        {:include_context => true, :context_map => {'bgpNeighbor' => ''}, :color => cyan, :title => "Available BGP Neighbor Options"}
+      )
+      exit 1
+    end
+
+    @network_routers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @network_routers_interface.dry.update_bgp_neighbor(router['id'], bgp_neighbor['id'], payload)
+      return
+    end
+
+    json_response = @network_routers_interface.update_bgp_neighbor(router['id'], bgp_neighbor['id'], payload)
+    render_response(json_response, options, 'networkRouterBgpNeighbor') do
+      print_green_success "\nUpdated Network Router BGP Neighbor #{bgp_neighbor['id']}\n"
+      _bgp_neighbors(router['id'], options)
+    end
+  end
+
+  def remove_bgp_neighbor(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[router] [BGP neighbor]")
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+      opts.footer = "Delete a network router BGP neighbor.\n" +
+        "[router] is required. This is the name or id of an existing network router."
+        "[BGP neighbor] is required. This is the id of an existing network router BGP neighbor."
+    end
+    optparse.parse!(args)
+    if args.count != 2
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+
+    router = find_router(args[0])
+    return if !router
+
+    if !router['type']['hasBgp']
+      print_red_alert "BGP not supported for #{router['type']['name']}"
+      return 1
+    end
+
+    bgp_neighbor = router['bgpNeighbors'] ? router['bgpNeighbors'].find {|it| it['id'] == args[1].to_i} : nil
+
+    if !bgp_neighbor
+      print_red_alert "BGP neighbor #{args[1]} not found for router #{router['name']}"
+      exit 1
+    end
+
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the BGP neighbor '#{bgp_neighbor['id']}' from router '#{router['name']}'?", options)
+      return 9, "aborted command"
+    end
+    @network_routers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @network_routers_interface.dry.destroy_bgp_neighbor(router['id'], bgp_neighbor['id'])
+      return
+    end
+    json_response = @network_routers_interface.destroy_bgp_neighbor(router['id'], bgp_neighbor['id'])
+    render_response(json_response, options, 'networkRouterBgpNeighbor') do
+      print_green_success "\nDeleted Network Router BGP Neighbor #{bgp_neighbor['id']}\n"
+      _bgp_neighbors(router['id'], options)
+    end
+  end
+
   def types(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -1989,7 +2253,7 @@ class Morpheus::Cli::NetworkRoutersCommand
       }
       print_description_list(description_cols, router_type)
 
-      {'optionTypes' => 'Router', 'ruleOptionTypes' => 'Firewall Rule', 'ruleGroupOptionTypes' => 'Firewall Rule Group', 'natOptionTypes' => 'NAT'}.each_pair do |field, title|
+      {'optionTypes' => 'Router', 'ruleOptionTypes' => 'Firewall Rule', 'ruleGroupOptionTypes' => 'Firewall Rule Group', 'natOptionTypes' => 'NAT', 'bgpNeighborOptionTypes' => 'BGP Neighbor'}.each_pair do |field, title|
         if !router_type[field].nil? && router_type[field].count > 0
           println cyan
           print Morpheus::Cli::OptionTypes.display_option_types_help(
@@ -2187,6 +2451,27 @@ class Morpheus::Cli::NetworkRoutersCommand
     end
   end
 
+  def print_bgp_neighbors(router)
+    if router['type']['hasBgp']
+      if router['bgpNeighbors'].count > 0
+        rows = router['bgpNeighbors'].sort_by {|it| it['id']}.collect do |it|
+          {
+            id: it['id'],
+            ip_address: it['ipAddress'],
+            bfd_enabled: it['bfdEnabled'],
+            remote_as: it['remoteAs'],
+            route_filtering_out: it['routeFilteringOut'],
+            route_filtering_in: it['routeFilteringIn'],
+            allow_as_in: it['allowAsIn']
+          }
+        end
+        puts as_pretty_table(rows, [:id, :ip_address, :bfd_enabled, :remote_as, :route_filtering_out, :route_filtering_in, :allow_as_in])
+      else
+        println "No BGP Neighbors\n"
+      end
+    end
+  end
+
   def format_router_status(router, return_color = cyan)
     status = router['status']
     color = white
@@ -2285,8 +2570,53 @@ class Morpheus::Cli::NetworkRoutersCommand
         end
       end
     else
-      rule = router['firewall'] && router['firewall']['rules'] ? router['firewall']['rules'].find {|it| it['name'] == args[1] || it['id'] == args[1].to_i} : nil
+      rule = router['firewall'] && router['firewall']['rules'] ? router['firewall']['rules'].find {|it| it['name'] == rule_id || it['id'] == rule_id.to_i} : nil
     end
     rule
   end
+
+  def find_firewall_rule_group(router_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_firewall_rule_group_by_id(router_id, val)
+    else
+      if group = find_firewall_rule_group_by_name(router_id, val)
+        return find_firewall_rule_group_by_id(router_id, group['id'])
+      end
+    end
+  end
+
+  def find_firewall_rule_group_by_id(router_id, group_id)
+    begin
+      json_response = @network_routers_interface.get_firewall_rule_group(router_id, group_id.to_i)
+      return json_response['ruleGroup']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Network firewall rule group not found by id #{group_id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_firewall_rule_group_by_name(router_id, name)
+    groups = search_firewall_rule_groups(router_id, name)
+    if groups.empty?
+      print_red_alert "Network firewall rule group not found by name #{name}"
+      return nil
+    elsif groups.size > 1
+      print_red_alert "#{scopes.size} network firewall rule groups found by name #{name}"
+      rows = groups.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      return groups[0]
+    end
+  end
+
+  def search_firewall_rule_groups(router_id, phrase = nil)
+    @network_routers_interface.list_firewall_rule_groups(router_id, phrase ? {phrase: phrase.to_s} : {})['ruleGroups']
+  end
 end

data/lib/morpheus/cli/{network_services_command.rb → commands/network_services_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkServicesCommand
   include Morpheus::Cli::CliCommand