openc3 5.4.1 → 5.4.3.pre.beta0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba92696b60117db745207ad94efe543da2db11f25212f70269a6305cb8445295
-  data.tar.gz: ac3d2cc21a962434b478f708644bb33b702858c770a4c93c0017529bcb5b7b05
+  metadata.gz: 859879129f5646a4e8fd10a916e1e88859a7b5ed178fe2983f42df4e7e8c1a52
+  data.tar.gz: 745a188c5e9277e0bb793207f383f85d6ec6d571d41d6115530f6f78bd671817
 SHA512:
-  metadata.gz: cca2d57593526f75888406d0b7946f22ce53823d6e2a45e5204a0856948b6b752b9a7a9612f417d973a6a50c55bf46b16800f4e9295cbeb451d48600d1ae71d0
-  data.tar.gz: 37cb6cf7247cc6956172641d95755145e409ef09ee35dc08d7bae7650e422961c7d17caf83ee7affb428da84057a94625c4484e5b11165bf50db7d692d72a0f2
+  metadata.gz: '0582ba269983955ae39c8d0c941666d2fcc65811416e3c1ae7026811fa00d9699ecffc09e195909f30cac3c8571f6b83889349fed9c96ec89c95091aff088a61'
+  data.tar.gz: a9c9c554d6595cd7718dc58b1e2e07e0ff9a440cd6545674b47250a3542164a41d27bad1bf237c8c121f170dd04380eeaa125769abc9423c0de2e610578f9799

data/Gemfile

@@ -6,13 +6,8 @@ gem 'ruby-termios', '>= 0.9' if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cy
 
 gemspec :name => 'openc3'
 
-# unless ENV['JENKINS_HOME']
-#   # Example of how to use a local branch (doesn't work on Jenkins)
-#   #   You also need to set "bundle config local.mock_redis <LOCAL PATH TO CHECKED OUT GEM>"
-#   #   For example: bundle config local.mock_redis C:/_Programs/oss/mock_redis
-#   #   Make sure the local copy is checked out to the specified branch
-#   #   Delete the config: bundle config --delete local.mock_redis
-#   group :development do
-#     gem 'mock_redis', github: 'jasonatball/mock_redis', branch: 'master'
-#   end
-# end
+# Include the rails gems for the convenience of custom microservice plugins
+gem 'rails', '~> 7.0.0'
+gem 'bootsnap', '>= 1.9.3', require: false
+gem 'rack-cors', '~> 1.1'
+gem 'tzinfo-data'

data/bin/openc3cli

@@ -43,6 +43,8 @@ require 'redis'
 require 'erb'
 require 'pp'
 # require 'psych' # Psych code is commented out
+require "irb"
+require "irb/completion"
 
 $redis_url = "redis://#{ENV['OPENC3_REDIS_HOSTNAME']}:#{ENV['OPENC3_REDIS_PORT']}"
 # Initialize the connection to the bucket library
@@ -64,13 +66,14 @@ def print_usage
   puts "Usage:"
   puts "  cli help                          # Displays this information"
   puts "  cli rake                          # Runs rake in the local directory"
+  puts "  cli irb                           # Runs irb in the local directory"
   puts "  cli validate /PATH/FILENAME.gem SCOPE variables.txt # Validate a COSMOS plugin gem file"
   puts "  cli load /PATH/FILENAME.gem SCOPE variables.txt     # Loads a COSMOS plugin gem file"
   puts "  cli generate plugin PLUGIN_NAME   # Generate a COSMOS plugin"
   puts "  #{MIGRATE_PARSER}"
   puts "  cli bridge CONFIG_FILENAME        # Run COSMOS host bridge"
   puts "  cli bridgesetup CONFIG_FILENAME   # Create a default config file"
-  puts "  cli geminstall GEMFILENAME SCOPE        # Install loaded gem to /gems"
+  puts "  cli geminstall GEMFILENAME SCOPE  # Install loaded gem to /gems"
   puts "  cli rubysloc                      # Counts Ruby SLOC recursively. Run with --help for more info."
   puts "  cli xtce_converter                # Convert to and from the XTCE format. Run with --help for more info."
   puts "  cli cstol_converter               # Converts CSTOL files (.prc) to COSMOS. Run with --help for more info."
@@ -526,6 +529,10 @@ if not ARGV[0].nil? # argument(s) given
   # Handle each task
   case ARGV[0].downcase
 
+  when 'irb'
+    ARGV.clear
+    IRB.start
+
   when 'rake'
     puts `rake #{ARGV[1..-1].join(' ')}`
 

data/data/config/_interfaces.yaml

@@ -27,7 +27,8 @@ tcpip_client_interface.rb:
     - name: Protocol Type
       required: true
       description: Protocol to apply on the interface data
-      values: 
+      # prettier-ignore
+      values:
         <%= MetaConfigParser.load('protocols.yaml').to_meta_config_yaml(8) %>
 tcpip_server_interface.rb:
   parameters:
@@ -52,7 +53,8 @@ tcpip_server_interface.rb:
     - name: Protocol Type
       required: true
       description: Protocol to apply on the interface data
-      values: 
+      # prettier-ignore
+      values:
         <%= MetaConfigParser.load('protocols.yaml').to_meta_config_yaml(8) %>
 udp_interface.rb:
   description: The UDP interface uses UDP packets to send and receive telemetry
@@ -142,73 +144,6 @@ serial_interface.rb:
     - name: Protocol Type
       required: true
       description: Protocol to apply on the interface data
-      values: 
+      # prettier-ignore
+      values:
         <%= MetaConfigParser.load('protocols.yaml').to_meta_config_yaml(8) %>
-cmd_tlm_server_interface.rb:
-  description: Provides a connection to the OpenC3 Command and Telemetry Server.
-    This allows scripts and other OpenC3 tools to send commands to the CmdTlmServer
-    to enable and disable logging. It also allows scripts and other tools to
-    receive a OpenC3 version information packet and a limits change packet which
-    is sent when any telemetry items change limits states. The CmdTlmServer
-    interface can be used by any OpenC3 configuration.
-linc_interface.rb:
-  description: The LINC interface uses a single TCPIP socket to talk to a Ball
-    Aerospace LINC Labview target.
-  parameters:
-    - name: Host
-      required: true
-      description: Machine name to connect to. Can be either a named
-        machine (DNS entry) or IP address.
-      values: .+
-    - name: Port
-      required: true
-      description: Port to write commands to and read telemetry from
-      values: \d{2,5}
-    - name: Handshake Enabled
-      required: false
-      description: Enable command handshaking where commands block until the
-        corresponding handshake message is received. Default is true.
-      values: ["true", "false"]
-    - name: Response Timeout
-      required: false
-      description: Number of seconds to wait for a handshaking response.
-        Default is 5 seconds
-      values: \d+
-    - name: Read Timeout
-      required: true
-      description: Number of seconds to wait before aborting the read.
-        Pass 'nil' to block on read. Default is nil.
-      values: .+
-    - name: Write Timeout
-      required: true
-      description: Number of seconds to wait before aborting the write.
-        Pass 'nil' to block on write. Default is 5 seconds.
-      values: .+
-    - name: Length Bit Offset
-      required: false
-      description: The bit offset of the length field. Every packet using this
-        interface must have the same structure such that the length field is the
-        same size at the same location. Default is 0.
-      values: \d+
-    - name: Length Bit Size
-      required: false
-      description: The size in bits of the length field. Default is 16 bits.
-      values: \d+
-    - name: Length Value Offset
-      required: false
-      description: The offset to apply to the length field value. For example if
-        the length field indicates packet length minus one, this value should be one.
-        Default is 4.
-      values: \d+
-    - name: GUID Fieldname
-      required: false
-      description: Fieldname of the GUID field. Default is 'HDR_GUID'.
-      values: .+
-    - name: Length Endianness
-      required: false
-      description: The endianness of the length field. Default is BIG_ENDIAN.
-      values: ["BIG_ENDIAN", "LITTLE_ENDIAN"]
-    - name: Length Fieldname
-      required: false
-      description: Fieldname of the length field. Defaults is 'HDR_LENGTH'.
-      values: .+

data/data/config/interface_modifiers.yaml

@@ -41,29 +41,6 @@ DISABLE_DISCONNECT:
     Use this keyword to prevent the user from disconnecting from the interface.
     This is typically used in a 'production' environment where you would not want
     the user to inadvertantly disconnect from a target.
-LOG:
-  summary: Enable logging on the interface by the specified log writer
-  description:
-    LOG is only required if you want a log writer other than the default
-    to log commands and telemetry on this interface
-  warning: Choosing a custom log writer can prevent OpenC3 from reading back your log files
-  parameters:
-    - name: Name
-      required: true
-      description: Log writer name as defined by PACKET_LOG_WRITER
-      values: \D\S*
-LOG_STORED:
-  summary: Enable logging of stored telemetry on the interface by the specified log writer
-  description:
-    LOG_STORED allows you to specify a different log writer for stored telemetry
-    (telemetry which has the 'stored' flag set in the packet). By default the stored telemetry
-    is intermingled in the normal log file.
-  warning: Choosing a custom log writer can prevent OpenC3 from reading back your log files
-  parameters:
-    - name: Name
-      required: true
-      description: Log writer name as defined by PACKET_LOG_WRITER
-      values: \D\S*
 DONT_LOG:
   summary: Disable logging commands and telemetry on this interface
 LOG_RAW:

data/data/config/microservice.yaml

@@ -106,3 +106,11 @@ MICROSERVICE:
           required: true
           description: Environment variable name or file path to store secret
           values: .*
+    ROUTE_PREFIX:
+      summary: Prefix of route
+      description: Prefix of route to the microservice to expose externally with Traefik
+      parameters:
+        - name: Route Prefix
+          required: true
+          description: Route prefix. Must be unique across all scopes. Something like /myprefix
+          values: .*

data/data/config/target.yaml

@@ -156,6 +156,7 @@ TARGET:
           values: \d+
     TARGET_MICROSERVICE:
       summary: Breaks a target microservice out into its own process.
+      description:
         Can be used to give more resources to processing that is falling behind.
         If defined multiple times for the same type, will create multiple processes.
         Each process can be given specific packets to process with the PACKET keyword.

data/data/config/widgets.yaml

@@ -162,26 +162,6 @@ TITLE:
       required: true
       description: Text to display above the horizontal line
       values: .*
-# SPACER:
-#   summary: Inserts a spacer into a layout. This can be used to
-#     separate or align other widgets.
-#   parameters:
-#     - name: Width
-#       required: true
-#       description: The width of the spacer in pixels.
-#       values: .*
-#     - name: Height
-#       required: true
-#       description: The height of the spacer in pixels.
-#       values: .*
-#     - name: Horizontal Policy
-#       required: false
-#       description: The horizontal size policy of the spacer. Default is MINIMUM.
-#       values: <%= %w(FIXED MINIMUM MAXIMUM PREFERRED EXPANDING MINIMUMEXPANDING IGNORED) %>
-#     - name: Vertical Policy
-#       required: false
-#       description: The vertical size policy of the spacer. Default is MINIMUM.
-#       values: <%= %w(FIXED MINIMUM MAXIMUM PREFERRED EXPANDING MINIMUMEXPANDING IGNORED) %>
 ARRAY:
   summary: Displays ARRAY data organized into rows and space separated
   parameters:
@@ -303,7 +283,8 @@ BLOCK:
 #       values: .*
 FORMATVALUE:
   summary: Displays a box with a formatted value
-  description: Data is formatted by the specified string rather than by a format string given in
+  description:
+    Data is formatted by the specified string rather than by a format string given in
     the telemetry definition files. The white portion of the box darkens to gray
     while the value remains stagnant, then brightens to white each time the value
     changes. Additionally the value is colored based on the items limits state
@@ -615,7 +596,8 @@ LABELVALUERANGEBAR:
 #       values: .*
 LED:
   summary: Displays a LED which changes color based on telemetry values
-  description: By default TRUE is green and FALSE is red and all other values are black.
+  description:
+    By default TRUE is green and FALSE is red and all other values are black.
     Additional values can be added by using the LED_COLOR setting. For example
     LED INST PARAMS VALUE3 RAW can be followed by SETTING LED_COLOR 0 GREEN,
     SETTING LED_COLOR 1 RED, and SETTING LED_COLOR ANY ORANGE.
@@ -1153,7 +1135,8 @@ TEXTBOX:
 #       values: .*
 VALUE:
   summary: Displays a box with a telemetry item value
-  description: The white portion of the box darkens to gray while the value remains stagnant, then
+  description:
+    The white portion of the box darkens to gray while the value remains stagnant, then
     brightens to white each time the value changes. Additionally the value is
     colored based on the items limits state (Red for example if it is out of limits).
   parameters:

data/lib/openc3/api/tlm_api.rb

@@ -37,6 +37,7 @@ module OpenC3
                        'set_tlm',
                        'inject_tlm',
                        'override_tlm',
+                       'get_overrides',
                        'normalize_tlm',
                        'get_tlm_buffer',
                        'get_tlm_packet',
@@ -169,6 +170,12 @@ module OpenC3
       CvtModel.override(target_name, packet_name, item_name, value, type: type.intern, scope: scope)
     end
 
+    # Get the list of CVT overrides
+    def get_overrides(scope: $openc3_scope, token: $openc3_token)
+      authorize(permission: 'tlm', scope: scope, token: token)
+      CvtModel.overrides(scope: scope)
+    end
+
     # Normalize a telemetry item in a packet to its default behavior. Called
     # after override_tlm to restore standard processing.
     #
@@ -394,7 +401,7 @@ module OpenC3
       return nil
     end
 
-    def tlm_process_args(args, function_name, scope: $openc3_scope, token: $openc3_token)
+    def tlm_process_args(args, method_name, scope: $openc3_scope, token: $openc3_token)
       case args.length
       when 1
         target_name, packet_name, item_name = extract_fields_from_tlm_text(args[0])
@@ -404,7 +411,7 @@ module OpenC3
         item_name = args[2]
       else
         # Invalid number of arguments
-        raise "ERROR: Invalid number of arguments (#{args.length}) passed to #{function_name}()"
+        raise "ERROR: Invalid number of arguments (#{args.length}) passed to #{method_name}()"
       end
       if packet_name == 'LATEST'
         latest = -1
@@ -429,7 +436,7 @@ module OpenC3
       return [target_name, packet_name, item_name]
     end
 
-    def set_tlm_process_args(args, function_name, scope: $openc3_scope, token: $openc3_token)
+    def set_tlm_process_args(args, method_name, scope: $openc3_scope, token: $openc3_token)
       case args.length
       when 1
         target_name, packet_name, item_name, value = extract_fields_from_set_tlm_text(args[0])
@@ -440,7 +447,7 @@ module OpenC3
         value = args[3]
       else
         # Invalid number of arguments
-        raise "ERROR: Invalid number of arguments (#{args.length}) passed to #{function_name}()"
+        raise "ERROR: Invalid number of arguments (#{args.length}) passed to #{method_name}()"
       end
       # Determine if this item exists, it will raise appropriate errors if not
       TargetModel.packet_item(target_name, packet_name, item_name, scope: scope)

data/lib/openc3/core_ext/string.rb

@@ -17,7 +17,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'openc3/packets/binary_accessor'
@@ -28,7 +28,7 @@ class String
   # The printable range of ASCII characters
   PRINTABLE_RANGE = 32..126
   # Regular expression to identify a character that is not in the printable range
-  NON_PRINTABLE_REGEX = /[^\s -~]/
+  NON_PRINTABLE_REGEX = /[^\s!-~]/
   # Regular expression to identify a String as a floating point number
   FLOAT_CHECK_REGEX = /\A\s*[-+]?\d*\.\d+\s*\z/
   # Regular expression to identify a String as a floating point number in

data/lib/openc3/io/json_rpc.rb

@@ -56,11 +56,15 @@ end
 
 class String
   NON_ASCII_PRINTABLE = /[^\x21-\x7e\s]/
-
+  NON_UTF8_PRINTABLE = /[\x00-\x08\x0E-\x1F\x7F]/
   def as_json(options = nil)
     as_utf8 = self.dup.force_encoding('UTF-8')
     if as_utf8.valid_encoding?
-      return as_utf8
+      if as_utf8 =~ NON_UTF8_PRINTABLE
+        return self.to_json_raw_object
+      else
+        return as_utf8
+      end
     else
       return self.to_json_raw_object
     end

data/lib/openc3/microservices/interface_microservice.rb

@@ -362,14 +362,18 @@ module OpenC3
       @interface.tlm_target_names.each do |target_name|
         # Initialize the target's packet counters based on the Topic stream
         # Prevents packet count resetting to 0 when interface restarts
-        System.telemetry.packets(target_name).each do |packet_name, packet|
-          topic = "#{@scope}__TELEMETRY__{#{target_name}}__#{packet_name}"
-          msg_id, msg_hash = Topic.get_newest_message(topic)
-          if msg_id
-            packet.received_count = msg_hash['received_count'].to_i
-          else
-            packet.received_count = 0
+        begin
+          System.telemetry.packets(target_name).each do |packet_name, packet|
+            topic = "#{@scope}__TELEMETRY__{#{target_name}}__#{packet_name}"
+            msg_id, msg_hash = Topic.get_newest_message(topic)
+            if msg_id
+              packet.received_count = msg_hash['received_count'].to_i
+            else
+              packet.received_count = 0
+            end
           end
+        rescue
+          # Handle targets without telemetry
         end
       end
       if @interface.connect_on_startup
@@ -649,15 +653,17 @@ module OpenC3
         # Need to make sure that @cancel_thread is set and the interface disconnected within
         # mutex to ensure that connect() is not called when we want to stop()
         @cancel_thread = true
-        @handler_thread.stop
-        @interface_thread_sleeper.cancel
-        @interface.disconnect
-        if @interface_or_router == 'INTERFACE'
-          valid_interface = InterfaceStatusModel.get_model(name: @interface.name, scope: @scope)
-        else
-          valid_interface = RouterStatusModel.get_model(name: @interface.name, scope: @scope)
+        @handler_thread.stop if @handler_thread
+        @interface_thread_sleeper.cancel if @interface_thread_sleeper
+        if @interface
+          @interface.disconnect
+          if @interface_or_router == 'INTERFACE'
+            valid_interface = InterfaceStatusModel.get_model(name: @interface.name, scope: @scope)
+          else
+            valid_interface = RouterStatusModel.get_model(name: @interface.name, scope: @scope)
+          end
+          valid_interface.destroy if valid_interface
         end
-        valid_interface.destroy if valid_interface
       end
     end
 

data/lib/openc3/microservices/plugin_microservice.rb

@@ -17,7 +17,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'openc3/microservices/microservice'
@@ -31,6 +31,15 @@ module OpenC3
 
     def run
       Dir.chdir @work_dir
+      begin
+        if @config["cmd"][0] != 'ruby'
+          # Try to make sure the cmd is executable
+          FileUtils.chmod 0777, @config["cmd"][0]
+        end
+      rescue Exception
+        # Its ok if this fails
+      end
+
       # Fortify: Process Control
       # This is dangerous! However, plugins need to be able to run whatever they want.
       # Only admins can install plugins and they need to be vetted for content.

data/lib/openc3/models/cvt_model.rb

@@ -21,6 +21,7 @@
 # if purchased from OpenC3, Inc.
 
 require 'openc3/utilities/store'
+require 'openc3/models/target_model'
 
 module OpenC3
   class CvtModel
@@ -41,22 +42,24 @@ module OpenC3
 
     # Set an item in the current value table
     def self.set_item(target_name, packet_name, item_name, value, type:, scope: $openc3_scope)
+      hash = JSON.parse(Store.hget("#{scope}__tlm__#{target_name}", packet_name), :allow_nan => true, :create_additions => true)
       case type
       when :WITH_UNITS
-        field = "#{item_name}__U"
-        value = value.to_s # WITH_UNITS should always be a string
+        hash["#{item_name}__U"] = value.to_s # WITH_UNITS should always be a string
       when :FORMATTED
-        field = "#{item_name}__F"
-        value = value.to_s # FORMATTED should always be a string
+        hash["#{item_name}__F"] = value.to_s # FORMATTED should always be a string
       when :CONVERTED
-        field = "#{item_name}__C"
+        hash["#{item_name}__C"] = value
       when :RAW
-        field = item_name
+        hash[item_name] = value
+      when :ALL
+        hash["#{item_name}__U"] = value.to_s # WITH_UNITS should always be a string
+        hash["#{item_name}__F"] = value.to_s # FORMATTED should always be a string
+        hash["#{item_name}__C"] = value
+        hash[item_name] = value
       else
         raise "Unknown type '#{type}' for #{target_name} #{packet_name} #{item_name}"
       end
-      hash = JSON.parse(Store.hget("#{scope}__tlm__#{target_name}", packet_name), :allow_nan => true, :create_additions => true)
-      hash[field] = value
       Store.hset("#{scope}__tlm__#{target_name}", packet_name, JSON.generate(hash.as_json(:allow_nan => true)))
     end
 
@@ -144,6 +147,38 @@ module OpenC3
       results
     end
 
+    # Return all the overrides
+    def self.overrides(scope: $openc3_scope)
+      overrides = []
+      TargetModel.names(scope: scope).each do |target_name|
+        all = Store.hgetall("#{scope}__override__#{target_name}")
+        next if all.nil? or all.empty?
+        all.each do |packet_name, hash|
+          items = JSON.parse(hash, :allow_nan => true, :create_additions => true)
+          items.each do |key, value|
+            item = {}
+            item['target_name'] = target_name
+            item['packet_name'] = packet_name
+            item_name, value_type_key = key.split('__')
+            item['item_name'] = item_name
+            case value_type_key
+            when 'U'
+              item['value_type'] = 'WITH_UNITS'
+            when 'F'
+              item['value_type'] = 'FORMATTED'
+            when 'C'
+              item['value_type'] = 'CONVERTED'
+            else
+              item['value_type'] = 'RAW'
+            end
+            item['value'] = value
+            overrides << item
+          end
+        end
+      end
+      overrides
+    end
+
     # Override a current value table item such that it always returns the same value
     # for the given type
     def self.override(target_name, packet_name, item_name, value, type: :ALL, scope: $openc3_scope)

data/lib/openc3/models/metadata_model.rb

@@ -69,7 +69,7 @@ module OpenC3
       if @color.nil?
         @color = '#%06x' % (rand * 0xffffff)
       end
-      unless @color =~ /(#*)([0-9,a-f,A-f]{6})/
+      unless @color =~ /(#*)([0-9,a-f,A-F]{6})/
         raise SortedInputError.new "invalid color, must be in hex format, e.g. #FF0000"
       end
       @color = "##{@color}" unless @color.start_with?('#')

data/lib/openc3/models/microservice_model.rb

@@ -23,6 +23,7 @@
 require 'openc3/top_level'
 require 'openc3/models/model'
 require 'openc3/models/metric_model'
+require 'openc3/models/traefik_model'
 require 'openc3/utilities/bucket'
 
 module OpenC3
@@ -41,6 +42,7 @@ module OpenC3
     attr_accessor :ports
     attr_accessor :parent
     attr_accessor :secrets
+    attr_accessor :prefix
 
     # NOTE: The following three class methods are used by the ModelController
     # and are reimplemented to enable various Model class methods to work
@@ -99,6 +101,7 @@ module OpenC3
       plugin: nil,
       needs_dependencies: false,
       secrets: [],
+      prefix: nil,
       scope:
     )
       parts = name.split("__")
@@ -122,6 +125,7 @@ module OpenC3
       @container = container
       @needs_dependencies = needs_dependencies
       @secrets = secrets
+      @prefix = prefix
       @bucket = Bucket.getClient()
     end
 
@@ -141,7 +145,8 @@ module OpenC3
         'updated_at' => @updated_at,
         'plugin' => @plugin,
         'needs_dependencies' => @needs_dependencies,
-        'secrets' => @secrets.as_json(*a)
+        'secrets' => @secrets.as_json(*a),
+        'prefix' => @prefix
       }
     end
 
@@ -190,6 +195,9 @@ module OpenC3
       when 'SECRET'
         parser.verify_num_parameters(3, 3, "#{keyword} <Secret Type: ENV or FILE> <Secret Name> <Environment Variable Name or File Path>")
         @secrets << parameters.dup
+      when 'ROUTE_PREFIX'
+        parser.verify_num_parameters(1, 1, "#{keyword} <Route Prefix>")
+        @prefix = parameters[0]
       else
         raise ConfigParser::Error.new(parser, "Unknown keyword and parameters for Microservice: #{keyword} #{parameters.join(" ")}")
       end
@@ -214,9 +222,12 @@ module OpenC3
         end
         unless validate_only
           @bucket.put_object(bucket: ENV['OPENC3_CONFIG_BUCKET'], key: key, body: data)
-          ConfigTopic.write({ kind: 'created', type: 'microservice', name: @name, plugin: @plugin }, scope: @scope)
         end
       end
+      unless validate_only
+        TraefikModel.register_route(microservice_name: @name, port: @ports[0][0], prefix: @prefix) if @ports[0] and ports[0][0] and @prefix
+        ConfigTopic.write({ kind: 'created', type: 'microservice', name: @name, plugin: @plugin }, scope: @scope)
+      end
     end
 
     def undeploy
@@ -224,6 +235,7 @@ module OpenC3
       @bucket.list_objects(bucket: ENV['OPENC3_CONFIG_BUCKET'], prefix: prefix).each do |object|
         @bucket.delete_object(bucket: ENV['OPENC3_CONFIG_BUCKET'], key: object.key)
       end
+      TraefikModel.unregister_route(microservice_name: @name, port: @ports[0][0], prefix: @prefix) if @ports[0] and ports[0][0] and @prefix
       ConfigTopic.write({ kind: 'deleted', type: 'microservice', name: @name, plugin: @plugin }, scope: @scope)
     rescue Exception => error
       Logger.error("Error undeploying microservice model #{@name} in scope #{@scope} due to #{error}")

data/lib/openc3/models/model.rb

@@ -63,20 +63,12 @@ module OpenC3
     # END NOTE
 
     # Loops over all items and returns objects that match a key value pair
-    def self.filter(key, value, scope:, use_regex: false)
+    def self.filter(key, value, scope:, substr: false)
       filtered = {}
       results = all(scope: scope)
-      regex = nil
-      regex = Regexp.new(value) if use_regex
       results.each do |name, result|
-        if regex
-          if result[key] =~ regex
-            filtered[name] = result
-          end
-        else
-          if result[key] == value
-            filtered[name] = result
-          end
+        if result[key] == value || (substr && result[key].include?(value))
+          filtered[name] = result
         end
       end
       return filtered

data/lib/openc3/models/note_model.rb

@@ -78,7 +78,7 @@ module OpenC3
       if @color.nil?
         @color = '#%06x' % (rand * 0xffffff)
       end
-      unless @color =~ /(#*)([0-9,a-f,A-f]{6})/
+      unless @color =~ /(#*)([0-9,a-f,A-F]{6})/
         raise SortedInputError.new "invalid color, must be in hex format, e.g. #FF0000"
       end
       @color = "##{@color}" unless @color.start_with?('#')

data/lib/openc3/models/timeline_model.rb

@@ -17,7 +17,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'openc3/models/model'
@@ -91,11 +91,10 @@ module OpenC3
       if color.nil?
         color = '#%06x' % (rand * 0xffffff)
       end
-      valid_color = color =~ /(#*)([0-9,a-f,A-f]{6})/
+      valid_color = color =~ /[0-9,a-f,A-F]{6}/
       if valid_color.nil?
         raise RuntimeError.new "invalid color but in hex format. #FF0000"
       end
-
       unless color.start_with?('#')
         color = "##{color}"
       end