morpheus-cli 7.0.2.1 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b065f573767cfc129de6b434464b83827b2116963138d6f64c7b310168d1cbee
-  data.tar.gz: 5aac7646b5d1a6a1547d843bfa59ecf09af909b9ee25d01dab5aa72244cfab8e
+  metadata.gz: 44eb4962dacc18e8a073e0472202fcb811dc0e00f300eac02da1608f4abb7a91
+  data.tar.gz: babba8e15b2712ad3075504e76ca144b7ce9fd714c1c45f1cc2e195bd09d1575
 SHA512:
-  metadata.gz: 1d13e149f91071922ab1caa2785a47fdf9ee3db07627790868a4be0fff6c29cb0afbb796fe5503df75d7c677f4b303e01cecd8285c99cb62f53f71ede8b300c8
-  data.tar.gz: cc7809fa5d2152759702454dd3cfa1eab88acbc0641377578736fc7e9247971594cd95f92b1cd82e830db3dfc7c5959733a771a89fe283dddb61a25ef4412b50
+  metadata.gz: a3ef0604371d19cb597e57e38b457152d36282e74737d3fbe3838d0878b1f16f7a006b873fb09ac7a48898961d6cb217b3f85366735cbebc985df70fbe4e3291
+  data.tar.gz: e71942de507284bac1c9d8f02a95999d4c508350ccdfd7cf81025c1fa37dadeb5c34cefd50dadf5cd1ce81827076fbfbf328a367798fa02dbcaa0c89bf548143

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 7.0.2.1
+RUN gem install morpheus-cli -v 7.0.3
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/cli/commands/network_routers_command.rb

@@ -1010,68 +1010,63 @@ class Morpheus::Cli::NetworkRoutersCommand
       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
     _firewall_rule(args[0], args[1], options)
   end
 
   def _firewall_rule(router_id, rule_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)
-        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']['hasFirewall']
-        rule = find_firewall_rule(router, rule_id)
-
-        if rule
-          json_response = {'rule' => rule}
-
-          if options[:json]
-            puts as_json(json_response, options, "rule")
-            return 0
-          elsif options[:yaml]
-            puts as_yaml(json_response, options, "rule")
-            return 0
-          elsif options[:csv]
-            puts records_as_csv([json_response['rule']], options)
-            return 0
-          end
+    router = find_router(router_id)
+    if router.nil?
+      return 1
+    end
 
-          print_h1 "Firewall Rule Details"
-          print cyan
-          description_cols = {
-            "ID" => lambda {|it| it['id'] },
-            "Enabled" => lambda {|it| format_boolean(it['enabled'])},
-            "Priority" => lambda {|it| it['priority']},
-            "Name" => lambda {|it| it['name'] },
-            "Type" => lambda {|it| it['ruleType'] },
-            "Policy" => lambda {|it| it['policy'] },
-            "Direction" => lambda {|it| it['direction'] || 'any' },
-            "Source" => lambda {|it| it['source'].kind_of?(Array) && it['source'].count > 0 ? it['source'].join(', ') : (it['source'].nil? || it['source'].empty? ? 'any' : it['source']) },
-            "Destination" => lambda {|it| it['destination'].kind_of?(Array) && it['destination'].count > 0 ? it['destination'].join(', ') : (it['destination'].nil? || it['destination'].empty? ? 'any' : it['destination'])},
-            "Application" => lambda {|it| it['applications'].count > 0 ? it['applications'][0]['name'] : "#{(it['protocol'] || 'any')} #{it['portRange'] || ''}"}
-          }
-          print_description_list(description_cols, rule)
-        else
-          print_red_alert "Firewall rule #{rule_id} not found for router #{router['name']}"
+    if router['type']['hasFirewall']
+      rule = find_firewall_rule(router, rule_id)
+
+      if rule
+        json_response = {'rule' => rule}
+
+        if options[:json]
+          puts as_json(json_response, options, "rule")
+          return 0
+        elsif options[:yaml]
+          puts as_yaml(json_response, options, "rule")
+          return 0
+        elsif options[:csv]
+          puts records_as_csv([json_response['rule']], options)
+          return 0
         end
+
+        print_h1 "Firewall Rule Details"
+        print cyan
+        description_cols = {
+          "ID" => lambda {|it| it['id'] },
+          "Enabled" => lambda {|it| format_boolean(it['enabled'])},
+          "Priority" => lambda {|it| it['priority']},
+          "Name" => lambda {|it| it['name'] },
+          "Type" => lambda {|it| it['ruleType'] },
+          "Policy" => lambda {|it| it['policy'] },
+          "Direction" => lambda {|it| it['direction'] || 'any' },
+          "Source" => lambda {|it| it['source'].kind_of?(Array) && it['source'].count > 0 ? it['source'].join(', ') : (it['source'].nil? || it['source'].empty? ? 'any' : it['source']) },
+          "Destination" => lambda {|it| it['destination'].kind_of?(Array) && it['destination'].count > 0 ? it['destination'].join(', ') : (it['destination'].nil? || it['destination'].empty? ? 'any' : it['destination'])},
+          "Application" => lambda {|it| it['applications'].count > 0 ? it['applications'][0]['name'] : "#{(it['protocol'] || 'any')} #{it['portRange'] || ''}"}
+        }
+        print_description_list(description_cols, rule)
       else
-        print_red_alert "Firewall not supported for #{router['type']['name']}"
+        print_red_alert "Firewall rule #{rule_id} not found for router #{router['name']}"
       end
-      println reset
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
+    else
+      print_red_alert "Firewall not supported for #{router['type']['name']}"
     end
+    println reset
   end
 
   def add_firewall_rule(args)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "7.0.2.1"
+    VERSION = "7.0.3"
   end
 end

data/test/api/network_routers_interface_test.rb

@@ -0,0 +1,22 @@
+require 'morpheus_test'
+
+# Tests for Morpheus::InstancesInterface
+class MorpheusTest::NetworkRoutersInterfaceTest < MorpheusTest::TestCase
+  
+  def test_network_routers_interface
+    @network_routers_interface = client.network_routers
+    response = @network_routers_interface.list()
+    network_routers = response['networkRouters']
+    assert network_routers.is_a?(Array)
+    if !network_routers.empty?
+      response = @network_routers_interface.get(network_routers[0]['id'])
+      network_router = response['networkRouter']
+      assert network_router.is_a?(Hash)
+      assert_equal network_router['id'], network_routers[0]['id']
+    else
+      #puts "No network routers found in this environment"
+    end
+    #todo: create and delete  
+  end
+
+end

data/test/cli/network_routers_test.rb

@@ -0,0 +1,62 @@
+require 'morpheus_test'
+
+# Tests for Morpheus::Cli::NetworkRouters
+class MorpheusTest::NetworkRoutersTest < MorpheusTest::TestCase
+
+  def test_network_routers_list
+    assert_execute %(network-routers list)
+  end
+
+  def test_network_routers_get
+    network_router = client.network_routers.list({})['networkRouters'][0]
+    if network_router
+      assert_execute %(network-routers get "#{network_router['id']}")
+      assert_execute %(network-routers get "#{escape_arg network_router['name']}")
+    else
+      puts "No network routers found, unable to execute test `#{__method__}`"
+    end
+  end
+
+  def test_network_routers_firewall_rules
+    network_router = client.network_routers.list({})['networkRouters'].find {|it| it['firewall'] }
+    if network_router
+      assert_execute %(network-routers firewall-rules "#{network_router['id']}")
+    else
+      puts "No network routers found with a firewall, unable to execute test `#{__method__}`"
+    end
+  end
+
+  def test_network_routers_firewall_rules_get
+    network_router = client.network_routers.list({})['networkRouters'].find {|it| it['firewall'] }
+    if network_router
+      # need to get by id to get the firewall rules
+      network_router = client.network_routers.get(network_router['id'])['networkRouter']
+      rules = network_router['type']['hasFirewallGroups'] ? (network_router['firewall']['ruleGroups'] || []).collect {|it| it['rules']}.flatten : network_router['firewall']['rules']
+      rule = rules[0]
+      if rule
+        assert_execute %(network-routers firewall-rule "#{network_router['id']}" "#{rule['id']}")
+      else
+        puts "No network router firewall rules found, unable to execute test `#{__method__}`"
+      end
+    else
+      puts "No network routers found with a firewall, unable to execute test `#{__method__}`"
+    end
+  end
+
+  # def test_network_routers_add
+  #   warn "Skipped test test_network_routers_add() because it is not implemented"
+  # end
+
+  # def test_network_routers_update
+  #   warn "Skipped test test_network_routers_update() because it is not implemented"
+  # end
+
+  # def test_network_routers_delete
+  #   warn "Skipped test test_network_routers_remove() because it is not implemented"
+  # end
+
+  # todo: many more network-routers commands to add
+
+  protected
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 7.0.2.1
+  version: 7.0.3
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-20 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -600,6 +600,7 @@ files:
 - morpheus-cli.gemspec
 - test/api/containers_interface_test.rb
 - test/api/instances_interface_test.rb
+- test/api/network_routers_interface_test.rb
 - test/api/whoami_interface_test.rb
 - test/cli/access_token_test.rb
 - test/cli/auth_test.rb
@@ -608,6 +609,7 @@ files:
 - test/cli/help_test.rb
 - test/cli/instances_test.rb
 - test/cli/man_test.rb
+- test/cli/network_routers_test.rb
 - test/cli/remote_test.rb
 - test/cli/roles_test.rb
 - test/cli/shell_test.rb
@@ -644,6 +646,7 @@ summary: Provides CLI Interface to the Morpheus Public/Private Cloud Appliance
 test_files:
 - test/api/containers_interface_test.rb
 - test/api/instances_interface_test.rb
+- test/api/network_routers_interface_test.rb
 - test/api/whoami_interface_test.rb
 - test/cli/access_token_test.rb
 - test/cli/auth_test.rb
@@ -652,6 +655,7 @@ test_files:
 - test/cli/help_test.rb
 - test/cli/instances_test.rb
 - test/cli/man_test.rb
+- test/cli/network_routers_test.rb
 - test/cli/remote_test.rb
 - test/cli/roles_test.rb
 - test/cli/shell_test.rb