Review update

Author: lordgamez

behave_framework/src/minifi_test_framework/containers/minifi_container.py

@@ -28,7 +28,6 @@
 class MinifiContainer(Container):
     def __init__(self, container_name: str, test_context: MinifiTestContext):
         super().__init__(test_context.minifi_container_image, f"{container_name}-{test_context.scenario_id}", test_context.network)
-        self.flow_config_str: str = ""
         self.flow_definition = FlowDefinition()
         self.properties: dict[str, str] = {}
         self.log_properties: dict[str, str] = {}

behave_framework/src/minifi_test_framework/minifi/processor.py

@@ -20,12 +20,13 @@
 
 class Processor:
     def __init__(self, class_name: str, proc_name: str, scheduling_strategy: str = "TIMER_DRIVEN",
-                 scheduling_period: str = "1 sec", ):
+                 scheduling_period: str = "1 sec", penalization_period: str = "1 sec"):
         self.class_name = class_name
         self.id: str = str(uuid.uuid4())
         self.name = proc_name
         self.scheduling_strategy: str = scheduling_strategy
         self.scheduling_period: str = scheduling_period
+        self.penalization_period: str = penalization_period
         self.properties: dict[str, str] = {}
         self.auto_terminated_relationships: list[str] = []
 
@@ -46,6 +47,7 @@ def to_yaml_dict(self) -> dict:
             'class': self.class_name,
             'scheduling strategy': self.scheduling_strategy,
             'scheduling period': self.scheduling_period,
+            'penalization period': self.penalization_period,
         }
         if self.auto_terminated_relationships:
             data['auto-terminated relationships list'] = self.auto_terminated_relationships

behave_framework/src/minifi_test_framework/steps/flow_building_steps.py

@@ -247,7 +247,7 @@ def step_impl(context: MinifiTestContext, property_name: str, processor_name: st
     processor.add_property(property_name, filtering)
 
 
-@given("the \"{property_name}\" properties of the {processor_name_one} and {processor_name_two} processors are set to the same random guid")
+@given("the \"{property_name}\" properties of the {processor_name_one} and {processor_name_two} processors are set to the same random UUID")
 def step_impl(context, property_name, processor_name_one, processor_name_two):
     uuid_str = str(uuid.uuid4())
     context.get_or_create_default_minifi_container().flow_definition.get_processor(processor_name_one).add_property(property_name, uuid_str)

extensions/splunk/tests/features/splunk.feature

@@ -25,7 +25,7 @@ Feature: Sending data to Splunk HEC using PutSplunkHTTP
     And PutSplunkHTTP is EVENT_DRIVEN
     And a QuerySplunkIndexingStatus processor
     And QuerySplunkIndexingStatus is EVENT_DRIVEN
-    And the "Splunk Request Channel" properties of the PutSplunkHTTP and QuerySplunkIndexingStatus processors are set to the same random guid
+    And the "Splunk Request Channel" properties of the PutSplunkHTTP and QuerySplunkIndexingStatus processors are set to the same random UUID
     And the "Source" property of the PutSplunkHTTP processor is set to "my-source"
     And the "Source Type" property of the PutSplunkHTTP processor is set to "my-source-type"
     And the "Host" property of the PutSplunkHTTP processor is set to "my-host"
@@ -45,7 +45,7 @@ Feature: Sending data to Splunk HEC using PutSplunkHTTP
     And PutFile's success relationship is auto-terminated
 
     When the MiNiFi instance starts up
-    Then a single file with the content "foobar" is placed in the "/tmp/output" directory in less than 120 seconds
+    Then a single file with the content "foobar" is placed in the "/tmp/output" directory in less than 20 seconds
     And an event is registered in Splunk HEC with the content "foobar" with "my-source" set as source and "my-source-type" set as sourcetype and "my-host" set as host
 
   Scenario: A MiNiFi instance transfers data to a Splunk HEC with SSL enabled
@@ -56,7 +56,7 @@ Feature: Sending data to Splunk HEC using PutSplunkHTTP
     And PutSplunkHTTP is EVENT_DRIVEN
     And a QuerySplunkIndexingStatus processor
     And QuerySplunkIndexingStatus is EVENT_DRIVEN
-    And the "Splunk Request Channel" properties of the PutSplunkHTTP and QuerySplunkIndexingStatus processors are set to the same random guid
+    And the "Splunk Request Channel" properties of the PutSplunkHTTP and QuerySplunkIndexingStatus processors are set to the same random UUID
     And the "Source" property of the PutSplunkHTTP processor is set to "my-source"
     And the "Source Type" property of the PutSplunkHTTP processor is set to "my-source-type"
     And the "Host" property of the PutSplunkHTTP processor is set to "my-host"
@@ -79,5 +79,5 @@ Feature: Sending data to Splunk HEC using PutSplunkHTTP
     And SSL is enabled for the Splunk HEC and the SSL context service is set up for PutSplunkHTTP and QuerySplunkIndexingStatus
 
     When the MiNiFi instance starts up
-    Then a single file with the content "foobar" is placed in the "/tmp/output" directory in less than 120 seconds
+    Then a single file with the content "foobar" is placed in the "/tmp/output" directory in less than 20 seconds
     And an event is registered in Splunk HEC with the content "foobar" with "my-source" set as source and "my-source-type" set as sourcetype and "my-host" set as host

extensions/splunk/tests/features/steps/splunk_container.py

@@ -44,9 +44,9 @@ def __init__(self, test_context: MinifiTestContext):
 
         splunk_cert, splunk_key = make_server_cert(self.container_name, test_context.root_ca_cert, test_context.root_ca_key)
         splunk_cert_content = crypto.dump_certificate(crypto.FILETYPE_PEM, splunk_cert)
-        splunkt_key_content = crypto.dump_privatekey(crypto.FILETYPE_PEM, splunk_key)
+        splunk_key_content = crypto.dump_privatekey(crypto.FILETYPE_PEM, splunk_key)
         root_ca_content = crypto.dump_certificate(crypto.FILETYPE_PEM, test_context.root_ca_cert)
-        self.files.append(File("/opt/splunk/etc/auth/splunk_cert.pem", splunk_cert_content.decode() + splunkt_key_content.decode() + root_ca_content.decode(), permissions=0o644))
+        self.files.append(File("/opt/splunk/etc/auth/splunk_cert.pem", splunk_cert_content.decode() + splunk_key_content.decode() + root_ca_content.decode(), permissions=0o644))
         self.files.append(File("/opt/splunk/etc/auth/root_ca.pem", root_ca_content.decode(), permissions=0o644))
 
     def deploy(self):